Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
RiscOS
S
Sources
Desktop
Wimp
Commits
0941dd09
Commit
0941dd09
authored
Jan 22, 2020
by
Andy Vawer
Committed by
ROOL
Jan 25, 2020
Browse files
Fix crash on closing a task which has a currently open menu and input focus
Version 5.70. Tagged as 'Wimp-5_70'
parent
384a1ec5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
21 deletions
+21
-21
VersionASM
VersionASM
+6
-6
VersionNum
VersionNum
+10
-10
s/CnPCaret
s/CnPCaret
+5
-5
No files found.
VersionASM
View file @
0941dd09
...
...
@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "5.
69
"
Module_Version SETA 5
69
Module_MajorVersion SETS "5.
70
"
Module_Version SETA 5
70
Module_MinorVersion SETS ""
Module_Date SETS "
18
Jan 2020"
Module_ApplicationDate SETS "
18
-Jan-20"
Module_Date SETS "
25
Jan 2020"
Module_ApplicationDate SETS "
25
-Jan-20"
Module_ComponentName SETS "Wimp"
Module_FullVersion SETS "5.
69
"
Module_HelpVersion SETS "5.
69 (18
Jan 2020)"
Module_FullVersion SETS "5.
70
"
Module_HelpVersion SETS "5.
70 (25
Jan 2020)"
END
VersionNum
View file @
0941dd09
/* (5.
69
)
/* (5.
70
)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 5.
69
#define Module_MajorVersion_CMHG 5.
70
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG
18
Jan 2020
#define Module_Date_CMHG
25
Jan 2020
#define Module_MajorVersion "5.
69
"
#define Module_Version 5
69
#define Module_MajorVersion "5.
70
"
#define Module_Version 5
70
#define Module_MinorVersion ""
#define Module_Date "
18
Jan 2020"
#define Module_Date "
25
Jan 2020"
#define Module_ApplicationDate "
18
-Jan-20"
#define Module_ApplicationDate "
25
-Jan-20"
#define Module_ComponentName "Wimp"
#define Module_FullVersion "5.
69
"
#define Module_HelpVersion "5.
69 (18
Jan 2020)"
#define Module_LibraryVersionInfo "5:
69
"
#define Module_FullVersion "5.
70
"
#define Module_HelpVersion "5.
70 (25
Jan 2020)"
#define Module_LibraryVersionInfo "5:
70
"
s/CnPCaret
View file @
0941dd09
...
...
@@ -27,7 +27,7 @@
; remove existing caret or selection or whatever first, depending on how we're called
int_set_caret_position
ROUT
Push
"R0-R
6
,R11,R14"
Push
"R0-R
7
,R11,R14"
; if we're called with R5=-1 then R4,R5 are calculated from R0-R3
; however, R4 is undefined on entry so could be anything.
...
...
@@ -375,7 +375,7 @@ wscp_workarea
; is the icon handle valid?
LDR
R14
,[
handle
,#
w_nicons
]
CMP
R1
,
R14
; icon handle out of range?
Pull
"R0-R
6
,R11,R14"
,
HS
; abort if so
Pull
"R0-R
7
,R11,R14"
,
HS
; abort if so
BHS
exitsetcaret
LDR
R14
,[
handle
,#
w_taskhandle
]
...
...
@@ -520,13 +520,13 @@ exitsetcaret_abort
TEQ
R14
,#
2
BEQ
%FT01
RestPSR
R6
Pull
"R0-R
6
,R11,PC"
; no, continue as normal by exiting
Pull
"R0-R
7
,R11,PC"
; no, continue as normal by exiting
01
; yes. We've finished our things, so we can re-call set_caret_position to set the input focus.
; that way losefocus/gainfocus messages etc will be sent properly and so on
; input focus goes to end point of selection, so
LDMFD
R13
,{
R0
-
R
6
,
R11
}
LDMFD
R13
,{
R0
-
R
7
,
R11
}
MOV
R5
,
R6
; index into string is now the end point
BIC
R4
,
R4
,#
crf_selection
:OR:
crf_nocentre
; was selection, but make it the main caret
...
...
@@ -534,7 +534,7 @@ exitsetcaret_abort
BL
int_set_caret_position
; back round again for another go
RestPSR
R6
Pull
"R0-R
6
,R11,PC"
; finally quit
Pull
"R0-R
7
,R11,PC"
; finally quit
wscp_remove_current_caret
ROUT
; on entry, r0=window handle or -1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment