diff --git a/src/ChangeLog b/src/ChangeLog index 8bba5bea9..f5648fff7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2001-06-13 Pavel Roskin + * color.c (color_table): Make static. Only use in text edition. + * xtty.h: Remove unused definitions. + * slint.c (slang_init): Check screen dimensions and exit if they are abnormal. This may happen due to a S-Lang bug when the TERM is set to a value not listed in termcap or terminfo. diff --git a/src/color.c b/src/color.c index 4357e1f62..b480f1a61 100644 --- a/src/color.c +++ b/src/color.c @@ -120,7 +120,8 @@ struct color_table_s { }; -struct color_table_s color_table [] = { +#ifndef HAVE_X +static struct color_table_s color_table [] = { { "black", COLOR_BLACK }, { "gray", COLOR_BLACK | A_BOLD }, { "red", COLOR_RED }, @@ -139,6 +140,7 @@ struct color_table_s color_table [] = { { "white", COLOR_WHITE | A_BOLD }, { "default", 0 } /* hack for transparent background */ }; +#endif /* !HAVE_X */ #ifdef HAVE_GNOME void get_color (char *cpp, CTYPE *colp); diff --git a/src/xtty.h b/src/xtty.h index 001057510..eacfe8faa 100644 --- a/src/xtty.h +++ b/src/xtty.h @@ -2,16 +2,3 @@ #define LINES 0 #define COLS 0 -#define ERR -1 - -enum { - COLOR_BLACK, COLOR_RED, COLOR_GREEN, COLOR_YELLOW, - COLOR_BLUE, COLOR_MAGENTA, COLOR_CYAN, COLOR_WHITE -}; - -#define A_NORMAL 0 -#define A_BOLD 0x40 -#define A_UNDERLINE 0x40 -#define A_REVERSE 0x20 -#define A_BOLD_REVERSE 0x21 -