summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2011-09-06 18:12:43 -0400
committerKristian Høgsberg <krh@bitplanet.net>2011-09-06 18:12:43 -0400
commit34b26802d710d36224db25a4bb1e9ac5ff1e9843 (patch)
treebbcc81a05ac137584a3185b43ecd8c7f2e1c380c
parent468c9bd9e741b720fbbfa10d1fd3fce9278bdf1b (diff)
Rename motion_grab to implicit_grab
Let's just use the same terms as X.
-rw-r--r--src/wayland-server.c2
-rw-r--r--src/wayland-server.h2
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;