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

wayland: Make xdg_shell surface role names shorter

Browse Source 
MetaWaylandSurfaceRoleXdgSurface -> MetaWaylandXdgSurface
MetaWaylandSurfaceRoleXdgPopup -> MetaWaylandXdgPopup

https://bugzilla.gnome.org/show_bug.cgi?id=763431
This commit is contained in:
Jonas Ådahl 2016-01-14 12:49:14 +08:00
parent 1088bf476d
commit 87555359f5
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,22 +35,22 @@
#include "wayland/meta-window-wayland.h" #include "wayland/meta-window-wayland.h"
#include "xdg-shell-unstable-v5-server-protocol.h" #include "xdg-shell-unstable-v5-server-protocol.h"
struct _MetaWaylandSurfaceRoleXdgSurface struct _MetaWaylandXdgSurface
{ {
MetaWaylandSurfaceRoleShellSurface parent; MetaWaylandSurfaceRoleShellSurface parent;
}; };
G_DEFINE_TYPE (MetaWaylandSurfaceRoleXdgSurface, G_DEFINE_TYPE (MetaWaylandXdgSurface,
meta_wayland_surface_role_xdg_surface, meta_wayland_xdg_surface,
META_TYPE_WAYLAND_SURFACE_ROLE_SHELL_SURFACE); META_TYPE_WAYLAND_SURFACE_ROLE_SHELL_SURFACE);
struct _MetaWaylandSurfaceRoleXdgPopup struct _MetaWaylandXdgPopup
{ {
MetaWaylandSurfaceRoleShellSurface parent; MetaWaylandSurfaceRoleShellSurface parent;
}; };
G_DEFINE_TYPE (MetaWaylandSurfaceRoleXdgPopup, G_DEFINE_TYPE (MetaWaylandXdgPopup,
meta_wayland_surface_role_xdg_popup, meta_wayland_xdg_popup,
META_TYPE_WAYLAND_SURFACE_ROLE_SHELL_SURFACE); META_TYPE_WAYLAND_SURFACE_ROLE_SHELL_SURFACE);
static void static void
@ -321,8 +321,7 @@ xdg_shell_get_xdg_surface (struct wl_client *client,
return; return;
} }
if (!meta_wayland_surface_assign_role (surface, if (!meta_wayland_surface_assign_role (surface, META_TYPE_WAYLAND_XDG_SURFACE))
META_TYPE_WAYLAND_SURFACE_ROLE_XDG_SURFACE))
{ {
wl_resource_post_error (resource, XDG_SHELL_ERROR_ROLE, wl_resource_post_error (resource, XDG_SHELL_ERROR_ROLE,
"wl_surface@%d already has a different role", "wl_surface@%d already has a different role",
@ -440,8 +439,7 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
return; return;
} }
if (!meta_wayland_surface_assign_role (surface, if (!meta_wayland_surface_assign_role (surface, META_TYPE_WAYLAND_XDG_POPUP))
META_TYPE_WAYLAND_SURFACE_ROLE_XDG_POPUP))
{ {
wl_resource_post_error (resource, XDG_SHELL_ERROR_ROLE, wl_resource_post_error (resource, XDG_SHELL_ERROR_ROLE,
"wl_surface@%d already has a different role", "wl_surface@%d already has a different role",
@ -574,7 +572,7 @@ xdg_surface_role_commit (MetaWaylandSurfaceRole *surface_role,
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
surface_role_class = surface_role_class =
META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_surface_role_xdg_surface_parent_class); META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_xdg_surface_parent_class);
surface_role_class->commit (surface_role, pending); surface_role_class->commit (surface_role, pending);
if (surface->buffer_ref.buffer == NULL) if (surface->buffer_ref.buffer == NULL)
@ -655,12 +653,12 @@ xdg_surface_role_close (MetaWaylandSurfaceRoleShellSurface *shell_surface_role)
} }
static void static void
meta_wayland_surface_role_xdg_surface_init (MetaWaylandSurfaceRoleXdgSurface *role) meta_wayland_xdg_surface_init (MetaWaylandXdgSurface *role)
{ {
} }
static void static void
meta_wayland_surface_role_xdg_surface_class_init (MetaWaylandSurfaceRoleXdgSurfaceClass *klass) meta_wayland_xdg_surface_class_init (MetaWaylandXdgSurfaceClass *klass)
{ {
MetaWaylandSurfaceRoleClass *surface_role_class = MetaWaylandSurfaceRoleClass *surface_role_class =
META_WAYLAND_SURFACE_ROLE_CLASS (klass); META_WAYLAND_SURFACE_ROLE_CLASS (klass);
@ -685,7 +683,7 @@ xdg_popup_role_commit (MetaWaylandSurfaceRole *surface_role,
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
surface_role_class = surface_role_class =
META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_surface_role_xdg_popup_parent_class); META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_xdg_popup_parent_class);
surface_role_class->commit (surface_role, pending); surface_role_class->commit (surface_role, pending);
if (surface->buffer_ref.buffer == NULL) if (surface->buffer_ref.buffer == NULL)
@ -751,12 +749,12 @@ xdg_popup_role_popup_done (MetaWaylandSurfaceRoleShellSurface *shell_surface_rol
} }
static void static void
meta_wayland_surface_role_xdg_popup_init (MetaWaylandSurfaceRoleXdgPopup *role) meta_wayland_xdg_popup_init (MetaWaylandXdgPopup *role)
{ {
} }
static void static void
meta_wayland_surface_role_xdg_popup_class_init (MetaWaylandSurfaceRoleXdgPopupClass *klass) meta_wayland_xdg_popup_class_init (MetaWaylandXdgPopupClass *klass)
{ {
MetaWaylandSurfaceRoleClass *surface_role_class = MetaWaylandSurfaceRoleClass *surface_role_class =
META_WAYLAND_SURFACE_ROLE_CLASS (klass); META_WAYLAND_SURFACE_ROLE_CLASS (klass);

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

@ -22,16 +22,16 @@
#include "wayland/meta-wayland-surface.h" #include "wayland/meta-wayland-surface.h"
#define META_TYPE_WAYLAND_SURFACE_ROLE_XDG_SURFACE (meta_wayland_surface_role_xdg_surface_get_type ()) #define META_TYPE_WAYLAND_XDG_SURFACE (meta_wayland_xdg_surface_get_type ())
G_DECLARE_FINAL_TYPE (MetaWaylandSurfaceRoleXdgSurface, G_DECLARE_FINAL_TYPE (MetaWaylandXdgSurface,
meta_wayland_surface_role_xdg_surface, meta_wayland_xdg_surface,
META, WAYLAND_SURFACE_ROLE_XDG_SURFACE, META, WAYLAND_XDG_SURFACE,
MetaWaylandSurfaceRoleShellSurface); MetaWaylandSurfaceRoleShellSurface);
#define META_TYPE_WAYLAND_SURFACE_ROLE_XDG_POPUP (meta_wayland_surface_role_xdg_popup_get_type ()) #define META_TYPE_WAYLAND_XDG_POPUP (meta_wayland_xdg_popup_get_type ())
G_DECLARE_FINAL_TYPE (MetaWaylandSurfaceRoleXdgPopup, G_DECLARE_FINAL_TYPE (MetaWaylandXdgPopup,
meta_wayland_surface_role_xdg_popup, meta_wayland_xdg_popup,
META, WAYLAND_SURFACE_ROLE_XDG_POPUP, META, WAYLAND_XDG_POPUP,
MetaWaylandSurfaceRoleShellSurface); MetaWaylandSurfaceRoleShellSurface);
void meta_wayland_xdg_shell_init (MetaWaylandCompositor *compositor); void meta_wayland_xdg_shell_init (MetaWaylandCompositor *compositor);