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 c2824ca2cdeec4fd72830a44c8deb980bdc057be..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);
@@ -227,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) {