summaryrefslogtreecommitdiff
path: root/xwayland
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2015-03-21 21:24:43 -0700
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2015-03-27 08:57:00 +0200
commitd19e9b0e424125230107b4c8082a90971678dcbf (patch)
treee2eee7a5ea6d05245bc3b71bb5e53c6d1acfd993 /xwayland
parent4e53c53fe705781e848cfbfa24f0aff7eba0a5ff (diff)
downloadweston-d19e9b0e424125230107b4c8082a90971678dcbf.tar.gz
weston-d19e9b0e424125230107b4c8082a90971678dcbf.tar.bz2
weston-d19e9b0e424125230107b4c8082a90971678dcbf.zip
xwayland: Correct input for undecorated clients
We were correctly handling decorated and fullscreen clients, but left uninitialized values in the input region for undecorated clients. Fix this behavi-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'xwayland')
-rw-r--r--xwayland/window-manager.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index ad608b71..59cf39ae 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -1039,14 +1039,14 @@ weston_wm_window_draw_decoration(void *data)
pixman_region32_fini(&window->surface->pending.input);
- if (window->fullscreen) {
- input_x = 0;
- input_y = 0;
- input_w = window->width;
- input_h = window->height;
- } else if (window->decorate) {
+ if (window->decorate && !window->fullscreen) {
frame_input_rect(window->frame, &input_x, &input_y,
&input_w, &input_h);
+ } else {
+ input_x = x;
+ input_y = y;
+ input_w = width;
+ input_h = height;
}
pixman_region32_init_rect(&window->surface->pending.input,