isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-20 06:25:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Move gtk_surface fields out of MetaWaylandSurface

Browse Source 
Let the gtk_shell extension unit handle its own state.

https://bugzilla.gnome.org/show_bug.cgi?id=769936
This commit is contained in:
Jonas Ådahl 2016-06-28 11:57:29 +08:00
parent 335cd8e74c
commit 3a75e55cd8
3 changed files with 56 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/wayland/meta-wayland-gtk-shell.c
View File

@ -33,12 +33,25 @@
#include "gtk-shell-server-protocol.h" #include "gtk-shell-server-protocol.h"
static GQuark quark_gtk_surface_data = 0;
typedef struct _MetaWaylandGtkSurface
{
struct wl_resource *resource;
MetaWaylandSurface *surface;
gboolean is_modal;
} MetaWaylandGtkSurface;
static void static void
gtk_surface_destructor (struct wl_resource *resource) gtk_surface_destructor (struct wl_resource *resource)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandGtkSurface *gtk_surface = wl_resource_get_user_data (resource);
surface->gtk_surface = NULL; if (gtk_surface->surface)
g_object_steal_qdata (G_OBJECT (gtk_surface->surface),
quark_gtk_surface_data);
g_free (gtk_surface);
} }
static void static void
@ -51,7 +64,8 @@ gtk_surface_set_dbus_properties (struct wl_client *client,
const char *application_object_path, const char *application_object_path,
const char *unique_bus_name) const char *unique_bus_name)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandGtkSurface *gtk_surface = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface = gtk_surface->surface;
/* Broken client, let it die instead of us */ /* Broken client, let it die instead of us */
if (!surface->window) if (!surface->window)
@ -73,12 +87,13 @@ static void
gtk_surface_set_modal (struct wl_client *client, gtk_surface_set_modal (struct wl_client *client,
struct wl_resource *resource) struct wl_resource *resource)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandGtkSurface *gtk_surface = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface = gtk_surface->surface;
if (surface->is_modal) if (gtk_surface->is_modal)
return; return;
surface->is_modal = TRUE; gtk_surface->is_modal = TRUE;
meta_window_set_type (surface->window, META_WINDOW_MODAL_DIALOG); meta_window_set_type (surface->window, META_WINDOW_MODAL_DIALOG);
} }
@ -86,12 +101,13 @@ static void
gtk_surface_unset_modal (struct wl_client *client, gtk_surface_unset_modal (struct wl_client *client,
struct wl_resource *resource) struct wl_resource *resource)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandGtkSurface *gtk_surface = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface = gtk_surface->surface;
if (!surface->is_modal) if (!gtk_surface->is_modal)
return; return;
surface->is_modal = FALSE; gtk_surface->is_modal = FALSE;
meta_window_set_type (surface->window, META_WINDOW_NORMAL); meta_window_set_type (surface->window, META_WINDOW_NORMAL);
} }
@ -100,7 +116,8 @@ gtk_surface_present (struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t timestamp) uint32_t timestamp)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandGtkSurface *gtk_surface = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface = gtk_surface->surface;
MetaWindow *window = surface->window; MetaWindow *window = surface->window;
if (!window) if (!window)
@ -117,6 +134,14 @@ static const struct gtk_surface1_interface meta_wayland_gtk_surface_interface =
gtk_surface_present, gtk_surface_present,
}; };
static void
gtk_surface_surface_destroyed (MetaWaylandGtkSurface *gtk_surface)
{
wl_resource_set_implementation (gtk_surface->resource,
NULL, NULL, NULL);
gtk_surface->surface = NULL;
}
static void static void
gtk_shell_get_gtk_surface (struct wl_client *client, gtk_shell_get_gtk_surface (struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
@ -124,8 +149,10 @@ gtk_shell_get_gtk_surface (struct wl_client *client,
struct wl_resource *surface_resource) struct wl_resource *surface_resource)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource); MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
MetaWaylandGtkSurface *gtk_surface;
if (surface->gtk_surface != NULL) gtk_surface = g_object_get_qdata (G_OBJECT (surface), quark_gtk_surface_data);
if (gtk_surface)
{ {
wl_resource_post_error (surface_resource, wl_resource_post_error (surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT, WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -133,13 +160,20 @@ gtk_shell_get_gtk_surface (struct wl_client *client,
return; return;
} }
surface->gtk_surface = wl_resource_create (client, gtk_surface = g_new0 (MetaWaylandGtkSurface, 1);
gtk_surface->surface = surface;
gtk_surface->resource = wl_resource_create (client,
&gtk_surface1_interface, &gtk_surface1_interface,
wl_resource_get_version (resource), wl_resource_get_version (resource),
id); id);
wl_resource_set_implementation (surface->gtk_surface, wl_resource_set_implementation (gtk_surface->resource,
&meta_wayland_gtk_surface_interface, &meta_wayland_gtk_surface_interface,
surface, gtk_surface_destructor); gtk_surface, gtk_surface_destructor);
g_object_set_qdata_full (G_OBJECT (surface),
quark_gtk_surface_data,
gtk_surface,
(GDestroyNotify) gtk_surface_surface_destroyed);
} }
static void static void
@ -163,8 +197,9 @@ gtk_shell_system_bell (struct wl_client *client,
if (gtk_surface_resource) if (gtk_surface_resource)
{ {
MetaWaylandSurface *surface = MetaWaylandGtkSurface *gtk_surface =
wl_resource_get_user_data (gtk_surface_resource); wl_resource_get_user_data (gtk_surface_resource);
MetaWaylandSurface *surface = gtk_surface->surface;
if (!surface->window) if (!surface->window)
return; return;
@ -205,6 +240,9 @@ bind_gtk_shell (struct wl_client *client,
void void
meta_wayland_gtk_shell_init (MetaWaylandCompositor *compositor) meta_wayland_gtk_shell_init (MetaWaylandCompositor *compositor)
{ {
quark_gtk_surface_data =
g_quark_from_static_string ("-meta-wayland-gtk-shell-surface-data");
if (wl_global_create (compositor->wayland_display, if (wl_global_create (compositor->wayland_display,
&gtk_shell1_interface, &gtk_shell1_interface,
META_GTK_SHELL1_VERSION, META_GTK_SHELL1_VERSION,

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

@ -1244,8 +1244,6 @@ wl_surface_destructor (struct wl_resource *resource)
if (surface->wl_subsurface) if (surface->wl_subsurface)
wl_resource_destroy (surface->wl_subsurface); wl_resource_destroy (surface->wl_subsurface);
if (surface->gtk_surface)
wl_resource_destroy (surface->gtk_surface);
g_object_unref (surface); g_object_unref (surface);

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

@ -203,12 +203,8 @@ struct _MetaWaylandSurface
MetaWaylandPendingState *pending; MetaWaylandPendingState *pending;
/* Extension resources. */ /* Extension resources. */
struct wl_resource *gtk_surface;
struct wl_resource *wl_subsurface; struct wl_resource *wl_subsurface;
/* gtk_surface stuff */
gboolean is_modal;
/* wl_subsurface stuff. */ /* wl_subsurface stuff. */
struct { struct {
MetaWaylandSurface *parent; MetaWaylandSurface *parent;