Skip to content

GitLab

Commit 082117ee authored by Ben Avison's avatar Ben Avison
Browse files

Iconise button removed from child windows 

Icon bar now jumps to the back of the stack as soon as a window is opened above
it (excluding menus, dialogue boxes and foregroud windows). This is to avoid
the ambiguous situation when the icon bar can be part-way down the window stack.
Improved co-odination between auto-fronting and Shift-F12 behaviour.
Stopped scroll offset overflow during icon bar scroll.
Numerous features made configurable:
  WimpIconBarSpeed
  WimpIconBarAcceleration
  WimpSpritePrecedence
  WimpIconiseButton
  WimpStickyEdges (although not actually implemented yet)
  WimpAutoFrontIconBar
  WimpAutoFrontDelay
  WimpAutoScrollDelay
To make room for these in CMOS, Wimp<Drag|DoubleClick><Delay|Move> and
Wimp<AutoMenu|MenuDrag>Delay options are now stored in a more compressed form
in CMOS - but the *Configure interface is unaltered.
parent f61b123f
Hide whitespace changes
Inline Side-by-side
Showing with 828 additions and 57 deletions
Options/s/!Debug
View file @ 082117ee
......@@ -95,6 +95,6 @@
OptionD mjs4, false ; Mike's debugs 4 (TransferBlock)
OptionD autohg, false ; AutoHourglass
OptionD sprprior, false ; ROM vs RAM sprite priority
OptionD autoscr, true ; autoscrolling / drags within windows
OptionD autoscr, false ; autoscrolling / drags within windows
END
Options/s/!Default
View file @ 082117ee
......@@ -63,6 +63,7 @@
Option ForegroundWindows, false ; Layering of windows within each stack
Option SpritePriority, false ; Allow configurable sprite pool priority
Option Autoscr, false ; Add Wimp_AutoScroll and dragbox-within-window facilities
Option StickyEdges, false ; Allow windows to "stick" when dragged over edge of screen
Option DoubleHeightVDU4, false ; Wimp_SetMode selects modes with double height VDU 4 output
Option RegisterMessages, false
......
Options/s/Ursula
View file @ 082117ee
......@@ -27,6 +27,7 @@
Option ForegroundWindows, true ; Layering of windows within each stack
Option SpritePriority, true ; Allow configurable sprite pool priority
Option Autoscr, true ; Add Wimp_AutoScroll and dragbox-within-window facilities
Option StickyEdges, true ; Allow windows to "stick" when dragged over edge of screen
ASSERT International_Help <> 0
......
Resources/UK/CmdHelp
View file @ 082117ee
No preview for this file type
Resources/UK/Messages
View file @ 082117ee
......@@ -7,7 +7,9 @@ OK:OK
Continue:Continue
Quit:Quit
OSUnits: OS Units
CentSec: * 1/10 second
DeciSec: * 1/10 second
OSUperSec: OS Units / second
OSUperSec2: OS Units / second
WSP:Wimp sprite pool
#{DictTokens}
......@@ -28,7 +30,6 @@ BadTemplate:Template entry invalid
BadFonts:Unable to bind font handle
BadSyntax:Syntax error in validation string
NoTasks:Too many tasks
BadConfFont:WimpFont value must be in the range 0-15
NoTemplate:Template entry not found
InUse:Window manager in use
BadPalFile:Error in palette file
......
Version
View file @ 082117ee
......@@ -6,6 +6,6 @@
Version SETA 399
VString SETS "3.99"
Date SETS "26 Mar 1998"
Date SETS "03 Apr 1998"
END
s/NewSWIs
View file @ 082117ee
......@@ -422,6 +422,7 @@ furnblock_hscrgap0 # 4
SUB y1, y1, y0 ; - right edge
MOV x0, x1 ; - bottom edge
LDR R14, [handle, #w_flags] ; load flags
LDR R1, [handle, #w_parent] ; get parent
B %FT02
01 LDR R0, dx ; assume max border widths
......@@ -436,6 +437,7 @@ furnblock_hscrgap0 # 4
MOV y1, x1
MOV x0, x1
MOV R14, #wf_iconbits ; assume all border flags set
MOV R1, #-1 ; assume a top-level window
02
TST R14, #wf_icon1 ; back icon?
......@@ -450,7 +452,15 @@ furnblock_hscrgap0 # 4
SUB x1, x1, R0
STR R0, furnblock_close
[ IconiseButton
LDRNE R0, iconise_width
BEQ %FT06
MOV R0, #0
CMP R1, #-1
BNE %FT06 ; no iconise button on children
LDRB R1, iconisebutton
TEQ R1, #0
BEQ %FT06
LDR R0, iconise_width
06
|
MOV R0, #0
]
......
s/Wimp01
View file @ 082117ee
......@@ -471,6 +471,48 @@ WimpWriteDir_Syntax DCB "Syntax: *WimpWriteDir 0|1",0
WimpKillSprite_Help DCB "Remove a sprite from the wimp sprite pool.",cr
WimpKillSprite_Syntax DCB "Syntax: *WimpKillSprite <spritename>",0
[ Autoscr
WimpAutoScrollDelayC_Help DCB "*Configure WimpAutoScrollDelay sets the time in 1/10 second units "
DCB "that the pointer has to stay over the edge of a window before it starts scrolling. "
DCB "This only applies in certain circumstances.",cr
WimpAutoScrollDelayC_Syntax DCB "Syntax: *Configure WimpAutoScrollDelay <delay>",0
]
[ PoppingIconBar
WimpAutoFrontDelayC_Help DCB "*Configure WimpAutoFrontDelay sets the time in 1/10 second units "
DCB "that the pointer has to stay at the bottom of the screen before "
DCB "the icon bar is brought to the front.",cr
WimpAutoFrontDelayC_Syntax DCB "Syntax: *Configure WimpAutoFrontDelay <delay>",0
]
WimpIconBarSpeedC_Help DCB "*Configure WimpIconBarSpeed sets the initial scrolling speed of the icon bar "
DCB "in OS units per second.",cr
WimpIconBarSpeedC_Syntax DCB "Syntax: *Configure WimpIconBarSpeed <speed>",0
WimpIconBarAccelerationC_Help DCB "*Configure WimpIconBarAcceleration sets the acceleration rate of an icon bar scroll "
DCB "in OS units per second per second.",cr
WimpIconBarAccelerationC_Syntax DCB "Syntax: *Configure WimpIconBarAcceleration <rate>",0
[ IconiseButton
WimpIconiseButtonC_Help DCB "*Configure WimpIconiseButton sets whether an iconise button is added to "
DCB "top-level windows.",cr
WimpIconiseButtonC_Syntax DCB "Syntax: *Configure WimpIconiseButton 0|1",0
]
[ PoppingIconBar
WimpAutoFrontIconBarC_Help DCB "*Configure WimpAutoFrontIconBar sets whether the icon bar is brought to the front "
DCB "when the pointer is held at the bottom of the screen.",cr
WimpAutoFrontIconBarC_Syntax DCB "Syntax: *Configure WimpAutoFrontIconBar 0|1",0
]
[ SpritePriority
WimpSpritePrecedenceC_Help DCB "*Configure WimpSpritePrecedence sets whether ROM sprites have priority over "
DCB "RAM sprites or vice versa.",cr
WimpSpritePrecedenceC_Syntax DCB "Syntax: *Configure WimpSpritePrecedence RAM|ROM",0
]
[ StickyEdges
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 0|1",0
]
ALIGN
|
......@@ -540,6 +582,38 @@ WimpWriteDir_Syntax DCB "SWNMWWD",0
WimpKillSprite_Help DCB "HWNMKS",0
WimpKillSprite_Syntax DCB "SWNMKS",0
[ Autoscr
WimpAutoScrollDelayC_Help DCB "HWNMASD",0
WimpAutoScrollDelayC_Syntax DCB "SWNMASD",0
]
[ PoppingIconBar
WimpAutoFrontDelayC_Help DCB "HWNMAFD",0
WimpAutoFrontDelayC_Syntax DCB "SWNMAFD",0
]
WimpIconBarSpeedC_Help DCB "HWNMIBS",0
WimpIconBarSpeedC_Syntax DCB "SWNMIBS",0
WimpIconBarAccelerationC_Help DCB "HWNMIBA",0
WimpIconBarAccelerationC_Syntax DCB "SWNMIBA",0
[ IconiseButton
WimpIconiseButtonC_Help DCB "HWNMICB",0
WimpIconiseButtonC_Syntax DCB "SWNMICB",0
]
[ PoppingIconBar
WimpAutoFrontIconBarC_Help DCB "HWNMAF",0
WimpAutoFrontIconBarC_Syntax DCB "SWNMAF",0
]
[ SpritePriority
WimpSpritePrecedenceC_Help DCB "HWNMSPP",0
WimpSpritePrecedenceC_Syntax DCB "SWNMSPP",0
]
[ StickyEdges
WimpStickyEdgesC_Help DCB "HWNMSE",0
WimpStickyEdgesC_Syntax DCB "SWNMSE",0
]
ALIGN
]
......@@ -558,14 +632,32 @@ Helptable
Command WimpSlot,6,1,International_Help
Command WimpTask,255,1,International_Help
Command WimpWriteDir,1,1 ,International_Help
Command WimpDragDelay,1,1,Status_Keyword_Flag:OR:International_Help,WimpDragDelayC
Command WimpFont,1,1,Status_Keyword_Flag:OR:International_Help,WimpFontC
Command WimpDragDelay,1,1,Status_Keyword_Flag:OR:International_Help,WimpDragDelayC
Command WimpDragMove,1,1,Status_Keyword_Flag:OR:International_Help,WimpDragMoveC
Command WimpDoubleClickDelay,1,1,Status_Keyword_Flag:OR:International_Help,WimpDoubleClickDelayC
Command WimpDoubleClickMove,1,1,Status_Keyword_Flag:OR:International_Help,WimpDoubleClickMoveC
Command WimpAutoMenuDelay,1,1,Status_Keyword_Flag:OR:International_Help,WimpAutoMenuDelayC
Command WimpMenuDragDelay,1,1,Status_Keyword_Flag:OR:International_Help,WimpMenuDragDelayC
Command WimpKillSprite,1,1,International_Help
Command WimpIconBarSpeed,1,1,Status_Keyword_Flag:OR:International_Help,WimpIconBarSpeedC
Command WimpIconBarAcceleration,1,1,Status_Keyword_Flag:OR:International_Help,WimpIconBarAccelerationC
[ SpritePriority
Command WimpSpritePrecedence,1,1,Status_Keyword_Flag:OR:International_Help,WimpSpritePrecedenceC
]
[ IconiseButton
Command WimpIconiseButton,1,1,Status_Keyword_Flag:OR:International_Help,WimpIconiseButtonC
]
[ StickyEdges
Command WimpStickyEdges,1,1,Status_Keyword_Flag:OR:International_Help,WimpStickyEdgesC
]
[ PoppingIconBar
Command WimpAutoFrontIconBar,1,1,Status_Keyword_Flag:OR:International_Help,WimpAutoFrontIconBarC
Command WimpAutoFrontDelay,1,1,Status_Keyword_Flag:OR:International_Help,WimpAutoFrontDelayC
]
[ Autoscr
Command WimpAutoScrollDelay,1,1,Status_Keyword_Flag:OR:International_Help,WimpAutoScrollDelayC
]
DCB 0
;............................................................................
......@@ -1422,70 +1514,218 @@ gotwork
STR R0,currentmode ; altered by Wimp_SetMode
]
;
; Read WimpFlags
MOV R0,#ReadCMOS
MOV R1,#WimpFlagsCMOS
SWI XOS_Byte
MOVVS R2,#0
STRB R2,sysflags ; read the WimpFlags CMOS
STRB R2,sysflags
;
; Read WimpDragDelay
MOV R0,#ReadCMOS
MOV R1,#WimpDragTimeCMOS
SWI XOS_Byte
[ false
EORVC R0,R2,#default_drag_timelimit
|
ANDVC R3, R2, #&0F
EORVC R3, R3, #default_drag_timelimit
MOVVC R1, #WimpDragMoveLimitCMOS
SWIVC XOS_Byte
ANDVC R4, R2, #1 :SHL: 0
MOVVC R0, R3, LSL R4
TEQ R4, #0 ; preserves V
ADDNE R0, R0, R0, LSL #2
]
MOVVS R0,#default_drag_timelimit
ADD R0,R0,R0,ASL #2 ; R0*5
MOV R0,R0,ASL #1 ; R0*10
STR R0,drag_timelimit
;
; Read WimpDoubleClickDelay
MOV R0,#ReadCMOS
MOV R1,#WimpDoubleClickTimeCMOS
SWI XOS_Byte
[ false
EORVC R0,R2,#default_doubleclick_timelimit
|
ANDVC R3, R2, #&0F
EORVC R3, R3, #default_doubleclick_timelimit
MOVVC R1, #WimpDoubleClickMoveLimitCMOS
SWIVC XOS_Byte
ANDVC R4, R2, #1 :SHL: 0
MOVVC R0, R3, LSL R4
TEQ R4, #0 ; preserves V
ADDNE R0, R0, R0, LSL #2
]
MOVVS R0,#default_doubleclick_timelimit
ADD R0,R0,R0,ASL #2 ; R0*5
MOV R0,R0,ASL #1 ; R0*10
STR R0,doubleclick_timelimit
;
; Read WimpDragMove
MOV R0,#ReadCMOS
MOV R1,#WimpDragMoveLimitCMOS
SWI XOS_Byte
[ true
ANDVC R2, R2, #&7C
]
EORVC R0,R2,#default_drag_movelimit
MOVVS R0,#default_drag_movelimit
STRB R0,drag_movelimit
;
; Read WimpDoubleClickMove
MOV R0,#ReadCMOS
MOV R1,#WimpDoubleClickMoveLimitCMOS
SWI XOS_Byte
[ true
ANDVC R2, R2, #&7C
]
EORVC R0,R2,#default_doubleclick_movelimit
MOVVS R0,#default_doubleclick_movelimit
STRB R0,doubleclick_movelimit
;
; Read WimpAutoMenuDelay
MOV R0,#ReadCMOS
MOV R1,#WimpAutoSubMenuTimeCMOS
SWI XOS_Byte
[ false
MOVVS R0,#0
ADDVC R0,R2,R2,ASL #2 ; R0*5
MOVVC R0,R0,ASL #1 ; R0*10
|
ANDVC R0, R2, #&0F
EORVC R0, R0, #default_automenudelay
TST R2, #1 :SHL: 4 ; preserves V
ADDNE R0, R0, R0, LSL #2
MOVNE R0, R0, LSL #1
MOVVS R0, #default_automenudelay
ADD R0, R0, R0, LSL #2
MOV R0, R0, LSL #1
]
STR R0,automenu_timelimit
;
; Read WimpMenuDragDelay
MOV R0,#ReadCMOS
MOV R1,#WimpMenuDragDelayCMOS
SWI XOS_Byte
[ false
MOVVS R0,#0
ADDVC R0,R2,R2,ASL #2 ; R0*5
MOVVC R0,R0,ASL #1 ; R0*10
|
ANDVC R0, R2, #&0F
EORVC R0, R0, #default_menudragdelay
TST R2, #1 :SHL: 4 ; preserves V
ADDNE R0, R0, R0, LSL #2
MOVNE R0, R0, LSL #1
MOVVS R0, #default_menudragdelay
ADD R0, R0, R0, LSL #2
MOV R0, R0, LSL #1
]
STR R0,menudragdelay
;
; Read WimpIconBarSpeed
ADR R3, iconbarlogtable
MOV R0, #ReadCMOS
MOV R1, #WimpAutoSubMenuTimeCMOS
SWI XOS_Byte
MOVVC R2, R2, LSR #5
EORVC R2, r2, #default_iconbarspeed
MOVVS R2, #default_iconbarspeed
LDR R0, [R3, R2, LSL#2]
STR R0, iconbar_scroll_speed
;
; Read WimpIconBarAcceleration
MOV R0, #ReadCMOS
MOV R1, #WimpMenuDragDelayCMOS
SWI XOS_Byte
MOVVC R2, R2, LSR #5
EORVC R2, r2, #default_iconbaraccel
MOVVS R2, #default_iconbaraccel
LDR R0, [R3, R2, LSL#2]
STR R0, iconbar_scroll_accel
;
; Read WimpSpritePrecedence
[ SpritePriority
MOV R0, #ReadCMOS
MOV R0, #1 ; ie ROM has priority - will need to add CMOS read stuff when allocated
MOV R1, #DesktopFeaturesCMOS
SWI XOS_Byte
TST R2, #1 :SHL: 5 ; preserves V
MOVEQ R0, #0
MOVNE R0, #1
MOVVS R0, #0
STR R0, preferredpool
]
;
; Read WimpIconiseButton
[ IconiseButton
MOV R0, #ReadCMOS
MOV R1, #WimpDragMoveLimitCMOS
SWI XOS_Byte
TST R2, #1 :SHL: 7 ; preserves V
MOVEQ R0, #0
MOVNE R0, #1
MOVVS R0, #0
STRB R0, iconisebutton
]
;
; ReadWimpStickyEdges
[ StickyEdges
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, stickyedges
]
;
; Read WimpAutoFrontIconBar
[ PoppingIconBar
MOV R0, #ReadCMOS
MOV R1, #WimpDoubleClickMoveLimitCMOS
SWI XOS_Byte
TST R2, #1 :SHL: 7 ;preserves V
MOVEQ R0, #1
MOVNE R0, #0
MOVVS R0, #1
STRB R0, popiconbar
;
; Read WimpAutoFrontDelay
MOV R0, #ReadCMOS
MOV R1, #WimpDoubleClickTimeCMOS
SWI XOS_Byte
MOVVC R3, R2, LSR #4
EORVC R3, R3, #default_autofrontdelay
MOVVC R1, #WimpDoubleClickMoveLimitCMOS
SWIVC XOS_Byte
TST R2, #1 :SHL: 1 ;preserves V
MOVEQ R0, R3
MOVNE R0, R3, LSL #1
ADDNE R0, R0, R0, LSL #2
MOVVS R0, #default_autofrontdelay
ADD R0, R0, R0, LSL #2
MOV R0, R0, LSL #1
STR R0, popiconbar_pause
]
;
; Read WimpAutoScrollDelay
[ Autoscr
MOV R0, #ReadCMOS
MOV R0, #5 ; ie 0.5 seconds - will need to add CMOS read stuff when allocated
STRB R0, autoscr_default_pause
MOV R1, #WimpDragTimeCMOS
SWI XOS_Byte
MOVVC R3, R2, LSR #4
EORVC R3, R3, #default_autoscrolldelay
MOVVC R1, #WimpDragMoveLimitCMOS
SWIVC XOS_Byte
TST R2, #1 :SHL: 1 ;preserves V
MOVEQ R0, R3
MOVNE R0, R3, LSL #1
ADDNE R0, R0, R0, LSL #2
MOVVS R0, #default_autofrontdelay
STRB R0, autoscr_default_pause ; not *10
]
;
ADRL R14,paltable ; initialise palette
......@@ -1582,6 +1822,9 @@ errcantclaim
Pull "R0-R12,PC"
MakeErrorBlock WimpNoClaim
iconbarlogtable
DCD 0, 20, 50, 100, 200, 500, 1000, 2000, -1
;.................................................................................
; Declare resource files to ResourceFS
......@@ -2523,6 +2766,12 @@ default_doubleclick_movelimit * 32 ; chicago dist. (OS coor
default_drag_movelimit * 32
default_doubleclick_timelimit * 10 ; centiseconds/10
default_drag_timelimit * default_doubleclick_timelimit / 2
default_automenudelay * 10
default_menudragdelay * 10
default_iconbarspeed * 4 ; 200 OS units / sec
default_iconbaraccel * 3 ; 100 OS units / sec^2
default_autofrontdelay * 5
default_autoscrolldelay * 5
drag_posn * 1 ; system dragging routines
drag_size * 2 ; all terminate when buttons released
......@@ -3092,6 +3341,23 @@ autoscr_update_delay * 8 ; hardwired minimum interval between upd
autoscr_END # 0
]
[ IconiseButton
iconisebutton # 1 ; nonzero => add iconise button
]
[ StickyEdges
stickyedges # 1 ; nonzero => interpret "force on screen" as sticky
]
[ PoppingIconBar
popiconbar # 1 ; nonzero => enable autofronting
ALIGNHASH 4
popiconbar_pause # 4 ; configured pause time (cs)
]
iconbar_scroll_speed # 4
iconbar_scroll_accel # 4
systemfontwidth # 4
systemfonty0 # 4
systemfonty1 # 4
......@@ -3361,8 +3627,6 @@ watchdogcodew # 4
iconbar_scroll_start_time # 4 ; time icon bar started scrolling
iconbar_scroll_start_scx # 4 ; and where it started from
iconbar_scroll_speed * 2 ; in 100 OS units per second
iconbar_scroll_accel * 1 ; in 100 OS units per second^2
MaxSlowIdleEvents # 4 ; 321nk added for PowerUtils incorporation
MaxFastIdleEvents # 4
Threshold * &600
......@@ -3374,7 +3638,7 @@ pop_Back * 0
pop_Delaying * 1
pop_Front * 2
pop_HeldByMenu * 3
pop_DelayTime * 50 ; centiseconds
pop_Front2 * 4 ; held by virtue of Shift-F12
]
[ ChildWindows
......@@ -3432,10 +3696,6 @@ misc # 1
save_context # 4
fontnamebuffer # 60 ; used to store last ROM font.
[ PoppingIconBar
iconbar_pop_previous # 4 ; where to go back to
]
[ DebugMemory
memory_claims # 8 ; build a list of mem claims for debugging
......
s/Wimp02
View file @ 082117ee
......@@ -186,7 +186,7 @@ SWIWimp_Initialise
;
B rationalisememory
[ debug
[ true ; debug
taskidentifier2 DCB "TASK"
]
;
......@@ -520,7 +520,7 @@ skipupcall
ADR R3,oldfxstatus ; remember old codes
BL resetkeycodes ; *FX 4,2 etc.
;
[ debug
[ true ; debug
LDR R5,taskidentifier2 ; if R1="TASK" on entry ...
|
LDR R5,taskidentifier ; if R1="TASK" on entry ...
......@@ -937,7 +937,7 @@ exitinit
checkversion
Push "LR"
LDR R14,taskidentifier
LDR R14,taskidentifier2
TEQ R1,R14
MOVEQ R14,#nullptr ; new-style tasks are not single-tasking
LDRNE R14,taskhandle
......@@ -999,6 +999,8 @@ fulltaskhandle
ORR R14,R1,R14,LSL #flag_versionbit
Pull "R1,PC"
LTORG
;;------------------------------------------------------------------------------
;; in R0=0 => print syntax message only
;; R0=1 => *Status WimpMode was typed - print out value
......@@ -1007,6 +1009,410 @@ fulltaskhandle
;; [currentmode] or [sysflags] reset
;;-----------------------------------------------------------------------------
[ true
; New configuration code that isn't as closely tied to the CMOS byte involved
; (most bytes are now shared by multiple options)
MACRO
$lab ConfigOption $string, $unit, $cmosbyte, $cmosbit, $cmossize, $shift, $eor, $expbyte, $expbit, $intvar, $intmul, $intbyte, $lut, $num
; $string: tail of label for status string
; $unit: (optional) tail of label for unit token string
; $cmosbyte: byte to read for mantissa
; $cmosbit: (default 0) minimum significant bit
; $cmossize: (default 8) number of significant bits
; $shift: non-null means don't shift mantissa bitfield down when reading (to make lsb=0)
; $eor: (optional) value to EOR with mantissa read from CMOS
; $expbyte: (optional) byte holding 1-bit exponent
; $expbit: (optional) bit holding 1-bit exponent
; $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
; $num: non-null means table contains 32-bit words instead
ENTRY "R7-R11"
LDR wsptr, [R12]
CMP R0, #1
BHI %FT02
BEQ %FT01
; Print syntax string
ADRL R0, configmess_$string
SWI XOS_Write0
EXIT
; Print status string
01 ADR R0, statusmess_$string
SWI XOS_Write0
MOVVC R0, #ReadCMOS
MOVVC R1, #$cmosbyte
SWIVC XOS_Byte
[ "$expbyte" <> "" :LAND: "$expbit" <> ""
[ $expbyte = $cmosbyte
MOVVC R4, R2 ; remember, to save another CMOS read later
]
]
[ "$cmosbit" <> "" :LAND: "$cmossize" <> ""
ANDVC R2, R2, #((1 :SHL: $cmossize) - 1) :SHL: $cmosbit
[ "$shift" = "" :LAND: $cmosbit <> 0
MOVVC R2, R2, LSR#$cmosbit
]
]
[ "$eor" <> ""
[ $eor <> 0
EORVC R2, R2, #$eor
]
]
[ "$expbyte" <> "" :LAND: "$expbit" <> ""
MOVVC R3, R2
[ $expbyte = $cmosbyte
MOVVC R2, R4 ; get value read earlier
|
MOVVC R0, #ReadCMOS
MOVVC R1, #$expbyte
SWIVC XOS_Byte
]
TSTVC R2, #1 :SHL: $expbit ; preserves V
ADDNE R3, R3, R3, LSL#2
MOVNE R2, R3, LSL#1 ; multiply by 10
MOVEQ R2, R3
]
[ "$lut" = ""
SUB sp, sp, #4 ; buffer space
MOVVC R0, R2
MOVVC R1, sp
MOVVC R2, #4
SWIVC XOS_ConvertCardinal1
SWIVC XOS_Write0
ADD sp, sp, #4
|
ADRVCL R0, $lut
ADDVC R0, R0, R2, LSL#2 ; strings and ints are at 4-byte intervals
[ "$num" = ""
SWIVC XOS_Write0
|
SUB sp, sp, #12 ; buffer space
LDRVC R0, [R0]
MOVVC R1, sp
MOVVC R2, #12
SWIVC XOS_ConvertCardinal4
SWIVC XOS_Write0
ADD sp, sp, #12
]
]
[ "$unit" <> ""
ADRVCL R0, statusmess_$unit
BLVC QuickLookup
SWIVC XOS_WriteN
]
SWIVC XOS_NewLine
TEQ PC, #0 ; get around kernel bug: Z must be clear on exit
EXIT
02 ; Set configuration - uses another macro due to assembler's limit on macro size
SetConfig $string, $unit, $cmosbyte, $cmosbit, $cmossize, $shift, $eor, $expbyte, $expbit, $intvar, $intmul, $intbyte, $lut, $num
MEND
MACRO
$lab SetConfig $string, $unit, $cmosbyte, $cmosbit, $cmossize, $shift, $eor, $expbyte, $expbit, $intvar, $intmul, $intbyte, $lut, $num
[ "$lut" = "" :LOR: ("$lut" <> "" :LAND: "$num" <> "")
MOV R1, R0
MOV R0, #10 :OR: 1:SHL:31 ; base 10, terminate at control char or space
SWI XOS_ReadUnsigned
EXIT VS
[ "$lut" <> "" :LAND: "$num" <> ""
ADRL R0, $lut
BL status_scaninttable
]
|
ADRL R4, $lut
BL status_scanstringtable
EXIT VS
]
; Restrict R2 to a valid value, calculate mantissa (R3) and exponent (R4) if applicable
[ "$shift" <> ""
MOV R2, R2, LSR #$cmosbit
]
[ "$cmossize" <> ""
CMP R2, #(1 :SHL: $cmossize) - 1
|
CMP R2, #&FF
]
[ "$expbyte" = ""
[ "$cmossize" <> ""
MOVHI R2, #(1 :SHL: $cmossize) - 1
|
MOVHI R2, #&FF
]
|
MOVLE R3, R2
MOVLE R4, #0
BLE %FT07
MOV R1, #10
DivRem R3, R2, R1, R0 ; R3 = R2 DIV 10, R2 = R2 MOD 10
CMP R3, #((1 :SHL: $cmossize) - 1) / 10 ; do we need to round down to 15?
MOVEQ R3, #(1 :SHL: $cmossize) - 1
MOVEQ R4, #0
MOVHI R4, #1
CMP R3, #(1 :SHL: $cmossize) - 1
MOVHI R3, #(1 :SHL: $cmossize) - 1
07 MOV R2, R3, LSL R4
TEQ R4, #0
ADDNE R2, R2, R2, LSL #2
]
[ "$intvar" <> ""
[ "$shift" <> ""
MOV R1, R2, LSL #$cmosbit
|
MOV R1, R2
]
[ "$intmul" <> ""
MOV R1, R1, LSL#1
ADD R1, R1, R1, LSL#2
]
[ "$lut" <> "" :LAND: "$num" <> ""
ADRL R0, $lut
LDR R1, [R0, R1, LSL#2]
]
STR$intbyte R1, $intvar
]
[ "$intvar" = "preferredpool" ; special case
TEQ R1, #0
LDR R0, baseofsprites
STREQ R0, baseofhisprites
STRNE R0, baseoflosprites
LDR R0, baseofromsprites
STREQ R0, baseoflosprites
STRNE R0, baseofhisprites
[ windowsprite
MOV R0, #-1
STR R0, tiling_sprite
]
BL freelist ; mark cached sprite list invalid
]
[ "$expbyte" = ""
[ "$eor" <> ""
[ $eor <> 0
[ "$shift" <> ""
EOR R2, R2, #$eor :SHR: $cmosbit
|
EOR R2, R2, #$eor
]
]
]
[ "$cmosbit" <> "" :LAND: "$cmossize" <> ""
MOV R3, R2
MOV R0, #ReadCMOS
MOV R1, #$cmosbyte
SWI XOS_Byte
EXIT VS
BIC R2, R2, #((1 :SHL: $cmossize) - 1) :SHL: $cmosbit
ORR R2, R2, R3, LSL #$cmosbit
|
MOV R1, #$cmosbyte
]
MOV R0, #WriteCMOS
SWI XOS_Byte
|
[ "$eor" <> ""
[ $eor <> 0
EOR R3, R3, #$eor
]
]
[ "$cmosbyte" = "$expbyte"
MOV R0, #ReadCMOS
MOV R1, #$cmosbyte
SWI XOS_Byte
EXIT VS
BIC R2, R2, #(((1 :SHL: $cmossize) - 1) :SHL: $cmosbit) + (1 :SHL: $expbit)
ORR R2, R2, R3, LSL #$cmosbit
ORR R2, R2, R4, LSL #$expbit
MOV R0, #WriteCMOS
SWI XOS_Byte
|
MOV R0, #ReadCMOS
MOV R1, #$cmosbyte
SWI XOS_Byte
EXIT VS
BIC R2, R2, #((1 :SHL: $cmossize) - 1) :SHL: $cmosbit
ORR R2, R2, R3, LSL #$cmosbit
MOV R0, #WriteCMOS
SWI XOS_Byte
EXIT VS
MOV R0, #ReadCMOS
MOV R1, #$expbyte
SWI XOS_Byte
EXIT VS
BIC R2, R2, #1 :SHL: $expbit
ORR R2, R2, R4, LSL #$expbit
MOV R0, #WriteCMOS
SWI XOS_Byte
]
]
EXIT
MEND
status_scaninttable
; In: R0 -> increasing integer table (terminated by -1)
; R2 = number to match
; Out: R2 = index into table of best match
ENTRY
MOV R4, R2
MOV R1, #0
01 LDR R3, [R0, R1, LSL #2]
CMP R4, R3
MOVHS R2, R1
ADD R1, R1, #1
CMP R3, #0
BGE %BT01
EXIT
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)
; Out: R2 = index into array of match, or V set if no match
ENTRY
MOV R3, sp
SUB sp, sp, #8
MOV R2, sp
03 LDRB R1, [R0], #1
CMP R1, #' '
MOVLS R1, #0 ; also terminate at spaces
STRB R1, [R2], #1
TEQ R2, R3
BNE %BT03
MOV R0, #0
STRB R0, [R2, #-1] ; just in case
MOV R5, #0
MOV R6, #-1
MOV R1, sp
MOV R3, #Collate_IgnoreCase
04 ADD R2, R4, R5, LSL #2
LDRB R14, [R2]
TEQ R14, #0
BEQ %FT05 ; this signifies the end of the table
MOV R0, #1 ; * commands are all in English
SWI XTerritory_Collate
EXIT VS
MOVEQ R6, R5
ADD R5, R5, #1
B %BT04
05 ADD sp, sp, #8
CMP R6, #0
MOVGE R2, R6
EXIT GE
MOV R0, #0 ; "Bad configure option"
SETV
EXIT
; Units tokens for *Status
statusmess_osunits DCB "OSUnits",0
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
; Code for handling *Configure/*Status
WimpFlagsC_Code
ConfigOption flags,,WimpFlagsCMOS,,,,,,,sysflags,,B
statusmess_flags DCB "WimpFlags ",0
configmess_flags DCB "WimpFlags <D>",cr,lf,0
WimpFontC_Code
ConfigOption wimpfont,,DesktopFeaturesCMOS,1,4
statusmess_wimpfont DCB "WimpFont ",0
configmess_wimpfont DCB "WimpFont <D>",cr,lf,0
WimpDragDelayC_Code
ConfigOption dragdelay,ds,WimpDragTimeCMOS,0,4,,default_drag_timelimit,WimpDragMoveLimitCMOS,0,drag_timelimit,x10
statusmess_dragdelay DCB "WimpDragDelay ",0
configmess_dragdelay DCB "WimpDragDelay <D>",cr,lf,0
WimpDragMoveC_Code
ConfigOption dragmove,osunits,WimpDragMoveLimitCMOS,2,5,noshift,default_drag_movelimit,,,drag_movelimit,,B
statusmess_dragmove DCB "WimpDragMove ",0
configmess_dragmove DCB "WimpDragMove <D>",cr,lf,0
WimpDoubleClickDelayC_Code
ConfigOption doubleclickdelay,ds,WimpDoubleClickTimeCMOS,0,4,,default_doubleclick_timelimit,WimpDoubleClickMoveLimitCMOS,0,doubleclick_timelimit,x10
statusmess_doubleclickdelay DCB "WimpDoubleClickDelay ",0
configmess_doubleclickdelay DCB "WimpDoubleClickDelay <D>",cr,lf,0
WimpDoubleClickMoveC_Code
ConfigOption doubleclickmove,osunits,WimpDoubleClickMoveLimitCMOS,2,5,noshift,default_doubleclick_movelimit,,,doubleclick_movelimit,,B
statusmess_doubleclickmove DCB "WimpDoubleClickMove ",0
configmess_doubleclickmove DCB "WimpDoubleClickMove <D>",cr,lf,0
WimpAutoMenuDelayC_Code
ConfigOption automenudelay,ds,WimpAutoSubMenuTimeCMOS,0,4,,default_automenudelay,WimpAutoSubMenuTimeCMOS,4,automenu_timelimit,x10
statusmess_automenudelay DCB "WimpAutoMenuDelay ",0
configmess_automenudelay DCB "WimpAutoMenuDelay <D>",cr,lf,0
WimpMenuDragDelayC_Code
ConfigOption menudragdelay,ds,WimpMenuDragDelayCMOS,0,4,,default_menudragdelay,WimpMenuDragDelayCMOS,4,menudragdelay,x10
statusmess_menudragdelay DCB "WimpMenuDragDelay ",0
configmess_menudragdelay DCB "WimpMenuDragDelay <D>",cr,lf,0
WimpIconBarSpeedC_Code
ConfigOption iconbarspeed,osupersec,WimpAutoSubMenuTimeCMOS,5,3,,default_iconbarspeed,,,iconbar_scroll_speed,,,iconbarlogtable,numeric
statusmess_iconbarspeed DCB "WimpIconBarSpeed ",0
configmess_iconbarspeed DCB "WimpIconBarSpeed <D>",cr,lf,0
WimpIconBarAccelerationC_Code
ConfigOption iconbaraccel,osupersec2,WimpMenuDragDelayCMOS,5,3,,default_iconbaraccel,,,iconbar_scroll_accel,,,iconbarlogtable,numeric
statusmess_iconbaraccel DCB "WimpIconBarAcceleration ",0
configmess_iconbaraccel DCB "WimpIconBarAcceleration <D>",cr,lf,0
[ SpritePriority
WimpSpritePrecedenceC_Code
ConfigOption sprite,,DesktopFeaturesCMOS,5,1,,0,,,preferredpool,,,status_ramrom
statusmess_sprite DCB "WimpSpritePrecedence ",0
configmess_sprite DCB "WimpSpritePrecedence RAM|ROM",cr,lf,0
]
[ IconiseButton
WimpIconiseButtonC_Code
ConfigOption iconisebut,,WimpDragMoveLimitCMOS,7,1,,0,,,iconisebutton,,B,status_offon
statusmess_iconisebut DCB "WimpIconiseButton ",0
configmess_iconisebut DCB "WimpIconiseButton On|Off",cr,lf,0
]
[ StickyEdges
WimpStickyEdgesC_Code
ConfigOption sticky,,DesktopFeaturesCMOS,6,1,,0,,,stickyedges,,B,status_offon
statusmess_sticky DCB "WimpStickyEdges ",0
configmess_sticky DCB "WimpStickyEdges On|Off",cr,lf,0
]
[ PoppingIconBar
WimpAutoFrontIconBarC_Code
ConfigOption autofront,,WimpDoubleClickMoveLimitCMOS,7,1,,1,,,popiconbar,,B,status_offon
statusmess_autofront DCB "WimpAutoFrontIconBar ",0
configmess_autofront DCB "WimpAutoFrontIconBar On|Off",cr,lf,0
WimpAutoFrontDelayC_Code
ConfigOption autofrontdelay,ds,WimpDoubleClickTimeCMOS,4,4,,default_autofrontdelay,WimpDoubleClickMoveLimitCMOS,1,popiconbar_pause,x10
statusmess_autofrontdelay DCB "WimpAutoFrontDelay ",0
configmess_autofrontdelay DCB "WimpAutoFrontDelay <D>",cr,lf,0
]
[ Autoscr
WimpAutoScrollDelayC_Code
ConfigOption scrolldelay,ds,WimpDragTimeCMOS,4,4,,default_autoscrolldelay,WimpDragMoveLimitCMOS,1,autoscr_default_pause,,B
statusmess_scrolldelay DCB "WimpAutoScrollDelay ",0
configmess_scrolldelay DCB "WimpAutoScrollDelay <D>",cr,lf,0
]
|
WimpDragDelayC_Code
MOV R1,#WimpDragTimeCMOS
B %FT01
......@@ -1265,6 +1671,8 @@ printsyntax
SWI XOS_Write0
Pull "R1,R12,PC"
]
;
; Entry: R0 = desired mode number
; Exit: mode change effected, pointer re-established etc.
......@@ -4601,7 +5009,56 @@ openfinished
LDR R14,[handle,#w_flags]
BIC R14,R14,#ws_onscreenonce ; only cancel this on Open_Window
STR R14,[handle,#w_flags] ; (not on Set_Extent)
;
[ PoppingIconBar
LDR R14, iconbar_pop_state ; don't bother if already at back
TEQ R14, #pop_Front
TEQNE R14, #pop_HeldByMenu
TEQNE R14, #pop_Front2
LDREQ R14, [handle, #w_bhandle]
CMPEQ R14, #-1 ; don't bother if not coming to front
LDREQ R14, [handle, #w_parent]
CMPEQ R14, #-1 ; don't bother if a child window
LDREQ R14, [handle, #w_flags]
TSTEQ R14, #wf_inborder ; don't bother for screensavers, interactive help etc.
BNE %FT02
LDR userblk, menuSP
CMP userblk, #0
BLT %FT01
ADR R14, menuhandles
LDR R14, [userblk, R14]
Abs R14, R14
TEQ handle, R14 ; don't bother if topmost existing menu
BEQ %FT02
01
LDR R14, menuhandle ; menuhandles and menuSP are not necessarily set up yet
Abs R14, R14
TEQ handle, R14 ; don't bother if the deepest menu or dialogue box (may be new)
LDRNE R14, iconbarhandle
Abs R14, R14, NE
TEQNE handle, R14 ; just in case the icon bar is the only window
BEQ %FT02
Push "handle"
MOV handle, R14
LDR R14, [handle, #w_flags]
ORR R14, R14, #wf_backwindow
STR R14, [handle, #w_flags]
ADD R14, handle, #w_wax0
LDMIA R14, {R0-R5}
MOV R6, #-2
Push "R0-R6" ; build block on stack
Push "R6" ; use external handle -2 for icon bar
MOV userblk, sp
BL int_open_window
ADD sp, sp, #8*4
MOVVC R14, #pop_Back
STRVC R14, iconbar_pop_state
Pull "handle"
02
]
;
Pull "LR" ; drop through
Debug opn,"Opening window complete"
......@@ -6991,6 +7448,12 @@ redrawoutlp_done_tracing
[ IconiseButton
01 TST R3,#wf_icon2 ; have an iconise button iff we have a close button
BEQ %FT01
LDR R0, [handle, #w_parent]
CMP R0, #-1
BNE %FT01 ; but not if a child window
LDRB R0, iconisebutton
TEQ R0, #0
BEQ %FT01 ; or if configured off
;
MOV R0,#iconposn_iconise
BL calc_w_iconposn ; bounding box of the iconise icon
......
s/Wimp03
View file @ 082117ee
......@@ -1153,11 +1153,16 @@ checkiconbarpop
B %F10
B %F20
B %F30
; Icon bar is held by menu
NOP ; drops through
; Icon bar is held by menu, or fronted by keyboard
Pull "R0,PC"
; Icon bar is at back
10 TEQ R1,#0 ; are we at the bottom of the screen?
10 LDRB R14, popiconbar
TEQ R14, #0
Pull "R0, PC", EQ ; don't bring to front if configured off
TEQ R1,#0 ; are we at the bottom of the screen?
Pull "R0,PC",NE
[ Autoscr
......@@ -1177,8 +1182,8 @@ checkiconbarpop
11 SWI XOS_ReadMonotonicTime
Pull "R0,PC",VS
[ false
LDR R14,automenu_timelimit
[ true
LDR R14, popiconbar_pause
ADD R0,R0,R14
|
ADD R0,R0,#pop_DelayTime
......@@ -1227,22 +1232,30 @@ checkiconbarpop
TEQ R0,#0
BNE %FT60
; Going to front. Remember where to go back to.
[ false
TST R14,#wf_backwindow
MOVNE R6,#-2
LDREQ R6,[handle,#w_bhandle]
ADRL R0,iconbar_pop_previous
STR R6,[R0]
]
BIC R14,R14,#wf_backwindow
STR R14,[handle,#w_flags]
MOV R6,#-1
B %FT65
60 ; Going back to previous position.
[ false
ADRL R6,iconbar_pop_previous
LDR R6,[R6]
CMP R6,#-2
ORREQ R14,R14,#wf_backwindow
STREQ R14,[handle,#w_flags]
|
ORR R14, R14, #wf_backwindow
STR R14, [handle, #w_flags]
MOV R6, #-2
]
65
ADD R14,handle,#w_wax0
LDMIA R14,{R0-R3,R4,R5}
......@@ -1476,31 +1489,19 @@ ptr_iconbar_icon
BNE %FT01 ; this isn't it!
;
LDR R14,scrx0
[ true
ADD R14,R14,#iconbarsepgap
CMP R0,R14
MOVLT R8,#-iconbar_scroll_speed * 100 - 1 ; scroll left
LDRLT R8, iconbar_scroll_speed
MVNLT R8, R8 ; ensure msb set ; scroll left
BLT %FT02
|
ADD R14,R14,#iconbar_scroll_speed
SUBS R8,R0,R14
BLT %FT02
]
;
LDR R14,scrx1
[ true
SUB R14,R14,#iconbarsepgap
CMP R0,R14
MOVLE R14,#0
STRLE R14,iconbar_scroll_start_time
BLE %FT01
MOVGT R8,#iconbar_scroll_speed * 100 ; scroll right
|
SUB R14,R14,#iconbar_scroll_speed
SUBS R8,R0,R14
MOVLE R14,#0
STRLE R14,iconbar_scroll_start_time
BLE %FT01
]
LDRGT R8, iconbar_scroll_speed ; scroll right
02
Push "R0-R8,handle,userblk"
Abs handle,R3
......@@ -1520,19 +1521,19 @@ ptr_iconbar_icon
LDR R5,iconbar_scroll_start_scx
LDR R2,iconbar_scroll_start_time
SUB R2,R0,R2 ; R2=time since scroll start (in centi-seconds)
[ iconbar_scroll_accel = 1
CMP R8,#0
ADDGT R8,R8,R2
SUBLT R8,R8,R2 ; R8=(+/-)(speed + accel*time)
|
MOV LR,#iconbar_scroll_accel
MUL LR,R2,LR ; LR=accel * time
CMP R2, #&3800 ;; much more than this, and accel*time^2 will overflow
MOVHI R2, #&3800 ;; when maximum acceleration is configured
LDR LR, iconbar_scroll_accel
MUL LR,R2,LR ; LR=accel * time (cs)
MOV LR, LR, ASR#6
ADD LR, LR, LR, ASR#2 ; LR=accel * time (s) (within 3%)
CMP R8,#0
ADDGT R8,R8,LR
ADDGE R8,R8,LR
SUBLT R8,R8,LR ; R8=(+/-)(speed + accel*time)
]
MUL R8,R2,R8 ; R8=(+/-)(speed + accel*time) * time
ADD R5,R5,R8,ASR #6 ; R5+=(+/-)(speed + accel*time) * time/128 (approximation to 100)
ADDLT R8, R8, #1 ; adjust because we used NOT(speed) rather than -(speed) for velocity
MUL R8,R2,R8 ; R8=(+/-)(speed + accel*time) * time (cs)
ADD R8, R8, R8, ASR#2
ADD R5,R5,R8,ASR #6 ; R5+=(+/-)(speed + accel*time) * time (s)
Pull "R2"
LDR R0,iconbarhandle
......@@ -2776,7 +2777,13 @@ check_h_arrows
BHI %FT04
LDR R2,[handle,#w_flags]
TST R2,#wf_icon2
BNE %BT05
BEQ %FT04
LDR R2, [handle, #w_parent]
CMP R2, #-1
BNE %FT04
LDRB R2, iconisebutton
TEQ R2, #0
BNE %BT05
04
]
;
......
s/Wimp04
View file @ 082117ee
......@@ -5055,8 +5055,16 @@ check3
LDRNE R14,close_width
ADDNE x0,x0,R14
[ IconiseButton
LDRNE R14,iconise_width
SUBNE x1,x1,R14
BEQ %FT01
LDR R14, [handle, #w_parent]
CMP R14, #-1
BNE %FT01
LDRB R14, iconisebutton
TEQ R14, #0
BEQ %FT01
LDR R14,iconise_width
SUB x1,x1,R14
01
]
TST R1,#wf_icon4
LDRNE R14,vscroll_width
......@@ -5192,8 +5200,16 @@ ignoretitle
LDRNE x1,close_width
ADDNE R14,R14,x1
[ IconiseButton
LDRNE x1,iconise_width ; + iconise
ADDNE R14,R14,x1
BEQ %FT01
LDR x1, [handle, #w_parent]
CMP x1, #-1
BNE %FT01
LDRB x1, iconisebutton
TEQ x1, #0
BEQ %FT01
LDR x1,iconise_width ; + iconise
ADD R14,R14,x1
01
]
TST R1,#wf_icon5 ; v_scroll
BNE %FT01
......
s/Wimp05
View file @ 082117ee
......@@ -1315,9 +1315,19 @@ defaultkey
BLE %FT01
BL checkhandle ; handle -> window block
[ PoppingIconBar
LDRVC R14, iconbar_pop_state
TEQ R14, #pop_Back
TEQNE R14, #pop_Delaying
MOVEQ R14, #pop_Front2
MOVNE R14, #pop_Back
STRVC R14, iconbar_pop_state
LDRVC R14, [handle, #w_flags]
|
BLVC calc_w_status ; set up flag word
LDRVC R14,[handle,#w_flags]
TSTVC R14,#ws_top ; is the window covered?
]
BICEQ R14,R14,#wf_backwindow ; not backwindow if coming to front
ORRNE R14,R14,#wf_backwindow ; backwindow if going to back
STRVC R14,[handle,#w_flags]
......@@ -3646,6 +3656,8 @@ closmlp
TEQ R1,#pop_HeldByMenu
MOVEQ R1,#pop_Front
STREQ R1,iconbar_pop_state
MOV R1, #0
STR R1, menuhandle
Pull "R1-R5,handle,PC" ; done
1 CMP R1,R0
Pull "R1-R5,handle,PC",LE ; done
......
s/Wimp07
View file @ 082117ee
......@@ -2152,7 +2152,7 @@ starterrorbox_draw
[ NewErrorSystem
; make sure we have default pointer
MOV R0,#SpriteReason_SetPointerShape
[ debug
[ true
ADRL R2,ptr_default2 ; ADRL doesn't reach if debugging enabled!
|
ADRL R2,ptr_default
......
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