From 28adec64ca90446896edd4811e58943191b42def Mon Sep 17 00:00:00 2001
From: Quinn Dunki <qd@quinndunki.com>
Date: Sun, 21 Sep 2014 13:46:41 -0700
Subject: [PATCH] - Added support for titles on checkboxes - Corrected byte
 ordering of callback and title pointers in views

---
 applesoft.s |  17 ++++++++++------
 gui.s       |  13 +++++++------
 guidemo.dsk | Bin 143360 -> 143360 bytes
 memory.s    |   2 +-
 views.s     |  55 ++++++++++++++++++++++++++++++++++++++++++++--------
 5 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/applesoft.s b/applesoft.s
index db3915e..a61131a 100644
--- a/applesoft.s
+++ b/applesoft.s
@@ -435,6 +435,11 @@ WGAmpersand_CHKBOX:
 
 	jsr WGAmpersandIntArgument
 	sta WGAmpersandCommandBuffer+2
+	jsr WGAmpersandNextArgument
+
+	jsr WGAmpersandStrArgument
+	stx	WGAmpersandCommandBuffer+3
+	sty WGAmpersandCommandBuffer+4
 
 	jsr WGAmpersandEndArguments
 
@@ -492,12 +497,12 @@ WGAmpersand_BUTTN:
 	ora WG_VIEWRECORDS+4,y
 	sta WG_VIEWRECORDS+4,y
 
-	lda WGAmpersandCommandBuffer+6	; Set the button text
-	sta PARAM0
-	lda WGAmpersandCommandBuffer+7
-	sta PARAM1
-
-	jsr WGViewSetTitle
+;	lda WGAmpersandCommandBuffer+6	; Set the button text
+;	sta PARAM0
+;	lda WGAmpersandCommandBuffer+7
+;	sta PARAM1
+;
+;	jsr WGViewSetTitle
 
 	jsr WGPaintView
 	jsr WGBottomCursor
diff --git a/gui.s b/gui.s
index c630656..f7975a2 100644
--- a/gui.s
+++ b/gui.s
@@ -30,15 +30,9 @@ main:
 
 	CALL16 WGCreateView,testView
 	CALL16 WGViewSetTitle,testTitle0
-
 	CALL16 WGCreateCheckbox,testCheck
-
 	CALL16 WGCreateButton,testButton1
-	CALL16 WGViewSetTitle,testTitle1
-	CALL16 WGViewSetAction,testCallback
-
 	CALL16 WGCreateButton,testButton2
-	CALL16 WGViewSetTitle,testTitle2
 
 	jsr WGViewPaintAll
 ;	jsr testPaintContents
@@ -253,12 +247,17 @@ testView:
 
 testCheck:
 	.byte 1,16,4
+	.addr testTitle3
 
 testButton1:
 	.byte 2,35,10,15
+	.addr testCallback
+	.addr testTitle1
 
 testButton2:
 	.byte 3,35,13,15
+	.addr 0
+	.addr testTitle2
 
 testStr:
 ;	.byte "This is a test of the emergency broadcast system.",0; If this had been a real emergency, you would be dead now.",0	; 107 chars
@@ -274,6 +273,8 @@ testTitle1:
 	.byte "Okay",0
 testTitle2:
 	.byte "Cancel",0
+testTitle3:
+	.byte "More Magic",0
 
 
 
diff --git a/guidemo.dsk b/guidemo.dsk
index c0892f4fd5ace6bacc88501a4e871b2b0be1cd43..1d0359539ecf8a1878acc71756f11fdb9d7f641f 100644
GIT binary patch
delta 3929
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
Jo*LC~{{xP^53~RP

delta 3956
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
G2H}6JYY+|q

diff --git a/memory.s b/memory.s
index f2ebc3f..3479300 100644
--- a/memory.s
+++ b/memory.s
@@ -56,7 +56,7 @@ WG_VIEWCLIP:
 
 WG_VIEWRECORDS:
 	; 0  1       2             3           4       5         6          7           8         9        10         11        12      13
-	; X, Y, Screen Width, Screen Height, Style, X Offset, Y Offset, View Width, View Height, State, CallbackH, CallbackL, TitleH, TitleL
+	; X, Y, Screen Width, Screen Height, Style, X Offset, Y Offset, View Width, View Height, State, CallbackL, CallbackH, TitleL, TitleH
 .byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 .byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 .byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/views.s b/views.s
index 07ff99f..d33f84a 100644
--- a/views.s
+++ b/views.s
@@ -113,6 +113,8 @@ WGCreateView_done:
 ; ID: View ID (0-f)
 ; XX: Screen X origin
 ; YY: Screen Y origin
+; SL: String pointer (LSB)
+; SH: String pointer (MSB)
 ;
 WGCreateCheckbox:
 	SAVE_AXY
@@ -166,6 +168,16 @@ WGCreateCheckbox:
 	sta	WG_VIEWRECORDS,x	; Initialize callback
 	inx
 	sta	WG_VIEWRECORDS,x
+	inx
+
+	iny
+	lda (PARAM0),y
+	sta	WG_VIEWRECORDS,x	; Title
+	inx
+	iny
+	lda (PARAM0),y
+	sta	WG_VIEWRECORDS,x
+	inx
 
 	pla
 	jsr WGSelectView		; Leave this as the active view
@@ -190,6 +202,8 @@ WGCreateCheckbox_done:
 ; BW: Button width
 ; PL: Action callback (LSB)
 ; PH: Action callback (MSB)
+; SL: Title string pointer (LSB)
+; SH: Title string pointer (MSB)
 WGCreateButton:
 	SAVE_AXY
 	SAVE_ZPS
@@ -252,10 +266,14 @@ WGCreateButton:
 	sta	WG_VIEWRECORDS,x
 	inx
 
-	lda	#0
-	sta	WG_VIEWRECORDS,x	; Initialize title
+	iny
+	lda (PARAM0),y
+	sta	WG_VIEWRECORDS,x	; Title
+	inx
+	iny
+	lda (PARAM0),y
+	sta	WG_VIEWRECORDS,x
 	inx
-	sta	WG_VIEWRECORDS,x	; Initialize title
 
 	pla
 	jsr WGSelectView		; Leave this as the active view
@@ -327,7 +345,7 @@ WGPaintView_done:
 ; paintCheck
 ; Paints the contents of a checkbox
 ; Y: Index into view records of checkbox to paint
-; Side effects: Clobbers A, S0
+; Side effects: Clobbers S0,P0,P1, all registers
 paintCheck:
 	lda WG_VIEWRECORDS+0,y		; Position cursor
 	sta	WG_CURSORX
@@ -362,6 +380,27 @@ paintCheck_selectedUnchecked:
 
 paintCheck_plot:				; Paint our state
 	jsr WGPlot
+
+	inc WG_CURSORX				; Prepare for title
+	inc WG_CURSORX
+	jsr WGNormal
+
+	lda WG_VIEWRECORDS+12,y
+	sta PARAM0
+	lda WG_VIEWRECORDS+13,y
+	sta PARAM1
+	ldy #0
+
+paintCheck_titleLoop:
+	lda (PARAM0),y
+	beq paintCheck_done
+	ora #$80
+	jsr WGPlot
+	inc WG_CURSORX
+	iny
+	bra paintCheck_titleLoop
+
+paintCheck_done:
 	rts
 
 
@@ -374,9 +413,9 @@ paintButton:
 	SAVE_AX
 	SAVE_ZPS
 
-	lda WG_VIEWRECORDS+13,y	; Prep the title string
+	lda WG_VIEWRECORDS+12,y	; Prep the title string
 	sta PARAM0
-	lda WG_VIEWRECORDS+12,y
+	lda WG_VIEWRECORDS+13,y
 	sta PARAM1
 
 	jsr WGStrLen			; Compute centering offset for title
@@ -747,10 +786,10 @@ WGViewFocusAction_buttonClick:
 	and #VIEW_STYLE_APPLESOFT
 	bne WGViewFocusAction_buttonClickApplesoft
 
-	lda WG_VIEWRECORDS+10,y				; Do we have a callback?
+	lda WG_VIEWRECORDS+11,y				; Do we have a callback?
 	beq WGViewFocusAction_done
 	sta WGViewFocusAction_userJSR+2		; Modify code below so we can JSR to user's code
-	lda WG_VIEWRECORDS+11,y
+	lda WG_VIEWRECORDS+10,y
 	sta WGViewFocusAction_userJSR+1
 
 WGViewFocusAction_userJSR: