From 83c37cfd0f43f42afe7e1e193157efe03dd2ea32 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Mon, 3 Sep 2001 04:32:16 +0000 Subject: [PATCH] * color.c: Remove unused code. * color.h: Likewise. --- src/ChangeLog | 5 ++++ src/color.c | 72 ++++++++++++--------------------------------------- src/color.h | 16 ++++-------- 3 files changed, 27 insertions(+), 66 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5eb6db12b..4698eb1f5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-09-03 Pavel Roskin + + * color.c: Remove unused code. + * color.h: Likewise. + 2001-09-02 Pavel Roskin * key.c: Remove support for BUGGY_CURSES. diff --git a/src/color.c b/src/color.c index 780c5080d..e60f46640 100644 --- a/src/color.c +++ b/src/color.c @@ -16,13 +16,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include -#include "tty.h" #include #include #include "global.h" +#include "tty.h" #include "setup.h" /* For the externs */ #include "color.h" -#include "x.h" /* "$Id$" */ @@ -39,19 +38,12 @@ int dialog_colors [4]; #define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) ) - - -#ifdef HAVE_GNOME -# define CTYPE GdkColor * -void init_pair (int, CTYPE, CTYPE); +#ifdef HAVE_SLANG +# define CTYPE char * #else -# ifdef HAVE_SLANG -# define CTYPE char * -# else -# define CTYPE int -# define color_map_fg(n) (color_map[n].fg % COLORS) -# define color_map_bg(n) (color_map[n].bg % COLORS) -# endif +# define CTYPE int +# define color_map_fg(n) (color_map[n].fg % COLORS) +# define color_map_bg(n) (color_map[n].bg % COLORS) #endif struct colorpair { @@ -120,7 +112,6 @@ struct color_table_s { }; -#ifndef HAVE_X static struct color_table_s const color_table [] = { { "black", COLOR_BLACK }, { "gray", COLOR_BLACK | A_BOLD }, @@ -140,18 +131,14 @@ static struct color_table_s const 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); +#ifdef HAVE_SLANG +# define color_value(i) color_table [i].name +# define color_name(i) color_table [i].name #else -# ifdef HAVE_SLANG -# define color_value(i) color_table [i].name -# define color_name(i) color_table [i].name -# else -# define color_value(i) color_table [i].value -# define color_name(i) color_table [i].name -# endif +# define color_value(i) color_table [i].value +# define color_name(i) color_table [i].name +#endif static void get_color (char *cpp, CTYPE *colp) { @@ -164,7 +151,6 @@ static void get_color (char *cpp, CTYPE *colp) } } } -#endif /* HAVE_GNOME */ static void get_two_colors (char **cpp, struct colorpair *colorpairp) { @@ -193,7 +179,7 @@ static void get_two_colors (char **cpp, struct colorpair *colorpairp) get_color (*cpp, state ? &colorpairp->bg : &colorpairp->fg); } -void configure_colors_string (char *the_color_string) +static void configure_colors_string (char *the_color_string) { char *color_string, *p; int i, found; @@ -256,20 +242,6 @@ load_dialog_colors (void) dialog_colors [3] = COLOR_HOT_FOCUS; } -#ifdef HAVE_X -void -init_colors (void) -{ - int i; - - use_colors = 1; - configure_colors (); - for (i = 0; i < ELEMENTS (color_map); i++) - if (color_map [i].name) - init_pair (i+1, color_map_fg(i), color_map_bg(i)); - load_dialog_colors (); -} -#else void init_colors (void) { int i; @@ -281,9 +253,7 @@ void init_colors (void) } if (use_colors){ -#ifndef HAVE_X start_color (); -#endif configure_colors (); #ifndef HAVE_SLANG @@ -293,7 +263,7 @@ void init_colors (void) "Too many defined colors, resize MAX_PAIRS on color.c"); exit (1); } -#endif +#endif /* !HAVE_SLANG */ if (use_colors) { #ifdef HAVE_SLANG @@ -305,10 +275,10 @@ void init_colors (void) * document this feature. */ SLtt_set_color (DEFAULT_COLOR_INDEX, NULL, "default", "default"); -#elif defined(USE_NCURSES) +#else /* Always white on black */ init_pair(DEFAULT_COLOR_INDEX, COLOR_WHITE, COLOR_BLACK); -#endif +#endif /* !HAVE_SLANG */ } for (i = 0; i < ELEMENTS (color_map); i++){ @@ -324,16 +294,8 @@ void init_colors (void) * later, to set the attribute with the colors. */ attr_pairs [i+1] = color_map [i].fg & A_BOLD; -#endif +#endif /* !HAVE_SLANG */ } } load_dialog_colors (); } -#endif - -void toggle_color_mode (void) -{ - if (hascolors) - use_colors = !use_colors; -} - diff --git a/src/color.h b/src/color.h index c4997bd06..f4775f314 100644 --- a/src/color.h +++ b/src/color.h @@ -2,26 +2,20 @@ #define __COLOR_H void init_colors (void); -void toggle_color_mode (void); -void configure_colors_string (char *color_string); extern int hascolors; extern int use_colors; extern int disable_colors; extern int attr_pairs []; -#ifdef HAVE_GNOME -# define MY_COLOR_PAIR(x) x -# define PORT_COLOR(co,bw) co +#ifdef HAVE_SLANG +# define MY_COLOR_PAIR(x) COLOR_PAIR(x) #else -# ifdef HAVE_SLANG -# define MY_COLOR_PAIR(x) COLOR_PAIR(x) -# else -# define MY_COLOR_PAIR(x) (COLOR_PAIR(x) | attr_pairs [x]) -# endif -#define PORT_COLOR(co,bw) (use_colors?co:bw) +# define MY_COLOR_PAIR(x) (COLOR_PAIR(x) | attr_pairs [x]) #endif +#define PORT_COLOR(co,bw) (use_colors?co:bw) + /* Beware! When using Slang with color, not all the indexes are free. See myslang.h (A_*) */ #define NORMAL_COLOR (PORT_COLOR (MY_COLOR_PAIR (1), 0))