summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2011-06-21 17:28:36 -0400
committerKristian Høgsberg <krh@bitplanet.net>2012-03-27 09:31:58 -0400
commitd47b9c42c04bbaf4568de8a70b3f216940983e1f (patch)
tree6e9b4f5ed0bed5b98b3ab870e0a98e9d44789291
parent423caf9969d167a61b7f7e207c8b98e698d693fa (diff)
xwayland: Follow wl_output protocol changes
-rw-r--r--hw/xfree86/xwayland/xwayland-client.c23
1 files changed, 20 insertions, 3 deletions
diff --git a/hw/xfree86/xwayland/xwayland-client.c b/hw/xfree86/xwayland/xwayland-client.c
index 859cf626c..b221d339f 100644
--- a/hw/xfree86/xwayland/xwayland-client.c
+++ b/hw/xfree86/xwayland/xwayland-client.c
@@ -67,14 +67,30 @@ static const struct wl_compositor_listener compositor_listener = {
static void
display_handle_geometry(void *data,
- struct wl_output *output,
- int32_t x, int32_t y,
- int32_t width, int32_t height)
+ struct wl_output *wl_output,
+ int x, int y,
+ int physical_width,
+ int physical_height,
+ int subpixel,
+ const char *make,
+ const char *model)
{
struct xwl_output *xwl_output = data;
xwl_output->x = x;
xwl_output->y = y;
+}
+
+static void
+display_handle_mode(void *data,
+ struct wl_output *wl_output,
+ uint32_t flags,
+ int width,
+ int height,
+ int refresh)
+{
+ struct xwl_output *xwl_output = data;
+
xwl_output->width = width;
xwl_output->height = height;
@@ -84,6 +100,7 @@ display_handle_geometry(void *data,
static const struct wl_output_listener output_listener = {
display_handle_geometry,
+ display_handle_mode
};
static void