Apple2: Make 80-columns support dynamic on apple2 target

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.

include/apple2.h

@@ -83,7 +83,57 @@
 #define CH_CURS_LEFT    0x08
 #define CH_CURS_RIGHT   0x15
 
-#if !defined(__APPLE2ENH__)
+#if defined(__APPLE2ENH__)
+
+/* MouseText-based functions for boxes and lines drawing */
+void mt_chline (unsigned char length);
+void mt_cvline (unsigned char length);
+void mt_chlinexy (unsigned char x, unsigned char y, unsigned char length);
+void mt_cvlinexy (unsigned char x, unsigned char y, unsigned char length);
+
+#define CH_HLINE        0x5F
+#define CH_VLINE        0xDF
+#define CH_ULCORNER     0x5F
+#define CH_URCORNER     0x20
+#define CH_LLCORNER     0xD4
+#define CH_LRCORNER     0xDF
+#define CH_TTEE         0x5F
+#define CH_BTEE         0xD4
+#define CH_LTEE         0xD4
+#define CH_RTEE         0xDF
+#define CH_CROSS        0xD4
+
+#define _chline(length)       mt_chline(length)
+#define _chlinexy(x,y,length) mt_chlinexy(x,y,length)
+#define _cvline(length)       mt_cvline(length)
+#define _cvlinexy(x,y,length) mt_cvlinexy(x,y,length)
+
+#else
+
+/* Functions that don't depend on MouseText to draw boxes and lines */
+void dyn_chline (unsigned char h, unsigned char length);
+void dyn_cvline (unsigned char v, unsigned char length);
+void dyn_chlinexy (unsigned char h, unsigned char x, unsigned char y, unsigned char length);
+void dyn_cvlinexy (unsigned char v, unsigned char x, unsigned char y, unsigned char length);
+
+#if defined(DYN_BOX_DRAW)
+/* When the user defines DYN_BOX_DRAW, we'll adapt to the machine
+** we run on.
+ */
+extern char CH_HLINE;
+extern char CH_VLINE;
+extern char CH_ULCORNER;
+extern char CH_URCORNER;
+extern char CH_LLCORNER;
+extern char CH_LRCORNER;
+extern char CH_TTEE;
+extern char CH_BTEE;
+extern char CH_LTEE;
+extern char CH_RTEE;
+extern char CH_CROSS;
+
+#else
+/* Otherwise, fallback to safety and don't use MouseText at all. */
 #define CH_HLINE        '-'
 #define CH_VLINE        '!'
 #define CH_ULCORNER     '+'
@@ -95,7 +145,14 @@
 #define CH_LTEE         '+'
 #define CH_RTEE         '+'
 #define CH_CROSS        '+'
-#endif
+#endif /* DYN_BOX_DRAW */
+
+#define _chline(length)         dyn_chline(CH_HLINE, length)
+#define _chlinexy(x, y, length) dyn_chlinexy(CH_HLINE, x ,y, length)
+#define _cvline(length)         dyn_cvline(CH_VLINE, length)
+#define _cvlinexy(x, y, length) dyn_cvlinexy(CH_VLINE, x, y, length)
+
+#endif /* __APPLE2ENH__ */
 
 /* Masks for joy_read */
 #define JOY_UP_MASK     0x10
@@ -127,6 +184,12 @@
 #define TV_PAL   1
 #define TV_OTHER 2
 
+/* Video modes */
+#define VIDEOMODE_40x24     0x15
+#define VIDEOMODE_80x24     0x00
+#define VIDEOMODE_40COL     VIDEOMODE_40x24
+#define VIDEOMODE_80COL     VIDEOMODE_80x24
+
 extern unsigned char _dos_type;
 /* Valid _dos_type values:
 **
@@ -255,6 +318,11 @@ unsigned char __fastcall__ allow_lowercase (unsigned char onoff);
 */
 #endif
 
+signed char __fastcall__ videomode (unsigned mode);
+/* Set the video mode, return the old mode, or -1 if 80-column hardware is not
+** installed. Call with one of the VIDEOMODE_xx constants.
+*/
+
 
 
 /* End of apple2.h */

include/apple2enh.h

@@ -57,18 +57,6 @@
 #define CH_CURS_UP      0x0B
 #define CH_CURS_DOWN    0x0A
 
-#define CH_HLINE        0x5F
-#define CH_VLINE        0xDF
-#define CH_ULCORNER     0x5F
-#define CH_URCORNER     0x20
-#define CH_LLCORNER     0xD4
-#define CH_LRCORNER     0xDF
-#define CH_TTEE         0x5F
-#define CH_BTEE         0xD4
-#define CH_LTEE         0xD4
-#define CH_RTEE         0xDF
-#define CH_CROSS        0xD4
-
 /* These are defined to be OpenApple + NumberKey */
 #define CH_F1   0xB1
 #define CH_F2   0xB2
@@ -81,12 +69,6 @@
 #define CH_F9   0xB9
 #define CH_F10  0xB0
 
-/* Video modes */
-#define VIDEOMODE_40x24     0x15
-#define VIDEOMODE_80x24     0x00
-#define VIDEOMODE_40COL     VIDEOMODE_40x24
-#define VIDEOMODE_80COL     VIDEOMODE_80x24
-
 
 
 /*****************************************************************************/
@@ -112,11 +94,6 @@ extern void a2e_lo_tgi[];
 
 
 
-unsigned __fastcall__ videomode (unsigned mode);
-/* Set the video mode, return the old mode. Call with one of the VIDEOMODE_xx
-** constants.
-*/
-
 void waitvsync (void);
 /* Wait for start of next frame */
 

include/conio.h

@@ -216,7 +216,18 @@ void __fastcall__ cputhex16 (unsigned val);
 #  define cpeekrevers()         _cpeekrevers()
 #endif
 
-
+#ifdef _chline
+#  define chline(len)      _chline(len)
+#endif
+#ifdef _cvline
+#  define cvline(len)      _cvline(len)
+#endif
+#ifdef _chlinexy
+#  define chlinexy(x, y, len)      _chlinexy(x, y, len)
+#endif
+#ifdef _cvlinexy
+#  define cvlinexy(x, y, len)      _cvlinexy(x, y, len)
+#endif
 
 /* End of conio.h */
 #endif