From 05200b8ec208090a00dacd118b03635b3379811c Mon Sep 17 00:00:00 2001 From: Quinn Dunki Date: Sun, 1 Feb 2015 16:05:30 -0800 Subject: [PATCH] Cleanup and small bug fixes --- Makefile | 2 +- ReadMe.md | 9 +++++---- WeeGUI_MLI.s | 2 +- asmdemo.s | 37 ++++++++++++++++++++++--------------- weegui.dsk | Bin 143360 -> 143360 bytes weegui.s | 2 +- 6 files changed, 30 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 57c040f..b0da7de 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ CL65=cl65 AC=AppleCommander.jar -ADDR=7e00 +ADDR=7d00 ADDRDEMO=6000 PGM=weegui diff --git a/ReadMe.md b/ReadMe.md index 136b2c9..ffc9bc4 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -9,8 +9,9 @@ Known issues To Do: ------ -- Delete view feature -- Factor out mouse driver -- Standardize naming of functions +- Support carriage returns in &print - Write sample code -- Update side effects in assembly API \ No newline at end of file +- Update side effects in assembly API +- Support for frameless views +- Document final memory map + diff --git a/WeeGUI_MLI.s b/WeeGUI_MLI.s index 7d15a6e..dddda1a 100644 --- a/WeeGUI_MLI.s +++ b/WeeGUI_MLI.s @@ -21,7 +21,7 @@ PARAM3 = $09 ; WeeGUI entry point ; Set up your call, then do a JSR to this address. ; -WeeGUI = $7e04 +WeeGUI = $7d04 ; 7d00 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/asmdemo.s b/asmdemo.s index 68f1c4b..c1dc39b 100644 --- a/asmdemo.s +++ b/asmdemo.s @@ -174,24 +174,31 @@ testPaintContents: ldx #WGEraseViewContents jsr WeeGUI - ldy #0 -testPaintContents_loop: - ldx #0 - stx PARAM0 - sty PARAM1 + stz PARAM0 + stz PARAM1 ldx #WGSetCursor jsr WeeGUI - tya - clc - adc #'A' - sta testStr3 +; ldy #0 +;testPaintContents_loop: +; ldx #0 +; stx PARAM0 +; sty PARAM1 +; ldx #WGSetCursor +; jsr WeeGUI - WGCALL16 WGPrint,testStr3 +; tya +; clc +; adc #'A' +; sta testStr3 +; +; WGCALL16 WGPrint,testStr3 +; +; iny +; cpy #25 +; bne testPaintContents_loop - iny - cpy #25 - bne testPaintContents_loop + WGCALL16 WGPrint,testStr testPaintContents_done: rts @@ -228,9 +235,9 @@ testButton2: 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 - .byte "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_ !",34,"#$%&'()*+,-./0123456789:;<=>?`abcdefghijklmno",0 + .byte "@ABCDEFGHIJKLMNOPQ",13,"RSTUVWXYZ[\]^_ !",34,"#$%&'()*+,-./0123456789:;<=>?`abcdefghijklmno" testStr2: - .byte "pqrstuvwxyz{|}~",$ff,0 + .byte "pqrstuvwxyz",0;//{|}~",$ff,0 testStr3: .byte "x",0 diff --git a/weegui.dsk b/weegui.dsk index 242ff43dccb645b82a9e75c36694b94e8763fa34..84373d2d1aed5ab43492ebc2d3230632b5335814 100644 GIT binary patch delta 5881 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 delta 5196 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 vq}sPHbk1M6*g<`semtY2$DV`Y$DHVyH>5O8##