Don’t check twice for client.focused, change all places were colorcodes are used

diff --git a/src/config.c b/src/config.c
index ec3be4ed9b8165876bcdf460868d1738b3186736..8e8a80bd6803826adf7dc52bba8643e8bb7fd040 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -125,7 +125,6 @@ void load_configuration(const char *override_configpath) {
                 OPTION_COLORTRIPLE("client.focused", client.focused);
                 OPTION_COLORTRIPLE("client.focused_inactive", client.focused_inactive);
                 OPTION_COLORTRIPLE("client.unfocused", client.unfocused);
-                OPTION_COLORTRIPLE("client.focused", client.focused);
                 OPTION_COLORTRIPLE("bar.focused", bar.focused);
                 OPTION_COLORTRIPLE("bar.unfocused", bar.unfocused);
 

diff --git a/src/handlers.c b/src/handlers.c
index 0d828d2004a522bbfb88119945bdcc01ad198cbe..cf15d1e420054a9b158953458ce9e7f2dfbf25b2 100644 (file)
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -793,9 +793,9 @@ int handle_expose_event(void *data, xcb_connection_t *conn, xcb_expose_event_t *
                 uint32_t background_color;
                 /* Distinguish if the window is currently focused… */
                 if (CUR_CELL->currently_focused == client)
-                        background_color = get_colorpixel(conn, "#285577");
+                        background_color = get_colorpixel(conn, config.client.focused.background);
                 /* …or if it is the focused window in a not focused container */
-                else background_color = get_colorpixel(conn, "#555555");
+                else background_color = get_colorpixel(conn, config.client.focused_inactive.background);
 
                 /* Set foreground color to current focused color, line width to 2 */
                 uint32_t values[] = {background_color, 2};