]> git.sur5r.net Git - i3/i3/blobdiff - src/handlers.c
Implement assignments of workspaces to screens, big cleanup of workspace code
[i3/i3] / src / handlers.c
index 1aaf4f5a80c53f215c1c9d900dd3dd9e05c3ca75..280750ba88e3f99fcd294c999fea204b3540bd6a 100644 (file)
@@ -35,6 +35,7 @@
 #include "client.h"
 #include "manage.h"
 #include "floating.h"
+#include "workspace.h"
 
 /* After mapping/unmapping windows, a notify event is generated. However, we don’t want it,
    since it’d trigger an infinite loop of switching between the different windows when
@@ -119,9 +120,24 @@ int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_
 
         /* Find the binding */
         Binding *bind;
-        TAILQ_FOREACH(bind, &bindings, bindings)
-                if (bind->keycode == event->detail && bind->mods == state_filtered)
-                        break;
+        TAILQ_FOREACH(bind, &bindings, bindings) {
+                /* First compare the modifiers */
+                if (bind->mods != state_filtered)
+                        continue;
+
+                /* If a symbol was specified by the user, we need to look in
+                 * the array of translated keycodes for the event’s keycode */
+                if (bind->symbol != NULL) {
+                        if (memmem(bind->translated_to,
+                                   bind->number_keycodes * sizeof(xcb_keycode_t),
+                                   &(event->detail), sizeof(xcb_keycode_t)) != NULL)
+                                break;
+                } else {
+                        /* This case is easier: The user specified a keycode */
+                        if (bind->keycode == event->detail)
+                                break;
+                }
+        }
 
         /* No match? Then it was an actively grabbed key, that is with Mode_switch, and
            the user did not press Mode_switch, so just pass it… */
@@ -140,6 +156,29 @@ int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_
         return 1;
 }
 
+/*
+ * Called with coordinates of an enter_notify event or motion_notify event
+ * to check if the user crossed virtual screen boundaries and adjust the
+ * current workspace, if so.
+ *
+ */
+static void check_crossing_screen_boundary(uint32_t x, uint32_t y) {
+        i3Screen *screen;
+
+        if ((screen = get_screen_containing(x, y)) == NULL) {
+                LOG("ERROR: No such screen\n");
+                return;
+        }
+        if (screen == c_ws->screen)
+                return;
+
+        c_ws->current_row = current_row;
+        c_ws->current_col = current_col;
+        c_ws = &workspaces[screen->current_workspace];
+        current_row = c_ws->current_row;
+        current_col = c_ws->current_col;
+        LOG("We're now on virtual screen number %d\n", screen->num);
+}
 
 /*
  * When the user moves the mouse pointer onto a window, this callback gets called.
@@ -176,17 +215,7 @@ int handle_enter_notify(void *ignored, xcb_connection_t *conn, xcb_enter_notify_
         /* If not, then the user moved his cursor to the root window. In that case, we adjust c_ws */
         if (client == NULL) {
                 LOG("Getting screen at %d x %d\n", event->root_x, event->root_y);
-                i3Screen *screen = get_screen_containing(event->root_x, event->root_y);
-                if (screen == NULL) {
-                        LOG("ERROR: No such screen\n");
-                        return 0;
-                }
-                c_ws->current_row = current_row;
-                c_ws->current_col = current_col;
-                c_ws = &workspaces[screen->current_workspace];
-                current_row = c_ws->current_row;
-                current_col = c_ws->current_col;
-                LOG("We're now on virtual screen number %d\n", screen->num);
+                check_crossing_screen_boundary(event->root_x, event->root_y);
                 return 1;
         }
 
@@ -212,6 +241,44 @@ int handle_enter_notify(void *ignored, xcb_connection_t *conn, xcb_enter_notify_
         return 1;
 }
 
+/*
+ * When the user moves the mouse but does not change the active window
+ * (e.g. when having no windows opened but moving mouse on the root screen
+ * and crossing virtual screen boundaries), this callback gets called.
+ *
+ */
+int handle_motion_notify(void *ignored, xcb_connection_t *conn, xcb_motion_notify_event_t *event) {
+        LOG("pointer motion notify, getting screen at %d x %d\n", event->root_x, event->root_y);
+
+        check_crossing_screen_boundary(event->root_x, event->root_y);
+
+        return 1;
+}
+
+/*
+ * Called when the keyboard mapping changes (for example by using Xmodmap),
+ * we need to update our key bindings then (re-translate symbols).
+ *
+ */
+int handle_mapping_notify(void *ignored, xcb_connection_t *conn, xcb_mapping_notify_event_t *event) {
+        LOG("\n\nmapping notify\n\n");
+
+        if (event->request != XCB_MAPPING_KEYBOARD &&
+            event->request != XCB_MAPPING_MODIFIER)
+                return 0;
+
+        xcb_refresh_keyboard_mapping(keysyms, event);
+
+        xcb_get_numlock_mask(conn);
+
+        ungrab_all_keys(conn);
+        LOG("Re-grabbing...\n");
+        grab_all_keys(conn);
+        LOG("Done\n");
+
+        return 0;
+}
+
 /*
  * Checks if the button press was on a stack window, handles focus setting and returns true
  * if so, or false otherwise.
@@ -271,21 +338,27 @@ static bool button_press_bar(xcb_connection_t *conn, xcb_button_press_event_t *e
                         int add = (event->detail == XCB_BUTTON_INDEX_4 ? -1 : 1);
                         for (int i = c_ws->num + add; (i >= 0) && (i < 10); i += add)
                                 if (workspaces[i].screen == screen) {
-                                        show_workspace(conn, i+1);
+                                        workspace_show(conn, i+1);
                                         return true;
                                 }
                         return true;
                 }
-                i3Font *font = load_font(conn, config.font);
-                int workspace = event->event_x / (font->height + 6),
-                    c = 0;
+                int drawn = 0;
                 /* Because workspaces can be on different screens, we need to loop
                    through all of them and decide to count it based on its ->screen */
-                for (int i = 0; i < 10; i++)
-                        if ((workspaces[i].screen == screen) && (c++ == workspace)) {
-                                show_workspace(conn, i+1);
+                for (int i = 0; i < 10; i++) {
+                        if (workspaces[i].screen != screen)
+                                continue;
+                        LOG("Checking if click was on workspace %d with drawn = %d, tw = %d\n",
+                                        i, drawn, workspaces[i].text_width);
+                        if (event->event_x > (drawn + 1) &&
+                            event->event_x <= (drawn + 1 + workspaces[i].text_width + 5 + 5)) {
+                                workspace_show(conn, i+1);
                                 return true;
                         }
+
+                        drawn += workspaces[i].text_width + 5 + 5 + 2;
+                }
                 return true;
         }
 
@@ -302,14 +375,16 @@ int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_
                 client = table_get(&by_parent, event->event);
                 border_click = true;
         }
-        /* See if this was a click with Mod1. If so, we need to move around
-         * the client if it was floating. if not, we just process as usual. */
-        if ((event->state & XCB_MOD_MASK_1) != 0) {
+        /* See if this was a click with the configured modifier. If so, we need
+         * to move around the client if it was floating. if not, we just process
+         * as usual. */
+        if (config.floating_modifier != 0 &&
+            (event->state & config.floating_modifier) != 0) {
                 if (client == NULL) {
-                        LOG("Not handling, Mod1 was pressed and no client found\n");
+                        LOG("Not handling, floating_modifier was pressed and no client found\n");
                         return 1;
                 }
-                if (client->floating) {
+                if (client_is_floating(client)) {
                         floating_drag_window(conn, client, event);
                         return 1;
                 }
@@ -346,11 +421,23 @@ int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_
 
         LOG("event->event_x = %d, client->rect.width = %d\n", event->event_x, client->rect.width);
 
+        /* Some clients (xfontsel for example) seem to pass clicks on their
+         * window to the parent window, thus we receive an event here which in
+         * reality is a border_click. Check for the position and fix state. */
+        if (border_click &&
+            event->event_x >= client->child_rect.x &&
+            event->event_x <= (client->child_rect.x + client->child_rect.width) &&
+            event->event_y >= client->child_rect.y &&
+            event->event_y <= (client->child_rect.y + client->child_rect.height)) {
+                LOG("Fixing border_click = false because of click in child\n");
+                border_click = false;
+        }
+
         if (!border_click) {
                 LOG("client. done.\n");
                 xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time);
                 /* Floating clients should be raised on click */
-                if (client->floating >= FLOATING_AUTO_ON)
+                if (client_is_floating(client))
                         xcb_raise_window(conn, client->frame);
                 xcb_flush(conn);
                 return 1;
@@ -362,10 +449,9 @@ int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_
                 LOG("click on titlebar\n");
 
                 /* Floating clients can be dragged by grabbing their titlebar */
-                if (client->floating >= FLOATING_AUTO_ON) {
+                if (client_is_floating(client)) {
                         /* Firstly, we raise it. Maybe the user just wanted to raise it without grabbing */
-                        uint32_t values[] = { XCB_STACK_MODE_ABOVE };
-                        xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_STACK_MODE, values);
+                        xcb_raise_window(conn, client->frame);
                         xcb_flush(conn);
 
                         floating_drag_window(conn, client, event);
@@ -373,7 +459,7 @@ int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_
                 return 1;
         }
 
-        if (client->floating >= FLOATING_AUTO_ON)
+        if (client_is_floating(client))
                 return floating_border_click(conn, client, event);
 
         if (event->event_y < 2) {
@@ -420,22 +506,13 @@ int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_
  */
 int handle_map_request(void *prophs, xcb_connection_t *conn, xcb_map_request_event_t *event) {
         xcb_get_window_attributes_cookie_t cookie;
-        xcb_get_window_attributes_reply_t *reply;
 
         cookie = xcb_get_window_attributes_unchecked(conn, event->window);
 
-        if ((reply = xcb_get_window_attributes_reply(conn, cookie, NULL)) == NULL) {
-                LOG("Could not get window attributes\n");
-                return -1;
-        }
-
-        window_attributes_t wa = { TAG_VALUE };
-        LOG("override_redirect = %d\n", reply->override_redirect);
-        wa.u.override_redirect = reply->override_redirect;
         LOG("window = 0x%08x, serial is %d.\n", event->window, event->sequence);
         add_ignore_event(event->sequence);
 
-        manage_window(prophs, conn, event->window, wa);
+        manage_window(prophs, conn, event->window, cookie, false);
         return 1;
 }
 
@@ -453,8 +530,61 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure
         Client *client = table_get(&by_child, event->window);
         if (client == NULL) {
                 LOG("This client is not mapped, so we don't care and just tell the client that he will get its size\n");
-                Rect rect = {event->x, event->y, event->width, event->height};
-                fake_configure_notify(conn, rect, event->window);
+                uint32_t mask = 0;
+                uint32_t values[7];
+                int c = 0;
+#define COPY_MASK_MEMBER(mask_member, event_member) do { \
+                if (event->value_mask & mask_member) { \
+                        mask |= mask_member; \
+                        values[c++] = event->event_member; \
+                } \
+} while (0)
+
+                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_X, x);
+                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_Y, y);
+                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_WIDTH, width);
+                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_HEIGHT, height);
+                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_BORDER_WIDTH, border_width);
+                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_SIBLING, sibling);
+                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_STACK_MODE, stack_mode);
+
+                xcb_configure_window(conn, event->window, mask, values);
+                xcb_flush(conn);
+
+                return 1;
+        }
+
+        if (client->fullscreen) {
+                LOG("Client is in fullscreen mode\n");
+
+                Rect child_rect = client->workspace->rect;
+                child_rect.x = child_rect.y = 0;
+                fake_configure_notify(conn, child_rect, client->child);
+
+                return 1;
+        }
+
+        /* Floating clients can be reconfigured */
+        if (client_is_floating(client)) {
+                i3Font *font = load_font(conn, config.font);
+
+                if (event->value_mask & XCB_CONFIG_WINDOW_X)
+                        client->rect.x = event->x;
+                if (event->value_mask & XCB_CONFIG_WINDOW_Y)
+                        client->rect.y = event->y;
+                if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH)
+                        client->rect.width = event->width + 2 + 2;
+                if (event->value_mask & XCB_CONFIG_WINDOW_HEIGHT)
+                        client->rect.height = event->height + (font->height + 2 + 2) + 2;
+
+                LOG("Accepted new position/size for floating client: (%d, %d) size %d x %d\n",
+                    client->rect.x, client->rect.y, client->rect.width, client->rect.height);
+
+                /* Push the new position/size to X11 */
+                reposition_client(conn, client);
+                resize_client(conn, client);
+                xcb_flush(conn);
+
                 return 1;
         }
 
@@ -536,17 +666,14 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
 
         client = table_remove(&by_child, event->window);
 
-        if (client->name != NULL)
-                free(client->name);
+        /* If this was the fullscreen client, we need to unset it */
+        if (client->fullscreen)
+                client->workspace->fullscreen_client = NULL;
 
         /* Clients without a container are either floating or dock windows */
         if (client->container != NULL) {
                 Container *con = client->container;
 
-                /* If this was the fullscreen client, we need to unset it */
-                if (client->fullscreen)
-                        con->workspace->fullscreen_client = NULL;
-
                 /* Remove the client from the list of clients */
                 client_remove_from_container(conn, client, con, true);
 
@@ -556,7 +683,9 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
                 /* Only if this is the active container, we need to really change focus */
                 if ((con->currently_focused != NULL) && ((con == CUR_CELL) || client->fullscreen))
                         set_focus(conn, con->currently_focused, true);
-        } else if (client->floating >= FLOATING_AUTO_ON) {
+        } else if (client_is_floating(client)) {
+                LOG("Removing from floating clients\n");
+                TAILQ_REMOVE(&(client->workspace->floating_clients), client, floating_clients);
                 SLIST_REMOVE(&(client->workspace->focus_stack), client, Client, focus_clients);
         }
 
@@ -572,8 +701,9 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
         table_remove(&by_parent, client->frame);
 
         if (client->container != NULL) {
-                cleanup_table(conn, client->container->workspace);
-                fix_colrowspan(conn, client->container->workspace);
+                Workspace *workspace = client->container->workspace;
+                cleanup_table(conn, workspace);
+                fix_colrowspan(conn, workspace);
         }
 
         /* Let’s see how many clients there are left on the workspace to delete it if it’s empty */
@@ -596,6 +726,8 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
                 client->workspace->screen = NULL;
         }
 
+        FREE(client->window_class);
+        FREE(client->name);
         free(client);
 
         render_layout(conn);
@@ -999,3 +1131,31 @@ int handle_transient_for(void *data, xcb_connection_t *conn, uint8_t state, xcb_
 
         return 1;
 }
+
+/*
+ * Handles changes of the WM_CLIENT_LEADER atom which specifies if this is a
+ * toolwindow (or similar) and to which window it belongs (logical parent).
+ *
+ */
+int handle_clientleader_change(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
+                        xcb_atom_t name, xcb_get_property_reply_t *prop) {
+        LOG("client leader changed\n");
+        if (prop == NULL) {
+                prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn,
+                                        false, window, WM_CLIENT_LEADER, WINDOW, 0, 32), NULL);
+        }
+
+        Client *client = table_get(&by_child, window);
+        if (client == NULL)
+                return 1;
+
+        xcb_window_t *leader = xcb_get_property_value(prop);
+        if (leader == NULL)
+                return 1;
+
+        LOG("changed to %08x\n", *leader);
+
+        client->leader = *leader;
+
+        return 1;
+}