Redraw of unfilled, font-specified icons now fixed; this caused antialising...

Redraw of unfilled, font-specified icons now fixed; this caused antialising errors, for example in CC applications' banner windows.

No longer maps anti-aliased system font character 128 to WimpSymbol tick;
this leaves character 128 free for use by Euro currency glyph.

Fixed Data Aborts in Wimp_SpriteOps 54, 57 and 58, and in *WimpKillSprite for
a sprite name found only in the ROM sprite pool.

Eureka window titles should now be redrawn correctly, without impacting the
redraw of Wimp-drawn titlebars, provided the ROM toolsprites are used. Note
that the toolsprite spritefile has regained sprite masks, but the colours
"behind" the mask are different to those in the last masked toolsprite file.

Options/s/!Default

@@ -69,6 +69,7 @@
         Option  Autoscr,                false                   ; Add Wimp_AutoScroll and dragbox-within-window facilities
         Option  StickyEdges,            false                   ; Allow windows to "stick" when dragged over edge of screen
         Option  MultiClose,             false                   ; Allow Ctrl-Alt clicks on close/iconise buttons
+        Option  Euro,                   false                   ; Don't map fancy fonts' char 128 to tick - used for Euro
 	Option  DoubleHeightVDU4,	false                   ; Wimp_SetMode selects modes with double height VDU 4 output
 	Option  ForceTwitter,           false :LAND: Twitter    ; Twitter needs-help windows & ignore interlace ModeFlags bit
 	Option  HideIconBar,            false                   ; icon bar is behind Wimp back window until brought to front

Options/s/Ursula

@@ -31,6 +31,7 @@
         Option  Autoscr,                true                    ; Add Wimp_AutoScroll and dragbox-within-window facilities
         Option  StickyEdges,            false  ; unimplemented  ; Allow windows to "stick" when dragged over edge of screen
         Option  MultiClose,             true                    ; Allow Ctrl-Alt clicks on close/iconise buttons
+        Option  Euro,                   true                    ; Don't map fancy fonts' char 128 to tick - used for Euro
 
         ASSERT  International_Help <> 0
 

Version

@@ -6,6 +6,6 @@
 
 Version SETA    399
 VString SETS    "3.99"
-Date    SETS    "13 Jul 1998"
+Date    SETS    "14 Jul 1998"
 
         END

hdr/WIMPMacros

@@ -188,7 +188,9 @@ $lab
         TEQNE   $c, #:CHR: &89 ;right
         TEQNE   $c, #:CHR: &8A ;down
         TEQNE   $c, #:CHR: &8B ;up
+      [ :LNOT: Euro
         TEQNE   $c, #:CHR: &80 ;tick
+      ]
         TEQNE   $c, #:CHR: &84 ;cross
         MEND
 ;---------------------------------------

s/Wimp01

@@ -1303,8 +1303,8 @@ dospriteopnext
 
 spritebits   ;    0       8      16      24     31
         DCD     2_11100000011000111000000001110111
-        DCD     2_11010000001011110000000000001100
-        ASSERT  SpriteReason_BadReasonCode < 66
+        DCD     2_11010000001011110000001001101100
+        ASSERT  SpriteReason_BadReasonCode < 64
 
 sprite_not_found
         ADR     R0,SpriteDoesntExist

s/Wimp04

@@ -813,7 +813,11 @@ mungetruecolours ROUT
         TST     R1, #if_sprite          ; deal with special cases
         ORREQ   R1, R1, #if_filled
 01
+      [ true
+        TST     R1, #if_sprite :OR: if_filled :OR: if_fancyfont  ; should only apply to system font, for compatibility
+      |
         TST     R1, #if_sprite :OR: if_filled
+      ]
         TSTEQ   R1, #is_inverted
       [ TrueIcon3
         LDR     R2, trueworkbg
@@ -3631,6 +3635,13 @@ wimp_SpriteOp
 
 do_spriteop
         Push    "LR"
+      [ true
+        AND     R14, R0, #&FF
+        TEQ     R14, #SpriteReason_DeleteSprite ; is able to get here, provided it came via *WimpKillSprite
+        LDREQ   R14, baseofromsprites
+        TEQEQ   R1, R14
+        Pull    "PC", EQ                        ; don't attempt to delete ROM sprites!
+      ]
         LDR     R14,lengthflags
         CMP     R14,#0                  ; if length 0, then R2 --> sprite
         ANDLE   R0,R0,#&0FF

s/Wimp10

@@ -718,12 +718,18 @@ maketoollist ENTRY "R1-R11"
         SUBS    R4,R4,#1
         MOVMI   R4,#0                   ; always returns an extra pixel - unhelpful!
         ]
+;
+      [ TrueIcon3
+        ; If these are the ROM toolsprites, assume all tools are unmasked
+        CMP     R1, #ROMstart
+        BGE     %FT66
+      ]
 ;
 	TEQ	R5,#1
 	LDREQ	R5,[sp]
 	ORREQ	R5,R5,#1
 	STREQ	R5,[sp]			; store mask status
-;
+66
         MOV     R0,R6
         MOV     R1,#VduExt_XEigFactor
         SWI     XOS_ReadModeVariable
@@ -848,7 +854,14 @@ maketoollist ENTRY "R1-R11"
         MOVEQ   R3,#0
       |
         LDR     R0,=&200+SpriteReason_PutSpriteScaled
+      [ TrueIcon3
+        LDR     R1, tool_area
+        CMP     R1, #ROMstart
+        MOVGE   R1, #0                  ; pretend ROM toolsprites are unmasked
+        MOVLT   R1, #8
+      |
         MOV     R1,#8
+      ]
         ADRL    R2,tool_scalingblk
         LDR     R3,pixtable_at
       ]