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 242ff43..84373d2 100644 Binary files a/weegui.dsk and b/weegui.dsk differ diff --git a/weegui.s b/weegui.s index 52761a9..234cfb3 100644 --- a/weegui.s +++ b/weegui.s @@ -7,7 +7,7 @@ ; -.org $7e00 +.org $7d00 ; Common definitions