Skip to content

Commit 46df4dd

Browse files
yuxin-azrtosyuxin-azrtos
committed
Release 6.1.10
1 parent 890c37a commit 46df4dd

580 files changed

Lines changed: 187016 additions & 186620 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎common/inc/gx_api.h‎

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/* APPLICATION INTERFACE DEFINITION RELEASE */
2525
/* */
2626
/* gx_api.h PORTABLE C */
27-
/* 6.1.9 */
27+
/* 6.1.10 */
2828
/* AUTHOR */
2929
/* */
3030
/* Kenneth Maxwell, Microsoft Corporation */
@@ -78,6 +78,14 @@
7878
/* 10-15-2021 Ting Zhu Modified comment(s), */
7979
/* updated patch number, */
8080
/* resulting in version 6.1.9 */
81+
/* 01-31-2022 Kenneth Maxwell Modified comment(s), */
82+
/* removed errant semicolons, */
83+
/* added new member to struct */
84+
/* GX_RADIAL_SLIDER_INFO, */
85+
/* added new member to */
86+
/* vertical and horizontal */
87+
/* list control blocks, */
88+
/* resulting in version 6.1.10 */
8189
/* */
8290
/**************************************************************************/
8391

@@ -101,7 +109,7 @@ extern "C" {
101109
#define AZURE_RTOS_GUIX
102110
#define GUIX_MAJOR_VERSION 6
103111
#define GUIX_MINOR_VERSION 1
104-
#define GUIX_PATCH_VERSION 9
112+
#define GUIX_PATCH_VERSION 10
105113

106114
/* The following symbols are defined for backward compatibility reasons.*/
107115
#define __PRODUCT_GUIX__
@@ -1007,6 +1015,12 @@ typedef struct GX_STRING_STRUCT
10071015
#define GX_TEXT_RENDER_THAI_GLYPH_SHAPING 0x01
10081016
#endif
10091017

1018+
/* Language direction flags. */
1019+
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
1020+
#define GX_LANGUAGE_DIRECTION_LTR 0x01
1021+
#define GX_LANGUAGE_DIRECTION_RTL 0x02
1022+
#endif
1023+
10101024
/* Define macros used in GUIX. */
10111025
#ifndef GX_MIN
10121026
#define GX_MIN(_a, _b) (((_a) < (_b)) ? (_a) : (_b))
@@ -1228,6 +1242,7 @@ typedef struct GX_BIDI_TEXT_INFO_STRUCT
12281242
GX_STRING gx_bidi_text_info_text;
12291243
GX_FONT *gx_bidi_text_info_font;
12301244
GX_VALUE gx_bidi_text_info_display_width;
1245+
GX_BYTE gx_bidi_text_info_direction;
12311246
} GX_BIDI_TEXT_INFO;
12321247

12331248
typedef struct GX_BIDI_RESOLVED_TEXT_INFO_STRUCT
@@ -1396,6 +1411,7 @@ typedef struct GX_RADIAL_SLIDER_INFO_STRUCT
13961411
GX_VALUE gx_radial_slider_info_ycenter;
13971412
USHORT gx_radial_slider_info_radius;
13981413
USHORT gx_radial_slider_info_track_width;
1414+
GX_VALUE gx_radial_slider_info_needle_offset;
13991415
GX_VALUE gx_radial_slider_info_current_angle;
14001416
GX_VALUE gx_radial_slider_info_min_angle;
14011417
GX_VALUE gx_radial_slider_info_max_angle;
@@ -1550,11 +1566,13 @@ typedef struct GX_DISPLAY_STRUCT
15501566
GX_FONT **gx_display_font_table; /* font ID to GX_FONT mapping table */
15511567
GX_COLOR *gx_display_palette; /* only used for 8-bpp palette mode driver */
15521568

1553-
#if defined(GX_ENABLE_DEPRECATED_STRING_API)
1569+
#if defined(GX_ENABLE_DEPRECATED_STRING_API)
15541570
GX_CONST GX_CHAR ***gx_display_language_table_deprecated;
1555-
#endif
1571+
#endif
15561572
GX_CONST GX_STRING **gx_display_language_table; /* Define the language table. */
1557-
1573+
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
1574+
GX_CONST GX_UBYTE *gx_display_language_direction_table; /* Define the langauge direction table. */
1575+
#endif
15581576
UINT gx_display_color_table_size;
15591577
UINT gx_display_pixelmap_table_size;
15601578
UINT gx_display_font_table_size;
@@ -2259,7 +2277,8 @@ typedef struct GX_RICH_TEXT_CONTEXT_STACK_STRUCT
22592277
GX_VALUE gx_vertical_list_visible_rows; \
22602278
GX_VALUE gx_vertical_list_child_count; \
22612279
GX_VALUE gx_vertical_list_child_height; \
2262-
GX_VALUE gx_vertical_list_snap_back_distance;
2280+
GX_VALUE gx_vertical_list_snap_back_distance; \
2281+
GX_WIDGET *gx_vertical_list_idle_child_list;
22632282

22642283
/* Define macro for GX_VERTICAL_LIST, based on GX_WINDOW. */
22652284
#define GX_HORIZONTAL_LIST_MEMBERS_DECLARE \
@@ -2273,7 +2292,8 @@ typedef struct GX_RICH_TEXT_CONTEXT_STACK_STRUCT
22732292
GX_VALUE gx_horizontal_list_visible_columns; \
22742293
GX_VALUE gx_horizontal_list_child_count; \
22752294
GX_VALUE gx_horizontal_list_child_width; \
2276-
GX_VALUE gx_horizontal_list_snap_back_distance;
2295+
GX_VALUE gx_horizontal_list_snap_back_distance; \
2296+
GX_WIDGET *gx_horizontal_list_idle_child_list;
22772297

22782298
#define GX_POPUP_LIST_MEMBERS_DECLARE \
22792299
GX_VERTICAL_LIST gx_popup_list_list; \
@@ -3061,6 +3081,9 @@ typedef struct GX_FIXED_POINT_STRUCT
30613081
#endif
30623082
#define gx_display_language_table_get_ext _gx_display_language_table_get_ext
30633083
#define gx_display_language_table_set_ext _gx_display_language_table_set_ext
3084+
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
3085+
#define gx_display_language_direction_table_set _gx_display_language_direction_table_set
3086+
#endif
30643087
#define gx_display_pixelmap_table_set _gx_display_pixelmap_table_set
30653088
#if defined(GX_ENABLE_DEPRECATED_STRING_API)
30663089
#define gx_display_string_get _gx_display_string_get
@@ -3303,8 +3326,8 @@ typedef struct GX_FIXED_POINT_STRUCT
33033326
#define gx_scroll_wheel_total_rows_set(a, b) _gx_scroll_wheel_total_rows_set((GX_SCROLL_WHEEL *) a, b)
33043327

33053328
#define gx_single_line_text_input_backspace(a) _gx_single_line_text_input_backspace((GX_SINGLE_LINE_TEXT_INPUT *)a)
3306-
#define gx_single_line_text_input_buffer_clear(a) _gx_single_line_text_input_buffer_clear((GX_SINGLE_LINE_TEXT_INPUT *)a);
3307-
#define gx_single_line_text_input_buffer_get(a, b, c, d) _gx_single_line_text_input_buffer_get((GX_SINGLE_LINE_TEXT_INPUT *)a, b, c, d);
3329+
#define gx_single_line_text_input_buffer_clear(a) _gx_single_line_text_input_buffer_clear((GX_SINGLE_LINE_TEXT_INPUT *)a)
3330+
#define gx_single_line_text_input_buffer_get(a, b, c, d) _gx_single_line_text_input_buffer_get((GX_SINGLE_LINE_TEXT_INPUT *)a, b, c, d)
33083331
#define gx_single_line_text_input_character_delete(a) _gx_single_line_text_input_character_delete(a)
33093332
#define gx_single_line_text_input_character_insert(a, b, c) _gx_single_line_text_input_character_insert(a, b, c)
33103333
#define gx_single_line_text_input_create(a, b, c, d, e, f, g, h) _gx_single_line_text_input_create(a, b, (GX_WIDGET *)c, d, e, f, g, h)
@@ -3458,6 +3481,7 @@ typedef struct GX_FIXED_POINT_STRUCT
34583481

34593482
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
34603483
#define gx_utility_bidi_paragraph_reorder _gx_utility_bidi_paragraph_reorder
3484+
#define gx_utility_bidi_paragraph_reorder_ext _gx_utility_bidi_paragraph_reorder_ext
34613485
#define gx_utility_bidi_resolved_text_info_delete _gx_utility_bidi_resolved_text_info_delete
34623486
#endif
34633487
#define gx_utility_canvas_to_bmp _gx_utility_canvas_to_bmp
@@ -3736,7 +3760,9 @@ UINT _gx_display_language_table_set(GX_DISPLAY *display, GX_CHAR ***table, GX_UB
37363760
#endif
37373761
UINT _gx_display_language_table_get_ext(GX_DISPLAY *display, GX_STRING ***table, GX_UBYTE *language_count, UINT *string_count);
37383762
UINT _gx_display_language_table_set_ext(GX_DISPLAY *display, GX_CONST GX_STRING **table, GX_UBYTE num_languages, UINT number_of_strings);
3739-
3763+
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
3764+
UINT _gx_display_language_direction_table_set(GX_DISPLAY *display, GX_CONST GX_UBYTE *language_direction_table, GX_UBYTE num_languages);
3765+
#endif
37403766
UINT _gx_display_pixelmap_table_set(GX_DISPLAY *display, GX_PIXELMAP **pixelmap_table, UINT number_of_pixelmaps);
37413767

37423768
#if defined(GX_ENABLE_DEPRECATED_STRING_API)
@@ -4256,6 +4282,7 @@ UINT _gx_tree_view_selected_set(GX_TREE_VIEW *tree, GX_WIDGET *selected);
42564282

42574283
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
42584284
UINT _gx_utility_bidi_paragraph_reorder(GX_BIDI_TEXT_INFO *input_info, GX_BIDI_RESOLVED_TEXT_INFO **resolved_info_head);
4285+
UINT _gx_utility_bidi_paragraph_reorder_ext(GX_BIDI_TEXT_INFO *input_info, GX_BIDI_RESOLVED_TEXT_INFO **resolved_info_head);
42594286
UINT _gx_utility_bidi_resolved_text_info_delete(GX_BIDI_RESOLVED_TEXT_INFO **resolved_info_head);
42604287
#endif
42614288
UINT _gx_utility_canvas_to_bmp(GX_CANVAS *canvas, GX_RECTANGLE *rect, UINT(*write_data)(GX_UBYTE *byte_data, UINT data_count));
@@ -4535,6 +4562,9 @@ UINT _gx_window_wallpaper_set(GX_WINDOW *window, GX_RESOURCE_ID wallpaper_id, GX
45354562
#endif
45364563
#define gx_display_language_table_get_ext _gxe_display_language_table_get_ext
45374564
#define gx_display_language_table_set_ext _gxe_display_language_table_set_ext
4565+
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
4566+
#define gx_display_language_direction_table_set _gxe_display_language_direction_table_set
4567+
#endif
45384568
#define gx_display_pixelmap_table_set _gxe_display_pixelmap_table_set
45394569
#if defined(GX_ENABLE_DEPRECATED_STRING_API)
45404570
#define gx_display_string_get _gxe_display_string_get
@@ -4775,8 +4805,8 @@ UINT _gx_window_wallpaper_set(GX_WINDOW *window, GX_RESOURCE_ID wallpaper_id, GX
47754805
#define gx_scroll_wheel_total_rows_set(a, b) _gxe_scroll_wheel_total_rows_set((GX_SCROLL_WHEEL *) a, b)
47764806

47774807
#define gx_single_line_text_input_backspace(a) _gxe_single_line_text_input_backspace((GX_SINGLE_LINE_TEXT_INPUT *)a)
4778-
#define gx_single_line_text_input_buffer_clear(a) _gxe_single_line_text_input_buffer_clear((GX_SINGLE_LINE_TEXT_INPUT *)a);
4779-
#define gx_single_line_text_input_buffer_get(a, b, c, d) _gxe_single_line_text_input_buffer_get((GX_SINGLE_LINE_TEXT_INPUT *)a, b, c, d);
4808+
#define gx_single_line_text_input_buffer_clear(a) _gxe_single_line_text_input_buffer_clear((GX_SINGLE_LINE_TEXT_INPUT *)a)
4809+
#define gx_single_line_text_input_buffer_get(a, b, c, d) _gxe_single_line_text_input_buffer_get((GX_SINGLE_LINE_TEXT_INPUT *)a, b, c, d)
47804810
#define gx_single_line_text_input_character_delete(a) _gxe_single_line_text_input_character_delete(a)
47814811
#define gx_single_line_text_input_character_insert(a, b, c) _gxe_single_line_text_input_character_insert(a, b, c)
47824812
#define gx_single_line_text_input_create(a, b, c, d, e, f, g, h) _gxe_single_line_text_input_create(a, b, (GX_WIDGET *)c, d, e, f, g, h, sizeof(GX_SINGLE_LINE_TEXT_INPUT))
@@ -4929,6 +4959,7 @@ UINT _gx_window_wallpaper_set(GX_WINDOW *window, GX_RESOURCE_ID wallpaper_id, GX
49294959

49304960
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
49314961
#define gx_utility_bidi_paragraph_reorder _gxe_utility_bidi_paragraph_reorder
4962+
#define gx_utility_bidi_paragraph_reorder_ext _gxe_utility_bidi_paragraph_reorder_ext
49324963
#define gx_utility_bidi_resolved_text_info_delete _gxe_utility_bidi_resolved_text_info_delete
49334964
#endif
49344965
#define gx_utility_canvas_to_bmp _gxe_utility_canvas_to_bmp
@@ -5205,6 +5236,9 @@ UINT _gxe_display_language_table_set(GX_DISPLAY *display, GX_CHAR ***table, GX_
52055236
#endif
52065237
UINT _gxe_display_language_table_get_ext(GX_DISPLAY *display, GX_STRING ***table, GX_UBYTE *language_count, UINT *string_count);
52075238
UINT _gxe_display_language_table_set_ext(GX_DISPLAY *display, GX_CONST GX_STRING **table, GX_UBYTE num_languages, UINT number_of_strings);
5239+
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
5240+
UINT _gxe_display_language_direction_table_set(GX_DISPLAY *display, GX_CONST GX_UBYTE *language_direction_table, GX_UBYTE num_languages);
5241+
#endif
52085242
UINT _gxe_display_pixelmap_table_set(GX_DISPLAY *display, GX_PIXELMAP **pixelmap_table, UINT number_of_pixelmaps);
52095243
#if defined(GX_ENABLE_DEPRECATED_STRING_API)
52105244
UINT _gxe_display_string_get(GX_DISPLAY *display, GX_RESOURCE_ID string_id, GX_CONST GX_CHAR **return_string);
@@ -5721,6 +5755,7 @@ UINT _gxe_utility_gradient_create(GX_GRADIENT *gradient, GX_VALUE width, GX_V
57215755
UINT _gxe_utility_gradient_delete(GX_GRADIENT *gradient);
57225756
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
57235757
UINT _gxe_utility_bidi_paragraph_reorder(GX_BIDI_TEXT_INFO *input_info, GX_BIDI_RESOLVED_TEXT_INFO **resolved_info_head);
5758+
UINT _gxe_utility_bidi_paragraph_reorder_ext(GX_BIDI_TEXT_INFO *input_info, GX_BIDI_RESOLVED_TEXT_INFO **resolved_info_head);
57245759
UINT _gxe_utility_bidi_resolved_text_info_delete(GX_BIDI_RESOLVED_TEXT_INFO **resolved_info_head);
57255760
#endif
57265761
UINT _gxe_utility_canvas_to_bmp(GX_CANVAS *canvas, GX_RECTANGLE *rect, UINT(*write_data)(GX_UBYTE *byte_data, UINT data_count));

‎common/inc/gx_display.h‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* COMPONENT DEFINITION RELEASE */
2727
/* */
2828
/* gx_display.h PORTABLE C */
29-
/* 6.1.5 */
29+
/* 6.1.10 */
3030
/* AUTHOR */
3131
/* */
3232
/* Kenneth Maxwell, Microsoft Corporation */
@@ -56,6 +56,10 @@
5656
/* added macro */
5757
/* GX_SET_32BPP_BLEND_FUNCTION,*/
5858
/* resulting in version 6.1.5 */
59+
/* 01-31-2022 Ting Zhu Modified comment(s), */
60+
/* added language direction */
61+
/* table set declarations, */
62+
/* resulting in version 6.1.10 */
5963
/* */
6064
/**************************************************************************/
6165

@@ -83,6 +87,9 @@ UINT _gx_display_language_table_set(GX_DISPLAY *display, GX_CHAR ***table, GX_UB
8387
#endif
8488
UINT _gx_display_language_table_get_ext(GX_DISPLAY *display, GX_STRING ***table, GX_UBYTE *language_count, UINT *string_count);
8589
UINT _gx_display_language_table_set_ext(GX_DISPLAY *display, GX_CONST GX_STRING **table, GX_UBYTE num_languages, UINT number_of_strings);
90+
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
91+
UINT _gx_display_language_direction_table_set(GX_DISPLAY *display, GX_CONST GX_UBYTE *language_direction_table, GX_UBYTE num_languages);
92+
#endif
8693
UINT _gx_display_pixelmap_table_set(GX_DISPLAY *display, GX_PIXELMAP **pixelmap_table, UINT number_of_pixelmaps);
8794
#if defined(GX_ENABLE_DEPRECATED_STRING_API)
8895
UINT _gx_display_string_get(GX_DISPLAY *display, GX_RESOURCE_ID string_id, GX_CONST GX_CHAR **return_string);
@@ -104,6 +111,9 @@ UINT _gxe_display_language_table_set(GX_DISPLAY *display, GX_CHAR ***table, GX_U
104111
#endif
105112
UINT _gxe_display_language_table_get_ext(GX_DISPLAY *display, GX_STRING ***table, GX_UBYTE *language_count, UINT *string_count);
106113
UINT _gxe_display_language_table_set_ext(GX_DISPLAY *display, GX_CONST GX_STRING **table, GX_UBYTE num_languages, UINT number_of_strings);
114+
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
115+
UINT _gxe_display_language_direction_table_set(GX_DISPLAY *display, GX_CONST GX_UBYTE *language_direction_table, GX_UBYTE num_languages);
116+
#endif
107117
UINT _gxe_display_pixelmap_table_set(GX_DISPLAY *display, GX_PIXELMAP **pixelmap_table, UINT number_of_pixelmaps);
108118

109119
#if defined(GX_ENABLE_DEPRECATED_STRING_API)

‎common/inc/gx_user_sample.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/* APPLICATION INTERFACE DEFINITION RELEASE */
2525
/* */
2626
/* gx_user.h PORTABLE C */
27-
/* 6.1 */
27+
/* 6.1.10 */
2828
/* AUTHOR */
2929
/* */
3030
/* Kenneth Maxwell, Microsoft Corporation */
@@ -42,6 +42,9 @@
4242
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
4343
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
4444
/* resulting in version 6.1 */
45+
/* 01-31-2022 Kenneth Maxwell Modified comment(s), */
46+
/* fixed typo, */
47+
/* resulting in version 6.1.10 */
4548
/* */
4649
/**************************************************************************/
4750

@@ -53,7 +56,7 @@
5356
GUI API services, comment out the definition below to reduce system
5457
overhead.
5558
*/
56-
/* #define GUIX_DISABLE_MULTITHREAD_SUPPORT */
59+
/* #define GX_DISABLE_MULTITHREAD_SUPPORT */
5760

5861
/* Defined, GUIX disables UTF8 support. */
5962
/* #define GX_DISABLE_UTF8_SUPPORT */

0 commit comments

Comments
 (0)