Commit f8542a95 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. NetFiler$DefaultDir

Version 0.85. Tagged as 'NetFiler-0_85'
parent 409afabf
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.84"
Module_Version SETA 84
Module_MajorVersion SETS "0.85"
Module_Version SETA 85
Module_MinorVersion SETS ""
Module_Date SETS "03 Jul 2016"
Module_ApplicationDate SETS "03-Jul-16"
Module_Date SETS "20 Sep 2016"
Module_ApplicationDate SETS "20-Sep-16"
Module_ComponentName SETS "NetFiler"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/NetFS/NetFiler"
Module_FullVersion SETS "0.84"
Module_HelpVersion SETS "0.84 (03 Jul 2016)"
Module_FullVersion SETS "0.85"
Module_HelpVersion SETS "0.85 (20 Sep 2016)"
END
/* (0.84)
/* (0.85)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.84
#define Module_MajorVersion_CMHG 0.85
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 03 Jul 2016
#define Module_Date_CMHG 20 Sep 2016
#define Module_MajorVersion "0.84"
#define Module_Version 84
#define Module_MajorVersion "0.85"
#define Module_Version 85
#define Module_MinorVersion ""
#define Module_Date "03 Jul 2016"
#define Module_Date "20 Sep 2016"
#define Module_ApplicationDate "03-Jul-16"
#define Module_ApplicationDate "20-Sep-16"
#define Module_ComponentName "NetFiler"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/NetFS/NetFiler"
#define Module_FullVersion "0.84"
#define Module_HelpVersion "0.84 (03 Jul 2016)"
#define Module_LibraryVersionInfo "0:84"
#define Module_FullVersion "0.85"
#define Module_HelpVersion "0.85 (20 Sep 2016)"
#define Module_LibraryVersionInfo "0:85"
......@@ -4818,8 +4818,8 @@ message_datasave
BL matchiconbar ; returns r2 -> fs block
ADD r1, r5, #44
BL GetPathName ; Put pathname in message block data field
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 '.<NetFiler$DefaultDir>' (if it exists)
MOV r0, #46
STRB r0, [r1], #1 ; add a '.'
ADR r2, filenamebuffer
......@@ -4877,7 +4877,7 @@ message_dataload
ADD r1, r5, #20
BL GetPathName ; Put pathname in message block data field
MOV r2, #256 ; maximum size we'll allow for media name + default path
BL append_dotdefaultpath ; Append NetFiler$DefaultPath
BL append_dotdefaultdir ; Append NetFiler$DefaultDir
MOV r1, r5 ; location of message data
MOV r2, r6 ; task handle of sender (to send back to)
......@@ -4901,20 +4901,20 @@ message_dataload
BL matchiconbar ; returns r2 -> fs block
BNE %FT50
BL GetPathName
MOV r2, #256 ; maximum size we'll allow for media name + default path
BL append_dotdefaultpath
MOV r2, #256 ; maximum size we'll allow for media name + default path
BL append_dotdefaultdir
BL fileropendir
50
Pull "pc"
netfiler_defaultpath DCB "NetFiler$$DefaultPath",0
netfiler_defaultdir DCB "NetFiler$$DefaultDir",0
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; append_dotdefaultpath
; append_dotdefaultdir
;
; Read value of NetFiler$DefaultPath and append it to the path in r1
; Read value of NetFiler$DefaultDir and append it to the path in r1
; (ie. does string1 becomes string1.value)
;
; In: r1 -> destination buffer
......@@ -4925,12 +4925,12 @@ netfiler_defaultpath DCB "NetFiler$$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, netfiler_defaultpath
ADR r0, netfiler_defaultdir
MOV r2, #-1
MOV r3, #0
MOV r4, #0
......@@ -4943,7 +4943,7 @@ append_dotdefaultpath Entry "r3-r7"
CMP r0, r6
EXIT GT ; exit if buffer not big enough
ADR r0, netfiler_defaultpath
ADR r0, netfiler_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