]> git.lizzy.rs Git - bspwm.git/blobdiff - events.c
Don't trust WM_PROTOCOLS
[bspwm.git] / events.c
index 7847a93fd9b4fd820bb09fce138c741048acfcfd..307861c6a717a862fa9c8a57d5d09280f58d2542 100644 (file)
--- a/events.c
+++ b/events.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <xcb/xcb.h>
+#include <xcb/randr.h>
 #include <xcb/xcb_event.h>
 #include <xcb/xcb_icccm.h>
 #include "types.h"
 #include "window.h"
 #include "events.h"
 #include "tree.h"
+#include "query.h"
 #include "rules.h"
 #include "ewmh.h"
 
 void handle_event(xcb_generic_event_t *evt)
 {
-    switch (XCB_EVENT_RESPONSE_TYPE(evt)) {
+    uint8_t resp_type = XCB_EVENT_RESPONSE_TYPE(evt);
+    switch (resp_type) {
         case XCB_MAP_REQUEST:
             map_request(evt);
             break;
@@ -41,7 +44,12 @@ void handle_event(xcb_generic_event_t *evt)
         case XCB_MOTION_NOTIFY:
             motion_notify(evt);
             break;
+        case XCB_FOCUS_IN:
+            focus_in(evt);
+            break;
         default:
+            if (randr && resp_type == randr_base + XCB_RANDR_SCREEN_CHANGE_NOTIFY)
+                import_monitors();
             break;
     }
 }
@@ -61,7 +69,7 @@ void configure_request(xcb_generic_event_t *evt)
 
     PRINTF("configure request %X\n", e->window);
 
-    window_location_t loc;
+    coordinates_t loc;
     bool is_managed = locate_window(e->window, &loc);
 
     if (!is_managed || is_floating(loc.node->client)) {
@@ -150,7 +158,7 @@ void destroy_notify(xcb_generic_event_t *evt)
 
     PRINTF("destroy notify %X\n", e->window);
 
-    window_location_t loc;
+    coordinates_t loc;
     if (locate_window(e->window, &loc)) {
         remove_node(loc.desktop, loc.node);
         arrange(loc.monitor, loc.desktop);
@@ -163,7 +171,7 @@ void unmap_notify(xcb_generic_event_t *evt)
 
     PRINTF("unmap notify %X\n", e->window);
 
-    window_location_t loc;
+    coordinates_t loc;
     if (locate_window(e->window, &loc)) {
         remove_node(loc.desktop, loc.node);
         arrange(loc.monitor, loc.desktop);
@@ -180,18 +188,10 @@ void property_notify(xcb_generic_event_t *evt)
     if (e->atom != XCB_ATOM_WM_HINTS)
         return;
 
-    window_location_t loc;
-    if (locate_window(e->window, &loc)) {
-        if (xcb_icccm_get_wm_hints_reply(dpy, xcb_icccm_get_wm_hints(dpy, e->window), &hints, NULL) == 1) {
-            uint32_t urgent = xcb_icccm_wm_hints_get_urgency(&hints);
-            if (urgent != 0 && loc.node != mon->desk->focus) {
-                loc.node->client->urgent = urgent;
-                put_status();
-                if (loc.monitor->desk == loc.desktop)
-                    arrange(loc.monitor, loc.desktop);
-            }
-        }
-    }
+    coordinates_t loc;
+    if (locate_window(e->window, &loc)
+            && xcb_icccm_get_wm_hints_reply(dpy, xcb_icccm_get_wm_hints(dpy, e->window), &hints, NULL) == 1)
+        set_urgency(loc.monitor, loc.desktop, loc.node, xcb_icccm_wm_hints_get_urgency(&hints));
 }
 
 void client_message(xcb_generic_event_t *evt)
@@ -201,15 +201,13 @@ void client_message(xcb_generic_event_t *evt)
     PRINTF("client message %X %u\n", e->window, e->type);
 
     if (e->type == ewmh->_NET_CURRENT_DESKTOP) {
-        desktop_location_t loc;
-        if (ewmh_locate_desktop(e->data.data32[0], &loc)) {
-            select_monitor(loc.monitor);
-            select_desktop(loc.desktop);
-        }
+        coordinates_t loc;
+        if (ewmh_locate_desktop(e->data.data32[0], &loc))
+            focus_node(loc.monitor, loc.desktop, loc.desktop->focus);
         return;
     }
 
-    window_location_t loc;
+    coordinates_t loc;
     if (!locate_window(e->window, &loc))
         return;
 
@@ -217,15 +215,38 @@ void client_message(xcb_generic_event_t *evt)
         handle_state(loc.monitor, loc.desktop, loc.node, e->data.data32[1], e->data.data32[0]);
         handle_state(loc.monitor, loc.desktop, loc.node, e->data.data32[2], e->data.data32[0]);
     } else if (e->type == ewmh->_NET_ACTIVE_WINDOW) {
-        if (loc.desktop->focus->client->fullscreen && loc.desktop->focus != loc.node)
-            toggle_fullscreen(loc.monitor, loc.desktop->focus->client);
-        select_monitor(loc.monitor);
-        select_desktop(loc.desktop);
-        focus_node(loc.monitor, loc.desktop, loc.node, true);
-        arrange(loc.monitor, loc.desktop);
+        if (loc.node == mon->desk->focus)
+            return;
+        if (loc.desktop->focus->client->fullscreen && loc.desktop->focus != loc.node) {
+            set_fullscreen(loc.desktop, loc.desktop->focus, false);
+            arrange(loc.monitor, loc.desktop);
+        }
+        focus_node(loc.monitor, loc.desktop, loc.node);
+    } else if (e->type == ewmh->_NET_WM_DESKTOP) {
+        coordinates_t dloc;
+        if (ewmh_locate_desktop(e->data.data32[0], &dloc))
+            transfer_node(loc.monitor, loc.desktop, dloc.monitor, dloc.desktop, loc.node);
     }
 }
 
+void focus_in(xcb_generic_event_t *evt)
+{
+    xcb_focus_in_event_t *e = (xcb_focus_in_event_t *) evt;
+
+    /* PRINTF("focus in %X %d %d\n", e->event, e->mode, e->detail); */
+
+    if (e->mode == XCB_NOTIFY_MODE_GRAB
+            || e->mode == XCB_NOTIFY_MODE_UNGRAB)
+        return;
+    if ((e->detail == XCB_NOTIFY_DETAIL_ANCESTOR ||
+                e->detail == XCB_NOTIFY_DETAIL_INFERIOR ||
+                e->detail == XCB_NOTIFY_DETAIL_NONLINEAR_VIRTUAL ||
+                e->detail == XCB_NOTIFY_DETAIL_NONLINEAR) &&
+            (mon->desk->focus == NULL
+             || mon->desk->focus->client->window != e->event))
+        update_input_focus();
+}
+
 void enter_notify(xcb_generic_event_t *evt)
 {
     xcb_enter_notify_event_t *e = (xcb_enter_notify_event_t *) evt;
@@ -234,32 +255,61 @@ void enter_notify(xcb_generic_event_t *evt)
     PRINTF("enter notify %X %d %d\n", win, e->mode, e->detail);
 
     if (e->mode != XCB_NOTIFY_MODE_NORMAL
-            || (last_pointer_position.x = e->root_x && last_pointer_position.y == e->root_y))
+            || (mon->desk->focus != NULL && mon->desk->focus->client->window == win))
         return;
 
-    window_focus(win);
+    enable_motion_recorder();
 }
 
 void motion_notify(xcb_generic_event_t *evt)
 {
+    PUTS("motion notify");
+
     xcb_motion_notify_event_t *e = (xcb_motion_notify_event_t *) evt;
-    xcb_window_t win = e->event;
 
-    PRINTF("motion notify %X\n", win);
+    int dtime = e->time - last_motion_time;
+    if (dtime > 1000) {
+        last_motion_time = e->time;
+        last_motion_x = e->event_x;
+        last_motion_y = e->event_y;
+        return;
+    }
+
+    int mdist = abs(e->event_x - last_motion_x) + abs(e->event_y - last_motion_y);
+    if (mdist < 10)
+        return;
 
-    window_focus(win);
+    disable_motion_recorder();
+
+    xcb_window_t win = XCB_NONE;
+    query_pointer(&win, NULL);
+    if (win != XCB_NONE) {
+        bool backup = pointer_follows_monitor;
+        auto_raise = false;
+        pointer_follows_monitor = false;
+        window_focus(win);
+        pointer_follows_monitor = backup;
+        auto_raise = true;
+    }
 }
 
 void handle_state(monitor_t *m, desktop_t *d, node_t *n, xcb_atom_t state, unsigned int action)
 {
     if (state == ewmh->_NET_WM_STATE_FULLSCREEN) {
-        bool fs = n->client->fullscreen;
-        if (action == XCB_EWMH_WM_STATE_TOGGLE
-                || (fs && action == XCB_EWMH_WM_STATE_REMOVE)
-                || (!fs && action == XCB_EWMH_WM_STATE_ADD)) {
-            toggle_fullscreen(m, n->client);
-            arrange(m, d);
-        }
+        if (action == XCB_EWMH_WM_STATE_ADD)
+            set_fullscreen(d, n, true);
+        else if (action == XCB_EWMH_WM_STATE_REMOVE)
+            set_fullscreen(d, n, false);
+        else if (action == XCB_EWMH_WM_STATE_TOGGLE)
+            set_fullscreen(d, n, !n->client->fullscreen);
+        arrange(m, d);
+    } else if (state == ewmh->_NET_WM_STATE_DEMANDS_ATTENTION) {
+        if (action == XCB_EWMH_WM_STATE_ADD)
+            set_urgency(m, d, n, true);
+        else if (action == XCB_EWMH_WM_STATE_REMOVE)
+            set_urgency(m, d, n, false);
+        else if (action == XCB_EWMH_WM_STATE_TOGGLE)
+            set_urgency(m, d, n, !n->client->urgent);
     }
 }
 
@@ -267,59 +317,57 @@ void grab_pointer(pointer_action_t pac)
 {
     PRINTF("grab pointer %u\n", pac);
 
-    xcb_window_t win;
+    xcb_window_t win = XCB_NONE;
     xcb_point_t pos;
 
-    xcb_query_pointer_reply_t *qpr = xcb_query_pointer_reply(dpy, xcb_query_pointer(dpy, root), NULL);
-    if (qpr != NULL) {
-        pos = (xcb_point_t) {qpr->root_x, qpr->root_y};
-        win = qpr->child;
-        free(qpr);
-    } else {
-        return;
-    }
+    query_pointer(&win, &pos);
 
-    window_location_t loc;
-    bool found_win = locate_window(win, &loc);
-    if (found_win || pac == ACTION_RESIZE_TILED) {
-        fence_distance_t fd;
+    coordinates_t loc;
+    if (locate_window(win, &loc)) {
         client_t *c = NULL;
         frozen_pointer->position = pos;
         frozen_pointer->action = pac;
-        if (found_win) {
-            c = loc.node->client;
-            frozen_pointer->monitor = loc.monitor;
-            frozen_pointer->desktop = loc.desktop;
-            frozen_pointer->node = loc.node;
-            frozen_pointer->client = c;
-            frozen_pointer->window = c->window;
-        }
+        c = loc.node->client;
+        frozen_pointer->monitor = loc.monitor;
+        frozen_pointer->desktop = loc.desktop;
+        frozen_pointer->node = loc.node;
+        frozen_pointer->client = c;
+        frozen_pointer->window = c->window;
+        frozen_pointer->horizontal_fence = NULL;
+        frozen_pointer->vertical_fence = NULL;
+
         switch (pac)  {
             case ACTION_FOCUS:
-                focus_node(loc.monitor, loc.desktop, loc.node, true);
+                if (loc.node != mon->desk->focus) {
+                    bool backup = pointer_follows_monitor;
+                    pointer_follows_monitor = false;
+                    focus_node(loc.monitor, loc.desktop, loc.node);
+                    pointer_follows_monitor = backup;
+                } else if (focus_follows_pointer && is_floating(loc.node->client)) {
+                    stack(loc.desktop, loc.node);
+                }
                 break;
             case ACTION_MOVE:
             case ACTION_RESIZE_SIDE:
             case ACTION_RESIZE_CORNER:
                 if (is_tiled(c)) {
-                    loc.node->client->floating_rectangle = c->tiled_rectangle;
-                    toggle_floating(loc.node);
-                    arrange(loc.monitor, loc.desktop);
-                } else if (c->fullscreen) {
+                    frozen_pointer->rectangle = c->tiled_rectangle;
+                    frozen_pointer->is_tiled = true;
+                } else if (is_floating(c)) {
+                    frozen_pointer->rectangle = c->floating_rectangle;
+                    frozen_pointer->is_tiled = false;
+                } else {
                     frozen_pointer->action = ACTION_NONE;
                     return;
                 }
-                frozen_pointer->rectangle = c->floating_rectangle;
-
                 if (pac == ACTION_RESIZE_SIDE) {
-                    float W = c->floating_rectangle.width;
-                    float H = c->floating_rectangle.height;
+                    float W = frozen_pointer->rectangle.width;
+                    float H = frozen_pointer->rectangle.height;
                     float ratio = W / H;
-                    float x = pos.x - c->floating_rectangle.x;
-                    float y = pos.y - c->floating_rectangle.y;
+                    float x = pos.x - frozen_pointer->rectangle.x;
+                    float y = pos.y - frozen_pointer->rectangle.y;
                     float diag_a = ratio * y;
-                    float diag_b = c->floating_rectangle.width - diag_a;
-
+                    float diag_b = W - diag_a;
                     if (x < diag_a) {
                         if (x < diag_b)
                             frozen_pointer->side = SIDE_LEFT;
@@ -332,9 +380,8 @@ void grab_pointer(pointer_action_t pac)
                             frozen_pointer->side = SIDE_RIGHT;
                     }
                 } else if (pac == ACTION_RESIZE_CORNER) {
-                    int16_t mid_x, mid_y;
-                    mid_x = c->floating_rectangle.x + (c->floating_rectangle.width / 2);
-                    mid_y = c->floating_rectangle.y + (c->floating_rectangle.height / 2);
+                    int16_t mid_x = frozen_pointer->rectangle.x + (frozen_pointer->rectangle.width / 2);
+                    int16_t mid_y = frozen_pointer->rectangle.y + (frozen_pointer->rectangle.height / 2);
                     if (pos.x > mid_x) {
                         if (pos.y > mid_y)
                             frozen_pointer->corner = CORNER_BOTTOM_RIGHT;
@@ -347,25 +394,57 @@ void grab_pointer(pointer_action_t pac)
                             frozen_pointer->corner = CORNER_TOP_LEFT;
                     }
                 }
-                break;
-            case ACTION_RESIZE_TILED:
-                fd = nearest_fence(pos, mon->desk->root);
-                if (fd.fence != NULL && fd.distance < fence_grip) {
-                    frozen_pointer->node = fd.fence;
-                    frozen_pointer->action = pac;
-                    frozen_pointer->rectangle = fd.fence->rectangle;
-                } else {
-                    frozen_pointer->action = ACTION_NONE;
+                if (frozen_pointer->is_tiled) {
+                    if (pac == ACTION_RESIZE_SIDE) {
+                        switch (frozen_pointer->side) {
+                            case SIDE_TOP:
+                                frozen_pointer->horizontal_fence = find_fence(loc.node, DIR_UP);
+                                break;
+                            case SIDE_RIGHT:
+                                frozen_pointer->vertical_fence = find_fence(loc.node, DIR_RIGHT);
+                                break;
+                            case SIDE_BOTTOM:
+                                frozen_pointer->horizontal_fence = find_fence(loc.node, DIR_DOWN);
+                                break;
+                            case SIDE_LEFT:
+                                frozen_pointer->vertical_fence = find_fence(loc.node, DIR_LEFT);
+                                break;
+                        }
+                    } else if (pac == ACTION_RESIZE_CORNER) {
+                        switch (frozen_pointer->corner) {
+                            case CORNER_TOP_LEFT:
+                                frozen_pointer->horizontal_fence = find_fence(loc.node, DIR_UP);
+                                frozen_pointer->vertical_fence = find_fence(loc.node, DIR_LEFT);
+                                break;
+                            case CORNER_TOP_RIGHT:
+                                frozen_pointer->horizontal_fence = find_fence(loc.node, DIR_UP);
+                                frozen_pointer->vertical_fence = find_fence(loc.node, DIR_RIGHT);
+                                break;
+                            case CORNER_BOTTOM_RIGHT:
+                                frozen_pointer->horizontal_fence = find_fence(loc.node, DIR_DOWN);
+                                frozen_pointer->vertical_fence = find_fence(loc.node, DIR_RIGHT);
+                                break;
+                            case CORNER_BOTTOM_LEFT:
+                                frozen_pointer->horizontal_fence = find_fence(loc.node, DIR_DOWN);
+                                frozen_pointer->vertical_fence = find_fence(loc.node, DIR_LEFT);
+                                break;
+                        }
+                    }
+                    if (frozen_pointer->horizontal_fence != NULL)
+                        frozen_pointer->horizontal_ratio = frozen_pointer->horizontal_fence->split_ratio;
+                    if (frozen_pointer->vertical_fence != NULL)
+                        frozen_pointer->vertical_ratio = frozen_pointer->vertical_fence->split_ratio;
                 }
                 break;
-            case ACTION_MOVE_TILED:
-                if (!is_tiled(c))
-                    frozen_pointer->action = ACTION_NONE;
-                break;
             case ACTION_NONE:
                 break;
         }
     } else {
+        if (pac == ACTION_FOCUS) {
+            monitor_t *m = monitor_from_point(pos);
+            if (m != NULL)
+                focus_node(m, m->desk, m->desk->focus);
+        }
         frozen_pointer->action = ACTION_NONE;
     }
 }
@@ -375,116 +454,147 @@ void track_pointer(int root_x, int root_y)
     if (frozen_pointer->action == ACTION_NONE)
         return;
 
-    int16_t delta_x, delta_y, x, y, w, h;
+    int16_t delta_x, delta_y, x = 0, y = 0, w = 1, h = 1;
     uint16_t width, height;
 
+    pointer_action_t pac = frozen_pointer->action;
     monitor_t *m = frozen_pointer->monitor;
     desktop_t *d = frozen_pointer->desktop;
     node_t *n = frozen_pointer->node;
     client_t *c = frozen_pointer->client;
     xcb_window_t win = frozen_pointer->window;
     xcb_rectangle_t rect = frozen_pointer->rectangle;
-
-    x = y = 0;
-    w = h = 1;
+    node_t *vertical_fence = frozen_pointer->vertical_fence;
+    node_t *horizontal_fence = frozen_pointer->horizontal_fence;
 
     delta_x = root_x - frozen_pointer->position.x;
     delta_y = root_y - frozen_pointer->position.y;
-    double sr;
-    xcb_query_pointer_reply_t *qpr;
-    xcb_window_t pwin;
-    window_location_t loc;
 
-    switch (frozen_pointer->action) {
+    switch (pac) {
         case ACTION_MOVE:
-            x = rect.x + delta_x;
-            y = rect.y + delta_y;
-            window_move(win, x, y);
-            break;
-        case ACTION_RESIZE_SIDE:
-            switch (frozen_pointer->side) {
-                case SIDE_TOP:
-                    x = rect.x;
-                    y = rect.y + delta_y;
-                    w = rect.width;
-                    h = rect.height - delta_y;
-                    break;
-                case SIDE_RIGHT:
-                    x = rect.x;
-                    y = rect.y;
-                    w = rect.width + delta_x;
-                    h = rect.height;
-                    break;
-                case SIDE_BOTTOM:
-                    x = rect.x;
-                    y = rect.y;
-                    w = rect.width;
-                    h = rect.height + delta_y;
-                    break;
-                case SIDE_LEFT:
-                    x = rect.x + delta_x;
-                    y = rect.y;
-                    w = rect.width - delta_x;
-                    h = rect.height;
-                    break;
+            if (frozen_pointer->is_tiled) {
+                xcb_window_t pwin = XCB_NONE;
+                query_pointer(&pwin, NULL);
+                if (pwin == win)
+                    return;
+                coordinates_t loc;
+                bool is_managed = (pwin == XCB_NONE ? false : locate_window(pwin, &loc));
+                if (is_managed && is_tiled(loc.node->client) && loc.monitor == m) {
+                    swap_nodes(n, loc.node);
+                    arrange(m, d);
+                } else {
+                    if (is_managed && loc.monitor == m) {
+                        return;
+                    } else if (!is_managed) {
+                        xcb_point_t pt = (xcb_point_t) {root_x, root_y};
+                        monitor_t *pmon = monitor_from_point(pt);
+                        if (pmon == NULL || pmon == m) {
+                            return;
+                        } else {
+                            loc.monitor = pmon;
+                            loc.desktop = pmon->desk;
+                        }
+                    }
+                    transfer_node(m, d, loc.monitor, loc.desktop, n);
+                    frozen_pointer->monitor = loc.monitor;
+                    frozen_pointer->desktop = loc.desktop;
+                }
+            } else {
+                x = rect.x + delta_x;
+                y = rect.y + delta_y;
+                window_move(win, x, y);
+                c->floating_rectangle.x = x;
+                c->floating_rectangle.y = y;
+                xcb_point_t pt = (xcb_point_t) {root_x, root_y};
+                monitor_t *pmon = monitor_from_point(pt);
+                if (pmon == NULL || pmon == m)
+                    return;
+                transfer_node(m, d, pmon, pmon->desk, n);
+                frozen_pointer->monitor = pmon;
+                frozen_pointer->desktop = pmon->desk;
             }
-            width = MAX(1, w);
-            height = MAX(1, h);
-            window_move_resize(win, x, y, width, height);
-            c->floating_rectangle = (xcb_rectangle_t) {x, y, width, height};
-            window_draw_border(n, d->focus == n, mon == m);
             break;
+        case ACTION_RESIZE_SIDE:
         case ACTION_RESIZE_CORNER:
-            switch (frozen_pointer->corner) {
-                case CORNER_TOP_LEFT:
-                    x = rect.x + delta_x;
-                    y = rect.y + delta_y;
-                    w = rect.width - delta_x;
-                    h = rect.height - delta_y;
-                    break;
-                case CORNER_TOP_RIGHT:
-                    x = rect.x;
-                    y = rect.y + delta_y;
-                    w = rect.width + delta_x;
-                    h = rect.height - delta_y;
-                    break;
-                case CORNER_BOTTOM_LEFT:
-                    x = rect.x + delta_x;
-                    y = rect.y;
-                    w = rect.width - delta_x;
-                    h = rect.height + delta_y;
-                    break;
-                case CORNER_BOTTOM_RIGHT:
-                    x = rect.x;
-                    y = rect.y;
-                    w = rect.width + delta_x;
-                    h = rect.height + delta_y;
-                    break;
-            }
-            width = MAX(1, w);
-            height = MAX(1, h);
-            window_move_resize(win, x, y, width, height);
-            c->floating_rectangle = (xcb_rectangle_t) {x, y, width, height};
-            window_draw_border(n, d->focus == n, mon == m);
-            break;
-        case ACTION_RESIZE_TILED:
-            if (n->split_type == TYPE_VERTICAL)
-                sr = (double) (root_x - rect.x + window_gap / 2) / rect.width;
-            else
-                sr = (double) (root_y - rect.y + window_gap / 2) / rect.height;
-            sr = MAX(0, sr);
-            sr = MIN(1, sr);
-            n->split_ratio = sr;
-            arrange(mon, mon->desk);
-            break;
-        case ACTION_MOVE_TILED:
-            qpr = xcb_query_pointer_reply(dpy, xcb_query_pointer(dpy, root), NULL);
-            if (qpr != NULL) {
-                pwin = qpr->child;
-                free(qpr);
-                if (locate_window(pwin, &loc) && loc.monitor == m && loc.desktop == d && is_tiled(loc.node->client)) {
-                    swap_nodes(n, loc.node);
-                    arrange(m, d);
+            if (frozen_pointer->is_tiled) {
+                if (vertical_fence != NULL) {
+                    double sr = frozen_pointer->vertical_ratio + (double) delta_x / vertical_fence->rectangle.width;
+                    sr = MAX(0, sr);
+                    sr = MIN(1, sr);
+                    vertical_fence->split_ratio = sr;
+                }
+                if (horizontal_fence != NULL) {
+                    double sr = frozen_pointer->horizontal_ratio + (double) delta_y / horizontal_fence->rectangle.height;
+                    sr = MAX(0, sr);
+                    sr = MIN(1, sr);
+                    horizontal_fence->split_ratio = sr;
+                }
+                arrange(mon, mon->desk);
+            } else {
+                if (pac == ACTION_RESIZE_SIDE) {
+                    switch (frozen_pointer->side) {
+                        case SIDE_TOP:
+                            x = rect.x;
+                            y = rect.y + delta_y;
+                            w = rect.width;
+                            h = rect.height - delta_y;
+                            break;
+                        case SIDE_RIGHT:
+                            x = rect.x;
+                            y = rect.y;
+                            w = rect.width + delta_x;
+                            h = rect.height;
+                            break;
+                        case SIDE_BOTTOM:
+                            x = rect.x;
+                            y = rect.y;
+                            w = rect.width;
+                            h = rect.height + delta_y;
+                            break;
+                        case SIDE_LEFT:
+                            x = rect.x + delta_x;
+                            y = rect.y;
+                            w = rect.width - delta_x;
+                            h = rect.height;
+                            break;
+                    }
+                    width = MAX(1, w);
+                    height = MAX(1, h);
+                    window_move_resize(win, x, y, width, height);
+                    c->floating_rectangle = (xcb_rectangle_t) {x, y, width, height};
+                    window_draw_border(n, d->focus == n, mon == m);
+                } else if (pac == ACTION_RESIZE_CORNER) {
+                    switch (frozen_pointer->corner) {
+                        case CORNER_TOP_LEFT:
+                            x = rect.x + delta_x;
+                            y = rect.y + delta_y;
+                            w = rect.width - delta_x;
+                            h = rect.height - delta_y;
+                            break;
+                        case CORNER_TOP_RIGHT:
+                            x = rect.x;
+                            y = rect.y + delta_y;
+                            w = rect.width + delta_x;
+                            h = rect.height - delta_y;
+                            break;
+                        case CORNER_BOTTOM_LEFT:
+                            x = rect.x + delta_x;
+                            y = rect.y;
+                            w = rect.width - delta_x;
+                            h = rect.height + delta_y;
+                            break;
+                        case CORNER_BOTTOM_RIGHT:
+                            x = rect.x;
+                            y = rect.y;
+                            w = rect.width + delta_x;
+                            h = rect.height + delta_y;
+                            break;
+                    }
+                    width = MAX(1, w);
+                    height = MAX(1, h);
+                    window_move_resize(win, x, y, width, height);
+                    c->floating_rectangle = (xcb_rectangle_t) {x, y, width, height};
+                    window_draw_border(n, d->focus == n, mon == m);
                 }
             }
             break;
@@ -493,19 +603,3 @@ void track_pointer(int root_x, int root_y)
             break;
     }
 }
-
-void ungrab_pointer(void)
-{
-    PUTS("ungrab pointer");
-
-    if (frozen_pointer->action == ACTION_NONE)
-        return;
-
-    if (is_floating(frozen_pointer->client))
-        update_floating_rectangle(frozen_pointer->client);
-    monitor_t *m = underlying_monitor(frozen_pointer->client);
-    if (m != NULL && m != frozen_pointer->monitor) {
-        transfer_node(frozen_pointer->monitor, frozen_pointer->desktop, m, m->desk, frozen_pointer->node);
-        select_monitor(m);
-    }
-}