Merge branch 'tree' into next

[i3/i3] / i3-input / xcb.c

diff --git a/i3-input/xcb.c b/i3-input/xcb.c
index 71189a9751fb3e4c0db82aa9cb8760eec59b473c..3c1d99e1c21f758b4811c3f9b7fcea040fdc3eaf 100644 (file)
--- a/i3-input/xcb.c
+++ b/i3-input/xcb.c
@@ -53,12 +53,12 @@ uint32_t get_colorpixel(xcb_connection_t *conn, char *hex) {
  * keycode).
  *
  */
-uint32_t get_mode_switch_mask(xcb_connection_t *conn) {
+uint32_t get_mod_mask(xcb_connection_t *conn, uint32_t keycode) {
        xcb_key_symbols_t *symbols = xcb_key_symbols_alloc(conn);
 
        xcb_get_modifier_mapping_reply_t *modmap_r;
        xcb_keycode_t *modmap, kc;
-       xcb_keycode_t *modeswitchcodes = xcb_key_symbols_get_keycode(symbols, XK_Mode_switch);
+       xcb_keycode_t *modeswitchcodes = xcb_key_symbols_get_keycode(symbols, keycode);
        if (modeswitchcodes == NULL)
                return 0;
 
@@ -66,7 +66,7 @@ uint32_t get_mode_switch_mask(xcb_connection_t *conn) {
        modmap = xcb_get_modifier_mapping_keycodes(modmap_r);
 
        for (int i = 0; i < 8; i++)
-               for(int j = 0; j < modmap_r->keycodes_per_modifier; j++) {
+               for (int j = 0; j < modmap_r->keycodes_per_modifier; j++) {
                        kc = modmap[i * modmap_r->keycodes_per_modifier + j];
                        for (xcb_keycode_t *ktest = modeswitchcodes; *ktest; ktest++) {
                                if (*ktest != kc)
@@ -86,7 +86,6 @@ uint32_t get_mode_switch_mask(xcb_connection_t *conn) {
  *
  */
 xcb_window_t open_input_window(xcb_connection_t *conn, uint32_t width, uint32_t height) {
-        xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
         xcb_window_t win = xcb_generate_id(conn);
         //xcb_cursor_t cursor_id = xcb_generate_id(conn);