bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Apple2: Don't depend on apple2enh definition for characters

Browse Source 
Up, Down and Del, as well as Open-Apple, exist on
non-enhanced Apple //e.
This commit is contained in:
Colin Leroy-Mira
2025-05-25 16:22:24 +02:00
committed by Oliver Schmidt
parent 4971fe312a
commit d3ef3e1b62
3 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/apple2.h
View File

@@ -83,6 +83,26 @@
#define CH_CURS_LEFT 0x08 #define CH_CURS_LEFT 0x08
#define CH_CURS_RIGHT 0x15 #define CH_CURS_RIGHT 0x15
/* These characters are not available on the ][+, but
* are on the //e. */
#if defined(__APPLE2ENH__) || defined(APPLE2_INCLUDE_IIE_CHARS)
#define CH_DEL 0x7F
#define CH_CURS_UP 0x0B
#define CH_CURS_DOWN 0x0A
/* These are defined to be OpenApple + NumberKey */
#define CH_F1 0xB1
#define CH_F2 0xB2
#define CH_F3 0xB3
#define CH_F4 0xB4
#define CH_F5 0xB5
#define CH_F6 0xB6
#define CH_F7 0xB7
#define CH_F8 0xB8
#define CH_F9 0xB9
#define CH_F10 0xB0
#endif
#if defined(__APPLE2ENH__) #if defined(__APPLE2ENH__)
/* MouseText-based functions for boxes and lines drawing */ /* MouseText-based functions for boxes and lines drawing */

25
include/apple2enh.h
View File

@@ -46,31 +46,6 @@
/*****************************************************************************/
/* Data */
/*****************************************************************************/
/* Characters codes */
#define CH_DEL 0x7F
#define CH_CURS_UP 0x0B
#define CH_CURS_DOWN 0x0A
/* These are defined to be OpenApple + NumberKey */
#define CH_F1 0xB1
#define CH_F2 0xB2
#define CH_F3 0xB3
#define CH_F4 0xB4
#define CH_F5 0xB5
#define CH_F6 0xB6
#define CH_F7 0xB7
#define CH_F8 0xB8
#define CH_F9 0xB9
#define CH_F10 0xB0
/*****************************************************************************/ /*****************************************************************************/
/* Variables */ /* Variables */
/*****************************************************************************/ /*****************************************************************************/

10
libsrc/apple2/cgetc.s
View File

@@ -51,10 +51,14 @@ put_caret:
; At this time, the high bit of the key pressed is set. ; At this time, the high bit of the key pressed is set.
: bit KBDSTRB ; Clear keyboard strobe : bit KBDSTRB ; Clear keyboard strobe
.ifdef __APPLE2ENH__
.ifndef __APPLE2ENH__
bit machinetype ; Apple //e or more recent?
bpl clear
.endif
bit BUTN0 ; Check if OpenApple is down bit BUTN0 ; Check if OpenApple is down
bmi done bmi done
.endif
and #$7F ; If not down, then clear high bit clear: and #$7F ; If not down, then clear high bit
done: ldx #>$0000 done: ldx #>$0000
rts rts