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

wayland: update to new api

Browse Source 
Adapt to changes from this Wayland commit:
"Update surface.attach and change surface.map to surface.map_toplevel"
(82da52b15b49da3f3c7b4bd85d334ddfaa375ebc)
This commit is contained in:
nobled 2011-01-28 17:29:48 +00:00
parent 2a45ea6839
commit 0886452dc2
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ static void
handle_configure (void *data, struct wl_shell *shell, handle_configure (void *data, struct wl_shell *shell,
uint32_t timestamp, uint32_t edges, uint32_t timestamp, uint32_t edges,
struct wl_surface *surface, struct wl_surface *surface,
int32_t x, int32_t y, int32_t width, int32_t height) int32_t width, int32_t height)
{ {
ClutterStageWayland *stage_wayland; ClutterStageWayland *stage_wayland;
@ -123,8 +123,6 @@ handle_configure (void *data, struct wl_shell *shell,
clutter_actor_queue_relayout (CLUTTER_ACTOR (stage_wayland->wrapper)); clutter_actor_queue_relayout (CLUTTER_ACTOR (stage_wayland->wrapper));
} }
stage_wayland->pending_allocation.x = x;
stage_wayland->pending_allocation.y = y;
stage_wayland->pending_allocation.width = width; stage_wayland->pending_allocation.width = width;
stage_wayland->pending_allocation.height = height; stage_wayland->pending_allocation.height = height;
stage_wayland->allocation = stage_wayland->pending_allocation; stage_wayland->allocation = stage_wayland->pending_allocation;

10
clutter/wayland/clutter-stage-wayland.c
View File

@ -361,12 +361,10 @@ wayland_swap_buffers (ClutterStageWayland *stage_wayland)
stage_wayland->back_buffer = buffer; stage_wayland->back_buffer = buffer;
wl_surface_attach (stage_wayland->wayland_surface, wl_surface_attach (stage_wayland->wayland_surface,
stage_wayland->front_buffer->wayland_buffer); stage_wayland->front_buffer->wayland_buffer,
wl_surface_map (stage_wayland->wayland_surface, /* 0,0 here is "relative to the old buffer," not absolute */
stage_wayland->allocation.x, 0, 0);
stage_wayland->allocation.y, wl_surface_map_toplevel (stage_wayland->wayland_surface);
stage_wayland->allocation.width,
stage_wayland->allocation.height);
stage_wayland->pending_swaps++; stage_wayland->pending_swaps++;
wl_display_frame_callback (backend_wayland->wayland_display, wl_display_frame_callback (backend_wayland->wayland_display,