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

wayland/gtk-shell: Emit new capabilities event when changed

Browse Source 
The capabilities may change during the compositors lifetime, so make
gtk-shell emit the capabilities event when capabilities change.

https://gitlab.gnome.org/GNOME/mutter/issues/276
This commit is contained in:
Jonas Ådahl 2018-08-23 15:55:26 +02:00
parent 00619f3a1c
commit 0d29609aec
1 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,9 @@ typedef struct _MetaWaylandGtkSurface
struct _MetaWaylandGtkShell struct _MetaWaylandGtkShell
{ {
GObject parent; GObject parent;
GList *shell_resources;
uint32_t capabilities;
}; };
G_DEFINE_TYPE (MetaWaylandGtkShell, meta_wayland_gtk_shell, G_TYPE_OBJECT) G_DEFINE_TYPE (MetaWaylandGtkShell, meta_wayland_gtk_shell, G_TYPE_OBJECT)
@ -363,23 +366,32 @@ static const struct gtk_shell1_interface meta_wayland_gtk_shell_interface = {
gtk_shell_system_bell, gtk_shell_system_bell,
}; };
static void
gtk_shell_destructor (struct wl_resource *resource)
{
MetaWaylandGtkShell *gtk_shell = wl_resource_get_user_data (resource);
gtk_shell->shell_resources = g_list_remove (gtk_shell->shell_resources,
resource);
}
static void static void
bind_gtk_shell (struct wl_client *client, bind_gtk_shell (struct wl_client *client,
void *data, void *data,
guint32 version, guint32 version,
guint32 id) guint32 id)
{ {
MetaWaylandGtkShell *gtk_shell = data;
struct wl_resource *resource; struct wl_resource *resource;
uint32_t capabilities = 0;
resource = wl_resource_create (client, &gtk_shell1_interface, version, id); resource = wl_resource_create (client, &gtk_shell1_interface, version, id);
wl_resource_set_implementation (resource, &meta_wayland_gtk_shell_interface, wl_resource_set_implementation (resource, &meta_wayland_gtk_shell_interface,
data, NULL); data, gtk_shell_destructor);
if (!meta_prefs_get_show_fallback_app_menu ()) gtk_shell->shell_resources = g_list_prepend (gtk_shell->shell_resources,
capabilities = GTK_SHELL1_CAPABILITY_GLOBAL_APP_MENU; resource);
gtk_shell1_send_capabilities (resource, capabilities); gtk_shell1_send_capabilities (resource, gtk_shell->capabilities);
} }
static void static void
@ -394,6 +406,41 @@ meta_wayland_gtk_shell_class_init (MetaWaylandGtkShellClass *klass)
g_quark_from_static_string ("-meta-wayland-gtk-shell-surface-data"); g_quark_from_static_string ("-meta-wayland-gtk-shell-surface-data");
} }
static uint32_t
calculate_capabilities (void)
{
uint32_t capabilities = 0;
if (!meta_prefs_get_show_fallback_app_menu ())
capabilities = GTK_SHELL1_CAPABILITY_GLOBAL_APP_MENU;
return capabilities;
}
static void
prefs_changed (MetaPreference pref,
gpointer user_data)
{
MetaWaylandGtkShell *gtk_shell = user_data;
uint32_t new_capabilities;
GList *l;
if (pref != META_PREF_BUTTON_LAYOUT)
return;
new_capabilities = calculate_capabilities ();
if (gtk_shell->capabilities == new_capabilities)
return;
gtk_shell->capabilities = new_capabilities;
for (l = gtk_shell->shell_resources; l; l = l->next)
{
struct wl_resource *resource = l->data;
gtk_shell1_send_capabilities (resource, gtk_shell->capabilities);
}
}
static MetaWaylandGtkShell * static MetaWaylandGtkShell *
meta_wayland_gtk_shell_new (MetaWaylandCompositor *compositor) meta_wayland_gtk_shell_new (MetaWaylandCompositor *compositor)
{ {
@ -407,6 +454,10 @@ meta_wayland_gtk_shell_new (MetaWaylandCompositor *compositor)
gtk_shell, bind_gtk_shell) == NULL) gtk_shell, bind_gtk_shell) == NULL)
g_error ("Failed to register a global gtk-shell object"); g_error ("Failed to register a global gtk-shell object");
gtk_shell->capabilities = calculate_capabilities ();
meta_prefs_add_listener (prefs_changed, gtk_shell);
return gtk_shell; return gtk_shell;
} }