commit 1f67117f6fb171375505853f528a758891d5f475
author Kristian Høgsberg <krh@bitplanet.net> Tue Apr 29 14:30:44 2014 -0700
committer Kristian Høgsberg <krh@bitplanet.net> Tue Apr 29 14:30:44 2014 -0700
tree 447bcf75534f794e3e8bfcd64b0a1b17c094df26
parent c31f624141ab03baf243441467806753b9c2bb74

window.c: Also grab touch events when grabbing input

clients/window.c

diff --git a/clients/window.c b/clients/window.c
index adcec0d..466ce86 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -2979,9 +2979,12 @@
 		return;
 	}
 
-	widget = window_find_widget(input->touch_focus,
-				    wl_fixed_to_double(x_w),
-				    wl_fixed_to_double(y_w));
+	if (input->grab)
+		widget = input->grab;
+	else
+		widget = window_find_widget(input->touch_focus,
+					    wl_fixed_to_double(x_w),
+					    wl_fixed_to_double(y_w));
 	if (widget) {
 		struct touch_point *tp = xmalloc(sizeof *tp);
 		if (tp) {