some more rework, second attempt on fixing the color issues. added ifdefs to disable...

[cc65] / libsrc / c64 / soft80_cgetc.s

diff --git a/libsrc/c64/soft80_cgetc.s b/libsrc/c64/soft80_cgetc.s
index a8c52c1a233f1ddf7edeaaa332b59c399929bbdd..723c5ade87eabe995a7dbdabc1a9a207a6afceb9 100644 (file)
--- a/libsrc/c64/soft80_cgetc.s
+++ b/libsrc/c64/soft80_cgetc.s
@@ -4,87 +4,66 @@
 
         .export         soft80_cgetc
         .import         cursor
-        .import         soft80_putcolor
 
         .include        "c64.inc"
         .include        "soft80.inc"
 
+.if SOFT80COLORVOODOO = 1
+        .import         soft80_putcolor
+.endif
+
 soft80_cgetc:
         lda     KEY_COUNT       ; Get number of characters
         bne     L3              ; Jump if there are already chars waiting
 
-; Switch on the cursor if needed
-
-        lda     cursor
-        jsr     setcursor       ; set cursor on or off accordingly
+        jsr     invertcursor    ; set cursor on or off accordingly
 
 L1:     lda     KEY_COUNT       ; wait for key
         beq     L1
 
-        ldx     #0
-        lda     CURS_FLAG
-        bne     L2
-        inx
-L2:     txa
-        jsr     setcursor
+        jsr     invertcursor    ; set cursor on or off accordingly
 
 L3:     jsr     KBDREAD         ; Read char and return in A
         ldx     #0
         rts
 
-; Switch the cursor on or off
-
-; A= 0: cursor off
-;    1: cursor on
+; Switch the cursor on or off (invert)
 
-        .proc   setcursor
-
-        ; On or off?
-        cmp     CURS_STATE
-        bne     @set
+invertcursor:
+        lda     cursor
+        bne     @invert
         rts
-@set:
-        sta     CURS_STATE
+@invert:
 
         sei
         lda     $01
         pha
-        lda     #$34
+        lda     #$34            ; enable RAM under I/O
         sta     $01
 
-        jsr     soft80_putcolor
-
         ldy     #$00
+.if SOFT80COLORVOODOO = 1
+        jsr     soft80_putcolor
+.else
+        lda     CHARCOLOR
+        sta     (CRAM_PTR),y    ; vram
+.endif
 
         lda     CURS_X
         and     #$01
-        bne     @l1
-
-        .repeat 8,line
+        tax
+@lp1:
         lda     (SCREEN_PTR),y
-        eor     #$f0
+        eor     nibble,x
         sta     (SCREEN_PTR),y
-        .if (line < 7)
         iny
-        .endif
-        .endrepeat
+        cpy     #8
+        bne     @lp1
 
-@back:
         pla
         sta     $01
         cli
         rts
 
-@l1:
-        .repeat 8,line
-        lda     (SCREEN_PTR),y
-        eor     #$0f
-        sta     (SCREEN_PTR),y
-        .if line < 7
-        iny
-        .endif
-        .endrepeat
-
-        jmp     @back
-
-        .endproc
+        .rodata
+nibble: .byte $f0, $0f