summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2013-08-22 16:18:17 -0700
committerKristian Høgsberg <krh@bitplanet.net>2013-08-26 15:33:18 -0700
commit898e168bfd6c01b3613ac71c2f299c503c695f03 (patch)
tree02d9dc4ac5ee70695ccb9732fac23affef35947a
parent721f1f070bf9151df8aeb7ca86b6f2e664b01738 (diff)
downloadweston-898e168bfd6c01b3613ac71c2f299c503c695f03.tar.gz
weston-898e168bfd6c01b3613ac71c2f299c503c695f03.tar.bz2
weston-898e168bfd6c01b3613ac71c2f299c503c695f03.zip
xwm: Fix configure notify handler
We only get configure notify for toplevel (frame or override-redirect window) and those are the cases where we want to update window->x/y. The way the code worked, we'd exit immeidately in those cases and window->x/y would not be updated.
-rw-r--r--src/xwayland/window-manager.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c
index d63b042c..b4a1b7ac 100644
--- a/src/xwayland/window-manager.c
+++ b/src/xwayland/window-manager.c
@@ -574,17 +574,10 @@ weston_wm_handle_configure_notify(struct weston_wm *wm, xcb_generic_event_t *eve
configure_notify->x, configure_notify->y,
configure_notify->width, configure_notify->height);
- if (our_resource(wm, configure_notify->window))
- return;
-
window = hash_table_lookup(wm->window_hash, configure_notify->window);
- /* resize falls here */
- if (configure_notify->window != window->id)
- return;
-
weston_wm_window_get_child_position(window, &x, &y);
- window->x = configure_notify->x - x;
- window->y = configure_notify->y - y;
+ window->x = configure_notify->x;
+ window->y = configure_notify->y;
}
static void