From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 31 May 2009 15:18:49 +0000 (+0200)
Subject: Don’t check twice for client.focused, change all places were colorcodes are used
X-Git-Tag: 3.b~81
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=517c47ca95495eb332e628d9e6017189396e854d;p=i3%2Fi3

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 ec3be4ed..8e8a80bd 100644
--- 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 0d828d20..cf15d1e4 100644
--- 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};