Commit 8a71dace authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Fix to Wimp_DeleteIcon stiffing the machine when trying to delete an icon...

Fix to Wimp_DeleteIcon stiffing the machine when trying to delete an icon which doesn't yet exist.Now fails gracefully.

Import of another set of awful icons in the Iyonix resources.
Tweak to the number of CLI parameters accepted by * commands.

Version 4.80. Tagged as 'Wimp-4_80'
parent 21d01ef8
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "4.79"
Module_Version SETA 479
Module_MajorVersion SETS "4.80"
Module_Version SETA 480
Module_MinorVersion SETS ""
Module_Date SETS "31 Oct 2002"
Module_ApplicationDate SETS "31-Oct-02"
Module_Date SETS "28 Nov 2002"
Module_ApplicationDate SETS "28-Nov-02"
Module_ComponentName SETS "Wimp"
Module_ComponentPath SETS "RiscOS/Sources/Desktop/Wimp"
Module_FullVersion SETS "4.79"
Module_HelpVersion SETS "4.79 (31 Oct 2002)"
Module_FullVersion SETS "4.80"
Module_HelpVersion SETS "4.80 (28 Nov 2002)"
END
/* (4.79)
/* (4.80)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
*
*/
#define Module_MajorVersion_CMHG 4.79
#define Module_MajorVersion_CMHG 4.80
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 31 Oct 2002
#define Module_Date_CMHG 28 Nov 2002
#define Module_MajorVersion "4.79"
#define Module_Version 479
#define Module_MajorVersion "4.80"
#define Module_Version 480
#define Module_MinorVersion ""
#define Module_Date "31 Oct 2002"
#define Module_Date "28 Nov 2002"
#define Module_ApplicationDate "31-Oct-02"
#define Module_ApplicationDate "28-Nov-02"
#define Module_ComponentName "Wimp"
#define Module_ComponentPath "RiscOS/Sources/Desktop/Wimp"
#define Module_FullVersion "4.79"
#define Module_HelpVersion "4.79 (31 Oct 2002)"
#define Module_LibraryVersionInfo "4:79"
#define Module_FullVersion "4.80"
#define Module_HelpVersion "4.80 (28 Nov 2002)"
#define Module_LibraryVersionInfo "4:80"
......@@ -2131,7 +2131,7 @@ WimpVisualFlags_Help DCB "Change the visual appearance of the desktop.",cr
DCB " Remove the filled box from behind the text in text+sprite icons.",cr
DCB "-NoIconBoxesInTransWindows",cr
DCB " Remove the filled box from icons on windows similar to the pinboard.",cr
DCB "-Fully3DIconbar",cr
DCB "-Fully3DIconBar",cr
DCB " Make the iconbar have a full 3D border.",cr
DCB "-NoFontBlending",cr
DCB " Don't use font blending in icons.
......@@ -2318,7 +2318,7 @@ Helptable
Command WimpClickSubmenu,1,1,Status_Keyword_Flag:OR:International_Help,WimpClickSubmenuC
]
[ ThreeDPatch
Command WimpVisualFlags,15,0,International_Help
Command WimpVisualFlags,255,0,International_Help
]
DCB 0
......
......@@ -5842,7 +5842,7 @@ errhandle
; It's dirty
MyXError WimpBadHandle
STR R0,[sp]
STR R0,[sp,#Proc_RegOffset]
EXIT
MakeErrorBlock WimpBadHandle
LTORG
......
......@@ -157,8 +157,16 @@ makespritelist Entry "R0-R4,R8-R9"
Debug sprite,"HeapSort: Items, At, Checker =",R0,R1,R2
TST R1,#2_111:SHL:29 ; high address?
BNE %FA37
SWI XOS_HeapSort ; attempt to sort the list
Pull "R3" ; restore original boundary for the list
B %FA39
37 Push "R7"
MOV R7,#0
SWI XOS_HeapSort32 ; use new SWI with 32-bit address
Pull "R7"
39 Pull "R3" ; restore original boundary for the list
; Now attempt to remove duplicates by simply scanning down the list from start to
; end. This we do by checking first to see if we have reached the end, if we
......@@ -679,8 +687,13 @@ sortmessages
MOV R0,R3,LSR #2 ; size of the list to be sorted
MOV R1,R2 ; -> list to be sorted
MOV R2,#0 ; sorting unsigned integers
TST R1,#2_111:SHL:29
BNE %FT55
SWI XOS_HeapSort
B %FT57
55 MOV R7,#0
SWI XOS_HeapSort32
57
Debug msgsel,"list sorted and ready to rock and roll"
EXIT
......
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