[PATCH weston 16/19] desktop-shell: Use the grabbed pointer in popup_grab_button

Derek Foreman derekf at osg.samsung.com
Wed Jun 3 13:53:35 PDT 2015


This should be identical to the pointer in shset->seat.

A later patch prevents direct access to seat->pointer, using the
known valid pointer in the grab will be nicer than using the
getter functions that patch introduces.

Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
---
 desktop-shell/shell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index a431291..6643612 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -3226,7 +3226,7 @@ popup_grab_button(struct weston_pointer_grab *grab,
 		}
 	} else if (state == WL_POINTER_BUTTON_STATE_RELEASED &&
 		   (shseat->popup_grab.initial_up ||
-		    time - shseat->seat->pointer->grab_time > 500)) {
+		    time - grab->pointer->grab_time > 500)) {
 		popup_grab_end(grab->pointer);
 	}
 
-- 
2.1.4



More information about the wayland-devel mailing list