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

Apple2: Make 80-columns support dynamic on apple2 target

Browse Source 
Add a machinetype identifier to help us quickly identify
Apple //e (bit 7) and //e enhanced (bit 6).

Use it in conio functions for 80-columns code instead of
relying entirely on the __APPLE2ENH__ target.

Move videomode() to the apple2 target, and have it return
an error if 80-columns hardware is not available - this
is a lie for now, it is considered available on //e enhanced,
which may not be true, and not available on //e, which
may also be not true. An ulterior patch will make that
check correctly.

Adapt the box/line drawing characters so that one can use
MouseText on the apple2 target if it is available, by
defining DYN_DRAW_BOX. No change by default: MouseText is
considered available on apple2enh and not available on
apple2.
This commit is contained in:
Colin Leroy-Mira
2025-05-27 16:31:23 +02:00
committed by Oliver Schmidt
parent cd92e4f0af
commit 816666615b
23 changed files with 523 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
targettest/conio.c
View File

@@ -9,6 +9,15 @@
*
*/
/* Box drawing characters are usually constant expressions. However, there
* are scenarios where this is not the case. To ensure compatibility with
* code that assumes they are constant expressions, the scenarios in question
* must be explicitly enabled by defining DYN_BOX_DRAW. Currently, the only
* such scenario is the apple2 target. There, DYN_BOX_DRAW can be used to
* enable the use of MouseText characters on exactly those machines that
* support them.
*/
#define DYN_BOX_DRAW
#include <conio.h>
#include <string.h>
@@ -34,6 +43,10 @@
#define CH_VLINE '!'
#endif
#if defined(DYN_BOX_DRAW)
static char grid[5][5];
#else
static char grid[5][5] = {
{CH_ULCORNER, CH_HLINE, CH_TTEE, CH_HLINE, CH_URCORNER},
{CH_VLINE, ' ', CH_VLINE, ' ', CH_VLINE },
@@ -41,6 +54,35 @@ static char grid[5][5] = {
{CH_VLINE, ' ', CH_VLINE, ' ', CH_VLINE },
{CH_LLCORNER, CH_HLINE, CH_BTEE, CH_HLINE, CH_LRCORNER}
};
#endif
#if defined(DYN_BOX_DRAW)
static void init_grid(void)
{
/* Programmatically fill the array with extern chars
* instead of constants. */
grid[0][0] = CH_ULCORNER;
grid[2][0] = CH_LTEE;
grid[4][0] = CH_LLCORNER;
grid[0][2] = CH_TTEE;
grid[2][2] = CH_CROSS;
grid[4][2] = CH_BTEE;
grid[0][4] = CH_URCORNER;
grid[2][4] = CH_RTEE;
grid[4][4] = CH_LRCORNER;
grid[1][1] = grid[1][3] =
grid[3][1] = grid[3][3] = ' ';
grid[1][0] = grid[1][2] = grid[1][4] =
grid[3][0] = grid[3][2] = grid[3][4] = CH_VLINE;
grid[0][1] = grid[0][3] =
grid[2][1] = grid[2][3] =
grid[4][1] = grid[4][3] = CH_HLINE;
}
#endif
#define LINE_COLORTEST 3
#define LINE_PEEKTEST 11
@@ -152,6 +194,11 @@ void main(void)
joy_install(joy_static_stddrv);
#endif
#if defined(DYN_BOX_DRAW)
init_grid();
#endif
clrscr();
screensize(&xsize, &ysize);
cputs("cc65 conio test\n\r");