1
0
mirror of https://github.com/cc65/cc65.git synced 2024-12-23 19:29:37 +00:00

- Introduced Apple GEOS specific key codes.

- Reorganized color defines.
- Changed GEOS 64/128 'enter' key code from 10 to 13 (I've no idea how this could have been wrong but but at least VICE delivers 13).

git-svn-id: svn://svn.cc65.org/cc65/trunk@5877 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
ol.sc 2012-10-25 20:08:18 +00:00
parent 3aabd85bf4
commit a9cb044183
3 changed files with 68 additions and 41 deletions

View File

@ -67,6 +67,7 @@
#include <geos/gdlgbox.h>
#endif
#define CH_ULCORNER '+'
#define CH_URCORNER '+'
#define CH_LLCORNER '+'
@ -77,25 +78,61 @@
#define CH_LTEE '+'
#define CH_CROSS '+'
/* Additional key defines */
#define CH_F1 133
#define CH_F2 137
#define CH_F3 134
#define CH_F4 138
#define CH_F5 135
#define CH_F6 139
#define CH_F7 136
#define CH_F8 140
#define CH_F1 KEY_F1
#define CH_F2 KEY_F2
#define CH_F3 KEY_F3
#define CH_F4 KEY_F4
#define CH_F5 KEY_F5
#define CH_F6 KEY_F6
#define CH_F7 KEY_F7
#define CH_F8 KEY_F8
#define CH_CURS_UP KEY_UP
#define CH_CURS_DOWN KEY_DOWN
#define CH_CURS_LEFT KEY_LEFT
#define CH_CURS_RIGHT KEY_RIGHT
#define CH_DEL KEY_DELETE
#define CH_INS KEY_INSERT
#define CH_ENTER KEY_ENTER
#define CH_STOP KEY_STOP
#define CH_ESC KEY_ESC
#define COLOR_BLACK BLACK
#define COLOR_WHITE WHITE
#define COLOR_RED RED
#define COLOR_CYAN CYAN
#define COLOR_VIOLET PURPLE
#define COLOR_PURPLE PURPLE
#define COLOR_GREEN GREEN
#define COLOR_BLUE BLUE
#define COLOR_YELLOW YELLOW
#define COLOR_ORANGE ORANGE
#define COLOR_BROWN BROWN
#define COLOR_LIGHTRED LTRED
#define COLOR_GRAY1 DKGREY
#define COLOR_GRAY2 MEDGREY
#define COLOR_LIGHTGREEN LTGREEN
#define COLOR_LIGHTBLUE LTBLUE
#define COLOR_GRAY3 LTGREY
#define TGI_COLOR_BLACK COLOR_BLACK
#define TGI_COLOR_WHITE COLOR_WHITE
#define TGI_COLOR_RED COLOR_RED
#define TGI_COLOR_CYAN COLOR_CYAN
#define TGI_COLOR_VIOLET COLOR_VIOLET
#define TGI_COLOR_PURPLE COLOR_PURPLE
#define TGI_COLOR_GREEN COLOR_GREEN
#define TGI_COLOR_BLUE COLOR_BLUE
#define TGI_COLOR_YELLOW COLOR_YELLOW
#define TGI_COLOR_ORANGE COLOR_ORANGE
#define TGI_COLOR_BROWN COLOR_BROWN
#define TGI_COLOR_LIGHTRED COLOR_LIGHTRED
#define TGI_COLOR_GRAY1 COLOR_GRAY1
#define TGI_COLOR_GRAY2 COLOR_GRAY2
#define TGI_COLOR_LIGHTGREEN COLOR_LIGHTGREEN
#define TGI_COLOR_LIGHTBLUE COLOR_LIGHTBLUE
#define TGI_COLOR_GRAY3 COLOR_GRAY3
#define CH_CURS_UP 145
#define CH_CURS_DOWN 17
#define CH_CURS_LEFT 157
#define CH_CURS_RIGHT 29
#define CH_DEL 20
#define CH_INS 148
#define CH_ENTER '\n'
#define CH_STOP 3
#define CH_ESC 27
/* End of geos.h */
#endif

View File

@ -65,23 +65,6 @@ void __fastcall__ GraphicsString(char *myGfxString);
#define LTGREEN 13
#define LTBLUE 14
#define LTGREY 15
/* once again for cc65 compatibility */
#define COLOR_BLACK 0x00
#define COLOR_WHITE 0x01
#define COLOR_RED 0x02
#define COLOR_CYAN 0x03
#define COLOR_VIOLET 0x04
#define COLOR_GREEN 0x05
#define COLOR_BLUE 0x06
#define COLOR_YELLOW 0x07
#define COLOR_ORANGE 0x08
#define COLOR_BROWN 0x09
#define COLOR_LIGHTRED 0x0A
#define COLOR_GRAY1 0x0B
#define COLOR_GRAY2 0x0C
#define COLOR_LIGHTGREEN 0x0D
#define COLOR_LIGHTBLUE 0x0E
#define COLOR_GRAY3 0x0F
/* VIC memory banks - lowest 2 bits of cia2base+0 */
#define GRBANK0 3
#define GRBANK1 2

View File

@ -31,15 +31,13 @@ char GetNextChar(void);
#define KEY_F5 5
#define KEY_F6 6
#define KEY_NOSCRL 7
#define KEY_ENTER 11
#define KEY_ENTER 13
#define KEY_F7 14
#define KEY_F8 15
#define KEY_UP 16
#define KEY_DOWN 17
#define KEY_HOME 18
#define KEY_CLEAR 19
#define KEY_LARROW 20
#define KEY_UPARROR 21
#define KEY_UPARROW 21
#define KEY_STOP 22
#define KEY_RUN 23
#define KEY_BPS 24
@ -47,10 +45,19 @@ char GetNextChar(void);
#define KEY_ALT 26
#define KEY_ESC 27
#define KEY_INSERT 28
#define KEY_DELETE 29
#define KEY_RIGHT 30
#define KEY_INVALID 31
#define KEY_LEFT BACKSPACE
#ifdef __GEOS_CBM__
#define KEY_UP 16
#define KEY_DOWN 17
#define KEY_DELETE 29
#define KEY_RIGHT 30
#else
#define KEY_UP 11
#define KEY_DOWN 10
#define KEY_DELETE 127
#define KEY_RIGHT 21
#endif
/* values of faultData - pointer position vs. mouseWindow */
/* bit numbers */