Commit 4f75a3b2 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. SCSIFiler$DefaultDir SDFSFiler$DefaultDir ADFSFiler$DefaultDir

Version 1.11. Tagged as 'ADFSFiler-1_11'
parent 9a765cd8
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.10"
Module_Version SETA 110
Module_MajorVersion SETS "1.11"
Module_Version SETA 111
Module_MinorVersion SETS ""
Module_Date SETS "29 May 2016"
Module_ApplicationDate SETS "29-May-16"
Module_Date SETS "20 Sep 2016"
Module_ApplicationDate SETS "20-Sep-16"
Module_ComponentName SETS "ADFSFiler"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
Module_FullVersion SETS "1.10"
Module_HelpVersion SETS "1.10 (29 May 2016)"
Module_FullVersion SETS "1.11"
Module_HelpVersion SETS "1.11 (20 Sep 2016)"
END
/* (1.10)
/* (1.11)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.10
#define Module_MajorVersion_CMHG 1.11
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 29 May 2016
#define Module_Date_CMHG 20 Sep 2016
#define Module_MajorVersion "1.10"
#define Module_Version 110
#define Module_MajorVersion "1.11"
#define Module_Version 111
#define Module_MinorVersion ""
#define Module_Date "29 May 2016"
#define Module_Date "20 Sep 2016"
#define Module_ApplicationDate "29-May-16"
#define Module_ApplicationDate "20-Sep-16"
#define Module_ComponentName "ADFSFiler"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
#define Module_FullVersion "1.10"
#define Module_HelpVersion "1.10 (29 May 2016)"
#define Module_LibraryVersionInfo "1:10"
#define Module_FullVersion "1.11"
#define Module_HelpVersion "1.11 (20 Sep 2016)"
#define Module_LibraryVersionInfo "1:11"
......@@ -4519,8 +4519,8 @@ message_datasave
BL strcpy_advance ; do the copy
ADR r2, dotdollar3
BL strcpy_advance ; add a '.$' to the medianame (eg. 'ADFS::Flibble.$.')
MOV r2, #256 ; maximum length for append_dotdefaultpath
BL append_dotdefaultpath ; add '.<ADFSFiler$DefaultPath>' (if it exists)
MOV r2, #256 ; maximum length for append_dotdefaultdir
BL append_dotdefaultdir ; add '.<ADFSFiler$DefaultDir>' (if it exists)
MOV r0, #46
STRB r0, [r1], #1 ; add a '.'
ADR r2, filenamebuffer
......@@ -4584,8 +4584,8 @@ message_dataload
BL strcpy_advance ; copy media name into the message block
ADR r2, dotdollar3
BL strcpy_advance ; add a .$
MOV r2, #256 ; maximum size we'll allow for append_dotdefaultpath
BL append_dotdefaultpath ; Add the value of ADFSFiler$DefaultPath if it exists
MOV r2, #256 ; maximum size we'll allow for append_dotdefaultdir
BL append_dotdefaultdir ; Add the value of ADFSFiler$DefaultDir if it exists
MOV r1, r5 ; location of message data
MOV r2, r6 ; task handle of sender (to send back to)
......@@ -4618,19 +4618,19 @@ message_dataload
ADR r2, dotdollar3
BL strcpy_advance ; add a '.$'
MOV r2, #256
BL append_dotdefaultpath ; Add the value of ADFSFiler$DefaultPath if it exists
BL append_dotdefaultdir ; Add the value of ADFSFiler$DefaultDir if it exists
ADR r0,userdata
SWI XOS_CLI ; Execute command
Pull "pc"
adfsfiler_defaultpath DCB "$FSTitle.Filer$$DefaultPath",0
adfsfiler_defaultdir DCB "$FSTitle.Filer$$DefaultDir",0
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; append_dotdefaultpath
; append_dotdefaultdir
;
; Read value of ADFSFiler$DefaultPath and append it to the path in r1
; Read value of ADFSFiler$DefaultDir and append it to the path in r1
; (ie. does string1 becomes string1.value)
;
; In: r1 -> destination buffer
......@@ -4641,12 +4641,12 @@ adfsfiler_defaultpath DCB "$FSTitle.Filer$$DefaultPath",0
; r2 = corrupted.
; All other regs preserved.
append_dotdefaultpath Entry "r3-r7"
append_dotdefaultdir Entry "r3-r7"
MOV r7, r1
MOV r6, r2
ADR r0, adfsfiler_defaultpath
ADR r0, adfsfiler_defaultdir
MOV r2, #-1
MOV r3, #0
MOV r4, #0
......@@ -4659,7 +4659,7 @@ append_dotdefaultpath Entry "r3-r7"
CMP r0, r6
EXIT GT ; exit if buffer not big enough
ADR r0, adfsfiler_defaultpath
ADR r0, adfsfiler_defaultdir
ADD r1, r7, #1
MOV r2, #256
MOV r3, #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