summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2011-05-11 13:16:33 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2011-05-11 13:16:33 +0200
commit6373430703d8e28682df9269628e0630d79cdf8f (patch)
tree776fece78ba098dfa43143ac0bf27fb4442187a2
parente7b8d9055ef570ad05b44aef8c61cabf413a2f82 (diff)
Follow resize edges type change to enum wl_shell_resizevisual
-rw-r--r--clients/window.c2
-rw-r--r--compositor/compositor-wayland.c2
-rw-r--r--compositor/shell.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/clients/window.c b/clients/window.c
index 8c3f8d2..391bcaa 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -1245,7 +1245,7 @@ window_activate_drag(struct wl_drag *drag, struct window *window,
static void
handle_configure(void *data, struct wl_shell *shell,
- uint32_t time, uint32_t edges,
+ uint32_t time, enum wl_shell_resize edges,
struct wl_surface *surface, int32_t width, int32_t height)
{
struct window *window = wl_surface_get_user_data(surface);
diff --git a/compositor/compositor-wayland.c b/compositor/compositor-wayland.c
index 6cd02ed..e8055be 100644
--- a/compositor/compositor-wayland.c
+++ b/compositor/compositor-wayland.c
@@ -302,7 +302,7 @@ static const struct wl_output_listener output_listener = {
/* parent shell interface */
static void
handle_configure(void *data, struct wl_shell *shell,
- uint32_t time, uint32_t edges,
+ uint32_t time, enum wl_shell_resize edges,
struct wl_surface *surface, int32_t width, int32_t height)
{
#if 0
diff --git a/compositor/shell.c b/compositor/shell.c
index ddf4d5f..14a0269 100644
--- a/compositor/shell.c
+++ b/compositor/shell.c
@@ -176,7 +176,8 @@ static const struct wl_grab_interface resize_grab_interface = {
static void
shell_resize(struct wl_client *client, struct wl_shell *shell,
struct wl_surface *surface,
- struct wl_input_device *device, uint32_t time, uint32_t edges)
+ struct wl_input_device *device, uint32_t time,
+ enum wl_shell_resize edges)
{
struct wlsc_input_device *wd = (struct wlsc_input_device *) device;
struct wlsc_resize_grab *resize;