isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Shorten MetaWaylandSurfaceRoleShellSurface name

Browse Source 
It was annoyingly long, so rename it to MetaWaylandShellSurface.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/5
https://bugzilla.gnome.org/show_bug.cgi?id=791938
This commit is contained in:
Jonas Ådahl 2017-12-13 12:37:23 +08:00
parent a2959510e5
commit d8f13f6b4c
6 changed files with 140 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
src/wayland/meta-wayland-surface.c
View File

@ -100,8 +100,8 @@ G_DEFINE_TYPE (MetaWaylandSurfaceRoleActorSurface,
meta_wayland_surface_role_actor_surface, meta_wayland_surface_role_actor_surface,
META_TYPE_WAYLAND_SURFACE_ROLE); META_TYPE_WAYLAND_SURFACE_ROLE);
G_DEFINE_TYPE (MetaWaylandSurfaceRoleShellSurface, G_DEFINE_TYPE (MetaWaylandShellSurface,
meta_wayland_surface_role_shell_surface, meta_wayland_shell_surface,
META_TYPE_WAYLAND_SURFACE_ROLE_ACTOR_SURFACE); META_TYPE_WAYLAND_SURFACE_ROLE_ACTOR_SURFACE);
G_DEFINE_TYPE (MetaWaylandPendingState, G_DEFINE_TYPE (MetaWaylandPendingState,
@ -156,23 +156,23 @@ static MetaWaylandSurface *
meta_wayland_surface_role_get_toplevel (MetaWaylandSurfaceRole *surface_role); meta_wayland_surface_role_get_toplevel (MetaWaylandSurfaceRole *surface_role);
static void static void
meta_wayland_surface_role_shell_surface_configure (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, meta_wayland_shell_surface_configure (MetaWaylandShellSurface *shell_surface,
int new_x, int new_x,
int new_y, int new_y,
int new_width, int new_width,
int new_height, int new_height,
MetaWaylandSerial *sent_serial); MetaWaylandSerial *sent_serial);
static void static void
meta_wayland_surface_role_shell_surface_ping (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, meta_wayland_shell_surface_ping (MetaWaylandShellSurface *shell_surface,
uint32_t serial); uint32_t serial);
static void static void
meta_wayland_surface_role_shell_surface_close (MetaWaylandSurfaceRoleShellSurface *shell_surface_role); meta_wayland_shell_surface_close (MetaWaylandShellSurface *shell_surface);
static void static void
meta_wayland_surface_role_shell_surface_managed (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, meta_wayland_shell_surface_managed (MetaWaylandShellSurface *shell_surface,
MetaWindow *window); MetaWindow *window);
static void static void
surface_actor_mapped_notify (MetaSurfaceActorWayland *surface_actor, surface_actor_mapped_notify (MetaSurfaceActorWayland *surface_actor,
@ -1746,44 +1746,44 @@ meta_wayland_surface_configure_notify (MetaWaylandSurface *surface,
int new_height, int new_height,
MetaWaylandSerial *sent_serial) MetaWaylandSerial *sent_serial)
{ {
MetaWaylandSurfaceRoleShellSurface *shell_surface_role = MetaWaylandShellSurface *shell_surface =
META_WAYLAND_SURFACE_ROLE_SHELL_SURFACE (surface->role); META_WAYLAND_SHELL_SURFACE (surface->role);
g_signal_emit (surface, surface_signals[SURFACE_CONFIGURE], 0); g_signal_emit (surface, surface_signals[SURFACE_CONFIGURE], 0);
meta_wayland_surface_role_shell_surface_configure (shell_surface_role, meta_wayland_shell_surface_configure (shell_surface,
new_x, new_y, new_x, new_y,
new_width, new_height, new_width, new_height,
sent_serial); sent_serial);
} }
void void
meta_wayland_surface_ping (MetaWaylandSurface *surface, meta_wayland_surface_ping (MetaWaylandSurface *surface,
guint32 serial) guint32 serial)
{ {
MetaWaylandSurfaceRoleShellSurface *shell_surface_role = MetaWaylandShellSurface *shell_surface =
META_WAYLAND_SURFACE_ROLE_SHELL_SURFACE (surface->role); META_WAYLAND_SHELL_SURFACE (surface->role);
meta_wayland_surface_role_shell_surface_ping (shell_surface_role, serial); meta_wayland_shell_surface_ping (shell_surface, serial);
} }
void void
meta_wayland_surface_delete (MetaWaylandSurface *surface) meta_wayland_surface_delete (MetaWaylandSurface *surface)
{ {
MetaWaylandSurfaceRoleShellSurface *shell_surface_role = MetaWaylandShellSurface *shell_surface =
META_WAYLAND_SURFACE_ROLE_SHELL_SURFACE (surface->role); META_WAYLAND_SHELL_SURFACE (surface->role);
meta_wayland_surface_role_shell_surface_close (shell_surface_role); meta_wayland_shell_surface_close (shell_surface);
} }
void void
meta_wayland_surface_window_managed (MetaWaylandSurface *surface, meta_wayland_surface_window_managed (MetaWaylandSurface *surface,
MetaWindow *window) MetaWindow *window)
{ {
MetaWaylandSurfaceRoleShellSurface *shell_surface_role = MetaWaylandShellSurface *shell_surface =
META_WAYLAND_SURFACE_ROLE_SHELL_SURFACE (surface->role); META_WAYLAND_SHELL_SURFACE (surface->role);
meta_wayland_surface_role_shell_surface_managed (shell_surface_role, window); meta_wayland_shell_surface_managed (shell_surface, window);
} }
void void
@ -2088,51 +2088,51 @@ meta_wayland_surface_role_get_surface (MetaWaylandSurfaceRole *role)
} }
static void static void
meta_wayland_surface_role_shell_surface_configure (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, meta_wayland_shell_surface_configure (MetaWaylandShellSurface *shell_surface,
int new_x, int new_x,
int new_y, int new_y,
int new_width, int new_width,
int new_height, int new_height,
MetaWaylandSerial *sent_serial) MetaWaylandSerial *sent_serial)
{ {
MetaWaylandSurfaceRoleShellSurfaceClass *shell_surface_role_class = MetaWaylandShellSurfaceClass *shell_surface_class =
META_WAYLAND_SURFACE_ROLE_SHELL_SURFACE_GET_CLASS (shell_surface_role); META_WAYLAND_SHELL_SURFACE_GET_CLASS (shell_surface);
shell_surface_role_class->configure (shell_surface_role, shell_surface_class->configure (shell_surface,
new_x, new_x,
new_y, new_y,
new_width, new_width,
new_height, new_height,
sent_serial); sent_serial);
} }
static void static void
meta_wayland_surface_role_shell_surface_ping (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, meta_wayland_shell_surface_ping (MetaWaylandShellSurface *shell_surface,
uint32_t serial) uint32_t serial)
{ {
MetaWaylandSurfaceRoleShellSurfaceClass *shell_surface_role_class = MetaWaylandShellSurfaceClass *shell_surface_class =
META_WAYLAND_SURFACE_ROLE_SHELL_SURFACE_GET_CLASS (shell_surface_role); META_WAYLAND_SHELL_SURFACE_GET_CLASS (shell_surface);
shell_surface_role_class->ping (shell_surface_role, serial); shell_surface_class->ping (shell_surface, serial);
} }
static void static void
meta_wayland_surface_role_shell_surface_close (MetaWaylandSurfaceRoleShellSurface *shell_surface_role) meta_wayland_shell_surface_close (MetaWaylandShellSurface *shell_surface)
{ {
MetaWaylandSurfaceRoleShellSurfaceClass *shell_surface_role_class = MetaWaylandShellSurfaceClass *shell_surface_class =
META_WAYLAND_SURFACE_ROLE_SHELL_SURFACE_GET_CLASS (shell_surface_role); META_WAYLAND_SHELL_SURFACE_GET_CLASS (shell_surface);
shell_surface_role_class->close (shell_surface_role); shell_surface_class->close (shell_surface);
} }
static void static void
meta_wayland_surface_role_shell_surface_managed (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, meta_wayland_shell_surface_managed (MetaWaylandShellSurface *shell_surface,
MetaWindow *window) MetaWindow *window)
{ {
MetaWaylandSurfaceRoleShellSurfaceClass *shell_surface_role_class = MetaWaylandShellSurfaceClass *shell_surface_class =
META_WAYLAND_SURFACE_ROLE_SHELL_SURFACE_GET_CLASS (shell_surface_role); META_WAYLAND_SHELL_SURFACE_GET_CLASS (shell_surface);
shell_surface_role_class->managed (shell_surface_role, window); shell_surface_class->managed (shell_surface, window);
} }
void void
@ -2200,8 +2200,8 @@ meta_wayland_surface_role_actor_surface_class_init (MetaWaylandSurfaceRoleActorS
} }
static void static void
shell_surface_role_surface_commit (MetaWaylandSurfaceRole *surface_role, meta_wayland_shell_surface_surface_commit (MetaWaylandSurfaceRole *surface_role,
MetaWaylandPendingState *pending) MetaWaylandPendingState *pending)
{ {
MetaWaylandSurface *surface = MetaWaylandSurface *surface =
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
@ -2213,7 +2213,7 @@ shell_surface_role_surface_commit (MetaWaylandSurfaceRole *surface_role,
double scale; double scale;
surface_role_class = surface_role_class =
META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_surface_role_shell_surface_parent_class); META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_shell_surface_parent_class);
surface_role_class->commit (surface_role, pending); surface_role_class->commit (surface_role, pending);
buffer = surface->buffer_ref.buffer; buffer = surface->buffer_ref.buffer;
@ -2233,17 +2233,17 @@ shell_surface_role_surface_commit (MetaWaylandSurfaceRole *surface_role,
} }
static void static void
meta_wayland_surface_role_shell_surface_init (MetaWaylandSurfaceRoleShellSurface *role) meta_wayland_shell_surface_init (MetaWaylandShellSurface *role)
{ {
} }
static void static void
meta_wayland_surface_role_shell_surface_class_init (MetaWaylandSurfaceRoleShellSurfaceClass *klass) meta_wayland_shell_surface_class_init (MetaWaylandShellSurfaceClass *klass)
{ {
MetaWaylandSurfaceRoleClass *surface_role_class = MetaWaylandSurfaceRoleClass *surface_role_class =
META_WAYLAND_SURFACE_ROLE_CLASS (klass); META_WAYLAND_SURFACE_ROLE_CLASS (klass);
surface_role_class->commit = shell_surface_role_surface_commit; surface_role_class->commit = meta_wayland_shell_surface_surface_commit;
} }
static void static void

32
src/wayland/meta-wayland-surface.h
View File

@ -81,27 +81,27 @@ struct _MetaWaylandSurfaceRoleActorSurfaceClass
MetaWaylandSurfaceRoleClass parent_class; MetaWaylandSurfaceRoleClass parent_class;
}; };
#define META_TYPE_WAYLAND_SURFACE_ROLE_SHELL_SURFACE (meta_wayland_surface_role_shell_surface_get_type ()) #define META_TYPE_WAYLAND_SHELL_SURFACE (meta_wayland_shell_surface_get_type ())
G_DECLARE_DERIVABLE_TYPE (MetaWaylandSurfaceRoleShellSurface, G_DECLARE_DERIVABLE_TYPE (MetaWaylandShellSurface,
meta_wayland_surface_role_shell_surface, meta_wayland_shell_surface,
META, WAYLAND_SURFACE_ROLE_SHELL_SURFACE, META, WAYLAND_SHELL_SURFACE,
MetaWaylandSurfaceRoleActorSurface); MetaWaylandSurfaceRoleActorSurface);
struct _MetaWaylandSurfaceRoleShellSurfaceClass struct _MetaWaylandShellSurfaceClass
{ {
MetaWaylandSurfaceRoleActorSurfaceClass parent_class; MetaWaylandSurfaceRoleActorSurfaceClass parent_class;
void (*configure) (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, void (*configure) (MetaWaylandShellSurface *shell_surface,
int new_x, int new_x,
int new_y, int new_y,
int new_width, int new_width,
int new_height, int new_height,
MetaWaylandSerial *sent_serial); MetaWaylandSerial *sent_serial);
void (*managed) (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, void (*managed) (MetaWaylandShellSurface *shell_surface,
MetaWindow *window); MetaWindow *window);
void (*ping) (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, void (*ping) (MetaWaylandShellSurface *shell_surface,
uint32_t serial); uint32_t serial);
void (*close) (MetaWaylandSurfaceRoleShellSurface *shell_surface_role); void (*close) (MetaWaylandShellSurface *shell_surface);
}; };
#define META_TYPE_WAYLAND_SURFACE_ROLE_SUBSURFACE (meta_wayland_surface_role_subsurface_get_type ()) #define META_TYPE_WAYLAND_SURFACE_ROLE_SUBSURFACE (meta_wayland_surface_role_subsurface_get_type ())

45
src/wayland/meta-wayland-wl-shell.c
View File

@ -46,7 +46,7 @@ typedef enum
struct _MetaWaylandWlShellSurface struct _MetaWaylandWlShellSurface
{ {
MetaWaylandSurfaceRoleShellSurface parent; MetaWaylandShellSurface parent;
struct wl_resource *resource; struct wl_resource *resource;
@ -71,7 +71,7 @@ popup_surface_iface_init (MetaWaylandPopupSurfaceInterface *iface);
G_DEFINE_TYPE_WITH_CODE (MetaWaylandWlShellSurface, G_DEFINE_TYPE_WITH_CODE (MetaWaylandWlShellSurface,
meta_wayland_wl_shell_surface, meta_wayland_wl_shell_surface,
META_TYPE_WAYLAND_SURFACE_ROLE_SHELL_SURFACE, META_TYPE_WAYLAND_SHELL_SURFACE,
G_IMPLEMENT_INTERFACE (META_TYPE_WAYLAND_POPUP_SURFACE, G_IMPLEMENT_INTERFACE (META_TYPE_WAYLAND_POPUP_SURFACE,
popup_surface_iface_init)); popup_surface_iface_init));
@ -616,15 +616,15 @@ wl_shell_surface_role_get_toplevel (MetaWaylandSurfaceRole *surface_role)
} }
static void static void
wl_shell_surface_role_configure (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, wl_shell_surface_role_configure (MetaWaylandShellSurface *shell_surface,
int new_x, int new_x,
int new_y, int new_y,
int new_width, int new_width,
int new_height, int new_height,
MetaWaylandSerial *sent_serial) MetaWaylandSerial *sent_serial)
{ {
MetaWaylandWlShellSurface *wl_shell_surface = MetaWaylandWlShellSurface *wl_shell_surface =
META_WAYLAND_WL_SHELL_SURFACE (shell_surface_role); META_WAYLAND_WL_SHELL_SURFACE (shell_surface);
if (!wl_shell_surface->resource) if (!wl_shell_surface->resource)
return; return;
@ -635,28 +635,28 @@ wl_shell_surface_role_configure (MetaWaylandSurfaceRoleShellSurface *shell_surfa
} }
static void static void
wl_shell_surface_role_managed (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, wl_shell_surface_role_managed (MetaWaylandShellSurface *shell_surface,
MetaWindow *window) MetaWindow *window)
{ {
MetaWaylandWlShellSurface *wl_shell_surface = MetaWaylandWlShellSurface *wl_shell_surface =
META_WAYLAND_WL_SHELL_SURFACE (shell_surface_role); META_WAYLAND_WL_SHELL_SURFACE (shell_surface);
if (wl_shell_surface->state == META_WL_SHELL_SURFACE_STATE_POPUP) if (wl_shell_surface->state == META_WL_SHELL_SURFACE_STATE_POPUP)
meta_window_set_type (window, META_WINDOW_DROPDOWN_MENU); meta_window_set_type (window, META_WINDOW_DROPDOWN_MENU);
} }
static void static void
wl_shell_surface_role_ping (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, wl_shell_surface_role_ping (MetaWaylandShellSurface *shell_surface,
guint32 serial) guint32 serial)
{ {
MetaWaylandWlShellSurface *wl_shell_surface = MetaWaylandWlShellSurface *wl_shell_surface =
META_WAYLAND_WL_SHELL_SURFACE (shell_surface_role); META_WAYLAND_WL_SHELL_SURFACE (shell_surface);
wl_shell_surface_send_ping (wl_shell_surface->resource, serial); wl_shell_surface_send_ping (wl_shell_surface->resource, serial);
} }
static void static void
wl_shell_surface_role_close (MetaWaylandSurfaceRoleShellSurface *shell_surface_role) wl_shell_surface_role_close (MetaWaylandShellSurface *shell_surface)
{ {
/* Not supported by wl_shell_surface. */ /* Not supported by wl_shell_surface. */
} }
@ -726,7 +726,7 @@ meta_wayland_wl_shell_surface_class_init (MetaWaylandWlShellSurfaceClass *klass)
{ {
GObjectClass *object_class; GObjectClass *object_class;
MetaWaylandSurfaceRoleClass *surface_role_class; MetaWaylandSurfaceRoleClass *surface_role_class;
MetaWaylandSurfaceRoleShellSurfaceClass *shell_surface_role_class; MetaWaylandShellSurfaceClass *shell_surface_class;
object_class = G_OBJECT_CLASS (klass); object_class = G_OBJECT_CLASS (klass);
object_class->finalize = wl_shell_surface_role_finalize; object_class->finalize = wl_shell_surface_role_finalize;
@ -735,12 +735,11 @@ meta_wayland_wl_shell_surface_class_init (MetaWaylandWlShellSurfaceClass *klass)
surface_role_class->commit = wl_shell_surface_role_commit; surface_role_class->commit = wl_shell_surface_role_commit;
surface_role_class->get_toplevel = wl_shell_surface_role_get_toplevel; surface_role_class->get_toplevel = wl_shell_surface_role_get_toplevel;
shell_surface_role_class = shell_surface_class = META_WAYLAND_SHELL_SURFACE_CLASS (klass);
META_WAYLAND_SURFACE_ROLE_SHELL_SURFACE_CLASS (klass); shell_surface_class->configure = wl_shell_surface_role_configure;
shell_surface_role_class->configure = wl_shell_surface_role_configure; shell_surface_class->managed = wl_shell_surface_role_managed;
shell_surface_role_class->managed = wl_shell_surface_role_managed; shell_surface_class->ping = wl_shell_surface_role_ping;
shell_surface_role_class->ping = wl_shell_surface_role_ping; shell_surface_class->close = wl_shell_surface_role_close;
shell_surface_role_class->close = wl_shell_surface_role_close;
} }
void void

2
src/wayland/meta-wayland-wl-shell.h
View File

@ -26,7 +26,7 @@
G_DECLARE_FINAL_TYPE (MetaWaylandWlShellSurface, G_DECLARE_FINAL_TYPE (MetaWaylandWlShellSurface,
meta_wayland_wl_shell_surface, meta_wayland_wl_shell_surface,
META, WAYLAND_WL_SHELL_SURFACE, META, WAYLAND_WL_SHELL_SURFACE,
MetaWaylandSurfaceRoleShellSurface); MetaWaylandShellSurface);
void meta_wayland_wl_shell_init (MetaWaylandCompositor *compositor); void meta_wayland_wl_shell_init (MetaWaylandCompositor *compositor);

78
src/wayland/meta-wayland-xdg-shell.c
View File

@ -85,7 +85,7 @@ typedef struct _MetaWaylandXdgSurfacePrivate
G_DEFINE_TYPE_WITH_PRIVATE (MetaWaylandXdgSurface, G_DEFINE_TYPE_WITH_PRIVATE (MetaWaylandXdgSurface,
meta_wayland_xdg_surface, meta_wayland_xdg_surface,
META_TYPE_WAYLAND_SURFACE_ROLE_SHELL_SURFACE); META_TYPE_WAYLAND_SHELL_SURFACE);
struct _MetaWaylandXdgToplevel struct _MetaWaylandXdgToplevel
{ {
@ -655,15 +655,15 @@ xdg_toplevel_role_get_toplevel (MetaWaylandSurfaceRole *surface_role)
} }
static void static void
xdg_toplevel_role_configure (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, xdg_toplevel_role_configure (MetaWaylandShellSurface *shell_surface,
int new_x, int new_x,
int new_y, int new_y,
int new_width, int new_width,
int new_height, int new_height,
MetaWaylandSerial *sent_serial) MetaWaylandSerial *sent_serial)
{ {
MetaWaylandXdgToplevel *xdg_toplevel = MetaWaylandXdgToplevel *xdg_toplevel =
META_WAYLAND_XDG_TOPLEVEL (shell_surface_role); META_WAYLAND_XDG_TOPLEVEL (shell_surface);
MetaWaylandXdgSurface *xdg_surface = META_WAYLAND_XDG_SURFACE (xdg_toplevel); MetaWaylandXdgSurface *xdg_surface = META_WAYLAND_XDG_SURFACE (xdg_toplevel);
MetaWaylandXdgSurfacePrivate *xdg_surface_priv = MetaWaylandXdgSurfacePrivate *xdg_surface_priv =
meta_wayland_xdg_surface_get_instance_private (xdg_surface); meta_wayland_xdg_surface_get_instance_private (xdg_surface);
@ -680,16 +680,16 @@ xdg_toplevel_role_configure (MetaWaylandSurfaceRoleShellSurface *shell_surface_r
} }
static void static void
xdg_toplevel_role_managed (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, xdg_toplevel_role_managed (MetaWaylandShellSurface *shell_surface,
MetaWindow *window) MetaWindow *window)
{ {
} }
static void static void
xdg_toplevel_role_close (MetaWaylandSurfaceRoleShellSurface *shell_surface_role) xdg_toplevel_role_close (MetaWaylandShellSurface *shell_surface)
{ {
MetaWaylandXdgToplevel *xdg_toplevel = MetaWaylandXdgToplevel *xdg_toplevel =
META_WAYLAND_XDG_TOPLEVEL (shell_surface_role); META_WAYLAND_XDG_TOPLEVEL (shell_surface);
zxdg_toplevel_v6_send_close (xdg_toplevel->resource); zxdg_toplevel_v6_send_close (xdg_toplevel->resource);
} }
@ -737,7 +737,7 @@ meta_wayland_xdg_toplevel_class_init (MetaWaylandXdgToplevelClass *klass)
{ {
GObjectClass *object_class; GObjectClass *object_class;
MetaWaylandSurfaceRoleClass *surface_role_class; MetaWaylandSurfaceRoleClass *surface_role_class;
MetaWaylandSurfaceRoleShellSurfaceClass *shell_surface_role_class; MetaWaylandShellSurfaceClass *shell_surface_class;
MetaWaylandXdgSurfaceClass *xdg_surface_class; MetaWaylandXdgSurfaceClass *xdg_surface_class;
object_class = G_OBJECT_CLASS (klass); object_class = G_OBJECT_CLASS (klass);
@ -747,11 +747,10 @@ meta_wayland_xdg_toplevel_class_init (MetaWaylandXdgToplevelClass *klass)
surface_role_class->commit = xdg_toplevel_role_commit; surface_role_class->commit = xdg_toplevel_role_commit;
surface_role_class->get_toplevel = xdg_toplevel_role_get_toplevel; surface_role_class->get_toplevel = xdg_toplevel_role_get_toplevel;
shell_surface_role_class = shell_surface_class = META_WAYLAND_SHELL_SURFACE_CLASS (klass);
META_WAYLAND_SURFACE_ROLE_SHELL_SURFACE_CLASS (klass); shell_surface_class->configure = xdg_toplevel_role_configure;
shell_surface_role_class->configure = xdg_toplevel_role_configure; shell_surface_class->managed = xdg_toplevel_role_managed;
shell_surface_role_class->managed = xdg_toplevel_role_managed; shell_surface_class->close = xdg_toplevel_role_close;
shell_surface_role_class->close = xdg_toplevel_role_close;
xdg_surface_class = META_WAYLAND_XDG_SURFACE_CLASS (klass); xdg_surface_class = META_WAYLAND_XDG_SURFACE_CLASS (klass);
xdg_surface_class->shell_client_destroyed = xdg_surface_class->shell_client_destroyed =
@ -916,14 +915,14 @@ xdg_popup_role_get_toplevel (MetaWaylandSurfaceRole *surface_role)
} }
static void static void
xdg_popup_role_configure (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, xdg_popup_role_configure (MetaWaylandShellSurface *shell_surface,
int new_x, int new_x,
int new_y, int new_y,
int new_width, int new_width,
int new_height, int new_height,
MetaWaylandSerial *sent_serial) MetaWaylandSerial *sent_serial)
{ {
MetaWaylandXdgPopup *xdg_popup = META_WAYLAND_XDG_POPUP (shell_surface_role); MetaWaylandXdgPopup *xdg_popup = META_WAYLAND_XDG_POPUP (shell_surface);
MetaWaylandXdgSurface *xdg_surface = META_WAYLAND_XDG_SURFACE (xdg_popup); MetaWaylandXdgSurface *xdg_surface = META_WAYLAND_XDG_SURFACE (xdg_popup);
MetaWindow *parent_window = xdg_popup->parent_surface->window; MetaWindow *parent_window = xdg_popup->parent_surface->window;
int geometry_scale; int geometry_scale;
@ -949,10 +948,10 @@ xdg_popup_role_configure (MetaWaylandSurfaceRoleShellSurface *shell_surface_role
} }
static void static void
xdg_popup_role_managed (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, xdg_popup_role_managed (MetaWaylandShellSurface *shell_surface,
MetaWindow *window) MetaWindow *window)
{ {
MetaWaylandXdgPopup *xdg_popup = META_WAYLAND_XDG_POPUP (shell_surface_role); MetaWaylandXdgPopup *xdg_popup = META_WAYLAND_XDG_POPUP (shell_surface);
MetaWaylandSurface *parent = xdg_popup->parent_surface; MetaWaylandSurface *parent = xdg_popup->parent_surface;
g_assert (parent); g_assert (parent);
@ -1053,7 +1052,7 @@ meta_wayland_xdg_popup_class_init (MetaWaylandXdgPopupClass *klass)
{ {
GObjectClass *object_class; GObjectClass *object_class;
MetaWaylandSurfaceRoleClass *surface_role_class; MetaWaylandSurfaceRoleClass *surface_role_class;
MetaWaylandSurfaceRoleShellSurfaceClass *shell_surface_role_class; MetaWaylandShellSurfaceClass *shell_surface_class;
MetaWaylandXdgSurfaceClass *xdg_surface_class; MetaWaylandXdgSurfaceClass *xdg_surface_class;
object_class = G_OBJECT_CLASS (klass); object_class = G_OBJECT_CLASS (klass);
@ -1063,10 +1062,9 @@ meta_wayland_xdg_popup_class_init (MetaWaylandXdgPopupClass *klass)
surface_role_class->commit = xdg_popup_role_commit; surface_role_class->commit = xdg_popup_role_commit;
surface_role_class->get_toplevel = xdg_popup_role_get_toplevel; surface_role_class->get_toplevel = xdg_popup_role_get_toplevel;
shell_surface_role_class = shell_surface_class = META_WAYLAND_SHELL_SURFACE_CLASS (klass);
META_WAYLAND_SURFACE_ROLE_SHELL_SURFACE_CLASS (klass); shell_surface_class->configure = xdg_popup_role_configure;
shell_surface_role_class->configure = xdg_popup_role_configure; shell_surface_class->managed = xdg_popup_role_managed;
shell_surface_role_class->managed = xdg_popup_role_managed;
xdg_surface_class = META_WAYLAND_XDG_SURFACE_CLASS (klass); xdg_surface_class = META_WAYLAND_XDG_SURFACE_CLASS (klass);
xdg_surface_class->shell_client_destroyed = xdg_surface_class->shell_client_destroyed =
@ -1324,11 +1322,10 @@ xdg_surface_role_assigned (MetaWaylandSurfaceRole *surface_role)
} }
static void static void
xdg_surface_role_ping (MetaWaylandSurfaceRoleShellSurface *shell_surface_role, xdg_surface_role_ping (MetaWaylandShellSurface *shell_surface,
uint32_t serial) uint32_t serial)
{ {
MetaWaylandXdgSurface *xdg_surface = MetaWaylandXdgSurface *xdg_surface = META_WAYLAND_XDG_SURFACE (shell_surface);
META_WAYLAND_XDG_SURFACE (shell_surface_role);
MetaWaylandXdgSurfacePrivate *priv = MetaWaylandXdgSurfacePrivate *priv =
meta_wayland_xdg_surface_get_instance_private (xdg_surface); meta_wayland_xdg_surface_get_instance_private (xdg_surface);
@ -1412,7 +1409,7 @@ meta_wayland_xdg_surface_class_init (MetaWaylandXdgSurfaceClass *klass)
{ {
GObjectClass *object_class; GObjectClass *object_class;
MetaWaylandSurfaceRoleClass *surface_role_class; MetaWaylandSurfaceRoleClass *surface_role_class;
MetaWaylandSurfaceRoleShellSurfaceClass *shell_surface_role_class; MetaWaylandShellSurfaceClass *shell_surface_class;
GParamSpec *pspec; GParamSpec *pspec;
object_class = G_OBJECT_CLASS (klass); object_class = G_OBJECT_CLASS (klass);
@ -1424,9 +1421,8 @@ meta_wayland_xdg_surface_class_init (MetaWaylandXdgSurfaceClass *klass)
surface_role_class->commit = xdg_surface_role_commit; surface_role_class->commit = xdg_surface_role_commit;
surface_role_class->assigned = xdg_surface_role_assigned; surface_role_class->assigned = xdg_surface_role_assigned;
shell_surface_role_class = shell_surface_class = META_WAYLAND_SHELL_SURFACE_CLASS (klass);
META_WAYLAND_SURFACE_ROLE_SHELL_SURFACE_CLASS (klass); shell_surface_class->ping = xdg_surface_role_ping;
shell_surface_role_class->ping = xdg_surface_role_ping;
klass->shell_client_destroyed = xdg_surface_role_shell_client_destroyed; klass->shell_client_destroyed = xdg_surface_role_shell_client_destroyed;

4
src/wayland/meta-wayland-xdg-shell.h
View File

@ -26,11 +26,11 @@
G_DECLARE_DERIVABLE_TYPE (MetaWaylandXdgSurface, G_DECLARE_DERIVABLE_TYPE (MetaWaylandXdgSurface,
meta_wayland_xdg_surface, meta_wayland_xdg_surface,
META, WAYLAND_XDG_SURFACE, META, WAYLAND_XDG_SURFACE,
MetaWaylandSurfaceRoleShellSurface); MetaWaylandShellSurface)
struct _MetaWaylandXdgSurfaceClass struct _MetaWaylandXdgSurfaceClass
{ {
MetaWaylandSurfaceRoleShellSurfaceClass parent_class; MetaWaylandShellSurfaceClass parent_class;
void (*shell_client_destroyed) (MetaWaylandXdgSurface *xdg_surface); void (*shell_client_destroyed) (MetaWaylandXdgSurface *xdg_surface);
}; };