From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 21 Jun 2009 11:44:44 +0000 (+0200)
Subject: Use a nested event loop which polls and saves motion notify events for later
X-Git-Tag: 3.b~32
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a5489d6546f7ab24fcc33399c62c3388a4c336ea;p=i3%2Fi3

Use a nested event loop which polls and saves motion notify events for later

This should speed up resizing/dragging quite a bit, thus fixing ticket #51
---

diff --git a/src/floating.c b/src/floating.c
index f4b22823..09b33ba1 100644
--- a/src/floating.c
+++ b/src/floating.c
@@ -254,42 +254,53 @@ static void drag_pointer(xcb_connection_t *conn, Client *client, xcb_button_pres
         /* Go into our own event loop */
         xcb_flush(conn);
 
-        xcb_generic_event_t *inside_event;
+        xcb_generic_event_t *inside_event, *last_motion_notify = NULL;
         /* 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;
+                /* We now handle all events we can get using xcb_poll_for_event */
+                do {
+                        /* 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);
+
+                        switch (nr) {
+                                case XCB_BUTTON_RELEASE:
+                                        goto done;
+
+                                case XCB_MOTION_NOTIFY:
+                                        /* motion_notify events are saved for later */
+                                        FREE(last_motion_notify);
+                                        last_motion_notify = inside_event;
+
+                                        break;
+                                default:
+                                        LOG("Passing to original handler\n");
+                                        /* Use original handler */
+                                        xcb_event_handle(&evenths, inside_event);
+                                        break;
+                        }
+                        if (last_motion_notify != inside_event)
+                                free(inside_event);
+                } while ((inside_event = xcb_poll_for_event(conn)) != NULL);
 
-                switch (nr) {
-                        case XCB_MOTION_NOTIFY:
-                                new_x = ((xcb_motion_notify_event_t*)inside_event)->root_x;
-                                new_y = ((xcb_motion_notify_event_t*)inside_event)->root_y;
+                if (last_motion_notify == NULL)
+                        continue;
 
-                                callback(&old_rect, new_x, new_y);
+                new_x = ((xcb_motion_notify_event_t*)last_motion_notify)->root_x;
+                new_y = ((xcb_motion_notify_event_t*)last_motion_notify)->root_y;
 
-                                break;
-                        default:
-                                LOG("Passing to original handler\n");
-                                /* Use original handler */
-                                xcb_event_handle(&evenths, inside_event);
-                                break;
-                }
-                free(inside_event);
+                callback(&old_rect, new_x, new_y);
+                FREE(last_motion_notify);
         }
-
+done:
         xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
         xcb_flush(conn);
 }