Commit e937dd5d authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Tabs expanded in Wimp10

Not tagged.
parent 4b327aac
...@@ -605,11 +605,11 @@ maketoollist EntryS "R1-R11" ...@@ -605,11 +605,11 @@ maketoollist EntryS "R1-R11"
; ;
MOV R1,#VduExt_YEigFactor MOV R1,#VduExt_YEigFactor
SWI XOS_ReadModeVariable SWI XOS_ReadModeVariable
CMP R2,#1 ; if both Xeig and Yeig <= 1 then use 22 postfix CMP R2,#1 ; if both Xeig and Yeig <= 1 then use 22 postfix
CMPLS R3,#1 CMPLS R3,#1
MOVLS R6,#"2" MOVLS R6,#"2"
MOVHI R5,#0 MOVHI R5,#0
MOVHI R6,#-1 MOVHI R6,#-1
; ;
MOV R1,#VduExt_Log2BPP MOV R1,#VduExt_Log2BPP
SWI XOS_ReadModeVariable SWI XOS_ReadModeVariable
...@@ -846,10 +846,10 @@ cachetoolspriteaddress ; [spritename], [thisCBptr], [lengthflags] as for cachesp ...@@ -846,10 +846,10 @@ cachetoolspriteaddress ; [spritename], [thisCBptr], [lengthflags] as for cachesp
BHS %FT66 BHS %FT66
] ]
; ;
TEQ R5,#1 TEQ R5,#1
LDREQ R5,[sp] LDREQ R5,[sp]
ORREQ R5,R5,#1 ORREQ R5,R5,#1
STREQ R5,[sp] ; store mask status STREQ R5,[sp] ; store mask status
66 66
MOV R0,R6 MOV R0,R6
MOV R1,#VduExt_XEigFactor MOV R1,#VduExt_XEigFactor
...@@ -918,9 +918,9 @@ cachetoolspriteaddress ; [spritename], [thisCBptr], [lengthflags] as for cachesp ...@@ -918,9 +918,9 @@ cachetoolspriteaddress ; [spritename], [thisCBptr], [lengthflags] as for cachesp
TEQ LR,#0 TEQ LR,#0
STREQ R1,close_width STREQ R1,close_width
[ IconiseButton [ IconiseButton
LDR LR,iconise_width LDR LR,iconise_width
TEQ LR,#0 TEQ LR,#0
STREQ R1,iconise_width STREQ R1,iconise_width
] ]
LDR LR,left_width LDR LR,left_width
TEQ LR,#0 TEQ LR,#0
...@@ -937,7 +937,7 @@ cachetoolspriteaddress ; [spritename], [thisCBptr], [lengthflags] as for cachesp ...@@ -937,7 +937,7 @@ cachetoolspriteaddress ; [spritename], [thisCBptr], [lengthflags] as for cachesp
; assume that R2 -> suitable sprite which describes the characteristics ; assume that R2 -> suitable sprite which describes the characteristics
; of all the other sprites being plotted. ; of all the other sprites being plotted.
; ;
BIC R2,R2,#1 ; strip our mask bit BIC R2,R2,#1 ; strip our mask bit
STR R2,spritename STR R2,spritename
MOV R2,#0 MOV R2,#0
STR R2,lengthflags ; [spritename] is absolute STR R2,lengthflags ; [spritename] is absolute
...@@ -1164,7 +1164,7 @@ default_params ...@@ -1164,7 +1164,7 @@ default_params
STR R1,back_width STR R1,back_width
STR R1,close_width STR R1,close_width
[ IconiseButton [ IconiseButton
STR R1,iconise_width STR R1,iconise_width
] ]
STR R1,left_width STR R1,left_width
STR R1,right_width STR R1,right_width
...@@ -1423,9 +1423,9 @@ default_tools ...@@ -1423,9 +1423,9 @@ default_tools
;; in R0,R1 = mouse co-ordinates ;; in R0,R1 = mouse co-ordinates
;; R2 = button state ;; R2 = button state
;; R4 = icon handle ;; R4 = icon handle
;; R6 = button attributes ;; R6 = button attributes
;; R7 = mouse flag ;; R7 = mouse flag
;; R8 = old button state ;; R8 = old button state
;; handle = window handle ;; handle = window handle
;; [border_iconselected] = tool handle (if applicable) ;; [border_iconselected] = tool handle (if applicable)
;; [border_windowselected] = window handle of tool window ;; [border_windowselected] = window handle of tool window
...@@ -1496,15 +1496,15 @@ modifytool_clicked ...@@ -1496,15 +1496,15 @@ modifytool_clicked
[ PushBothBars [ PushBothBars
ADDEQ sp, sp, #4*1 ADDEQ sp, sp, #4*1
] ]
EXIT EQ ; nope, so return EXIT EQ ; nope, so return
LDR R3,tool_list LDR R3,tool_list
TEQ R3,#0 ; is there a glyph list? TEQ R3,#0 ; is there a glyph list?
BNE %FT05 BNE %FT05
Push "R2" ; R2 corrupted :-( Push "R2" ; R2 corrupted :-(
BL recache_tools_trans ; if not, try to get one again BL recache_tools_trans ; if not, try to get one again
Pull "R2" Pull "R2"
LDR R3,tool_list LDR R3,tool_list
TEQ R3,#0 TEQ R3,#0
05 LDRNE R3,[R3,R2] 05 LDRNE R3,[R3,R2]
TEQNE R3,#0 ; does the glyph have a second state cached? TEQNE R3,#0 ; does the glyph have a second state cached?
[ PushBothBars [ PushBothBars
...@@ -1624,8 +1624,8 @@ modify_hscroll ...@@ -1624,8 +1624,8 @@ modify_hscroll
modifytool_release Entry "R4,handle" modifytool_release Entry "R4,handle"
LDR handle,border_windowselected LDR handle,border_windowselected
CMP handle,#nullptr CMP handle,#nullptr
EXIT EQ EXIT EQ
; ;
LDR R4,border_iconselected LDR R4,border_iconselected
CMP R4,#windowicon_back CMP R4,#windowicon_back
...@@ -1670,22 +1670,22 @@ invalidate_glyph EntryS "R0-R9" ...@@ -1670,22 +1670,22 @@ invalidate_glyph EntryS "R0-R9"
BL markinvalidrects BL markinvalidrects
BL losewindowrects BL losewindowrects
| |
; Actually, lets do this immediately ; Actually, lets do this immediately
BL int_redraw_window BL int_redraw_window
invglp EXIT VS invglp EXIT VS
TEQ R0,#0 TEQ R0,#0
EXITS EQ EXITS EQ
BL int_get_rectangle BL int_get_rectangle
B invglp B invglp
] ]
; ;
EXITS EXITS
; table to convert -ve icon handle to posn values ; table to convert -ve icon handle to posn values
[ IconiseButton [ IconiseButton
= iconposn_iconise = iconposn_iconise
] ]
= 0 = 0
= iconposn_hscroll = iconposn_hscroll
= iconposn_hscroll = iconposn_hscroll
...@@ -1708,9 +1708,9 @@ iconposn_table ...@@ -1708,9 +1708,9 @@ iconposn_table
;; Glyph tables, used for highlighting icons - deciding if highlightable. ;; Glyph tables, used for highlighting icons - deciding if highlightable.
;;------------------------------------------------------------------------------ ;;------------------------------------------------------------------------------
[ IconiseButton [ IconiseButton
= tool_iconise = tool_iconise
] ]
= 0 ; outer frame! = 0 ; outer frame!
= tool_right = tool_right
= 0 ; horizontal scroll bar = 0 ; horizontal scroll bar
...@@ -1726,9 +1726,9 @@ iconposn_table ...@@ -1726,9 +1726,9 @@ iconposn_table
= 0 ; work area = 0 ; work area
glyphs_normal glyphs_normal
[ IconiseButton [ IconiseButton
= tool_piconise = tool_piconise
] ]
= 0 ; outer frame - special case = 0 ; outer frame - special case
= tool_pright = tool_pright
= tool_phbarl = tool_phbarl
...@@ -1737,7 +1737,7 @@ glyphs_normal ...@@ -1737,7 +1737,7 @@ glyphs_normal
= tool_pdown = tool_pdown
= tool_pvbart = tool_pvbart
= tool_pup = tool_pup
= tool_ptoggle ; value not used, but non-0 to indicate highlightable = tool_ptoggle ; value not used, but non-0 to indicate highlightable
= tool_ptbarlcap = tool_ptbarlcap
= tool_pclose = tool_pclose
= tool_pback = tool_pback
...@@ -1801,9 +1801,9 @@ plot_windowglyph Entry "R0-R9" ...@@ -1801,9 +1801,9 @@ plot_windowglyph Entry "R0-R9"
; ;
; Allow toolsprites to be transparent (to show the colour through, if required) ; Allow toolsprites to be transparent (to show the colour through, if required)
; ;
TST R2,#1 TST R2,#1
BLNE solidrectangle ; corrupts flags :-( BLNE solidrectangle ; corrupts flags :-(
TST R2,#1 TST R2,#1
BLNE hollowrectangle ; suitable rectangles BLNE hollowrectangle ; suitable rectangles
; ;
MOV R3,x0 MOV R3,x0
...@@ -2023,9 +2023,9 @@ draw_spriteglyph EntryS "R0-R7" ...@@ -2023,9 +2023,9 @@ draw_spriteglyph EntryS "R0-R7"
EXITS GE ; ignore if not plottable EXITS GE ; ignore if not plottable
; ;
[ TrueIcon3 [ TrueIcon3
TST R2, #1 TST R2, #1
BLNE solidrectangle ; corrupts flags :-( BLNE solidrectangle ; corrupts flags :-(
TST R2, #1 TST R2, #1
BLNE hollowrectangle ; plot the borders of the gadget BLNE hollowrectangle ; plot the borders of the gadget
| |
BL solidrectangle BL solidrectangle
...@@ -2687,10 +2687,10 @@ FindFont Entry "R0-R10" ...@@ -2687,10 +2687,10 @@ FindFont Entry "R0-R10"
AND R2,R2,#&1E AND R2,R2,#&1E
MOV R2,R2, LSR #1 MOV R2,R2, LSR #1
TEQ R2,#1 ; system font TEQ R2,#1 ; system font
BNE %FT50 BNE %FT50
MOV R0,#0 MOV R0,#0
STR R0,systemfont STR R0,systemfont
SETV SETV
B afterfindingfont B afterfindingfont
50 ;Allocate a buffer big enough for the font name and setup a pointer 50 ;Allocate a buffer big enough for the font name and setup a pointer
...@@ -2700,14 +2700,14 @@ FindFont Entry "R0-R10" ...@@ -2700,14 +2700,14 @@ FindFont Entry "R0-R10"
TEQ R2,#0 ; wimp$font TEQ R2,#0 ; wimp$font
BEQ FindFont_get_font_size BEQ FindFont_get_font_size
; is the font the same as the last one we looked for ? ; is the font the same as the last one we looked for ?
ADRL R14,fontnamebuffer ADRL R14,fontnamebuffer
LDRB R8,[R14] LDRB R8,[R14]
TEQ R8,R2 TEQ R8,R2
ADDEQ R6,R14,#1 ADDEQ R6,R14,#1
BEQ fontinR6 BEQ fontinR6
STRB R2,[R14] STRB R2,[R14]
SUB R8,R2,#1 ; R8 is counter into rom fonts SUB R8,R2,#1 ; R8 is counter into rom fonts
...@@ -2726,14 +2726,14 @@ FindFont Entry "R0-R10" ...@@ -2726,14 +2726,14 @@ FindFont Entry "R0-R10"
Pull "R6" Pull "R6"
; copy font name into our buffer ; copy font name into our buffer
ADRL R14,fontnamebuffer ADRL R14,fontnamebuffer
Push R6 Push R6
50 50
LDRB R7,[R6],#1 LDRB R7,[R6],#1
STRB R7,[R14,#1]! STRB R7,[R14,#1]!
CMP R7,#31 CMP R7,#31
BGE %BT50 BGE %BT50
Pull R6 Pull R6
ADD SP,SP,#256 ; get rid of buffer ADD SP,SP,#256 ; get rid of buffer
...@@ -3179,7 +3179,7 @@ Tool_SpriteOp ...@@ -3179,7 +3179,7 @@ Tool_SpriteOp
BLEQ recache_tools_trans BLEQ recache_tools_trans
05 05
LDR R1,tool_area ; R1 is quite often wrong! LDR R1,tool_area ; R1 is quite often wrong!
BIC R2,R2,#1 BIC R2,R2,#1
SWI XOS_SpriteOp SWI XOS_SpriteOp
LDR R1,tool_list ; if the tool list is wrong then reset the pointer LDR R1,tool_list ; if the tool list is wrong then reset the pointer
...@@ -3212,7 +3212,7 @@ recache_tools_trans ...@@ -3212,7 +3212,7 @@ recache_tools_trans
recache_tools_trans2 recache_tools_trans2
Push "R0-R5,R14" Push "R0-R5,R14"
BIC R2,R2,#1 BIC R2,R2,#1
STR R2,spritename STR R2,spritename
MOV R2,#0 MOV R2,#0
STR R2,lengthflags STR R2,lengthflags
......
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