Skip to content

GitLab

Commit 99c7e1f2 authored by Ben Avison's avatar Ben Avison
Browse files

Window tool button type is now configurable. 

Windows now keep the same depth when toggle-size tool is clicked with Adjust.
Fixed bug where drags in Eureka caused branch-through-zeros and other
miscellaneous errors.
Fixed a few stray non-X form SWI calls.
Extended applicability/functionality of "MyEntry" debug macro.
parent 3382bc1d
Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 51 deletions
Options/s/!Debug
View file @ 99c7e1f2
......@@ -96,5 +96,6 @@
OptionD autohg, false ; AutoHourglass
OptionD sprprior, false ; ROM vs RAM sprite priority
OptionD autoscr, false ; autoscrolling / drags within windows
OptionD poll2, false ; stages through Wimp_Poll
END
Resources/UK/CmdHelp
View file @ 99c7e1f2
No preview for this file type
Version
View file @ 99c7e1f2
......@@ -6,6 +6,6 @@
Version SETA 399
VString SETS "3.99"
Date SETS "27 May 1998"
Date SETS "03 Jul 1998"
END
s/AutoScroll
View file @ 99c7e1f2
......@@ -90,6 +90,8 @@ a_wsptr # 4
;;-----------------------------------------------------------------------------
SWIWimp_AutoScroll
MyEntry "AutoScroll"
TST R0, #af_read
BNE return_autoscroll_state ; Wimp_Init not necessary to read state
......
s/NewSWIs
View file @ 99c7e1f2
......@@ -15,6 +15,8 @@
; > source.NewSWIs
SWIWimp_TextOp
MyEntry "TextOp"
AND userblk,R0,#255
TEQ userblk,#0
TEQNE userblk,#1
......@@ -48,10 +50,10 @@ textop_setcolours
MOV R0,R2
MOV R3,#128 ; bg
MOV R4,#0
SWI ColourTrans_SetGCOL
SWI XColourTrans_SetGCOL
MOVVC R0,R1
MOVVC R3,#0
SWIVC ColourTrans_SetGCOL
SWIVC XColourTrans_SetGCOL
Pull PC
......@@ -219,6 +221,8 @@ textop_sysfontwidth_loop
Pull "PC"
SWIWimp_ResizeIcon
MyEntry "ResizeIcon"
CMP R0,#0
LDRLT handle,iconbarhandle
MOVGE handle,R0
......@@ -276,6 +280,8 @@ badiconhandle
B ExitWimp
SWIWimp_Extend
MyEntry "Extend"
TEQ R0,#1
MOVEQ R0,R12
BEQ ExitWimp
......
s/Watchdog
View file @ 99c7e1f2
......@@ -294,6 +294,8 @@ printjobrunning ENTRY R0
LTORG
SWIWimp_SetWatchdogState
MyEntry "SetWatchdogState"
[ NewErrorSystem
TEQ R0,#0
BNE %FT01
......
s/Wimp01
View file @ 99c7e1f2
......@@ -155,7 +155,19 @@ $label
MACRO
$lab MyEntry $string
$lab Debug task2,"$string called by:",#taskhandle
$lab
[ debugtask2
Push "R0"
LDR R0, [sp, #1*4 + 11*4 + 2*4 + 2*4] ; get return address from stack - skip:
; 1 word: for storing R0 here
; 11 words: registers stored by generic Wimp SWI code
; 2 words: for Wimp re-entrancy
; 1 word: return address in kernel
; 1 word: used by kernel
SUB R0, R0, #4 ; we actually want the previous instruction
Debug task2,"$string called by, from:",#taskhandle,R0
Pull "R0"
]
MEND
MACRO
......@@ -512,6 +524,11 @@ WimpSpritePrecedenceC_Syntax DCB "Syntax: *Configure WimpSpritePrecedence RAM
WimpStickyEdgesC_Help DCB "*Configure WimpStickyEdges sets whether 'force on screen' directions can be "
DCB "overridden by pushing a window 'hard' enough.",cr
WimpStickyEdgesC_Syntax DCB "Syntax: *Configure WimpStickyEdges On|Off",0
]
[ BounceClose
WimpButtonTypeC_Help DCB "*Configure WimpButtonType sets whether the back, close, iconise and toggle-size icons "
DCB "act when you click on them or when you release the mouse button afterwards.",cr
WimpButtonTypeC_Syntax DCB "Syntax: *Configure WimpButtonType Click|Release",0
]
ALIGN
......@@ -613,6 +630,10 @@ WimpSpritePrecedenceC_Syntax DCB "SWNMSPP",0
[ StickyEdges
WimpStickyEdgesC_Help DCB "HWNMSE",0
WimpStickyEdgesC_Syntax DCB "SWNMSE",0
]
[ BounceClose
WimpButtonTypeC_Help DCB "HWNMBT",0
WimpButtonTypeC_Syntax DCB "SWNMBT",0
]
ALIGN
......@@ -645,6 +666,9 @@ Helptable
[ SpritePriority
Command WimpSpritePrecedence,1,1,Status_Keyword_Flag:OR:International_Help,WimpSpritePrecedenceC
]
[ BounceClose
Command WimpButtonType,1,1,Status_Keyword_Flag:OR:International_Help,WimpButtonTypeC
]
[ IconiseButton
Command WimpIconiseButton,1,1,Status_Keyword_Flag:OR:International_Help,WimpIconiseButtonC
]
......@@ -1221,6 +1245,8 @@ getspritefname
;
SWIWimp_SpriteOp
; MyEntry "SpriteOp"
AND R0,R0,#&FF ; just in case!
TEQ R0,#SpriteReason_MergeSpriteFile
BEQ %FT01
......@@ -1414,6 +1440,8 @@ int_merge_sprites
; R1 --> common sprite area (RAM)
SWIWimp_BaseOfSprites
; MyEntry "BaseOfSprites"
LDR R0,baseofromsprites
LDR R1,baseofsprites
STR R1,[sp,#0*4] ; overwrite stacked value
......@@ -1666,6 +1694,18 @@ gotwork
MOVVS R0, #0
STR R0, preferredpool
]
;
; ReadWimpButtonType
[ BounceClose
MOV R0, #ReadCMOS
MOV R1, #DesktopFeaturesCMOS
SWI XOS_Byte
TST R2, #1 :SHL: 6 ; preserves V
MOVEQ R0, #0
MOVNE R0, #1
MOVVS R0, #0
STRB R0, buttontype
]
;
; Read WimpIconiseButton
[ IconiseButton
......@@ -3451,6 +3491,10 @@ iconisebutton # 1 ; nonzero => add iconise button
stickyedges # 1 ; nonzero => interpret "force on screen" as sticky
]
[ BounceClose
buttontype # 1 ; nonzero => buttons are release-type
]
[ PoppingIconBar
popiconbar # 1 ; nonzero => enable autofronting
ALIGNHASH 4
......@@ -4398,8 +4442,7 @@ return
;Restore the current font and font colours that were in force on
; entry, if they've been changed. Preserve flags while doing
; this.
TraceK exit, "ExitWimp: restoring font and font colours"
TraceNL exit
Debug exit, "ExitWimp: restoring font and font colours"
Push "R0-R3,PC"
LDR R0, currentfont
TEQ R0, #0
......@@ -4410,8 +4453,7 @@ return
LDR R1, currentbg
LDR R2, currentfg
LDR R3, currentoffset
TraceK exit, "ExitWimp: calling Font_SetFontColours"
TraceNL exit
Debug exit, "ExitWimp: calling Font_SetFontColours"
SWI XFont_SetFontColours
05
MOV R0, #0
......@@ -5239,6 +5281,8 @@ Pointer2_Code
;
SWIWimp_SetPointerShape
MyEntry "SetPointerShape"
BL int_set_pointer_shape
B ExitWimp
......
s/Wimp02
View file @ 99c7e1f2
......@@ -285,7 +285,7 @@ initfirsttask
BVS exitinit
MOV R0,#10 ; Read number in base 10.
SWI OS_ReadUnsigned
SWI XOS_ReadUnsigned
BVS exitinit
LDRB R0,[R1] ; Get terminator.
......@@ -1027,7 +1027,7 @@ $lab ConfigOption $string, $unit, $cmosbyte, $cmosbit, $cmossize, $shift, $eo
; $intvar: (optional) internal value to set to value
; $intmul: non-null means store value * 10 in internal variable
; $intbyte: B => store as byte value
; $lut: (optional) label for table of (short) strings to use for each value
; $lut: (optional) label for table of <8 char strings to use for each value
; $num: non-null means table contains 32-bit words instead
ENTRY "R7-R11"
LDR wsptr, [R12]
......@@ -1086,10 +1086,11 @@ $lab ConfigOption $string, $unit, $cmosbyte, $cmosbit, $cmossize, $shift, $eo
ADD sp, sp, #4
|
ADRVCL R0, $lut
ADDVC R0, R0, R2, LSL#2 ; strings and ints are at 4-byte intervals
[ "$num" = ""
ADDVC R0, R0, R2, LSL#3 ; strings are at 8-byte intervals
SWIVC XOS_Write0
|
ADDVC R0, R0, R2, LSL#2 ; ints are at 4-byte intervals
SUB sp, sp, #12 ; buffer space
LDRVC R0, [R0]
MOVVC R1, sp
......@@ -1275,11 +1276,11 @@ status_scaninttable
status_scanstringtable
; In: R0 -> string to match case-insensitively (not null terminated)
; R4 -> array of null-terminated strings, starting at 1-word boundaries (terminates with a null string)
; R4 -> array of null-terminated strings, starting at 2-word boundaries (terminates with a null string)
; Out: R2 = index into array of match, or V set if no match
ENTRY
MOV R3, sp
SUB sp, sp, #8
SUB sp, sp, #12 ; must be at least 2 longer than longest string
MOV R2, sp
03 LDRB R1, [R0], #1
CMP R1, #' '
......@@ -1293,7 +1294,7 @@ status_scanstringtable
MOV R6, #-1
MOV R1, sp
MOV R3, #Collate_IgnoreCase
04 ADD R2, R4, R5, LSL #2
04 ADD R2, R4, R5, LSL #3
LDRB R14, [R2]
TEQ R14, #0
BEQ %FT05 ; this signifies the end of the table
......@@ -1303,7 +1304,7 @@ status_scanstringtable
MOVEQ R6, R5
ADD R5, R5, #1
B %BT04
05 ADD sp, sp, #8
05 ADD sp, sp, #12 ; matches with above
CMP R6, #0
MOVGE R2, R6
EXIT GE
......@@ -1317,8 +1318,9 @@ statusmess_ds DCB "DeciSec",0
statusmess_osupersec DCB "OSUperSec",0
statusmess_osupersec2 DCB "OSUperSec2",0
ALIGN
status_offon DCB "Off",0,"On",0,0,0,0,0,0
status_ramrom DCB "RAM",0,"ROM",0,0,0,0,0
status_offon DCB "Off",0,0,0,0,0,"On",0,0,0,0,0,0,0,0,0,0
status_ramrom DCB "RAM",0,0,0,0,0,"ROM",0,0,0,0,0,0,0,0,0
status_clickrelease DCB "Click",0,0,0, "Release",0,0,0,0,0
; Code for handling *Configure/*Status
WimpFlagsC_Code
......@@ -1378,6 +1380,13 @@ statusmess_sprite DCB "WimpSpritePrecedence ",0
configmess_sprite DCB "WimpSpritePrecedence RAM|ROM",cr,lf,0
]
[ BounceClose
WimpButtonTypeC_Code
ConfigOption button,,DesktopFeaturesCMOS,6,1,,0,,,buttontype,,B,status_clickrelease
statusmess_button DCB "WimpButtonType ",0
configmess_button DCB "WimpButtonType Click|Releease",cr,lf,0
]
[ IconiseButton
WimpIconiseButtonC_Code
ConfigOption iconisebut,,WimpDragMoveLimitCMOS,7,1,,0,,,iconisebutton,,B,status_offon
......@@ -1510,7 +1519,7 @@ WimpFlagsC_Code
BVS %FT02
Push "R2"
MOV R0,#ReadCMOS
SWI OS_Byte ; read current feature byte
SWI XOS_Byte ; read current feature byte
AND R0,R2,#&E1 ; mask out font
Pull "R2"
ORR R2,R0,R2, LSL #1
......@@ -1682,6 +1691,8 @@ printsyntax
;
SWIWimp_SetMode
MyEntry "SetMode"
BL validatemode
BVS ExitWimp
LDR R14,taskcount
......@@ -1966,6 +1977,8 @@ nomodemess
; palette is then recomputed
SWIWimp_SetPalette ROUT
MyEntry "SetPalette"
CMP userblk,#0
ADRLEL userblk,emergencypalette ; set default if R1 <= 0
BL int_setpalette
......@@ -2017,6 +2030,7 @@ int_setpalette
; Out 20 palette entries copied to block
SWIWimp_ReadPalette ROUT
MyEntry "ReadPalette"
BL getpalpointer ; R14 -> palette table to copy to caller
;
......@@ -3281,6 +3295,8 @@ setmousepalette
;
SWIWimp_SetFontColours
MyEntry "SetFontColours"
BL setfontcolours ; doesn't return errors
B ExitWimp
......@@ -3343,6 +3359,8 @@ setfontcolours
;;-----------------------------------------------------------------------------
SWIWimp_ForceRedraw
MyEntry "ForceRedraw"
BL checkredrawhandle
[ ChildWindows
BL int_flush_opens ; it's too complicated - wimp out for now!
......@@ -3501,7 +3519,7 @@ int_force_redraw_border ENTRY
;;-----------------------------------------------------------------------------
SWIWimp_CreateWindow
MyEntry "Create_Window"
MyEntry "CreateWindow"
;
BL int_create_window
B ExitWimp
......@@ -3743,6 +3761,7 @@ crwerror2
;;----------------------------------------------------------------------------
SWIWimp_SetExtent
MyEntry "SetExtent"
Debug err,"Wimp_SetExtent task,handle",#taskhandle,R0
......@@ -3863,7 +3882,7 @@ checkextent
;;----------------------------------------------------------------------------
SWIWimp_CreateIcon
MyEntry "Create_Icon"
MyEntry "CreateIcon"
;
LDR handle,[userblk]
CMP handle,#0
......@@ -3926,7 +3945,7 @@ addicon
;;-----------------------------------------------------------------------------
SWIWimp_DeleteWindow
MyEntry "Delete_Window"
MyEntry "DeleteWindow"
;
LDR R0,[userblk]
MOV handle,R0
......@@ -4066,7 +4085,7 @@ discard_window
;;-----------------------------------------------------------------------------
SWIWimp_DeleteIcon
MyEntry "Delete_Icon"
MyEntry "DeleteIcon"
;
LDR handle,[userblk]
LDR R2,[userblk,#4] ; icon handle
......@@ -4132,7 +4151,7 @@ goshuffdel
;;-----------------------------------------------------------------------------
SWIWimp_OpenWindow
MyEntry "Open_Window"
MyEntry "OpenWindow"
[ ChildWindows
LDR R14,openidentifier1
......@@ -7071,7 +7090,7 @@ noblockcopy
;;-----------------------------------------------------------------------------
SWIWimp_CloseWindow
MyEntry "Close_Window"
MyEntry "CloseWindow"
;
LDR R0,[userblk]
MOV handle,R0
......@@ -7326,7 +7345,7 @@ int_mark_children ENTRY "handle"
;;-----------------------------------------------------------------------------
SWIWimp_RedrawWindow
MyEntry "Redraw_Window"
MyEntry "RedrawWindow"
[ ChildWindows
BL int_flush_opens ; if we get any, we'll have to redraw the whole window
......@@ -8799,7 +8818,7 @@ count0bits
;;--------------------------------------------------------------------------
SWIWimp_UpdateWindow
MyEntry "Update_Window"
MyEntry "UpdateWindow"
;
LDR handle,[userblk]
BL checkhandle_owner
......@@ -8889,7 +8908,7 @@ int_visibleinner_x0y0x1y1
;;---------------------------------------------------------------------------
SWIWimp_GetRectangle
MyEntry "Get_Rectangle"
MyEntry "GetRectangle"
[ ChildWindows
BL int_flush_opens ; it's barmy if there are any, but we want the correct error message
......
s/Wimp03
View file @ 99c7e1f2
......@@ -282,10 +282,12 @@ err_badR3
MakeErrorBlock WimpBadR3
SWIWimp_PollIdle
Debug poll2, "Wimp_PollIdle entry"
ORR R0,R0,#flag_pollidle ; time limit is in R2
B %FT01
SWIWimp_Poll
Debug poll2, "Wimp_Poll entry"
BIC R0,R0,#flag_pollidle ; no time limit supplied
01
......@@ -490,6 +492,7 @@ taskisused
; re-entry point from within polling routines
;
repollwimp
Debug poll2, "repollwimp"
LDR R14,IdlePerSec ; update the idle information for the portable modules
ADD R14,R14,#1
STR R14,IdlePerSec
......@@ -837,7 +840,7 @@ start_braindead_panic_redraw
SWI XOS_SetECFOrigin
MOV R0,#4
BL background
SWI OS_WriteI+16 ; CLG
SWI XOS_WriteI+16 ; CLG
; Find the backmost window and store in BPR_indication -
; BPR_notatall is used to indicate no windows
......@@ -973,6 +976,7 @@ lookatpointer
;
; now see what user input has occurred
;
Debug poll2, "Processing mouse"
BL getmouseposn ; ie. MOUSE R0,R1,R2
[ PoppingIconBar
......@@ -2154,6 +2158,7 @@ returnclick
;----------------------------------------------------------------------------
trykeys
Debug poll2, "Processing keys"
[ KeyboardMenus
MOV r6, #-1 ; so we can tell later on if we read a key
LDR r4, menuSP
......@@ -2712,7 +2717,14 @@ setwimpicon
ADDGT R4,R4,#3 ; and skip -13 (which is the border)
]
03
[ BounceClose
LDRB R14, buttontype
TEQ R14, #0
ADREQ R14, wiconflags - 4
ADRNE R14, wiconflags_release - 4
|
ADR R14,wiconflags-4
]
LDR R5,[R14,R4,ASL #2]
CMP R5,#-1
MOVEQ R5,#ibt_click:SHL:ib_buttontype
......@@ -2797,19 +2809,10 @@ check_h_arrows
wiconflags
[ BounceClose
DCD ibt_clickrelease :SHL: ib_buttontype ; back
DCD ibt_clickrelease :SHL: ib_buttontype ; quit
|
DCD ibt_click :SHL: ib_buttontype ; back
DCD ibt_click :SHL: ib_buttontype
]
DCD ibt_click :SHL: ib_buttontype ; quit
DCD ibt_click :SHL: ib_buttontype ; move BLOBBY
[ BounceClose
DCD ibt_clickrelease :SHL: ib_buttontype ; toggle
|
DCD ibt_click :SHL: ib_buttontype ; toggle
]
DCD -1 ; scup
DCD ibt_click :SHL: ib_buttontype ; scvert
DCD -1 ; scdown
......@@ -2820,12 +2823,28 @@ wiconflags
bordericon * -2 - (.-wiconflags)/4
[ IconiseButton
DCD -1
[ BounceClose
DCD ibt_clickrelease :SHL: ib_buttontype ; iconise
|
DCD ibt_click :SHL: ib_buttontype ; iconise
]
[ BounceClose
wiconflags_release
DCD ibt_clickrelease :SHL: ib_buttontype ; back
DCD ibt_clickrelease :SHL: ib_buttontype ; quit
DCD ibt_click :SHL: ib_buttontype ; move BLOBBY
DCD ibt_clickrelease :SHL: ib_buttontype ; toggle
DCD -1 ; scup
DCD ibt_click :SHL: ib_buttontype ; scvert
DCD -1 ; scdown
DCD ibt_click :SHL: ib_buttontype ; size
DCD -1 ; scleft
DCD ibt_click :SHL: ib_buttontype ; schoriz
DCD -1 ; scright
[ IconiseButton
DCD -1
DCD ibt_clickrelease :SHL: ib_buttontype ; iconise
]
]
wimpaction
CMP R3,#0 ; is this a real window?
BLGT pageinicontask_R3R4 ; takes note of iconbar
......@@ -2868,6 +2887,9 @@ wicon_move
B trykeys
wicon_toggle
[ BounceClose
STR R2,mousebuttons ; Horrible hack so adjust-toggle still works properly
]
MOV R1,#wf_isapane ; we want to ignore panes
BL go_get_window_state ; 2nd entry point - uses R1
LDR R14,[handle,#w_flags]
......@@ -3057,7 +3079,7 @@ wicon_quit
MOV R0,#121 ; Scan keyboard for shift key
MOV R1,#&80
SWI OS_Byte
SWI XOS_Byte
CMP R1,#&FF
......@@ -3470,7 +3492,7 @@ pagehoriz
;;----------------------------------------------------------------------------
SWIWimp_GetPointerInfo
MyEntry "Get_Pointer_Info"
MyEntry "GetPointerInfo"
;
LDR R0,mousexpos ; just read old values
LDR R1,mouseypos
......
s/Wimp04
View file @ 99c7e1f2
......@@ -1679,7 +1679,7 @@ icontext TraceL font
ADR R0,writedirreverse
]
MOV R1,#writedirreverse_len
SWI OS_WriteN ; poke the write direction for the cursor
SWI XOS_WriteN ; poke the write direction for the cursor
Pull "R1"
94
MOV R0,#4
......@@ -1853,7 +1853,7 @@ wrcrlp
Push "R0,R1"
ADR R0,writedirnormal
MOV R1,#writedirnormal_len
SWI OS_WriteN ; poke the write direction for the cursor
SWI XOS_WriteN ; poke the write direction for the cursor
Pull "R0,R1"
94
Push "R0,x0,y0,x1,y1,PC"
......@@ -2877,6 +2877,9 @@ iconfilled
;;----------------------------------------------------------------------------
SWIWimp_ReadPixTrans
MyEntry "ReadPixTrans"
CMP R0,#&100
MOVLT R1,#0 ; use system area if R0 < &100
MOV R14,#0
......@@ -3314,6 +3317,8 @@ checkforsprite ROUT
SWIWimp_TextColour
MyEntry "TextColour"
Push "R0,R3"
AND R3,R0,#&80 ; fg/bg flag
AND R0,R0,#&0F
......@@ -3333,6 +3338,9 @@ SWIWimp_TextColour
;
SWIWimp_SetColour
MyEntry "SetColour"
Push R0
BL int_setcolour
ADDVS sp,sp,#4
......@@ -4408,7 +4416,7 @@ dottedbox_toggle
BL dottedbox1 ; remove old box
01
Pull "x0-y1"
MOV R1, #drg_on
MOV R0, #drg_on
BL dottedbox1 ; plot new box
Pull "PC"
]
......@@ -4609,7 +4617,7 @@ pointerwindow
; userblk = R1
SWIWimp_GetWindowInfo
MyEntry "Get_Window_Info"
MyEntry "GetWindowInfo"
;
BIC userblk,userblk,#3 ; bottom 2 bits are flags
LDR handle,[userblk,#u_handle]
......@@ -4620,7 +4628,7 @@ SWIWimp_GetWindowInfo
SWIWimp_GetWindowState
MyEntry "Get_Window_State"
MyEntry "GetWindowState"
LDR handle,[userblk]
BL checkhandle_iconbar
......@@ -4651,7 +4659,7 @@ openidentifier2 DCB "TASK" ; magic word for new form of Wim
SWIWimp_GetWindowOutline
MyEntry "Get_Window_Outline"
MyEntry "GetWindowOutline"
;
LDR handle,[userblk]
BL checkhandle_iconbar
......@@ -4739,7 +4747,7 @@ cplp10 LDR R14,[R2],#4
;;----------------------------------------------------------------------------
SWIWimp_SetIconState
MyEntry "Set_Icon_State"
MyEntry "SetIconState"
;
LDR handle,[userblk]
CMP handle,#0
......@@ -4823,7 +4831,7 @@ mustredraw
;;----------------------------------------------------------------------------
SWIWimp_GetIconState
MyEntry "Get_Icon_State"
MyEntry "GetIconState"
;
LDR handle,[userblk]
CMP handle,#0
......@@ -4870,6 +4878,9 @@ int_get_icon_state
;;----------------------------------------------------------------------------
SWIWimp_WhichIcon
MyEntry "WhichIcon"
MOV handle,R0 ; R0 < 0 => iconbar
BL checkhandle_iconbar
BLVC int_which_icon
......@@ -4945,6 +4956,8 @@ dr_subr_off # 4
dr_subr_move # 4 ; if <=0, use undraw/draw sequence
SWIWimp_DragBox
MyEntry "DragBox"
CMP userblk,#0
BLLE nodragging ; preserves flags
BLE ExitWimp ; <=0 ==> cancel current dragbox
......
s/Wimp06
View file @ 99c7e1f2
......@@ -138,6 +138,9 @@ int_gbpb ENTRY "R1"
;----------------------------------------------------------------------------
SWIWimp_OpenTemplate
MyEntry "OpenTemplate"
BL int_open_template
B ExitWimp
......@@ -277,6 +280,9 @@ int_open_template
;----------------------------------------------------------------------------
SWIWimp_CloseTemplate ROUT
MyEntry "CloseTemplate"
BL int_close_template
B ExitWimp
......@@ -338,6 +344,9 @@ int_close_template
;----------------------------------------------------------------------------
SWIWimp_LoadTemplate
MyEntry "LoadTemplate"
BL int_load_template
B ExitWimp2 ; R1-R6 returned to user
......
s/Wimp07
View file @ 99c7e1f2
......@@ -229,6 +229,9 @@ doneblock
;;----------------------------------------------------------------------------
SWIWimp_SendMessage
MyEntry "SendMessage"
; first find out if application is sending a font changed message
Push "R0-R1"
LDR R0,[R1,#16]
......@@ -1014,6 +1017,7 @@ ExitPoll_toparent
STR R14,sender ; don't return R2 from Wimp_StartTask
ExitPoll
Debug poll2, "ExitPoll"
BVS reporterror ; don't return to caller
returnerror
......
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