Skip to content

Commit

Permalink
Remove default color definitions.
Browse files Browse the repository at this point in the history
  Use Colorset[0] for the default instead of the default color
  definitions (since it is now defined) in the few places remaining.
  • Loading branch information
somiaj committed Nov 10, 2022
1 parent 7884849 commit 6916a70
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
4 changes: 2 additions & 2 deletions fvwm/events.c
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions fvwm/module_interface.c
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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
{
Expand Down
4 changes: 0 additions & 4 deletions libs/defaults.h
Expand Up @@ -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"

Expand Down

0 comments on commit 6916a70

Please sign in to comment.