Merge "force_focus_wrapping" option into "focus_wrapping force"

[i3/i3] / src / config.c

diff --git a/src/config.c b/src/config.c
index a11114632ccc921a09c539153fe8fd8c198dfff2..24c7b541e447e4f80ab2b676c4d3f0b140bdff6c 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -1,5 +1,3 @@
-#undef I3__FILE__
-#define I3__FILE__ "config.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -11,9 +9,11 @@
  *
  */
 #include "all.h"
+
 #include <xkbcommon/xkbcommon.h>
 
 char *current_configpath = NULL;
+char *current_config = NULL;
 Config config;
 struct modes_head modes;
 struct barconfig_head barconfigs = TAILQ_HEAD_INITIALIZER(barconfigs);
@@ -71,6 +71,11 @@ bool parse_configuration(const char *override_configpath, bool use_nagbar) {
  */
 void load_configuration(xcb_connection_t *conn, const char *override_configpath, bool reload) {
     if (reload) {
+        /* If we are currently in a binding mode, we first revert to the
+         * default since we have no guarantee that the current mode will even
+         * still exist after parsing the config again. See #2228. */
+        switch_mode("default");
+
         /* First ungrab the keys */
         ungrab_all_keys(conn);
 
@@ -155,13 +160,6 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
             FREE(barconfig);
         }
 
-/* Clear workspace names */
-#if 0
-        Workspace *ws;
-        TAILQ_FOREACH(ws, workspaces, workspaces)
-            workspace_set_name(ws, NULL);
-#endif
-
         /* Invalidate pixmap caches in case font or colors changed */
         Con *con;
         TAILQ_FOREACH(con, &all_cons, all_cons)
@@ -193,13 +191,13 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
     memset(&config, 0, sizeof(config));
 
 /* Initialize default colors */
-#define INIT_COLOR(x, cborder, cbackground, ctext, cindicator)     \
-    do {                                                           \
-        x.border = draw_util_hex_to_color(cborder);                \
-        x.background = draw_util_hex_to_color(cbackground);        \
-        x.text = draw_util_hex_to_color(ctext);                    \
-        x.indicator = draw_util_hex_to_color(cindicator);          \
-        x.decoration_border = draw_util_hex_to_color(cbackground); \
+#define INIT_COLOR(x, cborder, cbackground, ctext, cindicator) \
+    do {                                                       \
+        x.border = draw_util_hex_to_color(cborder);            \
+        x.background = draw_util_hex_to_color(cbackground);    \
+        x.text = draw_util_hex_to_color(ctext);                \
+        x.indicator = draw_util_hex_to_color(cindicator);      \
+        x.child_border = draw_util_hex_to_color(cbackground);  \
     } while (0)
 
     config.client.background = draw_util_hex_to_color("#000000");
@@ -229,6 +227,8 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
     if (config.workspace_urgency_timer == 0)
         config.workspace_urgency_timer = 0.5;
 
+    config.focus_wrapping = FOCUS_WRAPPING_ON;
+
     parse_configuration(override_configpath, true);
 
     if (reload) {
@@ -249,21 +249,4 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
         x_deco_recurse(croot);
         xcb_flush(conn);
     }
-
-#if 0
-    /* Set an empty name for every workspace which got no name */
-    Workspace *ws;
-    TAILQ_FOREACH(ws, workspaces, workspaces) {
-            if (ws->name != NULL) {
-                    /* If the font was not specified when the workspace name
-                     * was loaded, we need to predict the text width now */
-                    if (ws->text_width == 0)
-                            ws->text_width = predict_text_width(global_conn,
-                                            config.font, ws->name, ws->name_len);
-                    continue;
-            }
-
-            workspace_set_name(ws, NULL);
-    }
-#endif
 }