Commit 4af06d1c authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Standardise drag-to-iconbar system variable name

While the behaviour introduced with Ursula whereby files can be dropped on the iconbar filer icon to start a copy/move operation, there is a hidden bit of functionality that you can set an alternative destination directory other than the root.
This is governed by a system variable, however Acorn's implementation erroneously called this a path, when in fact it's a directory (no trailing dot). RISC OS Ltd fixed this by the time RISC OS 4.00 came along, so this change brings this filer into sync.
For reference, the variable is "FSTitle + Filer$DefaultDir", where FSTitle can be found by calling OS_FSControl 33. eg. RAMFiler$DefaultDir (not RAMFSFiler$DefaultDir)

Version 0.40. Tagged as 'RAMFSFiler-0_40'
parent 4cb1107e
# RAMFSFiler *Help Messages file
Desktop_RAMFSFiler:The RAMFSFiler provides the RAMFS icon on the icon bar, and uses the Filer to display RAMFS directories.|MDo not use *Desktop_RAMFSFiler, use *Desktop instead.
# RAMFSFiler Syntax Messages file
Desktop_RAMFSFiler:Syntax: *Desktop_RAMFSFiler
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.39"
Module_Version SETA 39
Module_MajorVersion SETS "0.40"
Module_Version SETA 40
Module_MinorVersion SETS ""
Module_Date SETS "14 Jan 2014"
Module_ApplicationDate SETS "14-Jan-14"
Module_Date SETS "20 Sep 2016"
Module_ApplicationDate SETS "20-Sep-16"
Module_ComponentName SETS "RAMFSFiler"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/RAMFS/RAMFSFiler"
Module_FullVersion SETS "0.39"
Module_HelpVersion SETS "0.39 (14 Jan 2014)"
Module_FullVersion SETS "0.40"
Module_HelpVersion SETS "0.40 (20 Sep 2016)"
END
/* (0.39)
/* (0.40)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.39
#define Module_MajorVersion_CMHG 0.40
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 14 Jan 2014
#define Module_Date_CMHG 20 Sep 2016
#define Module_MajorVersion "0.39"
#define Module_Version 39
#define Module_MajorVersion "0.40"
#define Module_Version 40
#define Module_MinorVersion ""
#define Module_Date "14 Jan 2014"
#define Module_Date "20 Sep 2016"
#define Module_ApplicationDate "14-Jan-14"
#define Module_ApplicationDate "20-Sep-16"
#define Module_ComponentName "RAMFSFiler"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/RAMFS/RAMFSFiler"
#define Module_FullVersion "0.39"
#define Module_HelpVersion "0.39 (14 Jan 2014)"
#define Module_LibraryVersionInfo "0:39"
#define Module_FullVersion "0.40"
#define Module_HelpVersion "0.40 (20 Sep 2016)"
#define Module_LibraryVersionInfo "0:40"
......@@ -1347,9 +1347,9 @@ message_datasave
STRB r2, [r1], #1
MOV r2, #'$'
STRB r2, [r1], #1
MOV r2, #256 ; maximum length for append_dotdefaultpath
MOV r2, #256 ; maximum length for append_dotdefaultdir
STRB r2, [r1]
BL append_dotdefaultpath ; add '.<RAMFSFiler$DefaultPath>' (if it exists)
BL append_dotdefaultdir ; add '.<RAMFiler$DefaultDir>' (if it exists)
MOV r0, #46
STRB r0, [r1], #1 ; add a '.'
ADR r2, filenamebuffer
......@@ -1413,7 +1413,7 @@ message_dataload
STRB r2, [r1], #1
MOV r2, #256 ; Maximum size for default path
STRB r2, [r1]
BL append_dotdefaultpath ; append RAMFSFiler$DefaultPath
BL append_dotdefaultdir ; append RAMFiler$DefaultDir
MOV r1, r5 ; location of message data
MOV r2, r6 ; task handle of sender (to send back to)
......@@ -1446,7 +1446,7 @@ message_dataload
STRB r2, [r1], #1
MOV r2, #256 ; Maximum size for default path
STRB r2, [r1]
BL append_dotdefaultpath ; append RAMFSFiler$DefaultPath
BL append_dotdefaultdir ; append RAMFiler$DefaultDir
ADR r0,userdata
SWI XOS_CLI ; Issue the command
......@@ -1458,9 +1458,9 @@ FilerOpenDirCommand DCB "%Filer_OpenDir RAM::",0 ; Has the drive name appended
ALIGN
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; append_dotdefaultpath
; append_dotdefaultdir
;
; Read value of RAMFSFiler$DefaultPath and append it to the path in r1
; Read value of RAMFiler$DefaultDir and append it to the path in r1
; (ie. does string1 becomes string1.value)
;
; In: r1 -> destination buffer
......@@ -1471,12 +1471,12 @@ FilerOpenDirCommand DCB "%Filer_OpenDir RAM::",0 ; Has the drive name appended
; r2 = corrupted.
; All other regs preserved.
append_dotdefaultpath Entry "r3-r7"
append_dotdefaultdir Entry "r3-r7"
MOV r7, r1
MOV r6, r2
ADR r0, ramfsfiler_defaultpath
ADR r0, ramfsfiler_defaultdir
MOV r2, #-1
MOV r3, #0
MOV r4, #0
......@@ -1489,7 +1489,7 @@ append_dotdefaultpath Entry "r3-r7"
CMP r0, r6
EXIT GT ; exit if buffer not big enough
ADR r0, ramfsfiler_defaultpath
ADR r0, ramfsfiler_defaultdir
ADD r1, r7, #1
MOV r2, #256
MOV r3, #0
......@@ -1504,7 +1504,7 @@ append_dotdefaultpath Entry "r3-r7"
EXIT
ramfsfiler_defaultpath DCB "RAMFSFiler$$DefaultPath",0
ramfsfiler_defaultdir DCB "RAMFiler$$DefaultDir",0
]
......
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