isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 08:30:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Update to latest Wayland API (wl_shell_surface transition)

Browse Source 
Previously the wl_shell object held the methods that allowed a client to
request changes to the shell's state associated with a surface. These methods
have now been moved to a wl_shell_surface object.

This change allows configure events to be handled inside the stage rather than
the backend.
This commit is contained in:
Rob Bradford 2011-12-08 17:32:27 +00:00
parent af294aafe6
commit 34cc45dae5
2 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,34 +68,7 @@ clutter_backend_wayland_dispose (GObject *gobject)
G_OBJECT_CLASS (clutter_backend_wayland_parent_class)->dispose (gobject); G_OBJECT_CLASS (clutter_backend_wayland_parent_class)->dispose (gobject);
} }
static void
handle_configure (void *data,
struct wl_shell *shell,
uint32_t timestamp,
uint32_t edges,
struct wl_surface *surface,
int32_t width,
int32_t height)
{
ClutterStageCogl *stage_cogl = wl_surface_get_user_data (surface);
CoglFramebuffer *fb = COGL_FRAMEBUFFER (stage_cogl->onscreen);
if (cogl_framebuffer_get_width (fb) != width ||
cogl_framebuffer_get_height (fb) != height)
clutter_actor_queue_relayout (CLUTTER_ACTOR (stage_cogl->wrapper));
clutter_actor_set_size (CLUTTER_ACTOR (stage_cogl->wrapper),
width, height);
/* the resize process is complete, so we can ask the stage
* to set up the GL viewport with the new size
*/
clutter_stage_ensure_viewport (stage_cogl->wrapper);
}
static const struct wl_shell_listener shell_listener = {
handle_configure,
};
static void static void
display_handle_global (struct wl_display *display, display_handle_global (struct wl_display *display,
@ -118,8 +91,7 @@ display_handle_global (struct wl_display *display,
{ {
backend_wayland->wayland_shell = backend_wayland->wayland_shell =
wl_display_bind (display, id, &wl_shell_interface); wl_display_bind (display, id, &wl_shell_interface);
wl_shell_add_listener (backend_wayland->wayland_shell,
&shell_listener, backend_wayland);
} }
else if (strcmp (interface, "wl_shm") == 0) else if (strcmp (interface, "wl_shm") == 0)
backend_wayland->wayland_shm = backend_wayland->wayland_shm =

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

@ -46,19 +46,53 @@ G_DEFINE_TYPE_WITH_CODE (ClutterStageWayland,
G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_STAGE_WINDOW, G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_STAGE_WINDOW,
clutter_stage_window_iface_init)); clutter_stage_window_iface_init));
static void
handle_configure (void *data,
struct wl_shell_surface *shell_surface,
uint32_t timestamp,
uint32_t edges,
int32_t width,
int32_t height)
{
ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL(data);
CoglFramebuffer *fb = COGL_FRAMEBUFFER (stage_cogl->onscreen);
if (cogl_framebuffer_get_width (fb) != width ||
cogl_framebuffer_get_height (fb) != height)
clutter_actor_queue_relayout (CLUTTER_ACTOR (stage_cogl->wrapper));
clutter_actor_set_size (CLUTTER_ACTOR (stage_cogl->wrapper),
width, height);
/* the resize process is complete, so we can ask the stage
* to set up the GL viewport with the new size
*/
clutter_stage_ensure_viewport (stage_cogl->wrapper);
}
static const struct wl_shell_surface_listener shell_surface_listener = {
handle_configure,
};
static gboolean static gboolean
clutter_stage_wayland_realize (ClutterStageWindow *stage_window) clutter_stage_wayland_realize (ClutterStageWindow *stage_window)
{ {
ClutterStageWayland *stage_wayland = CLUTTER_STAGE_WAYLAND (stage_window); ClutterStageWayland *stage_wayland = CLUTTER_STAGE_WAYLAND (stage_window);
ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window); ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window);
struct wl_surface *wl_surface; struct wl_surface *wl_surface;
struct wl_shell_surface *wl_shell_surface;
clutter_stage_window_parent_iface->realize (stage_window); clutter_stage_window_parent_iface->realize (stage_window);
wl_surface = cogl_wayland_onscreen_get_surface (stage_cogl->onscreen); wl_surface = cogl_wayland_onscreen_get_surface (stage_cogl->onscreen);
wl_surface_set_user_data (wl_surface, stage_wayland); wl_surface_set_user_data (wl_surface, stage_wayland);
wl_shell_surface =
cogl_wayland_onscreen_get_shell_surface (stage_cogl->onscreen);
wl_shell_surface_add_listener (wl_shell_surface,
&shell_surface_listener,
stage_wayland);
return TRUE; return TRUE;
} }