Switch to xcb-xkb and libxkbcommon

[i3/i3] / src / config.c

diff --git a/src/config.c b/src/config.c
index a8e66314fbba2eff3e4c912dedb3a254a07df70e..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;
@@ -30,76 +28,14 @@ void ungrab_all_keys(xcb_connection_t *conn) {
     xcb_ungrab_key(conn, XCB_GRAB_ANY, root, XCB_BUTTON_MASK_ANY);
 }
 
-/*
- * Switches the key bindings to the given mode, if the mode exists
- *
- */
-void switch_mode(const char *new_mode) {
-    struct Mode *mode;
-
-    LOG("Switching to mode %s\n", new_mode);
-
-    SLIST_FOREACH(mode, &modes, modes) {
-        if (strcasecmp(mode->name, new_mode) != 0)
-            continue;
-
-        ungrab_all_keys(conn);
-        bindings = mode->bindings;
-        translate_keysyms();
-        grab_all_keys(conn, false);
-
-        char *event_msg;
-        sasprintf(&event_msg, "{\"change\":\"%s\"}", mode->name);
-
-        ipc_send_event("mode", I3_IPC_EVENT_MODE, event_msg);
-        FREE(event_msg);
-
-        return;
-    }
-
-    ELOG("ERROR: Mode not found\n");
-}
-
 /*
  * Sends the current bar configuration as an event to all barconfig_update listeners.
- * This update mechnism currently only includes the hidden_state and the mode in the config.
  *
  */
 void update_barconfig() {
     Barconfig *current;
     TAILQ_FOREACH(current, &barconfigs, configs) {
-        /* Build json message */
-        char *hidden_state;
-        switch (current->hidden_state) {
-            case S_SHOW:
-                hidden_state ="show";
-                break;
-            case S_HIDE:
-            default:
-                hidden_state = "hide";
-                break;
-        }
-
-        char *mode;
-        switch (current->mode) {
-            case M_HIDE:
-                mode ="hide";
-                break;
-            case M_INVISIBLE:
-                mode ="invisible";
-                break;
-            case M_DOCK:
-            default:
-                mode = "dock";
-                break;
-        }
-
-        /* Send an event to all barconfig listeners*/
-        char *event_msg;
-        sasprintf(&event_msg, "{ \"id\":\"%s\", \"hidden_state\":\"%s\", \"mode\":\"%s\" }", current->id, hidden_state, mode);
-
-        ipc_send_event("barconfig_update", I3_IPC_EVENT_BARCONFIG_UPDATE, event_msg);
-        FREE(event_msg);
+        ipc_send_barconfig_update_event(current);
     }
 }
 
@@ -167,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)");
 }
 
 /*
@@ -258,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)
@@ -268,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();
@@ -285,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");
@@ -316,7 +251,8 @@ 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 = 2;
+    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;