Made Apple II CONIO more flexible.
Originally the Apple II had a 64 char set and used the upper two bits to control inverse and blinking. The Apple //e brought then an alternate char set without blinking but more individual chars. However, it does _not_ contain 128 chars and use the upper bit to control inverse as one would assume. Rather it contains more than 128 chars - the MouseText chars. And because Apple wanted to provide as much backward compatibility as possible with the original char set, the alternate char set has a rather weird layout for chars > 128 with the inverse lowercase chars _not_ at (normal lowercase char + 128). So far the Apple II CONIO implementation mapped chars 128-255 to chars 0-127 (with the exception of \r and \n). It made use of alternate chars > 128 transparently for the user via reverse(1). The user didn't have direct access to the MouseText chars, they were only used interally for things like chline() and cvline(). Now the mapping of chars 128-255 to 0-127 is removed. Using chars > 128 gives the user direct access to the "raw" alternate chars > 128. This especially give the use direct access to the MouseText chars. But this clashes with the exsisting (and still desirable) revers(1) logic. Combining reverse(1) with chars > 128 just doesn't result in anything usable! What motivated this change? When I worked on the VT100 line drawing support for Telnet65 on the Apple //e (not using CONIO at all) I finally understood how MouseText is intended to be used to draw arbitrary grids with just three chars: A special "L" type char, the underscore and a vertical bar at the left side of the char box. I notice that with those chars it is possible to follow the CONIO approach to boxes and grids: Combining chline()/cvline() with special CH_... char constants for edges and intersections. But in order to actually do so I needed to be able to define CH_... constants that when fed into the ordinary cputc() pipeline end up as MouseText chars. The obvious approach was to allow chars > 128 to directly access MouseText chars :-) Now that the native CONIO box/grid approach works I deleted the Apple //e proprietary textframe() function that I added as replacement quite some years ago. Again: Please note that chline()/cvline() and the CH... constants don't work with reverse(1)!
This commit is contained in:
Oliver Schmidt
106
include/apple2.h
106
include/apple2.h
@@ -52,45 +52,49 @@
|
||||
|
||||
|
||||
/* Color defines */
|
||||
#define COLOR_BLACK 0x00
|
||||
#define COLOR_WHITE 0x01
|
||||
#define COLOR_BLACK 0x00
|
||||
#define COLOR_WHITE 0x01
|
||||
|
||||
/* TGI color defines */
|
||||
#define TGI_COLOR_BLACK 0x00
|
||||
#define TGI_COLOR_GREEN 0x01
|
||||
#define TGI_COLOR_VIOLET 0x02
|
||||
#define TGI_COLOR_WHITE 0x03
|
||||
#define TGI_COLOR_BLACK2 0x04
|
||||
#define TGI_COLOR_ORANGE 0x05
|
||||
#define TGI_COLOR_BLUE 0x06
|
||||
#define TGI_COLOR_WHITE2 0x07
|
||||
#define TGI_COLOR_BLACK 0x00
|
||||
#define TGI_COLOR_GREEN 0x01
|
||||
#define TGI_COLOR_VIOLET 0x02
|
||||
#define TGI_COLOR_WHITE 0x03
|
||||
#define TGI_COLOR_BLACK2 0x04
|
||||
#define TGI_COLOR_ORANGE 0x05
|
||||
#define TGI_COLOR_BLUE 0x06
|
||||
#define TGI_COLOR_WHITE2 0x07
|
||||
|
||||
#define TGI_COLOR_MAGENTA TGI_COLOR_BLACK2
|
||||
#define TGI_COLOR_DARKBLUE TGI_COLOR_WHITE2
|
||||
#define TGI_COLOR_DARKGREEN 0x08
|
||||
#define TGI_COLOR_GRAY 0x09
|
||||
#define TGI_COLOR_CYAN 0x0A
|
||||
#define TGI_COLOR_BROWN 0x0B
|
||||
#define TGI_COLOR_GRAY2 0x0C
|
||||
#define TGI_COLOR_PINK 0x0D
|
||||
#define TGI_COLOR_YELLOW 0x0E
|
||||
#define TGI_COLOR_AQUA 0x0F
|
||||
#define TGI_COLOR_MAGENTA TGI_COLOR_BLACK2
|
||||
#define TGI_COLOR_DARKBLUE TGI_COLOR_WHITE2
|
||||
#define TGI_COLOR_DARKGREEN 0x08
|
||||
#define TGI_COLOR_GRAY 0x09
|
||||
#define TGI_COLOR_CYAN 0x0A
|
||||
#define TGI_COLOR_BROWN 0x0B
|
||||
#define TGI_COLOR_GRAY2 0x0C
|
||||
#define TGI_COLOR_PINK 0x0D
|
||||
#define TGI_COLOR_YELLOW 0x0E
|
||||
#define TGI_COLOR_AQUA 0x0F
|
||||
|
||||
/* Characters codes */
|
||||
#define CH_ENTER 0x0D
|
||||
#define CH_ESC 0x1B
|
||||
#define CH_CURS_LEFT 0x08
|
||||
#define CH_CURS_RIGHT 0x15
|
||||
#define CH_ENTER 0x0D
|
||||
#define CH_ESC 0x1B
|
||||
#define CH_CURS_LEFT 0x08
|
||||
#define CH_CURS_RIGHT 0x15
|
||||
|
||||
#define CH_ULCORNER '+'
|
||||
#define CH_URCORNER '+'
|
||||
#define CH_LLCORNER '+'
|
||||
#define CH_LRCORNER '+'
|
||||
#define CH_TTEE '+'
|
||||
#define CH_BTEE '+'
|
||||
#define CH_LTEE '+'
|
||||
#define CH_RTEE '+'
|
||||
#define CH_CROSS '+'
|
||||
#if !defined(__APPLE2ENH__)
|
||||
#define CH_HLINE '-'
|
||||
#define CH_VLINE '!'
|
||||
#define CH_ULCORNER '+'
|
||||
#define CH_URCORNER '+'
|
||||
#define CH_LLCORNER '+'
|
||||
#define CH_LRCORNER '+'
|
||||
#define CH_TTEE '+'
|
||||
#define CH_BTEE '+'
|
||||
#define CH_LTEE '+'
|
||||
#define CH_RTEE '+'
|
||||
#define CH_CROSS '+'
|
||||
#endif
|
||||
|
||||
/* Masks for joy_read */
|
||||
#define JOY_UP_MASK 0x10
|
||||
@@ -101,21 +105,21 @@
|
||||
#define JOY_BTN_2_MASK 0x80
|
||||
|
||||
/* Return codes for get_ostype */
|
||||
#define APPLE_UNKNOWN 0x00
|
||||
#define APPLE_II 0x10 /* Apple ][ */
|
||||
#define APPLE_IIPLUS 0x11 /* Apple ][+ */
|
||||
#define APPLE_IIIEM 0x20 /* Apple /// (emulation) */
|
||||
#define APPLE_IIE 0x30 /* Apple //e */
|
||||
#define APPLE_IIEENH 0x31 /* Apple //e (enhanced) */
|
||||
#define APPLE_IIECARD 0x40 /* Apple //e Option Card */
|
||||
#define APPLE_IIC 0x50 /* Apple //c */
|
||||
#define APPLE_IIC35 0x51 /* Apple //c (3.5 ROM) */
|
||||
#define APPLE_IICEXP 0x53 /* Apple //c (Mem. Exp.) */
|
||||
#define APPLE_IICREV 0x54 /* Apple //c (Rev. Mem. Exp.) */
|
||||
#define APPLE_IICPLUS 0x55 /* Apple //c Plus */
|
||||
#define APPLE_IIGS 0x80 /* Apple IIgs */
|
||||
#define APPLE_IIGS1 0x81 /* Apple IIgs (ROM 1) */
|
||||
#define APPLE_IIGS3 0x83 /* Apple IIgs (ROM 3) */
|
||||
#define APPLE_UNKNOWN 0x00
|
||||
#define APPLE_II 0x10 /* Apple ][ */
|
||||
#define APPLE_IIPLUS 0x11 /* Apple ][+ */
|
||||
#define APPLE_IIIEM 0x20 /* Apple /// (emulation) */
|
||||
#define APPLE_IIE 0x30 /* Apple //e */
|
||||
#define APPLE_IIEENH 0x31 /* Apple //e (enhanced) */
|
||||
#define APPLE_IIECARD 0x40 /* Apple //e Option Card */
|
||||
#define APPLE_IIC 0x50 /* Apple //c */
|
||||
#define APPLE_IIC35 0x51 /* Apple //c (3.5 ROM) */
|
||||
#define APPLE_IICEXP 0x53 /* Apple //c (Mem. Exp.) */
|
||||
#define APPLE_IICREV 0x54 /* Apple //c (Rev. Mem. Exp.) */
|
||||
#define APPLE_IICPLUS 0x55 /* Apple //c Plus */
|
||||
#define APPLE_IIGS 0x80 /* Apple IIgs */
|
||||
#define APPLE_IIGS1 0x81 /* Apple IIgs (ROM 1) */
|
||||
#define APPLE_IIGS3 0x83 /* Apple IIgs (ROM 3) */
|
||||
|
||||
extern unsigned char _dos_type;
|
||||
/* Valid _dos_type values:
|
||||
@@ -200,9 +204,9 @@ void rebootafterexit (void);
|
||||
** to be overlaid by macros with the same names, saving the function call
|
||||
** overhead.
|
||||
*/
|
||||
#define _textcolor(color) COLOR_WHITE
|
||||
#define _bgcolor(color) COLOR_BLACK
|
||||
#define _bordercolor(color) COLOR_BLACK
|
||||
#define _textcolor(color) COLOR_WHITE
|
||||
#define _bgcolor(color) COLOR_BLACK
|
||||
#define _bordercolor(color) COLOR_BLACK
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user