mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xwm: Bring back synthetic events and handle synthetic unmap notify as per ICCCM

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-05-30 11:46:29 -04:00
parent e244cb03f7
commit f197e9f7a3
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xwayland/window-manager.c
+9 -1
View File
@@ -540,6 +540,14 @@ weston_wm_handle_unmap_notify(struct weston_wm *wm, xcb_generic_event_t *event)
return; return;
window = hash_table_lookup(wm->window_hash, unmap_notify->window); window = hash_table_lookup(wm->window_hash, unmap_notify->window);
if (window->frame_id == XCB_WINDOW_NONE) {
/* We already withdrew this window on the real unmap
* notify and this is the synthetic unmap notify from
* the client, or the other way around (ICCCM 4.1.4).
* Either way, we're already done so just return. */
return;
}
if (window->repaint_source) if (window->repaint_source)
wl_event_source_remove(window->repaint_source); wl_event_source_remove(window->repaint_source);
if (window->cairo_surface) if (window->cairo_surface)
@@ -882,7 +890,7 @@ weston_wm_handle_event(int fd, uint32_t mask, void *data)
continue; continue;
} }
switch (event->response_type) { switch (event->response_type & ~0x80) {
case XCB_BUTTON_PRESS: case XCB_BUTTON_PRESS:
case XCB_BUTTON_RELEASE: case XCB_BUTTON_RELEASE:
weston_wm_handle_button(wm, event); weston_wm_handle_button(wm, event);