Release 6.1.12

eclipse-threadx · Jul 26, 2022 · cec32ac · cec32ac
1 parent 3cc40b6
commit cec32ac
Show file tree

Hide file tree

Showing 59 changed files with 119 additions and 80 deletions.
diff --git a/common/inc/gx_api.h b/common/inc/gx_api.h
@@ -24,7 +24,7 @@
 /*  APPLICATION INTERFACE DEFINITION                       RELEASE        */
 /*                                                                        */
 /*    gx_api.h                                            PORTABLE C      */
-/*                                                           6.1.11       */
+/*                                                           6.1.12       */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Kenneth Maxwell, Microsoft Corporation                              */
@@ -92,6 +92,10 @@
 /*                                            added new animation flag    */
 /*                                            GX_ANIMATION_BLOCK_MOVE,    */
 /*                                            resulting in version 6.1.11 */
+/*  07-29-2022     Kenneth Maxwell          Modified comment(s),          */
+/*                                            added new style             */
+/*                                            GX_STYLE_REPEAT_SELECT,     */
+/*                                            resulting in version 6.1.12 */
 /*                                                                        */
 /**************************************************************************/
 
@@ -115,7 +119,7 @@ extern   "C" {
 #define AZURE_RTOS_GUIX
 #define GUIX_MAJOR_VERSION 6
 #define GUIX_MINOR_VERSION 1
-#define GUIX_PATCH_VERSION 11
+#define GUIX_PATCH_VERSION 12
 
 /* The following symbols are defined for backward compatibility reasons.*/
 #define __PRODUCT_GUIX__
@@ -799,6 +803,7 @@ typedef struct GX_STRING_STRUCT
 #define GX_STYLE_CENTER_SELECTED            0x00000010UL
 #define GX_STYLE_WRAP                       0x00000020UL
 #define GX_STYLE_FLICKABLE                  0x00000040UL
+#define GX_STYLE_REPEAT_SELECT              0x00000080UL
 
 
 /* Define Icon, Pixelmap button and Icon button alignment flags.  */

diff --git a/common/src/gx_display_driver_32argb_pixelmap_draw.c b/common/src/gx_display_driver_32argb_pixelmap_draw.c
@@ -123,7 +123,7 @@ GX_RECTANGLE *clip = context -> gx_draw_context_clip;
 /*                                                                        */
 /*    _gx_display_driver_32xrgb_pixelmap_compressed_alpha_write           */
 /*                                                        PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.12       */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Kenneth Maxwell, Microsoft Corporation                              */
@@ -161,6 +161,8 @@ GX_RECTANGLE *clip = context -> gx_draw_context_clip;
 /*  05-19-2020     Kenneth Maxwell          Initial Version 6.0           */
 /*  09-30-2020     Kenneth Maxwell          Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  07-29-2022     Kenneth Maxwell          Modified comment(s),          */
+/*                                            resulting in version 6.1.12 */
 /*                                                                        */
 /**************************************************************************/
 static VOID _gx_display_driver_32argb_pixelmap_compressed_alpha_write(GX_DRAW_CONTEXT *context,
@@ -205,7 +207,7 @@ GX_RECTANGLE      *clip = context -> gx_draw_context_clip;
     }
 
     /* now we are on the first visible row, copy pixels until we get
-       to the enf of the last visible row
+       to the end of the last visible row
      */
 
     while (yval <= clip -> gx_rectangle_bottom)

diff --git a/common/src/gx_horizontal_list_event_process.c b/common/src/gx_horizontal_list_event_process.c
@@ -37,7 +37,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _gx_horizontal_list_event_process                   PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.12       */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Kenneth Maxwell, Microsoft Corporation                              */
@@ -90,6 +90,10 @@
 /*  05-19-2020     Kenneth Maxwell          Initial Version 6.0           */
 /*  09-30-2020     Kenneth Maxwell          Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  07-29-2022     Kenneth Maxwell          Modified comment(s),          */
+/*                                            fixed bug in EVENT_PEN_DRAG */
+/*                                            handler,                    */
+/*                                            resulting in version 6.1.12 */
 /*                                                                        */
 /**************************************************************************/
 UINT  _gx_horizontal_list_event_process(GX_HORIZONTAL_LIST *list, GX_EVENT *event_ptr)
@@ -104,6 +108,8 @@ INT           list_width;
 INT           widget_width;
 INT           new_pen_index;
 GX_WIDGET   **stackptr;
+GX_WIDGET   **stacktop;
+
 GX_EVENT      input_release_event;
 
     switch (event_ptr -> gx_event_type)
@@ -222,19 +228,21 @@ GX_EVENT      input_release_event;
             {
                 /* Start sliding, remove other widgets from input capture stack.  */
                 stackptr = _gx_system_input_capture_stack;
+                stacktop = _gx_system_input_capture_stack + _gx_system_capture_count;
+
                 memset(&input_release_event, 0, sizeof(GX_EVENT));
                 input_release_event.gx_event_type = GX_EVENT_INPUT_RELEASE;
 
-                while (*stackptr)
+                while (stackptr < stacktop)
                 {
-                    if (*stackptr != widget)
+                    if (*stackptr != GX_NULL && *stackptr != widget)
                     {
                         input_release_event.gx_event_target = *stackptr;
                         _gx_system_event_send(&input_release_event);
                     }
                     stackptr++;
                 }
-
+ 
                 _gx_horizontal_list_scroll(list,
                                            event_ptr -> gx_event_payload.gx_event_pointdata.gx_point_x -
                                            list -> gx_window_move_start.gx_point_x);

diff --git a/common/src/gx_horizontal_list_selected_set.c b/common/src/gx_horizontal_list_selected_set.c
@@ -35,7 +35,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _gx_horizontal_list_selected_set                    PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.12       */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Kenneth Maxwell, Microsoft Corporation                              */
@@ -74,6 +74,10 @@
 /*  05-19-2020     Kenneth Maxwell          Initial Version 6.0           */
 /*  09-30-2020     Kenneth Maxwell          Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  07-29-2022     Kenneth Maxwell          Modified comment(s),          */
+/*                                            added support for           */
+/*                                            GX_STYLE_REPEAT_SELECT,     */
+/*                                            resulting in version 6.1.12 */
 /*                                                                        */
 /**************************************************************************/
 
@@ -87,7 +91,10 @@ INT        right_index;
 
     if (horizontal_list -> gx_horizontal_list_selected == index)
     {
-        return GX_SUCCESS;
+        if ((horizontal_list -> gx_widget_style & GX_STYLE_REPEAT_SELECT) == 0)
+        {
+            return GX_SUCCESS;
+        }
     }
 
     if (index < 0)

diff --git a/common/src/gx_system_input_release.c b/common/src/gx_system_input_release.c
@@ -34,7 +34,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _gx_system_input_release                            PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.12       */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Kenneth Maxwell, Microsoft Corporation                              */
@@ -69,6 +69,11 @@
 /*  05-19-2020     Kenneth Maxwell          Initial Version 6.0           */
 /*  09-30-2020     Kenneth Maxwell          Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  07-29-2022     Kenneth Maxwell          Modified comment(s),          */
+/*                                            optimized logic and ensured */
+/*                                            released stack entries are  */
+/*                                            reset to NULL,              */
+/*                                            resulting in version 6.1.12 */
 /*                                                                        */
 /**************************************************************************/
 
@@ -92,7 +97,6 @@ UINT        status = GX_PTR_ERROR;
                 {
                     _gx_widget_status_remove(owner, GX_STATUS_OWNS_INPUT);
                     _gx_system_capture_count--;
-                    *stackptr = GX_NULL;
                     status = GX_SUCCESS;
                     break;
                 }
@@ -102,14 +106,13 @@ UINT        status = GX_PTR_ERROR;
             if (status == GX_SUCCESS)
             {
                 /* collapse the stack if this entry was in the middle */
-                if (stackptr < stacktop)
+                while (stackptr < stacktop)
                 {
-                    while (stackptr < stacktop)
-                    {
-                        *stackptr = *(stackptr + 1);
-                        stackptr++;
-                    }
+                    *stackptr = *(stackptr + 1);
+                    stackptr++;
                 }
+                *stackptr = GX_NULL;
+
                 if (_gx_system_capture_count > 0)
                 {
                     stacktop--;

diff --git a/common/src/gx_vertical_list_event_process.c b/common/src/gx_vertical_list_event_process.c
@@ -35,7 +35,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _gx_vertical_list_event_process                     PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.12       */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Kenneth Maxwell, Microsoft Corporation                              */
@@ -86,6 +86,10 @@
 /*  05-19-2020     Kenneth Maxwell          Initial Version 6.0           */
 /*  09-30-2020     Kenneth Maxwell          Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  07-29-2022     Kenneth Maxwell          Modified comment(s),          */
+/*                                            fixed bug in EVENT_PEN_DRAG */
+/*                                            handler,                    */
+/*                                            resulting in version 6.1.12 */
 /*                                                                        */
 /**************************************************************************/
 UINT  _gx_vertical_list_event_process(GX_VERTICAL_LIST *list, GX_EVENT *event_ptr)
@@ -100,6 +104,7 @@ INT           list_height;
 INT           widget_height;
 INT           new_pen_index;
 GX_WIDGET   **stackptr;
+GX_WIDGET   **stacktop;
 GX_EVENT      input_release_event;
 
     switch (event_ptr -> gx_event_type)
@@ -219,12 +224,14 @@ GX_EVENT      input_release_event;
             {
                 /* Start sliding, remove other widgets from input capture stack.  */
                 stackptr = _gx_system_input_capture_stack;
+                stacktop = _gx_system_input_capture_stack + _gx_system_capture_count;
+
                 memset(&input_release_event, 0, sizeof(GX_EVENT));
                 input_release_event.gx_event_type = GX_EVENT_INPUT_RELEASE;
 
-                while (*stackptr)
+                while (stackptr < stacktop)
                 {
-                    if (*stackptr != widget)
+                    if (*stackptr != GX_NULL && *stackptr != widget)
                     {
                         input_release_event.gx_event_target = *stackptr;
                         _gx_system_event_send(&input_release_event);

diff --git a/common/src/gx_vertical_list_selected_set.c b/common/src/gx_vertical_list_selected_set.c
@@ -35,7 +35,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _gx_vertical_list_selected_set                      PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.12       */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Kenneth Maxwell, Microsoft Corporation                              */
@@ -75,6 +75,9 @@
 /*  05-19-2020     Kenneth Maxwell          Initial Version 6.0           */
 /*  09-30-2020     Kenneth Maxwell          Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  07-29-2022     Kenneth Maxwell          Added support for GX_STYLE_   */
+/*                                            REPEAT_SELECT,              */
+/*                                            resulting in version 6.1.12 */
 /*                                                                        */
 /**************************************************************************/
 UINT _gx_vertical_list_selected_set(GX_VERTICAL_LIST *vertical_list, INT index)
@@ -85,9 +88,12 @@ INT        page_index = vertical_list -> gx_vertical_list_top_index;
 INT        top_index;
 INT        bottom_index;
 
-    if (vertical_list -> gx_vertical_list_selected == index)
+   if (vertical_list -> gx_vertical_list_selected == index)
     {
-        return GX_SUCCESS;
+        if ((vertical_list -> gx_widget_style & GX_STYLE_REPEAT_SELECT) == 0)
+        {
+            return GX_SUCCESS;
+        }
     }
 
     if (index < 0)

diff --git a/ports/arc_em/metaware/inc/gx_port.h b/ports/arc_em/metaware/inc/gx_port.h
@@ -139,7 +139,7 @@ typedef SHORT  GX_VALUE;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX ARCv2_EM/MetaWare Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX ARCv2_EM/MetaWare Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif

diff --git a/ports/arc_hs/metaware/inc/gx_port.h b/ports/arc_hs/metaware/inc/gx_port.h
@@ -139,7 +139,7 @@ typedef SHORT  GX_VALUE;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX ARC_HS/MetaWare Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX ARC_HS/MetaWare Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif

diff --git a/ports/arm9/ac5/inc/gx_port.h b/ports/arm9/ac5/inc/gx_port.h
@@ -139,7 +139,7 @@ typedef SHORT  GX_VALUE;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX ARM9/AC5 Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX ARM9/AC5 Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif

diff --git a/ports/arm9/gnu/inc/gx_port.h b/ports/arm9/gnu/inc/gx_port.h
@@ -139,7 +139,7 @@ typedef SHORT  GX_VALUE;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX ARM9/GNU Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX ARM9/GNU Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif

diff --git a/ports/arm9/iar/inc/gx_port.h b/ports/arm9/iar/inc/gx_port.h
@@ -139,7 +139,7 @@ typedef SHORT  GX_VALUE;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX ARM9/IAR Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX ARM9/IAR Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif

diff --git a/ports/c667x/ccs/inc/gx_port.h b/ports/c667x/ccs/inc/gx_port.h
@@ -139,7 +139,7 @@ typedef SHORT  GX_VALUE;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX C6xxx/TI Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX C6xxx/TI Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif

diff --git a/ports/ccrx/inc/gx_port.h b/ports/ccrx/inc/gx_port.h
@@ -146,7 +146,7 @@ typedef unsigned char GX_UCHAR;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif

diff --git a/ports/cortex_a15/gnu/inc/gx_port.h b/ports/cortex_a15/gnu/inc/gx_port.h
@@ -139,7 +139,7 @@ typedef SHORT  GX_VALUE;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Cortex-A15/GNU Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Cortex-A15/GNU Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif

diff --git a/ports/cortex_a5/ac5/inc/gx_port.h b/ports/cortex_a5/ac5/inc/gx_port.h
@@ -139,7 +139,7 @@ typedef SHORT  GX_VALUE;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Cortex-A5/AC5 Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Cortex-A5/AC5 Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif

diff --git a/ports/cortex_a5/gnu/inc/gx_port.h b/ports/cortex_a5/gnu/inc/gx_port.h
@@ -139,7 +139,7 @@ typedef SHORT  GX_VALUE;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Cortex-A5/GNU Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Cortex-A5/GNU Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif

diff --git a/ports/cortex_a5/iar/inc/gx_port.h b/ports/cortex_a5/iar/inc/gx_port.h
@@ -139,7 +139,7 @@ typedef SHORT  GX_VALUE;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Cortex-A5/IAR Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Cortex-A5/IAR Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif

diff --git a/ports/cortex_a5x/ac6/inc/gx_port.h b/ports/cortex_a5x/ac6/inc/gx_port.h
@@ -139,7 +139,7 @@ typedef SHORT  GX_VALUE;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Cortex-A5x/AC6 Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Cortex-A5x/AC6 Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif

diff --git a/ports/cortex_a7/ac5/inc/gx_port.h b/ports/cortex_a7/ac5/inc/gx_port.h
@@ -139,7 +139,7 @@ typedef SHORT  GX_VALUE;
 
 #ifdef GX_SYSTEM_INIT
 CHAR _gx_version_id[] =
-    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Cortex-A7/AC5 Version 6.1.11 *";
+    "Copyright (c) Microsoft Corporation. All rights reserved.  *  GUIX Cortex-A7/AC5 Version 6.1.12 *";
 #else
 extern  CHAR _gx_version_id[];
 #endif