brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Update to current api

Browse Source 
Adapt to changes from these wayland commits:
35fd2a8cc68c42d90756330535de04cbbb4d2613
2bb3ebe1e437acf836449f0a63f3264ad29566f2
f8fc08f77187f6a5723281dab66841e5f3c24320

http://bugzilla.clutter-project.org/show_bug.cgi?id=2474
This commit is contained in:
nobled 2010-12-07 07:10:59 +00:00 committed by Emmanuele Bassi
parent d8a544c0f1
commit e7f62bc936
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/wayland/clutter-backend-wayland.c
View File

@ -90,12 +90,13 @@ static const struct wl_drm_listener drm_listener =
static void static void
display_handle_geometry (void *data, display_handle_geometry (void *data,
struct wl_output *output, struct wl_output *output,
int32_t x, int32_t y,
int32_t width, int32_t height) int32_t width, int32_t height)
{ {
ClutterBackendWayland *backend_wayland = data; ClutterBackendWayland *backend_wayland = data;
backend_wayland->screen_allocation.x = 0; backend_wayland->screen_allocation.x = x;
backend_wayland->screen_allocation.y = 0; backend_wayland->screen_allocation.y = y;
backend_wayland->screen_allocation.width = width; backend_wayland->screen_allocation.width = width;
backend_wayland->screen_allocation.height = height; backend_wayland->screen_allocation.height = height;
} }
@ -189,8 +190,7 @@ clutter_backend_wayland_post_parse (ClutterBackend *backend,
g_atexit (clutter_backend_at_exit); g_atexit (clutter_backend_at_exit);
/* TODO: expose environment variable/commandline option for this... */ /* TODO: expose environment variable/commandline option for this... */
backend_wayland->wayland_display = backend_wayland->wayland_display = wl_display_connect ("\0wayland");
wl_display_create ("\0wayland", sizeof ("\0wayland"));
if (!backend_wayland->wayland_display) if (!backend_wayland->wayland_display)
{ {
g_set_error (error, CLUTTER_INIT_ERROR, g_set_error (error, CLUTTER_INIT_ERROR,