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.
dev
Kristian Høgsberg 11 years ago
parent 69981d9621
commit 122877d5e7
  1. 11
      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->x, configure_notify->y,
configure_notify->width, configure_notify->height); configure_notify->width, configure_notify->height);
if (our_resource(wm, configure_notify->window))
return;
window = hash_table_lookup(wm->window_hash, configure_notify->window); 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); weston_wm_window_get_child_position(window, &x, &y);
window->x = configure_notify->x - x; window->x = configure_notify->x;
window->y = configure_notify->y - y; window->y = configure_notify->y;
} }
static void static void

Loading…
Cancel
Save