diff --git a/fvwm/events.c b/fvwm/events.c index e84d4b6f7..20379bf1c 100644 --- a/fvwm/events.c +++ b/fvwm/events.c @@ -2561,8 +2561,8 @@ void HandleFocusIn(const evh_args_t *ea) } /* Not very useful if no window that fvwm and its modules know * about has the focus. */ - fc = GetColor(DEFAULT_FORE_COLOR); - bc = GetColor(DEFAULT_BACK_COLOR); + fc = Colorset[0].fg; + bc = Colorset[0].bg; } else if (fw != Scr.Hilite || /* domivogt (16-May-2000): This check is necessary to force diff --git a/fvwm/module_interface.c b/fvwm/module_interface.c index 536bd6bf3..abc82d1b3 100644 --- a/fvwm/module_interface.c +++ b/fvwm/module_interface.c @@ -920,8 +920,7 @@ void CMD_Send_WindowList(F_CMD_ARGS) { SendPacket( mod, M_FOCUS_CHANGE, 5, 0, 0, (unsigned long)True, - (long)GetColor(DEFAULT_FORE_COLOR), - (long)GetColor(DEFAULT_BACK_COLOR)); + (long)Colorset[0].fg, (long)Colorset[0].bg); } if (Scr.DefaultIcon != NULL) { @@ -996,9 +995,8 @@ void CMD_Send_WindowList(F_CMD_ARGS) { BroadcastPacket( M_FOCUS_CHANGE, 5, (long)0, (long)0, - (unsigned long)True, - (long)GetColor(DEFAULT_FORE_COLOR), - (long)GetColor(DEFAULT_BACK_COLOR)); + (unsigned long)True, (long)Colorset[0].fg, + (long)Colorset[0].bg); } else { diff --git a/libs/defaults.h b/libs/defaults.h index 0b0e60260..d9c871f4a 100644 --- a/libs/defaults.h +++ b/libs/defaults.h @@ -100,10 +100,6 @@ #define DEFAULT_MENU_GRADIENT_PIXMAP_THICKNESS 4 /*** colours ***/ -#define DEFAULT_FORE_COLOR "black" -#define DEFAULT_BACK_COLOR "gray" -#define DEFAULT_HILIGHT_COLOR "white" -#define DEFAULT_SHADOW_COLOR "black" #define DEFAULT_CURSOR_FORE_COLOR "black" #define DEFAULT_CURSOR_BACK_COLOR "white"