diff options
Diffstat (limited to 'src/LYCurses.h')
| -rw-r--r-- | src/LYCurses.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/LYCurses.h b/src/LYCurses.h index abe30e7e..b84ba4ba 100644 --- a/src/LYCurses.h +++ b/src/LYCurses.h @@ -32,7 +32,9 @@ */ #undef USE_COLOR_TABLE -#ifndef USE_COLOR_STYLE +#ifdef USE_COLOR_STYLE +#define USE_COLOR_TABLE 1 /* default color logic is used */ +#else #if defined(USE_SLANG) || defined(COLOR_CURSES) #define USE_COLOR_TABLE 1 #endif @@ -410,11 +412,6 @@ extern "C" { #define LYtableCols 0 #endif -#if defined(USE_COLOR_TABLE) || defined(USE_SLANG) - extern int Current_Attr; - extern int Masked_Attr; -#endif - extern BOOLEAN setup(char *terminal); extern int LYscreenHeight(void); extern int LYscreenWidth(void); @@ -465,7 +462,7 @@ extern "C" { extern void LYaddAttr(int a); extern void LYsubAttr(int a); extern void lynx_setup_colors(void); - extern unsigned int Lynx_Color_Flags; + extern unsigned Lynx_Color_Flags; #endif #ifdef USE_SLANG @@ -594,14 +591,11 @@ extern "C" { * our own functions to add or subtract the * A_foo attributes. - FM */ -#ifdef USE_COLOR_TABLE +#if defined(USE_COLOR_TABLE) && !defined(USE_COLOR_STYLE) extern void LYaddWAttr(WINDOW * win, int a); extern void LYsubWAttr(WINDOW * win, int a); extern void LYaddWAttr(WINDOW * win, int a); extern void LYsubWAttr(WINDOW * win, int a); - extern void lynx_set_color(int a); - extern void lynx_standout(int a); - extern int lynx_chg_color(int, int, int); #undef standout #define standout() lynx_standout(TRUE) @@ -614,6 +608,14 @@ extern "C" { #define LYsubWAttr(win,attr) wattroff(win,attr) #endif +#if defined(USE_COLOR_TABLE) + extern void lynx_set_color(int a); + extern void lynx_standout(int a); + extern char *LYgetTableString(int code); + extern int LYgetTableAttr(void); + extern int lynx_chg_color(int, int, int); +#endif + #define start_bold() LYaddAttr(LYUnderlineLinks ? A_UNDERLINE : A_BOLD) #define stop_bold() LYsubAttr(LYUnderlineLinks ? A_UNDERLINE : A_BOLD) #define start_underline() LYaddAttr(LYUnderlineLinks ? A_BOLD : A_UNDERLINE) |