]> git.sur5r.net Git - i3/i3/blobdiff - src/handlers.c
Bugfix: Store width_factor/height_factor per workspace, not per container
[i3/i3] / src / handlers.c
index 0102cb12ac6704747d3f082afafb7716561e881e..0ce1724c0c8f9aa1edb82cf6b284d2af0939ff29 100644 (file)
@@ -31,6 +31,7 @@
 #include "xinerama.h"
 #include "config.h"
 #include "queue.h"
+#include "resize.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
@@ -57,7 +58,6 @@ static bool event_is_ignored(const int sequence) {
         time_t now = time(NULL);
         for (event = SLIST_FIRST(&ignore_events); event != SLIST_END(&ignore_events);) {
                 if ((now - event->added) > 5) {
-                        LOG("Entry is older than five seconds, cleaning up\n");
                         struct Ignore_Event *save = event;
                         event = SLIST_NEXT(event, ignore_events);
                         SLIST_REMOVE(&ignore_events, save, Ignore_Event, ignore_events);
@@ -298,20 +298,15 @@ int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_
                 return 1;
         }
 
-        xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
-        xcb_screen_t *root_screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data;
-
         /* Set focus in any case */
         set_focus(conn, client, true);
 
         /* Let’s see if this was on the borders (= resize). If not, we’re done */
         LOG("press button on x=%d, y=%d\n", event->event_x, event->event_y);
-
+        resize_orientation_t orientation = O_VERTICAL;
         Container *con = client->container,
                   *first = NULL,
                   *second = NULL;
-        enum { O_HORIZONTAL, O_VERTICAL } orientation = O_VERTICAL;
-        int new_position;
 
         if (con == NULL) {
                 LOG("dock. done.\n");
@@ -364,138 +359,7 @@ int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_
                 second = con->workspace->table[con->col+1][con->row];
         }
 
-        /* FIXME: horizontal resizing causes empty spaces to exist */
-        if (orientation == O_HORIZONTAL) {
-                LOG("Sorry, horizontal resizing is not yet activated due to creating layout bugs."
-                    "If you are brave, enable the code for yourself and try fixing it.\n");
-                return 1;
-        }
-
-        uint32_t mask = 0;
-        uint32_t values[2];
-
-        mask = XCB_CW_OVERRIDE_REDIRECT;
-        values[0] = 1;
-
-        /* Open a new window, the resizebar. Grab the pointer and move the window around
-           as the user moves the pointer. */
-        Rect grabrect = {0, 0, root_screen->width_in_pixels, root_screen->height_in_pixels};
-        xcb_window_t grabwin = create_window(conn, grabrect, XCB_WINDOW_CLASS_INPUT_ONLY, -1, mask, values);
-
-        Rect helprect;
-        if (orientation == O_VERTICAL) {
-                helprect.x = event->root_x;
-                helprect.y = 0;
-                helprect.width = 2;
-                helprect.height = root_screen->height_in_pixels; /* this has to be the cell’s height */
-                new_position = event->root_x;
-        } else {
-                helprect.x = 0;
-                helprect.y = event->root_y;
-                helprect.width = root_screen->width_in_pixels; /* this has to be the cell’s width */
-                helprect.height = 2;
-                new_position = event->root_y;
-        }
-
-        mask = XCB_CW_BACK_PIXEL;
-        values[0] = get_colorpixel(conn, "#4c7899");
-
-        mask |= XCB_CW_OVERRIDE_REDIRECT;
-        values[1] = 1;
-
-        xcb_window_t helpwin = create_window(conn, helprect, XCB_WINDOW_CLASS_INPUT_OUTPUT,
-                                             (orientation == O_VERTICAL ?
-                                              XCB_CURSOR_SB_V_DOUBLE_ARROW :
-                                              XCB_CURSOR_SB_H_DOUBLE_ARROW), mask, values);
-
-        xcb_circulate_window(conn, XCB_CIRCULATE_RAISE_LOWEST, helpwin);
-
-        xcb_grab_pointer(conn, false, root, XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION,
-                        XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, grabwin, XCB_NONE, XCB_CURRENT_TIME);
-
-        xcb_flush(conn);
-
-        xcb_generic_event_t *inside_event;
-        /* I’ve always wanted to have my own eventhandler… */
-        while ((inside_event = xcb_wait_for_event(conn))) {
-                /* Same as get_event_handler in xcb */
-                int nr = inside_event->response_type;
-                if (nr == 0) {
-                        /* An error occured */
-                        handle_event(NULL, conn, inside_event);
-                        free(inside_event);
-                        continue;
-                }
-                assert(nr < 256);
-                nr &= XCB_EVENT_RESPONSE_TYPE_MASK;
-                assert(nr >= 2);
-
-                /* Check if we need to escape this loop */
-                if (nr == XCB_BUTTON_RELEASE)
-                        break;
-
-                switch (nr) {
-                        case XCB_MOTION_NOTIFY:
-                                if (orientation == O_VERTICAL) {
-                                        values[0] = new_position = ((xcb_motion_notify_event_t*)inside_event)->root_x;
-                                        xcb_configure_window(conn, helpwin, XCB_CONFIG_WINDOW_X, values);
-                                } else {
-                                        values[0] = new_position = ((xcb_motion_notify_event_t*)inside_event)->root_y;
-                                        xcb_configure_window(conn, helpwin, XCB_CONFIG_WINDOW_Y, values);
-                                }
-
-                                xcb_flush(conn);
-                                break;
-                        default:
-                                LOG("Passing to original handler\n");
-                                /* Use original handler */
-                                xcb_event_handle(&evenths, inside_event);
-                                break;
-                }
-                free(inside_event);
-        }
-
-        xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
-        xcb_destroy_window(conn, helpwin);
-        xcb_destroy_window(conn, grabwin);
-        xcb_flush(conn);
-
-        Workspace *ws = con->workspace;
-        if (orientation == O_VERTICAL) {
-                LOG("Resize was from X = %d to X = %d\n", event->root_x, new_position);
-                if (event->root_x == new_position) {
-                        LOG("Nothing changed, not updating anything\n");
-                        return 1;
-                }
-
-                /* Convert 0 (for default width_factor) to actual numbers */
-                if (first->width_factor == 0)
-                        first->width_factor = ((float)ws->rect.width / ws->cols) / ws->rect.width;
-                if (second->width_factor == 0)
-                        second->width_factor = ((float)ws->rect.width / ws->cols) / ws->rect.width;
-
-                first->width_factor *= (float)(first->width + (new_position - event->root_x)) / first->width;
-                second->width_factor *= (float)(second->width - (new_position - event->root_x)) / second->width;
-        } else {
-                LOG("Resize was from Y = %d to Y = %d\n", event->root_y, new_position);
-                if (event->root_y == new_position) {
-                        LOG("Nothing changed, not updating anything\n");
-                        return 1;
-                }
-
-                /* Convert 0 (for default height_factor) to actual numbers */
-                if (first->height_factor == 0)
-                        first->height_factor = ((float)ws->rect.height / ws->rows) / ws->rect.height;
-                if (second->height_factor == 0)
-                        second->height_factor = ((float)ws->rect.height / ws->rows) / ws->rect.height;
-
-                first->height_factor *= (float)(first->height + (new_position - event->root_y)) / first->height;
-                second->height_factor *= (float)(second->height - (new_position - event->root_y)) / second->height;
-        }
-
-        render_layout(conn);
-
-        return 1;
+        return resize_graphical_handler(conn, first, second, orientation, event);
 }
 
 /*
@@ -542,6 +406,16 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure
                 return 1;
         }
 
+        if (client->fullscreen) {
+                LOG("Client is in fullscreen mode\n");
+
+                Rect child_rect = client->container->workspace->rect;
+                child_rect.x = child_rect.y = 0;
+                fake_configure_notify(conn, child_rect, client->child);
+
+                return 1;
+        }
+
         fake_absolute_configure_notify(conn, client);
 
         return 1;
@@ -558,6 +432,9 @@ int handle_configure_event(void *prophs, xcb_connection_t *conn, xcb_configure_n
         LOG("handle_configure_event for window %08x\n", event->window);
         LOG("event->type = %d, \n", event->response_type);
         LOG("event->x = %d, ->y = %d, ->width = %d, ->height = %d\n", event->x, event->y, event->width, event->height);
+
+        /* We ignore this sequence twice because events for child and frame should be ignored */
+        add_ignore_event(event->sequence);
         add_ignore_event(event->sequence);
 
         if (event->event == root) {
@@ -595,6 +472,13 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
         LOG("UnmapNotify for 0x%08x (received from 0x%08x)\n", event->window, event->event);
         if (client == NULL) {
                 LOG("not a managed window. Ignoring.\n");
+
+                /* This was most likely the destroyed frame of a client which is
+                 * currently being unmapped, so we add this sequence (again!) to
+                 * the ignore list (enter_notify events will get sent for both,
+                 * the child and its frame). */
+                add_ignore_event(event->sequence);
+
                 return 0;
         }
 
@@ -617,8 +501,8 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
                 con->currently_focused = get_last_focused_client(conn, con, NULL);
 
                 /* Only if this is the active container, we need to really change focus */
-                if ((con->currently_focused != NULL) && (con == CUR_CELL))
-                        set_focus(conn, con->currently_focused, false);
+                if ((con->currently_focused != NULL) && ((con == CUR_CELL) || client->fullscreen))
+                        set_focus(conn, con->currently_focused, true);
         }
 
         if (client->dock) {
@@ -703,8 +587,7 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
         client->name_len = new_len;
         client->uses_net_wm_name = true;
 
-        if (old_name != NULL)
-                free(old_name);
+        FREE(old_name);
 
         /* If the client is a dock window, we don’t need to render anything */
         if (client->dock)
@@ -786,6 +669,35 @@ int handle_windowname_change_legacy(void *data, xcb_connection_t *conn, uint8_t
         return 1;
 }
 
+/*
+ * Updates the client’s WM_CLASS property
+ *
+ */
+int handle_windowclass_change(void *data, xcb_connection_t *conn, uint8_t state,
+                             xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) {
+        LOG("window class changed\n");
+        if (prop == NULL || xcb_get_property_value_length(prop) == 0) {
+                LOG("prop == NULL\n");
+                return 1;
+        }
+        Client *client = table_get(&by_child, window);
+        if (client == NULL)
+                return 1;
+        char *new_class;
+        if (asprintf(&new_class, "%.*s", xcb_get_property_value_length(prop), (char*)xcb_get_property_value(prop)) == -1) {
+                perror("Could not get window class");
+                LOG("Could not get window class\n");
+                return 1;
+        }
+
+        LOG("changed to %s\n", new_class);
+        char *old_class = client->window_class;
+        client->window_class = new_class;
+        FREE(old_class);
+
+        return 1;
+}
+
 /*
  * Expose event means we should redraw our windows (= title bar)
  *