From 898e168bfd6c01b3613ac71c2f299c503c695f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 22 Aug 2013 16:18:17 -0700 Subject: 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. --- src/xwayland/window-manager.c | 11 ++--------- 1 file 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 -- cgit v1.2.3