From 1cc2caa794ffa28b64a1a70a7e3180d1254c7755 Mon Sep 17 00:00:00 2001 From: Curtis F Kaylor Date: Tue, 13 Oct 2020 23:22:44 -0400 Subject: [PATCH] Updated module keydef with X16 keys --- include/apple2/keydef.a02 | 42 -------------------- include/apple2/keydef.h02 | 48 ----------------------- include/c64/keydef.a02 | 12 ++++-- include/c64/keydef.h02 | 14 ++++--- include/keydef.a02 | 18 +++++---- include/keydef.h02 | 11 ++++-- include/vic/keydef.a02 | 16 +++++--- include/vic/keydef.h02 | 14 ++++--- include/x16/keydef.a02 | 80 +++++++++++++++++++++------------------ include/x16/keydef.h02 | 17 +++++++-- test/keydefs.c02 | 10 +++-- 11 files changed, 118 insertions(+), 164 deletions(-) delete mode 100644 include/apple2/keydef.a02 delete mode 100644 include/apple2/keydef.h02 diff --git a/include/apple2/keydef.a02 b/include/apple2/keydef.a02 deleted file mode 100644 index edbbd11..0000000 --- a/include/apple2/keydef.a02 +++ /dev/null @@ -1,42 +0,0 @@ -;Apple II Key Code Definitions -;Undefined Keys hae value $00 - -;Key Definitions (Struct Key Codes) -; Chr NAME Description -KEYS: BYTE $08 ;BCKSPC Backspace - BYTE $00 ;BREAK Break - BYTE $00 ;CLEAR Clear - BYTE $00 ;COPY Copy - BYTE $7F ;DELETE Delete - BYTE $0S ;DOWN Cursor Down (Line Feed) - BYTE $1B ;ESCAPE Escape - BYTE $00 ;FN1 F1 - BYTE $00 ;FN2 F2 - BYTE $00 ;FN3 F3 - BYTE $00 ;FN4 F4 - BYTE $00 ;FN5 F5 - BYTE $00 ;FN6 F6 - BYTE $00 ;FN7 F7 - BYTE $00 ;FN8 F8 - BYTE $00 ;FN9 F9 - BYTE $00 ;FN10 F10 - BYTE $00 ;FN11 F11 - BYTE $00 ;FN12 F12 - BYTE $00 ;HELP Help - BYTE $00 ;HOME Home - BYTE $00 ;INSERT Insert - BYTE $08 ;LEFT Cursor Left (Backspace) - BYTE $00 ;LNFD Line Feed - BYTE $15 ;RIGHT Cursor Right - BYTE $0D ;RETURN Return - BYTE $00 ;SHFRTN Shift-Return - BYTE $00 ;RUN Run - BYTE $00 ;RVSOFF Reverse Off - BYTE $00 ;RVSON Reverse On - BYTE $00 ;SHFSPC Shifted Space - BYTE $09 ;TAB Tab - BYTE $00 ;SHFTAB Shift-Tab - BYTE $0B ;UP Cursor Up - -;System Key Names -KNAMES BYTE "<-",0,"ESC",0,"RETURN",0 diff --git a/include/apple2/keydef.h02 b/include/apple2/keydef.h02 deleted file mode 100644 index e30de12..0000000 --- a/include/apple2/keydef.h02 +++ /dev/null @@ -1,48 +0,0 @@ -/* Apple II Key Code Definitions * - * Undefined Keys have value $00 * - -/* Structure for Key Definitions */ -struct keydef { - char bckspc; //Backspace - char break; //Break - char clear; //Clear - char copy; //Copy - char delete; //Delete - char down; //Cursor Down - char escape; //Escape - char fn1; //F1 - char fn2; //F2 - char fn3; //F3 - char fn4; //F4 - char fn5; //F5 - char fn6; //F6 - char fn7; //F7 - char fn8; //F8 - char fn9; //F9 - char fn10; //F10 - char fn11; //F11 - char fn12; //F12 - char help; //Help - char home; //Home - char insert; //Insert - char left; //Cursor Left - char lnfd; //Line Feed - char right; //Cursor Right - char return; //Return - char shfrtn; //Shift-Return - char run; //Run - char rvsoff; //Reverse Off - char rvson; //Reverse On - char shfspc; //Shifted Space - char tab; //Tab - char shftab; //Shift-Tab - char up; //Cursor Up -}; - -/* Actual Key Definitions */ -const struct keydef keys; - -/* Structure for Key Names */ -struct kname {char delete[2], escape[3], return[6];}; -const struct kname knames; - diff --git a/include/c64/keydef.a02 b/include/c64/keydef.a02 index 29091ba..fcd37cd 100644 --- a/include/c64/keydef.a02 +++ b/include/c64/keydef.a02 @@ -2,13 +2,14 @@ ;for Commodore 64 Computer ;Key Definitions (Struct Key Codes) -; Chr NAME Description VICE x64 +; Chr Name Description VICE x64 KEYS: BYTE $00 ;BCKSPC Backspace [N/A] BYTE $03 ;BREAK Break (RUN/STOP) Escape, Caps Lock, or Tab-C BYTE $93 ;CLEAR Clear (Shift-CLR/HOME) Shift-Home BYTE $00 ;COPY Copy [N/A] BYTE $14 ;DELETE Delete Backspace, Delete, or Tab-T BYTE $11 ;DOWN Cursor Down Cursor Down or Tab-Q + BYTE $00 ;END End [N/A] BYTE $00 ;ESCAPE Escape [N/A] BYTE $85 ;FN1 F1 (F1/F2) F1 BYTE $89 ;FN2 F2 (Shift-F1/F2) F2 or Shift-F1 @@ -27,15 +28,18 @@ KEYS: BYTE $00 ;BCKSPC Backspace [N/A] BYTE $94 ;INSERT Insert (Shift-INS/DEL) Insert or Shift-Back BYTE $9D ;LEFT Cursor Left Cursor Left BYTE $00 ;LNFD Line Feed [N/A] - BYTE $1D ;RIGHT Cursor Right Cursor Right + BYTE $00 ;MENU Menu [N/A] + BYTE $00 ;PAGEDN Page Down [N/A] + BYTE $00 ;PAGEUP Page Up [N/A] BYTE $0D ;RETURN Return Enter or Tab-M - BYTE $8D ;SHFRTN Shift-Return Shift-Enter + BYTE $1D ;RIGHT Cursor Right Cursor Right BYTE $83 ;RUN Run (Shift-RUN/STOP) Shift-Escape BYTE $92 ;RVSOFF Reverse Off Tab-0 BYTE $12 ;RVSON Reverse On Tab-9 or Tab-R + BYTE $8D ;SHFRTN Shift-Return Shift-Enter BYTE $A0 ;SHFSPC Shift-Space Shift-Space - BYTE $00 ;TAB Tab BYTE $00 ;SHFTAB Shift-Tab [N/A] + BYTE $00 ;TAB Tab BYTE $91 ;UP Cursor Up Cursor Up ;System Key Names diff --git a/include/c64/keydef.h02 b/include/c64/keydef.h02 index b49cb56..e97d138 100644 --- a/include/c64/keydef.h02 +++ b/include/c64/keydef.h02 @@ -9,6 +9,7 @@ struct keydef { char copy; //Copy [N/A] char delete; //Delete char down; //Cursor Down + char end; //End char escape; //Escape [N/A] char fn1; //Function Key 1 (F1/F2) char fn2; //Function Key 2 (Shift-F1/F2) @@ -27,15 +28,18 @@ struct keydef { char insert; //Insert (Shift-INS/DEL) char left; //Cursor Left char lnfd; //Line Feed (N/A) - char right; //Cursor Right + char menu; //Menu (N/A) + char pagedn; //Page Down (N/A) + char pageup; //Page Up char return; //Return - char shfrtn; //Shift-Return + char right; //Cursor Right char run; //Run (Shift-RUN/STOP) - char rvsoff; //Reverse Off - char rvson; //Reverse On + char rvsoff; //Reverse Off (Ctrl-0) + char rvson; //Reverse On (Ctrl-9) + char shfrtn; //Shift-Return char shfspc; //Shifted Space - char tab; //Tab char shftab; //Shift-Tab [N/A] + char tab; //Tab char up; //Cursor Up }; diff --git a/include/keydef.a02 b/include/keydef.a02 index b8b049b..1691948 100644 --- a/include/keydef.a02 +++ b/include/keydef.a02 @@ -1,5 +1,5 @@ ;Standard ASCII Key Code Definitions -;Undefined Keys hae value $00 +;Undefined Keys have value $00 ;Key Definitions (Struct Key Codes) ; Chr NAME Description @@ -9,6 +9,7 @@ KEYS: BYTE $08 ;BCKSPC Backspace BYTE $00 ;COPY Copy [Acorn Atom] BYTE $7F ;DELETE Delete BYTE $00 ;DOWN Cursor Down + BYTE $00 ;END End [X16] BYTE $1B ;ESCAPE Escape BYTE $00 ;FN1 F1 BYTE $00 ;FN2 F2 @@ -26,16 +27,19 @@ KEYS: BYTE $08 ;BCKSPC Backspace BYTE $00 ;HOME Home BYTE $00 ;INSERT Insert BYTE $00 ;LEFT Cursor Left - BYTE $0A ;LNFD ;Line Feed [C128] - BYTE $00 ;RIGHT Cursor Right + BYTE $0A ;LNFD Line Feed [C128] + BYTE $00 ;MENU Menu [X16] + BYTE $00 ;PAGEDN Page Down [X16] + BYTE $00 ;PAGEUP Page Up [X16] BYTE $0D ;RETURN Return - BYTE $80 ;SHFRTN Shift-Return + BYTE $00 ;RIGHT Cursor Right BYTE $00 ;RUN Run [PET/CBM] - BYTE $92 ;RVSOFF Reverse OffCtrl-0 - BYTE $12 ;RVSON Reverse On Ctrl-9 + BYTE $00 ;RVSOFF Reverse Off + BYTE $00 ;RVSON Reverse On + BYTE $00 ;SHFRTN Shift-Return BYTE $00 ;SHFSPC Shifted Space - BYTE $09 ;TAB Tab BYTE $00 ;SHFTAB Shift-Tab + BYTE $09 ;TAB Tab BYTE $00 ;UP Cursor Up ;System Key Names diff --git a/include/keydef.h02 b/include/keydef.h02 index 9d44fed..99c5166 100644 --- a/include/keydef.h02 +++ b/include/keydef.h02 @@ -9,6 +9,7 @@ struct keydef { char copy; //Copy char delete; //Delete char down; //Cursor Down + char end; //End char escape; //Escape char fn1; //F1 char fn2; //F2 @@ -27,15 +28,18 @@ struct keydef { char insert; //Insert char left; //Cursor Left char lnfd; //Line Feed - char right; //Cursor Right + char menu; //Menu + char pagedn; //Page Down + char pageup; //Page Up char return; //Return - char shfrtn; //Shift-Return + char right; //Cursor Right char run; //Run char rvsoff; //Reverse Off char rvson; //Reverse On + char shfrtn; //Shift-Return char shfspc; //Shifted Space - char tab; //Tab char shftab; //Shift-Tab + char tab; //Tab\ char up; //Cursor Up }; @@ -45,4 +49,3 @@ const struct keydef keys; /* Structure for Key Names */ struct kname {char delete[6], escape[6], return[6];}; const struct kname knames; - diff --git a/include/vic/keydef.a02 b/include/vic/keydef.a02 index c79fc4a..899cf10 100644 --- a/include/vic/keydef.a02 +++ b/include/vic/keydef.a02 @@ -1,14 +1,15 @@ ;PETSCII Key Code Definitions -;for Commmodore 64 Computer +;for Commodore VIC-20 Computer -KEYS: ;Key Definitions (Struct Key Codes) +;Key Definitions (Struct Key Codes) ;Chr Name Description VICE xvic - BYTE $00 ;BCKSPC Backspace [N/A] +KEYS: BYTE $00 ;BCKSPC Backspace [N/A] BYTE $03 ;BREAK Break (RUN/STOP) Escape or Caps Lock BYTE $93 ;CLEAR Clear (Shift-CLR/HOME) Shift-Home BYTE $00 ;COPY Copy [N/A] BYTE $14 ;DELETE Delete Backspace BYTE $11 ;DOWN Cursor Down Cursor Down + BYTE $00 ;END End [N/A] BYTE $00 ;ESCAPE Escape [N/A] BYTE $85 ;FN1 F1 (F1/F2) F1 BYTE $89 ;FN2 F2 (Shift-F1/F2) F2 or Shift-F1 @@ -27,15 +28,18 @@ KEYS: ;Key Definitions (Struct Key Codes) BYTE $94 ;INSERT Insert (Shift-INS/DEL) Shift-Backspace BYTE $9D ;LEFT Cursor Left Cursor Left BYTE $00 ;LNFD Line Feed [N/A] - BYTE $1D ;RIGHT Cursor Right Cursor Right + BYTE $00 ;MENU Menu [N/A] + BYTE $00 ;PAGEDN Page Down [N/A] + BYTE $00 ;PAGEUP Page Up [N/A] BYTE $0D ;RETURN Return Enter - BYTE $8D ;SHFRTN Shift-Return Shift-Enter + BYTE $1D ;RIGHT Cursor Right Cursor Right BYTE $83 ;RUN Run (Shift-RUN/STOP) Shift-Escape BYTE $92 ;RVSOFF Reverse Off Tab-0 BYTE $12 ;RVSON Reverse On Tab-9 + BYTE $8D ;SHFRTN Shift-Return Shift-Enter BYTE $A0 ;SHFSPC Shifted Space Shift-Space - BYTE $00 ;TAB Tab BYTE $00 ;SHFTAB Shift-Tab [N/A] + BYTE $00 ;TAB Tab BYTE $91 ;UP Cursor Up Cursor Up ;System Key Names diff --git a/include/vic/keydef.h02 b/include/vic/keydef.h02 index f52dd57..dd263ec 100644 --- a/include/vic/keydef.h02 +++ b/include/vic/keydef.h02 @@ -9,6 +9,7 @@ struct keydef { char copy; //Copy [N/A] char delete; //Delete char down; //Cursor Down + char end; //End char escape; //Escape [N/A] char fn1; //Function Key 1 (F1/F2) char fn2; //Function Key 2 (Shift-F1/F2) @@ -27,15 +28,18 @@ struct keydef { char insert; //Insert (Shift-INS/DEL) char left; //Cursor Left char lnfd; //Line Feed (N/A) - char right; //Cursor Right + char menu; //Menu (N/A) + char pagedn; //Page Down (N/A) + char pageup; //Page Up char return; //Return - char shfrtn; //Shift-Return + char right; //Cursor Right char run; //Run (Shift-RUN/STOP) - char rvsoff; //Reverse Off - char rvson; //Reverse On + char rvsoff; //Reverse Off (Ctrl-0) + char rvson; //Reverse On (Ctrl-9) + char shfrtn; //Shift-Return char shfspc; //Shifted Space - char tab; //Tab char shftab; //Shift-Tab [N/A] + char tab; //Tab char up; //Cursor Up }; diff --git a/include/x16/keydef.a02 b/include/x16/keydef.a02 index 4a5c0de..dd7d525 100644 --- a/include/x16/keydef.a02 +++ b/include/x16/keydef.a02 @@ -1,38 +1,46 @@ ;PETSCII Key Code Definitions for Commander X16 -KEYS: ;Key Definitions (Struct Key Codes) -;NAME Chr Description x16emu -.BCKSPC BYTE $00 ;Backspace [N/A] -.BREAK BYTE $03 ;Break (RUN/STOP) **missing** -.CLEAR BYTE $93 ;Clear (Shift-CLR/HOME) Shift-Home -.COPY BYTE $00 ;Copy [N/A] -.DELETE BYTE $14 ;Delete Backspace -.DOWN BYTE $11 ;Cursor Down Cursor Down -.ESCAPE BYTE $1B ;Escape [C128/C65] **missing** -.FN1 BYTE $85 ;F1 (F1/F2) F1 -.FN2 BYTE $89 ;F2 (Shift-F1/F2) F2 -.FN3 BYTE $86 ;F3 (F3/F4) F3 -.FN4 BYTE $8A ;F4 (Shift-F3/F4) F4 -.FN5 BYTE $87 ;F5 (F5/F6) F5 -.FN6 BYTE $8B ;F6 (Shift-F5/F6) F6 -.FN7 BYTE $88 ;F7 (F7/F8) F7 -.FN8 BYTE $8C ;F8 (Shift-F7/F8) F8 -.FN9 BYTE $89 ;F9 [C65] F9 -.FN10 BYTE $15 ;F10 [C65] F10 -.FN11 BYTE $16 ;F11 [C65] F11 -.FN12 BYTE $17 ;F12 [C65] F12 -.HELP BYTE $84 ;Help [C65] -.HOME BYTE $13 ;Home (CLR/HOME) Home -.INSERT BYTE $94 ;Insert (Shift-INS/DEL) Shift-Backspace -.LEFT BYTE $9D ;Cursor Left Cursor Left -.LNFD BYTE $00 ;Line Feed [C128] -.RIGHT BYTE $1D ;Cursor Right Cursor Right -.RETURN BYTE $0D ;Return Enter -.SHFRTN BYTE $8D ;Shift-Return Shift-Enter -.RUN BYTE $00 ;Run (Shift-RUN/STOP) -.RVSOFF BYTE $92 ;Reverse Off Ctrl-0 -.RVSON BYTE $12 ;Reverse On Ctrl-9 -.SHFSPC BYTE $A0 ;Shifted Space Shifted Space -.TAB BYTE $09 ;Tab Tab -.SHFTAB BYTE $18 ;Shift-Tab **missing** -.UP BYTE $91 ;Cursor Up Cursor Up + +;Key Definitions (Struct Key Codes) +; Chr NAME Description x16emu +KEYS: BYTE $08 ;BCKSPC Backspace [N/A] + BYTE $03 ;BREAK Break (RUN/STOP) **missing** + BYTE $93 ;CLEAR Clear (Shift-CLR/HOME) Shift-Home + BYTE $00 ;COPY Copy [N/A] + BYTE $14 ;DELETE Delete Backspace + BYTE $11 ;DOWN Cursor Down Cursor Down + BYTE $11 ;END End + BYTE $1B ;ESCAPE Escape [C128/C65] **missing** + BYTE $85 ;FN1 F1 (F1/F2) F1 + BYTE $89 ;FN2 F2 (Shift-F1/F2) F2 + BYTE $86 ;FN3 F3 (F3/F4) F3 + BYTE $8A ;FN4 F4 (Shift-F3/F4) F4 + BYTE $87 ;FN5 F5 (F5/F6) F5 + BYTE $8B ;FN6 F6 (Shift-F5/F6) F6 + BYTE $88 ;FN7 F7 (F7/F8) F7 + BYTE $8C ;FN8 F8 (Shift-F7/F8) F8 + BYTE $89 ;FN9 F9 F9 + BYTE $15 ;FN10 F10 F10 + BYTE $16 ;FN11 F11 F11 + BYTE $17 ;FN12 F12 F12 + BYTE $84 ;HELP Help **missing** + BYTE $13 ;HOME Home (CLR/HOME) Home + BYTE $94 ;INSERT Insert (Shift-INS/DEL) Shift-Backspace + BYTE $9D ;LEFT Cursor Left Cursor Left + BYTE $00 ;LNFD Line Feed **missing** + BYTE $00 ;MENU Menu + BYTE $00 ;PAGEDN Page Down + BYTE $00 ;PAGEUP Page Up + BYTE $0D ;RETURN Return Enter + BYTE $1D ;RIGHT Cursor Right Cursor Right + BYTE $00 ;RUN Run (Shift-RUN/STOP) **missing** + BYTE $92 ;RVSOFF Reverse Off Ctrl-0 + BYTE $12 ;RVSON Reverse On Ctrl-9 + BYTE $8D ;SHFRTN Shift-Return Shift-Enter + BYTE $A0 ;SHFSPC Shifted Space Shifted Space + BYTE $18 ;SHFTAB Shift-Tab **missing** + BYTE $09 ;TAB Tab Tab + BYTE $91 ;UP Cursor Up Cursor Up + +;System Key Names +KNAMES BYTE "DEL",0,"STOP",0,"RETURN",0 diff --git a/include/x16/keydef.h02 b/include/x16/keydef.h02 index cef293b..61885f4 100644 --- a/include/x16/keydef.h02 +++ b/include/x16/keydef.h02 @@ -1,5 +1,6 @@ /* PETSCII Key Code Definitions for Commander X16 */ + /* Structure for Key Definitions */ struct keydef { char bckspc; //Backspace @@ -8,10 +9,11 @@ struct keydef { char copy; //Copy char delete; //Delete char down; //Cursor Down + char end; //End char escape; //Escape char fn1; //Function Key 1 (F1/F2) char fn2; //Function Key 2 (Shift-F1/F2) - char fn3; //Function Key 3 (F3/F4) + char fn3; //Fun ction Key 3 (F3/F4) char fn4; //Function Key 4 (Shift-F3/F4) char fn5; //Function Key 5 (F5/F6) char fn6; //Function Key 6 (Shift-F5/F6) @@ -26,17 +28,24 @@ struct keydef { char insert; //Insert (Shift-INS/DEL) char left; //Cursor Left char lnfd; //Line Feed (N/A) - char right; //Cursor Right + char menu; //Menu + char pagedn; //Page Down + char pageup; //Page Up char return; //Return - char shfrtn; //Shift-Return + char right; //Cursor Right char run; //Run (Shift-RUN/STOP) char rvsoff; //Reverse Off char rvson; //Reverse On + char shfrtn; //Shift-Return char shfspc; //Shifted Space - char tab; //Tab char shftab; //Shift-Tab [C65] + char tab; //Tab char up; //Cursor Up }; /* Actual Key Definitions */ const struct keydef keys; + +/* Structure for Key Names */ +struct kname {char delete[3], escape[4], return[6];}; +const struct kname knames; diff --git a/test/keydefs.c02 b/test/keydefs.c02 index c8e7820..fe0b7a8 100644 --- a/test/keydefs.c02 +++ b/test/keydefs.c02 @@ -19,6 +19,7 @@ main: case keys.copy: putstr("COPY"); case keys.delete: putstr("DELETE"); case keys.down: putstr("DOWN"); + case keys.end: putstr("END"); case keys.escape: putstr("ESCAPE"); case keys.fn1: putstr("F1"); case keys.fn2: putstr("F2"); @@ -37,15 +38,18 @@ main: case keys.insert: putstr("INSERT"); case keys.left: putstr("LEFT"); case keys.lnfd: putstr("LINE FEED"); - case keys.right: putstr("RIGHT"); + case keys.menu: putstr("MENU"); + case keys.pagedn: putstr("PAGE DOWN"); + case keys.pageup: putstr("PAGE UP"); case keys.return: putstr("RETURN"); - case keys.shfrtn: putstr("SHIFT-RETURN"); + case keys.right: putstr("RIGHT"); case keys.run: putstr("RUN"); case keys.rvsoff: putstr("RVS-OFF"); case keys.rvson: putstr("RVS-ON"); + case keys.shfrtn: putstr("SHIFT-RETURN"); case keys.shfspc: putstr("SHIFT-SPACE"); - case keys.tab: putstr("TAB"); case keys.shftab: putstr("SHIFT-TAB"); + case keys.tab: putstr("TAB"); case keys.up: putstr("UP"); case ' ': putstr("SPACE"); default: if (key > ' ' and key <> #DELKEY) putchr(key);