diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2011-01-06 10:00:23 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-01-06 10:00:23 -0500 |
| commit | f1ef15cb45f8831b81aeefe03412dfb099f0220e (patch) | |
| tree | 7ef554bc67ef4edb1054b46ae1ecef71ee248c48 /compositor/compositor.c | |
| parent | Move basic grab handling to core libraries (diff) | |
| download | wayland-f1ef15cb45f8831b81aeefe03412dfb099f0220e.tar wayland-f1ef15cb45f8831b81aeefe03412dfb099f0220e.tar.gz wayland-f1ef15cb45f8831b81aeefe03412dfb099f0220e.tar.bz2 wayland-f1ef15cb45f8831b81aeefe03412dfb099f0220e.tar.lz wayland-f1ef15cb45f8831b81aeefe03412dfb099f0220e.tar.xz wayland-f1ef15cb45f8831b81aeefe03412dfb099f0220e.tar.zst wayland-f1ef15cb45f8831b81aeefe03412dfb099f0220e.zip | |
Move grab definitions to wayland-util.h
These tokens really are part of the protocol and we need to extend the
scanner to generate them.
Diffstat (limited to 'compositor/compositor.c')
| -rw-r--r-- | compositor/compositor.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/compositor/compositor.c b/compositor/compositor.c index 4290e75..2146c9b 100644 --- a/compositor/compositor.c +++ b/compositor/compositor.c @@ -578,17 +578,17 @@ resize_grab_motion(struct wl_grab *grab, struct wl_surface *surface = device->pointer_focus; int32_t width, height; - if (resize->edges & WLSC_DEVICE_GRAB_RESIZE_LEFT) { + if (resize->edges & WL_GRAB_RESIZE_LEFT) { width = device->grab_x - x + resize->width; - } else if (resize->edges & WLSC_DEVICE_GRAB_RESIZE_RIGHT) { + } else if (resize->edges & WL_GRAB_RESIZE_RIGHT) { width = x - device->grab_x + resize->width; } else { width = resize->width; } - if (resize->edges & WLSC_DEVICE_GRAB_RESIZE_TOP) { + if (resize->edges & WL_GRAB_RESIZE_TOP) { height = device->grab_y - y + resize->height; - } else if (resize->edges & WLSC_DEVICE_GRAB_RESIZE_BOTTOM) { + } else if (resize->edges & WL_GRAB_RESIZE_BOTTOM) { height = y - device->grab_y + resize->height; } else { height = resize->height; @@ -645,28 +645,28 @@ shell_resize(struct wl_client *client, struct wl_shell *shell, return; switch (edges) { - case WLSC_DEVICE_GRAB_RESIZE_TOP: + case WL_GRAB_RESIZE_TOP: pointer = WLSC_POINTER_TOP; break; - case WLSC_DEVICE_GRAB_RESIZE_BOTTOM: + case WL_GRAB_RESIZE_BOTTOM: pointer = WLSC_POINTER_BOTTOM; break; - case WLSC_DEVICE_GRAB_RESIZE_LEFT: + case WL_GRAB_RESIZE_LEFT: pointer = WLSC_POINTER_LEFT; break; - case WLSC_DEVICE_GRAB_RESIZE_TOP_LEFT: + case WL_GRAB_RESIZE_TOP_LEFT: pointer = WLSC_POINTER_TOP_LEFT; break; - case WLSC_DEVICE_GRAB_RESIZE_BOTTOM_LEFT: + case WL_GRAB_RESIZE_BOTTOM_LEFT: pointer = WLSC_POINTER_BOTTOM_LEFT; break; - case WLSC_DEVICE_GRAB_RESIZE_RIGHT: + case WL_GRAB_RESIZE_RIGHT: pointer = WLSC_POINTER_RIGHT; break; - case WLSC_DEVICE_GRAB_RESIZE_TOP_RIGHT: + case WL_GRAB_RESIZE_TOP_RIGHT: pointer = WLSC_POINTER_TOP_RIGHT; break; - case WLSC_DEVICE_GRAB_RESIZE_BOTTOM_RIGHT: + case WL_GRAB_RESIZE_BOTTOM_RIGHT: pointer = WLSC_POINTER_BOTTOM_RIGHT; break; } @@ -917,7 +917,7 @@ notify_button(struct wl_input_device *device, shell_resize(NULL, (struct wl_shell *) &compositor->shell, &surface->surface, device, time, - WLSC_DEVICE_GRAB_RESIZE_BOTTOM_RIGHT); + WL_GRAB_RESIZE_BOTTOM_RIGHT); device->grab->interface->button(device->grab, time, button, state); |