Merge branch 'master' into next

[i3/i3] / src / config.c

diff --git a/src/config.c b/src/config.c
index bbfae9d70bbc0c8184b445039e0f14e3779c22c6..ec084bb19d8282844edba1cdd8cbdb9fc803a7cb 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -11,9 +11,7 @@
  *
  */
 #include "all.h"
-
-/* We need Xlib for XStringToKeysym */
-#include <X11/Xlib.h>
+#include <xkbcommon/xkbcommon.h>
 
 char *current_configpath = NULL;
 Config config;
@@ -105,8 +103,7 @@ static char *get_config_path(const char *override_configpath) {
     free(buf);
 
     die("Unable to find the configuration file (looked at "
-            "~/.i3/config, $XDG_CONFIG_HOME/i3/config, "
-            SYSCONFDIR "/i3/config and $XDG_CONFIG_DIRS/i3/config)");
+        "~/.i3/config, $XDG_CONFIG_HOME/i3/config, " SYSCONFDIR "/i3/config and $XDG_CONFIG_DIRS/i3/config)");
 }
 
 /*
@@ -196,7 +193,7 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
             FREE(barconfig);
         }
 
-        /* Clear workspace names */
+/* Clear workspace names */
 #if 0
         Workspace *ws;
         TAILQ_FOREACH(ws, workspaces, workspaces)
@@ -206,7 +203,7 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
         /* Invalidate pixmap caches in case font or colors changed */
         Con *con;
         TAILQ_FOREACH(con, &all_cons, all_cons)
-            FREE(con->deco_render_params);
+        FREE(con->deco_render_params);
 
         /* Get rid of the current font */
         free_font();
@@ -223,19 +220,19 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
     bindings = default_mode->bindings;
 
 #define REQUIRED_OPTION(name) \
-    if (config.name == NULL) \
+    if (config.name == NULL)  \
         die("You did not specify required configuration option " #name "\n");
 
     /* Clear the old config or initialize the data structure */
     memset(&config, 0, sizeof(config));
 
-    /* Initialize default colors */
+/* Initialize default colors */
 #define INIT_COLOR(x, cborder, cbackground, ctext, cindicator) \
-    do { \
-        x.border = get_colorpixel(cborder); \
-        x.background = get_colorpixel(cbackground); \
-        x.text = get_colorpixel(ctext); \
-        x.indicator = get_colorpixel(cindicator); \
+    do {                                                       \
+        x.border = get_colorpixel(cborder);                    \
+        x.background = get_colorpixel(cbackground);            \
+        x.text = get_colorpixel(ctext);                        \
+        x.indicator = get_colorpixel(cindicator);              \
     } while (0)
 
     config.client.background = get_colorpixel("#000000");
@@ -255,6 +252,7 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
     config.default_border = BS_NORMAL;
     config.default_floating_border = BS_NORMAL;
     config.default_border_width = logical_px(2);
+    config.default_floating_border_width = logical_px(2);
     /* Set default_orientation to NO_ORIENTATION for auto orientation. */
     config.default_orientation = NO_ORIENTATION;