nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Handle (and free) the last_motion_notify

This commit is contained in:
Michael Stapelberg 2011-07-31 21:21:45 +02:00
parent 7180dca3b2
commit bc98185f85
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/floating.c
View File

@ -430,8 +430,9 @@ void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t
xcb_flush(conn); xcb_flush(conn);
xcb_generic_event_t *inside_event, *last_motion_notify = NULL; xcb_generic_event_t *inside_event, *last_motion_notify = NULL;
bool loop_done = false;
/* I’ve always wanted to have my own eventhandler… */ /* I’ve always wanted to have my own eventhandler… */
while ((inside_event = xcb_wait_for_event(conn))) { while (!loop_done && (inside_event = xcb_wait_for_event(conn))) {
/* We now handle all events we can get using xcb_poll_for_event */ /* We now handle all events we can get using xcb_poll_for_event */
do { do {
/* skip x11 errors */ /* skip x11 errors */
@ -444,7 +445,8 @@ void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t
switch (type) { switch (type) {
case XCB_BUTTON_RELEASE: case XCB_BUTTON_RELEASE:
goto done; loop_done = true;
break;
case XCB_MOTION_NOTIFY: case XCB_MOTION_NOTIFY:
/* motion_notify events are saved for later */ /* motion_notify events are saved for later */
@ -457,7 +459,8 @@ void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t
case XCB_KEY_RELEASE: case XCB_KEY_RELEASE:
DLOG("Unmap-notify, aborting\n"); DLOG("Unmap-notify, aborting\n");
handle_event(type, inside_event); handle_event(type, inside_event);
goto done; loop_done = true;
break;
default: default:
DLOG("Passing to original handler\n"); DLOG("Passing to original handler\n");
@ -478,7 +481,7 @@ void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t
callback(con, &old_rect, new_x, new_y, extra); callback(con, &old_rect, new_x, new_y, extra);
FREE(last_motion_notify); FREE(last_motion_notify);
} }
done:
xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
xcb_flush(conn); xcb_flush(conn);
} }