Bugfix and feature.

Detail:
  * Validation string commands to set the pointer shape were incorrectly
    interpreted if they contained commas to set the active point.
  * Holding down shift when clicking on the back icon will only move the
    window by one position within the window stack.
Admin:
  Tested on Tungsten.

Version 4.83. Tagged as 'Wimp-4_83'

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "4.82"
-Module_Version          SETA    482
+Module_MajorVersion     SETS    "4.83"
+Module_Version          SETA    483
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "05 Dec 2002"
-Module_ApplicationDate  SETS    "05-Dec-02"
+Module_Date             SETS    "13 Dec 2002"
+Module_ApplicationDate  SETS    "13-Dec-02"
 Module_ComponentName    SETS    "Wimp"
 Module_ComponentPath    SETS    "RiscOS/Sources/Desktop/Wimp"
-Module_FullVersion      SETS    "4.82"
-Module_HelpVersion      SETS    "4.82 (05 Dec 2002)"
+Module_FullVersion      SETS    "4.83"
+Module_HelpVersion      SETS    "4.83 (13 Dec 2002)"
                         END

VersionNum

-/* (4.82)
+/* (4.83)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.68.
  *
  */
-#define Module_MajorVersion_CMHG        4.82
+#define Module_MajorVersion_CMHG        4.83
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                05 Dec 2002
+#define Module_Date_CMHG                13 Dec 2002
 
-#define Module_MajorVersion             "4.82"
-#define Module_Version                  482
+#define Module_MajorVersion             "4.83"
+#define Module_Version                  483
 #define Module_MinorVersion             ""
-#define Module_Date                     "05 Dec 2002"
+#define Module_Date                     "13 Dec 2002"
 
-#define Module_ApplicationDate          "05-Dec-02"
+#define Module_ApplicationDate          "13-Dec-02"
 
 #define Module_ComponentName            "Wimp"
 #define Module_ComponentPath            "RiscOS/Sources/Desktop/Wimp"
 
-#define Module_FullVersion              "4.82"
-#define Module_HelpVersion              "4.82 (05 Dec 2002)"
-#define Module_LibraryVersionInfo       "4:82"
+#define Module_FullVersion              "4.83"
+#define Module_HelpVersion              "4.83 (13 Dec 2002)"
+#define Module_LibraryVersionInfo       "4:83"

s/Wimp02

@@ -4147,8 +4147,8 @@ update_pointer_shape_for_icon_create
         CMP     R14,#";"
         MOVEQ   R14,#0
         CMP     R14,#" "
-        STRHIB  r14,[r2],#1
-        BHI     %BT01
+        STRGTB  r14,[r2],#1
+        BGT     %BT01
 
         MOV     R4,#0                   ; Default active point is 0,0
         MOV     R5,#0

s/Wimp03

@@ -1407,8 +1407,8 @@ ptr_iconbar_icon
         CMP     R14,#";"
         MOVEQ   R14,#0
         CMP     R14,#" "
-        STRHIB  r14,[r2],#1
-        BHI     %BT88
+        STRGTB  r14,[r2],#1
+        BGT     %BT88
 
         MOV     R4,#0                   ; Default active point is 0,0
         MOV     R5,#0
@@ -3421,17 +3421,56 @@ makesmall
 
 wicon_back
         BL      int_get_window_state
-      [ RO4
+      [ true
+        MOV     R0, #121
+        MOV     R1, #&80
+        SWI     XOS_Byte                ; Scan keyboard for Shift key
+        TEQ     R1, #&FF
+      ]
+      [ true :LOR: RO4
         LDR     R14,pending_buttons
         AND     R14,R14,#button_right
+        BEQ     %FT12                   ; Branch if so
         ASSERT  button_right = (nullptr - nullptr2)
-        ADD     R14,R14,#nullptr2
+11      ADD     R14,R14,#nullptr2
       |
         MOV     R14,#nullptr2                   ; will not match
       ]
         STR     R14,[userblk,#u_bhandle]        ; so will go to bottom
         B       Exit_OpenWindow
 
+      [ true
+12      LDR     R0,[userblk,#u_handle]
+        Abs     R0,R0
+        ADD     R0,R0,#w_active_link
+        MOV     R2,#wf_isapane
+        ORR     R2,R2,#wf_grabkeys
+        TEQ     R14,#button_right
+        MOVEQ   R3,#ll_backwards
+        MOVNE   R3,#ll_forwards
+        BNE     %FT14                   ; need to search 1 window down, or 2 windows up
+13      LDR     R0,[R0,R3]
+        LDR     R1,[R0,R3]
+        CMP     R1,#nullptr             ; hit the stops?
+        BEQ     %BT11                   ; yes, so behave as though shift wasn't pressed
+        LDR     R1,[R0,#w_flags - w_active_link]
+        TST     R1,R2
+        BNE     %BT13                   ; skip over any panes or hotkey windows
+14      LDR     R0,[R0,R3]
+        LDR     R1,[R0,R3]
+        CMP     R1,#nullptr             ; hit the stops?
+        BEQ     %BT11                   ; yes, so behave as though shift wasn't pressed
+        LDR     R1,[R0,#w_flags - w_active_link]
+        TST     R1,#wf_backwindow       ; hit a backwindow (presumably going down)?
+        BNE     %BT11                   ; don't open behind it!
+        TST     R1,R2
+        BNE     %BT14                   ; skip over any panes or hotkey windows
+        SUB     R0,R0,#w_active_link
+        Rel     R0,R0
+        STR     R0,[userblk,#u_bhandle]
+        B       Exit_OpenWindow
+      ]
+
       [ IconiseButton
 wicon_iconise
         Push	"r0-r4"