[PATCH weston] xwayland: Correct input for undecorated clients

Jasper St. Pierre jstpierre at mecheye.net
Sat Mar 21 21:24:43 PDT 2015


We were correctly handling decorated and fullscreen clients, but left
uninitialized values in the input region for undecorated clients. Fix
this behavior.
---
 xwayland/window-manager.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index ad608b7..59cf39a 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,
-- 
2.1.0



More information about the wayland-devel mailing list