[mutter/wip/carlosg/xdg-activation: 436/436] wayland: Support the xdg-activation protocol
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/xdg-activation: 436/436] wayland: Support the xdg-activation protocol
- Date: Tue, 23 Feb 2021 11:01:58 +0000 (UTC)
commit 589162a50ba673966bb0bc63bd8b5e562129277a
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Oct 9 16:23:32 2020 +0200
wayland: Support the xdg-activation protocol
This protocol implements the IPC necessary to focus application
windows across launcher/launchee. Add support for it.
src/core/startup-notification.c | 14 +-
src/meson.build | 3 +
src/wayland/meta-wayland-activation.c | 252 ++++++++++++++++++++++++++++++++++
src/wayland/meta-wayland-activation.h | 42 ++++++
src/wayland/meta-wayland-private.h | 1 +
src/wayland/meta-wayland-types.h | 2 +
src/wayland/meta-wayland-versions.h | 1 +
src/wayland/meta-wayland.c | 2 +
8 files changed, 316 insertions(+), 1 deletion(-)
---
diff --git a/src/core/startup-notification.c b/src/core/startup-notification.c
index 07f1856b0a..85a14e939c 100644
--- a/src/core/startup-notification.c
+++ b/src/core/startup-notification.c
@@ -62,6 +62,7 @@ enum
enum
{
SEQ_COMPLETE,
+ SEQ_TIMEOUT,
N_SEQ_SIGNALS
};
@@ -267,6 +268,12 @@ meta_startup_sequence_class_init (MetaStartupSequenceClass *klass)
G_STRUCT_OFFSET (MetaStartupSequenceClass, complete),
NULL, NULL, NULL,
G_TYPE_NONE, 0);
+ seq_signals[SEQ_TIMEOUT] =
+ g_signal_new ("timeout",
+ META_TYPE_STARTUP_SEQUENCE,
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
seq_props[PROP_SEQ_ID] =
g_param_spec_string ("id",
@@ -488,7 +495,12 @@ startup_sequence_timeout (void *data)
"Timed out sequence %s",
meta_startup_sequence_get_id (sequence));
- meta_startup_sequence_complete (sequence);
+ if (!meta_startup_sequence_get_completed (sequence))
+ {
+ g_signal_emit (sequence, seq_signals[SEQ_TIMEOUT], 0, sequence);
+ meta_startup_sequence_complete (sequence);
+ }
+
meta_startup_notification_remove_sequence (sn, sequence);
}
diff --git a/src/meson.build b/src/meson.build
index 92064e6e29..76e1cbe2ff 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -505,6 +505,8 @@ if have_wayland
'wayland/meta-pointer-lock-wayland.h',
'wayland/meta-selection-source-wayland.c',
'wayland/meta-selection-source-wayland-private.h',
+ 'wayland/meta-wayland-activation.c',
+ 'wayland/meta-wayland-activation.h',
'wayland/meta-wayland-actor-surface.c',
'wayland/meta-wayland-actor-surface.h',
'wayland/meta-wayland-buffer.c',
@@ -854,6 +856,7 @@ if have_wayland
['tablet', 'unstable', 'v2', ],
['text-input', 'unstable', 'v3', ],
['viewporter', 'stable', ],
+ ['xdg-activation', 'unstable', 'v1', ],
['xdg-foreign', 'unstable', 'v1', ],
['xdg-output', 'unstable', 'v1', ],
['xdg-shell', 'unstable', 'v6', ],
diff --git a/src/wayland/meta-wayland-activation.c b/src/wayland/meta-wayland-activation.c
new file mode 100644
index 0000000000..76deb6ba61
--- /dev/null
+++ b/src/wayland/meta-wayland-activation.c
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2020 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Author: Carlos Garnacho <carlosg gnome org>
+ */
+
+#include "config.h"
+
+#include "meta-wayland-activation.h"
+
+#include <glib.h>
+#include <wayland-server.h>
+
+#include "wayland/meta-wayland-private.h"
+#include "wayland/meta-wayland-versions.h"
+#include "xdg-activation-unstable-v1-server-protocol.h"
+
+static void
+unbind_resource (struct wl_resource *resource)
+{
+ wl_list_remove (wl_resource_get_link (resource));
+}
+
+static void
+activation_destroy (struct wl_client *client,
+ struct wl_resource *resource)
+{
+ wl_resource_destroy (resource);
+}
+
+static struct wl_resource *
+meta_wayland_activation_token_create_new_resource (MetaWaylandActivation *activation,
+ struct wl_client *client,
+ struct wl_resource *activation_resource,
+ uint32_t id)
+{
+ struct wl_resource *activation_token_resource;
+
+ activation_token_resource =
+ wl_resource_create (client, &zxdg_activation_token_provider_v1_interface,
+ wl_resource_get_version (activation_resource),
+ id);
+
+ return activation_token_resource;
+}
+
+static void
+activation_get_activation_token (struct wl_client *client,
+ struct wl_resource *resource,
+ uint32_t id,
+ struct wl_resource *surface_resource,
+ uint32_t serial,
+ struct wl_resource *seat_resource)
+{
+ MetaWaylandActivation *activation = wl_resource_get_user_data (resource);
+ MetaWaylandSeat *seat = wl_resource_get_user_data (seat_resource);
+ MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
+ struct wl_resource *token_resource;
+ gchar *token;
+
+ token_resource =
+ meta_wayland_activation_token_create_new_resource (activation,
+ client,
+ resource,
+ id);
+
+ if (meta_wayland_seat_get_grab_info (seat, surface, serial, FALSE, NULL, NULL))
+ {
+ token = g_uuid_string_random ();
+ zxdg_activation_token_provider_v1_send_done (token_resource, token);
+ g_hash_table_insert (activation->token_resources, token, token_resource);
+ }
+ else
+ {
+ zxdg_activation_token_provider_v1_send_failed (token_resource);
+ }
+}
+
+static void
+sequence_complete_cb (MetaStartupSequence *sequence,
+ MetaWaylandActivation *activation)
+{
+ struct wl_resource *token_resource;
+
+ token_resource = g_hash_table_lookup (activation->sequences, sequence);
+ if (token_resource)
+ g_hash_table_remove (activation->sequences, sequence);
+}
+
+static void
+activation_associate (struct wl_client *client,
+ struct wl_resource *resource,
+ const char *token,
+ const char *app_id)
+{
+ MetaWaylandActivation *activation = wl_resource_get_user_data (resource);
+ MetaDisplay *display = meta_get_display ();
+ MetaStartupSequence *sequence;
+ struct wl_resource *token_resource;
+ uint32_t timestamp;
+
+ token_resource = g_hash_table_lookup (activation->token_resources, token);
+ g_hash_table_steal (activation->token_resources, token);
+ if (!token_resource)
+ return;
+
+ timestamp = meta_display_get_current_time_roundtrip (display);
+ sequence = g_object_new (META_TYPE_STARTUP_SEQUENCE,
+ "id", token,
+ "application-id", app_id,
+ "timestamp", timestamp,
+ NULL);
+
+ g_signal_connect (sequence,
+ "complete",
+ G_CALLBACK (sequence_complete_cb),
+ activation);
+
+ meta_startup_notification_add_sequence (display->startup_notification,
+ sequence);
+
+ g_hash_table_insert (activation->sequences, sequence, token_resource);
+ wl_resource_set_user_data (token_resource, sequence);
+}
+
+static void
+activation_set_activation_token (struct wl_client *client,
+ struct wl_resource *resource,
+ const char *token)
+{
+ MetaWaylandActivation *activation = wl_resource_get_user_data (resource);
+ MetaDisplay *display = meta_get_display ();
+ MetaStartupSequence *sequence;
+
+ sequence = meta_startup_notification_lookup_sequence (display->startup_notification,
+ token);
+ if (sequence)
+ {
+ meta_startup_sequence_complete (sequence);
+ g_hash_table_insert (activation->ack_clients, client, sequence);
+ }
+}
+
+static void
+activation_activate (struct wl_client *client,
+ struct wl_resource *resource,
+ struct wl_resource *surface_resource)
+{
+ MetaWaylandActivation *activation = wl_resource_get_user_data (resource);
+ MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
+ MetaDisplay *display = meta_get_display ();
+ MetaStartupSequence *sequence = NULL;
+ MetaWindow *window;
+
+ window = meta_wayland_surface_get_window (surface);
+ if (!window)
+ return;
+
+ sequence = g_hash_table_lookup (activation->ack_clients, client);
+ g_hash_table_steal (activation->ack_clients, client);
+
+ if (sequence)
+ {
+ uint32_t timestamp;
+ int32_t workspace_idx;
+
+ workspace_idx = meta_startup_sequence_get_workspace (sequence);
+ timestamp = meta_startup_sequence_get_timestamp (sequence);
+
+ meta_startup_sequence_complete (sequence);
+ meta_startup_notification_remove_sequence (display->startup_notification,
+ sequence);
+ if (workspace_idx >= 0)
+ meta_window_change_workspace_by_index (window, workspace_idx, TRUE);
+
+ meta_window_activate_full (window, timestamp,
+ META_CLIENT_TYPE_APPLICATION, NULL);
+ }
+ else
+ {
+ meta_window_set_demands_attention (window);
+ }
+}
+
+static const struct zxdg_activation_v1_interface activation_interface = {
+ activation_destroy,
+ activation_get_activation_token,
+ activation_associate,
+ activation_set_activation_token,
+ activation_activate,
+};
+
+static void
+bind_activation (struct wl_client *client,
+ void *data,
+ uint32_t version,
+ uint32_t id)
+{
+ MetaWaylandCompositor *compositor = data;
+ MetaWaylandActivation *activation = compositor->activation;
+ struct wl_resource *resource;
+
+ resource = wl_resource_create (client, &zxdg_activation_v1_interface,
+ MIN (version, META_ZXDG_ACTIVATION_V1_VERSION),
+ id);
+ wl_resource_set_implementation (resource, &activation_interface,
+ activation, unbind_resource);
+ wl_resource_set_user_data (resource, activation);
+ wl_list_insert (&activation->resource_list,
+ wl_resource_get_link (resource));
+}
+
+void
+meta_wayland_activation_init (MetaWaylandCompositor *compositor)
+{
+ MetaWaylandActivation *activation;
+
+ activation = g_new0 (MetaWaylandActivation, 1);
+ activation->compositor = compositor;
+ activation->wl_display = compositor->wayland_display;
+ wl_list_init (&activation->resource_list);
+
+ activation->sequences = g_hash_table_new_full (NULL, NULL,
+ g_object_unref,
+ NULL);
+ activation->token_resources = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
+ NULL);
+ activation->ack_clients = g_hash_table_new (NULL, NULL);
+
+ wl_global_create (activation->wl_display,
+ &zxdg_activation_v1_interface, 1,
+ compositor, bind_activation);
+
+ compositor->activation = activation;
+}
diff --git a/src/wayland/meta-wayland-activation.h b/src/wayland/meta-wayland-activation.h
new file mode 100644
index 0000000000..42683eafc4
--- /dev/null
+++ b/src/wayland/meta-wayland-activation.h
@@ -0,0 +1,42 @@
+/*
+ * Wayland Support
+ *
+ * Copyright (C) 2020 Red Hat
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Carlos Garnacho <carlosg gnome org>
+ */
+
+#ifndef META_WAYLAND_ACTIVATION_H
+#define META_WAYLAND_ACTIVATION_H
+
+#include <glib.h>
+#include <wayland-server.h>
+
+#include "wayland/meta-wayland-types.h"
+
+struct _MetaWaylandActivation
+{
+ MetaWaylandCompositor *compositor;
+ struct wl_display *wl_display;
+ struct wl_list resource_list;
+ GHashTable *sequences;
+ GHashTable *token_resources;
+ GHashTable *ack_clients;
+};
+
+void meta_wayland_activation_init (MetaWaylandCompositor *compositor);
+
+#endif /* META_WAYLAND_ACTIVATION_H */
diff --git a/src/wayland/meta-wayland-private.h b/src/wayland/meta-wayland-private.h
index 82a256f60f..50e83de7df 100644
--- a/src/wayland/meta-wayland-private.h
+++ b/src/wayland/meta-wayland-private.h
@@ -92,6 +92,7 @@ struct _MetaWaylandCompositor
MetaWaylandSeat *seat;
MetaWaylandTabletManager *tablet_manager;
+ MetaWaylandActivation *activation;
GHashTable *scheduled_surface_associations;
};
diff --git a/src/wayland/meta-wayland-types.h b/src/wayland/meta-wayland-types.h
index 00712ad1f1..aeb6f61786 100644
--- a/src/wayland/meta-wayland-types.h
+++ b/src/wayland/meta-wayland-types.h
@@ -61,4 +61,6 @@ typedef struct _MetaWaylandWindowConfiguration MetaWaylandWindowConfiguration;
typedef struct _MetaWaylandPointerClient MetaWaylandPointerClient;
+typedef struct _MetaWaylandActivation MetaWaylandActivation;
+
#endif
diff --git a/src/wayland/meta-wayland-versions.h b/src/wayland/meta-wayland-versions.h
index bf891d99a1..2e69f0fff7 100644
--- a/src/wayland/meta-wayland-versions.h
+++ b/src/wayland/meta-wayland-versions.h
@@ -57,5 +57,6 @@
#define META_WP_VIEWPORTER_VERSION 1
#define META_GTK_PRIMARY_SELECTION_VERSION 1
#define META_ZWP_PRIMARY_SELECTION_V1_VERSION 1
+#define META_ZXDG_ACTIVATION_V1_VERSION 1
#endif
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index ef7a495b5c..700f095164 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -32,6 +32,7 @@
#include "clutter/wayland/clutter-wayland-compositor.h"
#include "compositor/meta-surface-actor-wayland.h"
#include "core/main-private.h"
+#include "wayland/meta-wayland-activation.h"
#include "wayland/meta-wayland-buffer.h"
#include "wayland/meta-wayland-data-device.h"
#include "wayland/meta-wayland-dma-buf.h"
@@ -444,6 +445,7 @@ meta_wayland_compositor_setup (MetaWaylandCompositor *compositor)
meta_wayland_surface_inhibit_shortcuts_dialog_init ();
meta_wayland_text_input_init (compositor);
meta_wayland_gtk_text_input_init (compositor);
+ meta_wayland_activation_init (compositor);
/* Xwayland specific protocol, needs to be filtered out for all other clients */
if (meta_xwayland_grab_keyboard_init (compositor))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
