some tweaks to C128 keyboard support

This commit is contained in:
FeralChild64 committed 2019-10-18 18:20:36 +02:00
1 parent 1db03b5921
commit e9565c9724
4 files changed
+7 -13

No files matched your search

+1 -1
View File
@@ -117,7 +117,7 @@ Needs 70-250 more space in KERNAL segment (depending on the features enabled for
### `CONFIG_KEYBOARD_C128` ### `CONFIG_KEYBOARD_C128`
Allows to use additional keys found on the C128 keyboard. Allows to use additional keys found on the C128 keyboard. NOTE: might be buggy, on VICE emulator I can't get all the keys working.
Needs about 125 bytes more space in KERNAL segment. If unsure - disable. Needs about 125 bytes more space in KERNAL segment. If unsure - disable.
+1 -1
View File
@@ -23,7 +23,7 @@ kb_matrix_128_bucky_filter:
.byte %00000000 .byte %00000000
.byte %00000000 .byte %00000000
.byte %10000001 // XXX ALT, NO_SCRL - probably here .byte %10000001 // ALT, NO_SCRL
+4 -10
View File
@@ -175,12 +175,7 @@ scnkey_no_keys:
// Mark no key press // Mark no key press
#if CONFIG_KEYBOARD_C128
lda #$FF // non-standard, but for C128 keyboard $40 is a valid position
#else
lda #$40 lda #$40
#endif
sta LSTX sta LSTX
rts rts
@@ -264,16 +259,15 @@ scnkey_output_key:
#if CONFIG_KEYBOARD_C128 #if CONFIG_KEYBOARD_C128
cpy #$40 cpy #$40
bcs !+ bcc !+
lda (KEYTAB), y // retrieve key code from standard matrix lda kb_matrix_128 - $41, y // retrieve key code from C128 extended matrix
jmp scnkey_got_petscii jmp scnkey_got_petscii
!: !:
lda (KEYTAB), y // retrieve key code from standard matrix
lda kb_matrix_128 - $40, y // retrieve key code from C128 extended matrix
// XXX this will be needed for extended screen editor // XXX this will be needed for extended screen editor
// cmp KEY_TAB_FW // special handling for SHIFT+TAB // cmp KEY_TAB_FW // special handling for SHIFT+TAB
// bne scnkey_got_petscii // bne scnkey_got_petscii
// lda SHFLAG // special handling for SHIFT+TAB // lda SHFLAG // special handling for SHIFT+TAB
+1 -1
View File
@@ -37,7 +37,7 @@ scnkey_matrix_128_loop_inner:
tya // now .A contains key offset within a row tya // now .A contains key offset within a row
clc clc
adc kb_matrix_row_offsets, x // now .A contains key offset from the matrix start adc kb_matrix_row_offsets, x // now .A contains key offset from the matrix start
adc #$40 // now .A contains fully normalized offset adc #$41 // now .A contains offset after the standard matrix
tay tay
jmp scnkey_matrix_128_loop_next jmp scnkey_matrix_128_loop_next
!: !: