Commit b752d15a authored by Jeffrey Lee's avatar Jeffrey Lee Committed by ROOL
Browse files

Fix delivery of extended scroll requests

Extended scroll requests and regular scroll requests share the same
reason code, but are different sizes. Update calcmessagesize to
calculate the size of extended scroll messages correctly, so that the
icon number won't get chopped off when the message is being passed to
the target task.

Version 5.73. Tagged as 'Wimp-5_73'
parent 791a168f
......@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "5.72"
Module_Version SETA 572
Module_MajorVersion SETS "5.73"
Module_Version SETA 573
Module_MinorVersion SETS ""
Module_Date SETS "11 Apr 2020"
Module_ApplicationDate SETS "11-Apr-20"
Module_Date SETS "02 May 2020"
Module_ApplicationDate SETS "02-May-20"
Module_ComponentName SETS "Wimp"
Module_FullVersion SETS "5.72"
Module_HelpVersion SETS "5.72 (11 Apr 2020)"
Module_FullVersion SETS "5.73"
Module_HelpVersion SETS "5.73 (02 May 2020)"
END
/* (5.72)
/* (5.73)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 5.72
#define Module_MajorVersion_CMHG 5.73
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 11 Apr 2020
#define Module_Date_CMHG 02 May 2020
#define Module_MajorVersion "5.72"
#define Module_Version 572
#define Module_MajorVersion "5.73"
#define Module_Version 573
#define Module_MinorVersion ""
#define Module_Date "11 Apr 2020"
#define Module_Date "02 May 2020"
#define Module_ApplicationDate "11-Apr-20"
#define Module_ApplicationDate "02-May-20"
#define Module_ComponentName "Wimp"
#define Module_FullVersion "5.72"
#define Module_HelpVersion "5.72 (11 Apr 2020)"
#define Module_LibraryVersionInfo "5:72"
#define Module_FullVersion "5.73"
#define Module_HelpVersion "5.73 (02 May 2020)"
#define Module_LibraryVersionInfo "5:73"
......@@ -725,6 +725,8 @@ calcmessagesize
CMP R3,#0
Pull "PC",GE ; < 0 ==> work it out
;
TEQ R0,#Scroll_Request
BEQ go_scrollrequest
TEQ R0,#Menu_Select
BEQ go_menuselsize
TEQ R0,#User_Message
......@@ -753,7 +755,7 @@ mess_sizes
DCD 4 * 4 ; user_dragbox (x0,y0,x1,y1)
DCD 4 * 7 ; key_pressed (wh,ih,x,y,h,i,k)
DCD -1 ; menu_select
DCD 4 * 10 ; scroll_window (cf. open_window)
DCD -1 ; scroll_request (cf. open_window)
DCD 4 * 6 ; lose_caret
DCD 4 * 6 ; gain_caret
DCD 0 ;
......@@ -765,6 +767,18 @@ mess_sizes
DCD -1 ; user_message_acknowledge
ASSERT (.-mess_sizes) = max_reason*4
go_scrollrequest
;
; Extended scroll requests have an extra word, for indicating the target icon
;
LDR R3,[R1,#u_scroll] ; Examine scroll directions
LDR R14,[R1,#u_scroll+4]
TST R3,#3 ; Extended requests are multiples of 4
TSTEQ R14,#3
MOVEQ R3,#4 * 11 ; Extended scroll
MOVNE R3,#4 * 10 ; Normal scroll
Pull "PC"
go_menuselsize
MOV R3,R1 ; R3 --> start of block
01
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment