From 34b26802d710d36224db25a4bb1e9ac5ff1e9843 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 6 Sep 2011 18:12:43 -0400 Subject: [PATCH] Rename motion_grab to implicit_grab Let's just use the same terms as X. --- src/wayland-server.c | 2 +- src/wayland-server.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wayland-server.c b/src/wayland-server.c index df6b769..4ee7796 100644 --- a/src/wayland-server.c +++ b/src/wayland-server.c @@ -503,7 +503,7 @@ wl_input_device_update_grab(struct wl_input_device *device, struct wl_grab *grab, struct wl_surface *surface, uint32_t time) { - if (device->grab != &device->motion_grab || + if (device->grab != &device->implicit_grab || device->grab_time != time || device->pointer_focus != surface) return -1; diff --git a/src/wayland-server.h b/src/wayland-server.h index afd3e69..9f5e8c3 100644 --- a/src/wayland-server.h +++ b/src/wayland-server.h @@ -174,7 +174,7 @@ struct wl_input_device { int32_t x, y; struct wl_grab *grab; - struct wl_grab motion_grab; + struct wl_grab implicit_grab; uint32_t grab_time; int32_t grab_x, grab_y; uint32_t grab_button; -- 2.7.4