Skip to content

GitLab

Commit cb05448e authored by Ben Avison's avatar Ben Avison
Browse files

Redraw of dragboxes when being resized/translated optimised to reduce flicker. 

Autoscroll update period extended to 12cs to reduce flicker.

Added Wimp_ReadSysInfo 17 to return configured drag-and-drop scroll startup
delay (in cs) because the CMOS storage isn't easy to read.

Identified and bracketed changes from 3.9x responsible for 24-bit icon colours.

defaultfontcolours now works correctly again.

Introduced new icon colour code. This holds icon colours in 24 bits internally
throughout, rather than treating 24-bit colour specifiers as a special case.
This results in the following bugfixes/improvements:
 * 3D faces and moat colours, and slabbed-in action button backgrounds, can
   all be specified in 24-bits
 * fading of icons is now consistent across icon types, and utilises the
   colour range of >16 colour modes
 * 3D borders now get faded along with the rest of the icon
 * action buttons can now contain sprites (background is correct, and sprite
   is not inverted)
 * various cases where anti-aliasing didn't blend in to the background
   correctly are now fixed
 * conventional and 24-bit specifiers now behave equivalently to each other -
   the same colour specified either way behaves the same when faded, used as
   an EOR colour etc. (greys are now always dithered in 1-bpp modes, even if
   specified in 24-bit)
 * behaviour is now the same whether the Wimp font is the system font or a
   fancy font (amazingly, this wasn't always the case)
 * except for 3D icons, if the icon background matches the work area
   background, it is unaffected by fading - so for example, group boxes can now
   be faded correctly

Switched out AutoHourglass (Mike was concerned about the speed hit).

Corrected *Help syntax strings for On/Off configuration options.
parent 776ffbd1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 575 additions and 25 deletions
Options/s/!Common
View file @ cb05448e
......@@ -65,6 +65,7 @@
Option Mode22, false:LAND:AutoScroll ; cater for low res modes
Option RealDarwin, false ; use bitmapped darwin font
Option NoDarwin, true ; don't even alias it.
Option TrueIcon1, true ; true colour support, phase 1
Option StartTaskPostFilter, true ; always call the post filter on exit
; from Wimp_StartTask
......
Options/s/!Default
View file @ cb05448e
......@@ -52,6 +52,8 @@
Option UseAMBControl, true ; delegate task memory management to OS_AMBControl
Option StrongARM, true
Option FPE4, true ; assume FPE 4.00 or later present
Option TrueIcon1, true ; true colour support, phase 1
Option TrueIcon2, false :LAND: TrueIcon1 ; true colour support, phase 2
; Icon bar pops to front when pointer
Option PoppingIconBar, true:LAND::LNOT:DisableShiftF12 ; at bottom of screen
Option IconiseButton, false ; Windows given iconise button
......
Options/s/Ursula
View file @ cb05448e
......@@ -17,13 +17,13 @@
;
Option ServiceCallTable, true ; Add Ursula kernel Service Call table
Option TrueIcon2, true :LAND: TrueIcon1 ; true colour support, phase 2
Option IconiseButton, true ; Windows given iconise button
Option BounceClose, true ; Furniture buttons are release-type
Option ChocolateScreen, true ; Clean cached screen after redraw loops
Option ShrinkableAreas, true ; Support Shrinkable Dynamic Areas
Option KernelLocksFreePool, true ; use OS_Memory 10 to lock Free Pool for Wimp_ClaimFreeMemory
Option StretchErrorText, true ; Stretch error box to contain long error messages neatly
Option AutoHourglass, true ; Hourglass automatically on between Wimp_Polls (requires Ursula Task Manager and Hourglass)
Option UrsulaHighlighting, true ; Uses icon highlighting algorithm to suit Ursula new-look
Option ForegroundWindows, true ; Layering of windows within each stack
Option SpritePriority, true ; Allow configurable sprite pool priority
......
Resources/UK/CmdHelp
View file @ cb05448e
No preview for this file type
Version
View file @ cb05448e
......@@ -6,6 +6,6 @@
Version SETA 399
VString SETS "3.99"
Date SETS "07 Apr 1998"
Date SETS "17 Apr 1998"
END
hdr/Wimp
View file @ cb05448e
......@@ -156,7 +156,8 @@ WimpSysInfo_MessagesDebug # 1 ; debugging only
WimpSysInfo_MemoryDebug # 1 ; debugging only
WimpSysInfo_TransTables # 1 ; internal use
WimpSysInfo_IconiseButton # 1 ; disabled in Wimp 3.99 onwards
WimpSysInfo_BaseOfSprites # 1
WimpSysInfo_BaseOfSprites # 1 ; Wimp 3.99 onwards
WimpSysInfo_ScrollPause # 1 ; Wimp 3.99 onwards
WimpSysInfo_MAX # 0
; Extend reason codes
......
s/AutoScroll
View file @ cb05448e
......@@ -123,7 +123,7 @@ return_autoscroll_state
MyXError WimpBadPtrInR1, LT, L
BVS ExitWimp ; just check pointer
ADR R14, autoscr_state
ADRL R14, autoscr_state
LDMIA R14, {R0, R1, cx0, cy0, cx1, cy1, x0, y0, x1}
TST R0, #af_enable
......@@ -153,7 +153,7 @@ int_autoscroll
; (does nothing if already off)
LDR R0, [sp]
ADR R14, autoscr_handle
ADRL R14, autoscr_handle
STMIA R14, {R1, cx0, cy0, cx1, cy1, x0, y0, x1}
CMP x0, #-1 ; default pause time requested?
......@@ -222,7 +222,7 @@ update_autoscroll_state
update_autoscroll_flags
; Updates status flag bits to reflect current state
ENTRY "R0-y1,handle,userblk"
ADR R14, autoscr_state
ADRL R14, autoscr_state
LDMIA R14, {R0, R1, cx0, cy0, cx1, cy1}
TST R0, #af_enable
......@@ -319,7 +319,7 @@ get_centre_zone
; In: handle = autoscroll window handle
; Out: x0-y0 = centre zone (may be zero width or height)
ENTRY "cx0-cy1"
ADR R14, autoscr_pz_x0 ; load zone sizes
ADRL R14, autoscr_pz_x0 ; load zone sizes
LDMIA R14, {cx0, cy0, cx1, cy1}
CMP cx0, #0 ; can't be negative
......
s/Wimp01
View file @ cb05448e
......@@ -496,12 +496,12 @@ WimpIconBarAccelerationC_Syntax DCB "Syntax: *Configure WimpIconBarAcceleration
[ IconiseButton
WimpIconiseButtonC_Help DCB "*Configure WimpIconiseButton sets whether an iconise button is added to "
DCB "top-level windows.",cr
WimpIconiseButtonC_Syntax DCB "Syntax: *Configure WimpIconiseButton 0|1",0
WimpIconiseButtonC_Syntax DCB "Syntax: *Configure WimpIconiseButton On|Off",0
]
[ PoppingIconBar
WimpAutoFrontIconBarC_Help DCB "*Configure WimpAutoFrontIconBar sets whether the icon bar is brought to the front "
DCB "when the pointer is held at the bottom of the screen.",cr
WimpAutoFrontIconBarC_Syntax DCB "Syntax: *Configure WimpAutoFrontIconBar 0|1",0
WimpAutoFrontIconBarC_Syntax DCB "Syntax: *Configure WimpAutoFrontIconBar On|Off",0
]
[ SpritePriority
WimpSpritePrecedenceC_Help DCB "*Configure WimpSpritePrecedence sets whether ROM sprites have priority over "
......@@ -511,7 +511,7 @@ WimpSpritePrecedenceC_Syntax DCB "Syntax: *Configure WimpSpritePrecedence RAM
[ StickyEdges
WimpStickyEdgesC_Help DCB "*Configure WimpStickyEdges sets whether 'force on screen' directions can be "
DCB "overridden by pushing a window 'hard' enough.",cr
WimpStickyEdgesC_Syntax DCB "Syntax: *Configure WimpStickyEdges 0|1",0
WimpStickyEdgesC_Syntax DCB "Syntax: *Configure WimpStickyEdges On|Off",0
]
ALIGN
......@@ -3106,8 +3106,16 @@ old_escape # 1
ALIGNHASH 4
[ TrueIcon1
truefgcolour # 4 ; for 24-bit colour icons
truebgcolour # 4
]
[ TrueIcon2
truebgcolour2 # 4 ; background colour for selected R5/R6 icons
truewellcolour # 4 ; well colour for R6 icons
truefacecolour # 4 ; 3D plinth colour facing light source
trueoppcolour # 4 ; 3D plinth colour opposite light source
]
redrawhandle # 4
iconhandle # 4
getrectflags # 4
......@@ -3385,7 +3393,7 @@ autoscr_scrolling # 1 ; used to determine next setting of flag
autoscr_pausing # 1 ; used to determine whether timer is dirty, also a "don't re-enter" flag
autoscr_speed_factor * 5 ; -log2 of number of pointer offsets to scroll per centisecond
autoscr_update_delay * 8 ; hardwired minimum interval between updates (cs)
autoscr_update_delay * 12 ; hardwired minimum interval between updates (cs)
; is necessary to ensure null events have a chance to be seen
ALIGNHASH 4
autoscr_END # 0
......@@ -4574,6 +4582,11 @@ SWIWimp_ReadSysInfo
|
B err_badR0
]
[ Autoscr
B sysinfo_pausedelay ; 17 = drag-and-drop scroll startup delay (cs)
|
B err_badR0
]
err_badR0
MyXError WimpBadSysInfo
......@@ -4688,6 +4701,14 @@ sysinfo_baseofsprites
B ExitWimp
]
[ Autoscr
sysinfo_pausedelay
LDRB R0, autoscr_default_pause
ADD R0, R0, R0, LSL #2 ; * 5
MOV R0, R0, LSL #1 ; * 10
B ExitWimp
]
;;-----------------------------------------------------------------------------
;; Command Window handling
;;-----------------------------------------------------------------------------
......
s/Wimp02
View file @ cb05448e
......@@ -3284,15 +3284,17 @@ SWIWimp_SetFontColours
BL setfontcolours ; doesn't return errors
B ExitWimp
defaultfontcolours
MOV R1,#0 ; background colour
MOV R2,#7 ; foreground colour
[ TrueIcon1
; set font colours (no translation)
settruefontcolours
Push "R0-R3, LR"
B %FT20
]
defaultfontcolours
MOV R1,#0 ; background colour
MOV R2,#7 ; foreground colour
; convert the logical to physical colours and then call ColourTrans to perform the conversion
; and set the Font Manager
......@@ -3308,11 +3310,15 @@ setfontcolours
TraceD fcol, R2
TraceNL fcol
[ TrueIcon1
LDR R1, [R14, R1, LSL #2] ; R1 = physical background colour
LDR R2, [R14, R2, LSL #2] ; R2 = physical foreground colour
20 MOV R0, #0 ; do not change current font
|
MOV R0, #0 ; do not change current font
LDR R1, [R14, R1, LSL #2] ; R1 = physical background colour
LDR R2, [R14, R2, LSL #2] ; R2 = physical foreground colour
]
MOV R3, #14 ; R3 = use as many levels to set the colours
TraceK fcol, "setfontcolours: true colours bg "
......
s/Wimp04
View file @ cb05448e
This diff is collapsed.
s/Wimp10
View file @ cb05448e
......@@ -132,6 +132,10 @@ plot_editable ENTRY
ADR R3,ct_grey
BL plot_slab
[ TrueIcon2
BL icon_fg
BL hollowrectangle
|
TST R1,#is_shaded ; Icon disabled?
BNE %FT10 ; Yes then no black border
......@@ -139,6 +143,7 @@ plot_editable ENTRY
BL int_setcolour ; then a rectangle that is in black
BL hollowrectangle
10
]
LDR R0,dx
ADD x0,x0,R0
SUB x1,x1,R0
......@@ -354,8 +359,18 @@ render_bbox ENTRY "R3"
render_line ENTRY
[ TrueIcon2
LDR R0, [R3], #4 ; get the line colour to be used
LDR R0, [wsptr, R0]
Push "R2-R4"
LDR R3, ditheringflag ; set foreground
MOV R4, #0 ; overwrite colour
SWI XColourTrans_SetGCOL
Pull "R2-R4"
|
LDRB R0,[R3],#1 ; get the line colour to be used
BL int_setcolour ; convert from the Wimp colour to suitable for screen
]
MOV R0,#&25
SWI XOS_Plot ; and then plot the relevant line section
......@@ -366,6 +381,17 @@ render_line ENTRY
;; Define constants relating to the borders.
;;-----------------------------------------------------------------------------
[ TrueIcon2
ct_in
ct_inshallow DCD :INDEX: truefacecolour, :INDEX: truefacecolour, :INDEX: trueoppcolour, :INDEX: trueoppcolour
ct_out
ct_outshallow DCD :INDEX: trueoppcolour, :INDEX: trueoppcolour, :INDEX: truefacecolour, :INDEX: truefacecolour
ct_cream
ct_grey DCD :INDEX: truewellcolour, :INDEX: truewellcolour, :INDEX: truewellcolour, :INDEX: truewellcolour
|
white * 0
lightgrey * 1
grey * 2
......@@ -385,7 +411,7 @@ ct_cream = cream, cream, cream, cream
ct_grey = lightgrey, lightgrey, lightgrey, lightgrey
ALIGN
]
;;-----------------------------------------------------------------------------
;; Handle replaceable window gadgets, this is simply a set of sprites which
......@@ -1873,6 +1899,13 @@ dofunkytitlebar ENTRY "R0-R11"
ADD x0,sp,#sp_x0
LDMIA x0,{x0,y0,x1,y1}
;
[ TrueIcon2
LDR R2, [handle, #w_flags]
TST R2, #ws_hasfocus
LDREQB R2, [handle, #w_tbcol]
LDRNEB R2, [handle, #w_tbcol2]
STRB R2, work_back_colour ; this is where mungetruecolours looks for font background if unfilled
]
BIC R1,R1,#if_border:OR:if_filled
ADD R2,handle,#w_title
......
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