Commit 7b3c022c authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Remove conflicting save desktop settings

Saving the desktop boot file results in some conflicting settings. Since to be able to save it you must have a writable medium, you also have <Choices$Write> so you should be using !Configure.
Remove the ChangeDynamicArea lines from being written
* FontSize - this was specifically mentioned as conflicting in the RISC OS 3.60 User Guide, in the memory dialogue of old !Configure or Font setup plugin now.
* SpriteSize - deprecated in the RISC OS 3.10 PRM, so don't encourage it to be non zero on boot up
* RamFsSize - likewise in the memory dialogue of old !Configure or Disc setup plugin now.
Still writes the WimpSlot size, since there's no corresponding !Configure item for that and it can be resized before every app starts anyway.

Version 1.48. Tagged as 'Switcher-1_48'
parent bcb04bd9
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.47"
Module_Version SETA 147
Module_MajorVersion SETS "1.48"
Module_Version SETA 148
Module_MinorVersion SETS ""
Module_Date SETS "26 Sep 2015"
Module_ApplicationDate SETS "26-Sep-15"
Module_Date SETS "12 Feb 2016"
Module_ApplicationDate SETS "12-Feb-16"
Module_ComponentName SETS "Switcher"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Switcher"
Module_FullVersion SETS "1.47"
Module_HelpVersion SETS "1.47 (26 Sep 2015)"
Module_FullVersion SETS "1.48"
Module_HelpVersion SETS "1.48 (12 Feb 2016)"
END
/* (1.47)
/* (1.48)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.47
#define Module_MajorVersion_CMHG 1.48
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 Sep 2015
#define Module_Date_CMHG 12 Feb 2016
#define Module_MajorVersion "1.47"
#define Module_Version 147
#define Module_MajorVersion "1.48"
#define Module_Version 148
#define Module_MinorVersion ""
#define Module_Date "26 Sep 2015"
#define Module_Date "12 Feb 2016"
#define Module_ApplicationDate "26-Sep-15"
#define Module_ApplicationDate "12-Feb-16"
#define Module_ComponentName "Switcher"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Switcher"
#define Module_FullVersion "1.47"
#define Module_HelpVersion "1.47 (26 Sep 2015)"
#define Module_LibraryVersionInfo "1:47"
#define Module_FullVersion "1.48"
#define Module_HelpVersion "1.48 (12 Feb 2016)"
#define Module_LibraryVersionInfo "1:48"
......@@ -6230,12 +6230,12 @@ savestate_bydragging
MOVVC R14,#0
STRVC R14,savedesk_nexttask ; next task to ask for a command
; OSS Get time for comment at top of auotboot file.
; OSS Get time for comment at top of autoboot file.
MOVVC R0,#OsWord_ReadRealTimeClock
ADRVC R1,pollblock
MOVVC R14,#3
STRVCB R14,[R1] ; reason code = 3 => read 5-byte time
MOVVC R14,#OWReadRTC_5ByteInt
STRVCB R14,[R1] ; reason code => read 5-byte time
SWIVC XOS_Word
MOVVC R0,R1
ADDVC R1,R1,#5 ; 5 bytes needed for time
......@@ -6270,20 +6270,6 @@ savestate_bydragging
ADRVCL R2,str_wimpslot
BLVC setmemcommand ; "*WimpSlot -next <n>K"
MOVVC R0,#fontarea
ADRVCL R2,str_fontsize
BLVC setareacommand ; "*ChangeDynamicArea -FontSize <n>K"
MOVVC R0,#spritearea
ADRVCL R2,str_spritesize
BLVC setareacommand ; "*ChangeDynamicArea -SpriteSize <n>K"
[ OldRAMFS
MOVVC R0,#ramfsarea
ADRVCL R2,str_ramfssize
BLVC setareacommand ; "*ChangeDynamicArea -RamFsSize <n>K"
]
MOVVC R0,#0 ; R0 = flag word on entry
LDRVCB R2,savedesk_handle ; R2 = file handle on entry
MOVVC R1,#Service_WimpSaveDesktop
......@@ -6490,22 +6476,6 @@ driveconfig DCB "Configure Drive ",0
;............................................................................
; In R0 = dynamic area number
; R2 -> command prefix
; [savedesk_handle] = file handle
; Out "*ChangeDynamicArea -xxx <n>K" written to file
setareacommand
Push "R1-R2,LR"
MOV R1,#0
SWI XOS_ReadDynamicArea ; doesn't touch R2
BLVC setmemcommand ; R1 = value to set, R2 -> prefix
Pull "R1-R2,PC"
;............................................................................
; In R1 = amount of memory to set (a whole number of K)
; R2 -> command prefix
; [savedesk_handle] = file handle
......@@ -6531,9 +6501,6 @@ setmemcommand
Pull "R1-R2,PC"
str_wimpslot DCB "WimpSlot -next ", 0
str_fontsize DCB "ChangeDynamicArea -FontSize ", 0
str_spritesize DCB "ChangeDynamicArea -SpriteSize ", 0
str_ramfssize DCB "ChangeDynamicArea -RamFsSize ", 0
str_K DCB "K",10,0
ALIGN
......
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