From e7f62bc936995c5d998f7c8dc4b2b1b7254ea97d Mon Sep 17 00:00:00 2001 From: nobled Date: Tue, 7 Dec 2010 07:10:59 +0000 Subject: [PATCH] wayland: Update to current api Adapt to changes from these wayland commits: 35fd2a8cc68c42d90756330535de04cbbb4d2613 2bb3ebe1e437acf836449f0a63f3264ad29566f2 f8fc08f77187f6a5723281dab66841e5f3c24320 http://bugzilla.clutter-project.org/show_bug.cgi?id=2474 --- clutter/wayland/clutter-backend-wayland.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clutter/wayland/clutter-backend-wayland.c b/clutter/wayland/clutter-backend-wayland.c index 34f0b50b6..29d83d02d 100644 --- a/clutter/wayland/clutter-backend-wayland.c +++ b/clutter/wayland/clutter-backend-wayland.c @@ -90,12 +90,13 @@ static const struct wl_drm_listener drm_listener = static void display_handle_geometry (void *data, struct wl_output *output, + int32_t x, int32_t y, int32_t width, int32_t height) { ClutterBackendWayland *backend_wayland = data; - backend_wayland->screen_allocation.x = 0; - backend_wayland->screen_allocation.y = 0; + backend_wayland->screen_allocation.x = x; + backend_wayland->screen_allocation.y = y; backend_wayland->screen_allocation.width = width; backend_wayland->screen_allocation.height = height; } @@ -189,8 +190,7 @@ clutter_backend_wayland_post_parse (ClutterBackend *backend, g_atexit (clutter_backend_at_exit); /* TODO: expose environment variable/commandline option for this... */ - backend_wayland->wayland_display = - wl_display_create ("\0wayland", sizeof ("\0wayland")); + backend_wayland->wayland_display = wl_display_connect ("\0wayland"); if (!backend_wayland->wayland_display) { g_set_error (error, CLUTTER_INIT_ERROR,