Commit a30f8517 authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Corrected setting of WatchdogTimer option to false.

Made options files specify any text wanted after the module version number.
Auto-fronting iconbar now returns to previous position rather than back, so
it interacts with Shift+F12 better.
parent 6bec6bd7
BadParent:Window cannot be its own parent
......@@ -53,7 +53,7 @@
Option ErrorServiceCall, true ; send service call for Wimp_ReportError
Option NewErrorSystem, true ; enable watchdog and so forth
Option Bits30and23, false ; use bits 30 and 23 of error number
Option WatchdogTimer, true ; use timer interupt for watchdog
Option WatchdogTimer, false ; use timer interupt for watchdog
Option AllowMatrix, false
Option FreePoolWCF, true
Option SnapShot, false
......
......@@ -17,6 +17,8 @@
; and sets the default values for these options, if not set in the system options file.
;
GBLS module_postfix ; something to appear after the module version
Option sixteenmeg, false ; if true, assume app space ends at 16 meg.
Option Stork, true ; try saving power by calling Portable_Idle
......
......@@ -16,6 +16,8 @@
; Wimp options for a RISC OS 3.10 build of the Window Manager
;
module_postfix SETS " RISC OS 3.1"
Option Stork, false ; try saving power by calling Portable_Idle
Option Medusa, false ; support Medusa Memory management
......
......@@ -16,6 +16,8 @@
; Wimp options for a RISC OS 3.50 build of the Window Manager
;
module_postfix SETS " RISC OS 3.5"
Option Stork, false ; try saving power by calling Portable_Idle
Option PlotSpritesFromPalette, false ; Use palette entries, not translation table
......
......@@ -16,6 +16,8 @@
; Wimp options for a RISC OS 3.60 build of the Window Manager
;
module_postfix SETS " RISC OS 3.6"
Option UseAMBControl, false ; delegate task memory management to OS_AMBControl
Option StrongARM, false
......
......@@ -4,8 +4,8 @@
GBLS VString
GBLS Date
Version SETA 390
VString SETS "3.90"
Date SETS "28 Apr 1997"
Version SETA 391
VString SETS "3.91"
Date SETS "07 May 1997"
END
......@@ -362,17 +362,7 @@ Helpstr = "Window Manager",9,"$VString ($Date)"
[ standalone
= " (Stand alone)"
]
[ :LNOT:Medusa
= " RISC OS 3.1"
|
[ International_Help=0
= " RISC OS 3.5"
|
[ :LNOT:UseAMBControl
= " RISC OS 3.6"
]
]
]
= module_postfix
= 0
[ International_Help=0
......@@ -3130,6 +3120,14 @@ watchdogtask # 4
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
[ PoppingIconBar
iconbar_pop_time # 4
iconbar_pop_state # 4
......@@ -3139,13 +3137,6 @@ pop_Front * 2
pop_HeldByMenu * 3
pop_DelayTime * 50 ; centiseconds
]
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
[ ChildWindows
newparent # 4 ; parameter for Wimp_OpenWindow
......@@ -3202,6 +3193,10 @@ 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
]
......
......@@ -1186,24 +1186,43 @@ checkiconbarpop
CMP handle,#0
Pull "R0,PC",LE
;
; As we enter here, R0=0 means pop to front, else go to back (or previous position)
;
Push "R1-R11"
BL checkhandle ; handle -> window block
BLVC calc_w_status ; set up flag word
LDRVC R14,[handle,#w_flags]
BVS %FT70
TEQ R0,#0
BICEQ R14,R14,#wf_backwindow
ORRNE R14,R14,#wf_backwindow
STRVC R14,[handle,#w_flags]
ADDVC R14,handle,#w_wax0
LDMVCIA R14,{R0-R3,R4,R5}
MOVEQ R6,#-1
BNE %FT60
; Going to front. Remember where to go back to.
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.
ADRL R6,iconbar_pop_previous
LDR R6,[R6]
CMP R6,#-2
ORREQ R14,R14,#wf_backwindow
STREQ R14,[handle,#w_flags]
65
ADD R14,handle,#w_wax0
LDMIA R14,{R0-R3,R4,R5}
Push "R0-R6"
LDRVC R14,iconbarhandle
LDR R14,iconbarhandle
Push "R14"
MOVVC userblk,sp
BLVC int_open_window
MOV userblk,sp
BL int_open_window
ADD sp,sp,#8*4
70
Pull "R1-R11"
Pull "R0,PC"
]
......
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