summaryrefslogtreecommitdiffstats
path: root/src/compositor/wayland_wrapper/wlshellsurface.h
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-05-08 12:41:30 +0300
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-05-09 09:12:45 +0200
commit9d7ef928ce0febdcee3cb4327b7f4fc559d3aba1 (patch)
tree4c25918fca8fc4a2259c89708eabd328e264d5aa /src/compositor/wayland_wrapper/wlshellsurface.h
parent675b41de61ff9e58f16725eba8ef04861039acf1 (diff)
Update to wayland head
Change-Id: Ie012861bc40e3bc448d85c9d8c27f798434020ed Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/compositor/wayland_wrapper/wlshellsurface.h')
-rw-r--r--src/compositor/wayland_wrapper/wlshellsurface.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/compositor/wayland_wrapper/wlshellsurface.h b/src/compositor/wayland_wrapper/wlshellsurface.h
index 3f8d42a8f..2661afef1 100644
--- a/src/compositor/wayland_wrapper/wlshellsurface.h
+++ b/src/compositor/wayland_wrapper/wlshellsurface.h
@@ -131,6 +131,15 @@ private:
static void set_maximized(struct wl_client *client,
struct wl_resource *shell_surface_resource,
struct wl_resource *output);
+ static void pong(struct wl_client *client,
+ struct wl_resource *resource,
+ uint32_t serial);
+ static void set_title(struct wl_client *client,
+ struct wl_resource *resource,
+ const char *title);
+ static void set_class(struct wl_client *client,
+ struct wl_resource *resource,
+ const char *class_);
static const struct wl_shell_surface_interface shell_surface_interface;
};
@@ -163,7 +172,7 @@ public:
static void motion(struct wl_pointer_grab *grab,
uint32_t time, int32_t x, int32_t y);
static void button(struct wl_pointer_grab *grab,
- uint32_t time, uint32_t mouse_grabber_button, int32_t state);
+ uint32_t time, uint32_t mouse_grabber_button, uint32_t state);
static const struct wl_pointer_grab_interface resize_grabber_interface;
};
@@ -180,7 +189,7 @@ public:
static void motion(struct wl_pointer_grab *grab,
uint32_t time, int32_t x, int32_t y);
static void button(struct wl_pointer_grab *grab,
- uint32_t time, uint32_t mouse_grabber_button, int32_t state);
+ uint32_t time, uint32_t mouse_grabber_button, uint32_t state);
static const struct wl_pointer_grab_interface move_grabber_interface;
};