X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fgeos.h;h=3f760b6ad6558d735858372241bb8536462de155;hb=2af76c7cffb08af3a6f7ca87c90132aa3e365f76;hp=9c44bbdb88c031f24879357ea25821de9a4a8847;hpb=e642fbbbeae6918f21c202b89538a80f4ae3ddbe;p=cc65

diff --git a/include/geos.h b/include/geos.h
index 9c44bbdb8..3f760b6ad 100644
--- a/include/geos.h
+++ b/include/geos.h
@@ -19,89 +19,93 @@
 
 
 
-#ifndef _GCONST_H
 #include <geos/gconst.h>
-#endif
-
-#ifndef _GSTRUCT_H
 #include <geos/gstruct.h>
-#endif
-
-#ifndef _GSYM_H
 #include <geos/gsym.h>
-#endif
-
-#ifndef _GDISK_H
 #include <geos/gdisk.h>
-#endif
-
-#ifndef _GFILE_H
 #include <geos/gfile.h>
-#endif
-
-#ifndef _GPROCESS_H
 #include <geos/gprocess.h>
-#endif
-
-#ifndef _GGRAPH_H
 #include <geos/ggraph.h>
-#endif
-
-#ifndef _GMENU_H
 #include <geos/gmenu.h>
-#endif
-
-#ifndef _GSPRITE_H
 #include <geos/gsprite.h>
-#endif
-
-#ifndef _GMEMORY_H
 #include <geos/gmemory.h>
-#endif
-
-#ifndef _GSYS_H
 #include <geos/gsys.h>
-#endif
-
-#ifndef _GDLGBOX_H
 #include <geos/gdlgbox.h>
-#endif
 
-/* Character codes $80-$8F */
-/*  1  */
-/* 2 4 */
-/*  8  */
-#define CH_HLINE		128|0|2|4|0
-#define CH_VLINE		128|1|0|0|8
-#define CH_ULCORNER		128|1|2|0|0
-#define CH_URCORNER		128|1|0|4|0
-#define CH_LLCORNER		128|0|2|0|8
-#define CH_LRCORNER		128|0|0|4|8
-#define CH_TTEE			128|1|2|4|0
-#define CH_RTEE			128|1|0|4|8
-#define CH_BTEE			128|0|2|4|8
-#define CH_LTEE			128|1|2|0|8
-#define CH_CROSS		128|1|2|4|8
-
-/* 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_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
+
+
+#define CH_ULCORNER             '+'
+#define CH_URCORNER             '+'
+#define CH_LLCORNER             '+'
+#define CH_LRCORNER             '+'
+#define CH_TTEE                 '+'
+#define CH_RTEE                 '+'
+#define CH_BTEE                 '+'
+#define CH_LTEE                 '+'
+#define CH_CROSS                '+'
+
+#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 JOY_UP_MASK             0x01
+#define JOY_DOWN_MASK           0x02
+#define JOY_LEFT_MASK           0x04
+#define JOY_RIGHT_MASK          0x08
+#define JOY_BTN_1_MASK          0x10
+
+
 
 /* End of geos.h */
 #endif