[mutter/wip/carlosg/clipboard-manager: 4/13] core: Add MetaSelection and MetaSelectionSource
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/clipboard-manager: 4/13] core: Add MetaSelection and MetaSelectionSource
- Date: Fri, 30 Nov 2018 16:44:43 +0000 (UTC)
commit 1ef212b3a352299321f07ef0f7f9134f5a50de69
Author: Carlos Garnacho <carlosg gnome org>
Date: Mon Nov 19 16:45:20 2018 +0100
core: Add MetaSelection and MetaSelectionSource
MetaSelectionSource represents a primary/clipboard/dnd selection owner,
it is an abstract type so wayland/x11/etc implementations can be provided.
These 3 selections are managed by the MetaSelection object, the current
selection owners will be set there, and signals will be emitted so the
previous selection owner can clean itself up.
The actual data transfer is done through the meta_selection_transfer_async()
call, which will take a GOutputStream and create a corresponding
GInputStream from the MetaSelectionSource in order to splice them.
src/Makefile.am | 4 +
src/core/meta-selection-source.c | 137 ++++++++++++++++++
src/core/meta-selection-source.h | 79 ++++++++++
src/core/meta-selection.c | 305 +++++++++++++++++++++++++++++++++++++++
src/core/meta-selection.h | 61 ++++++++
src/meson.build | 4 +
6 files changed, 590 insertions(+)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 13d572cc7..ccb40fdcf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -289,6 +289,10 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES = \
meta/meta-inhibit-shortcuts-dialog.h \
core/meta-inhibit-shortcuts-dialog-default.c \
core/meta-inhibit-shortcuts-dialog-default-private.h \
+ core/meta-selection.c \
+ core/meta-selection.h \
+ core/meta-selection-source.c \
+ core/meta-selection-source.h \
core/delete.c \
core/display.c \
core/display-private.h \
diff --git a/src/core/meta-selection-source.c b/src/core/meta-selection-source.c
new file mode 100644
index 000000000..afe061990
--- /dev/null
+++ b/src/core/meta-selection-source.c
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2018 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-selection.h"
+#include "meta-selection-source.h"
+
+typedef struct MetaSelectionSourcePrivate MetaSelectionSourcePrivate;
+
+struct MetaSelectionSourcePrivate
+{
+ MetaSelectionType selection;
+ guint active : 1;
+};
+
+G_DEFINE_TYPE_WITH_PRIVATE (MetaSelectionSource,
+ meta_selection_source,
+ G_TYPE_OBJECT)
+
+enum
+{
+ ACTIVE,
+ INACTIVE,
+ N_SIGNALS
+};
+
+static guint signals[N_SIGNALS] = { 0 };
+
+static void
+meta_selection_source_active (MetaSelectionSource *source,
+ MetaSelectionType selection)
+{
+ MetaSelectionSourcePrivate *priv =
+ meta_selection_source_get_instance_private (source);
+
+ priv->selection = selection;
+ priv->active = TRUE;
+}
+
+static void
+meta_selection_source_inactive (MetaSelectionSource *source)
+{
+ MetaSelectionSourcePrivate *priv =
+ meta_selection_source_get_instance_private (source);
+
+ priv->active = FALSE;
+}
+
+static void
+meta_selection_source_class_init (MetaSelectionSourceClass *klass)
+{
+ klass->active = meta_selection_source_active;
+ klass->inactive = meta_selection_source_inactive;
+
+ signals[ACTIVE] =
+ g_signal_new ("active",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MetaSelectionSourceClass, active),
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 1,
+ G_TYPE_UINT);
+ signals[INACTIVE] =
+ g_signal_new ("inactive",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MetaSelectionSourceClass, inactive),
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
+}
+
+static void
+meta_selection_source_init (MetaSelectionSource *source)
+{
+}
+
+void
+meta_selection_source_read_async (MetaSelectionSource *source,
+ const gchar *mimetype,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ META_SELECTION_SOURCE_GET_CLASS (source)->read_async (source,
+ mimetype,
+ cancellable,
+ callback,
+ user_data);
+}
+
+GInputStream *
+meta_selection_source_read_finish (MetaSelectionSource *source,
+ GAsyncResult *result,
+ GError **error)
+{
+ return META_SELECTION_SOURCE_GET_CLASS (source)->read_finish (source,
+ result,
+ error);
+}
+
+GList *
+meta_selection_source_get_mimetypes (MetaSelectionSource *source)
+{
+ return META_SELECTION_SOURCE_GET_CLASS (source)->get_mimetypes (source);
+}
+
+gboolean
+meta_selection_source_get_selection (MetaSelectionSource *source,
+ MetaSelectionType *selection)
+{
+ MetaSelectionSourcePrivate *priv =
+ meta_selection_source_get_instance_private (source);
+
+ if (!priv->active)
+ return FALSE;
+
+ *selection = priv->selection;
+ return TRUE;
+}
diff --git a/src/core/meta-selection-source.h b/src/core/meta-selection-source.h
new file mode 100644
index 000000000..a6d2e4155
--- /dev/null
+++ b/src/core/meta-selection-source.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2018 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>
+ */
+#ifndef META_SELECTION_SOURCE_H
+#define META_SELECTION_SOURCE_H
+
+#include <gio/gio.h>
+
+typedef enum
+{
+ META_SELECTION_PRIMARY,
+ META_SELECTION_CLIPBOARD,
+ META_SELECTION_DND,
+ META_N_SELECTION_TYPES,
+} MetaSelectionType;
+
+typedef struct _MetaSelectionSourceClass MetaSelectionSourceClass;
+typedef struct _MetaSelectionSource MetaSelectionSource;
+
+#define META_TYPE_SELECTION_SOURCE (meta_selection_source_get_type ())
+
+G_DECLARE_DERIVABLE_TYPE (MetaSelectionSource,
+ meta_selection_source,
+ META, SELECTION_SOURCE,
+ GObject)
+
+struct _MetaSelectionSourceClass
+{
+ GObjectClass parent_class;
+
+ void (* active) (MetaSelectionSource *source,
+ MetaSelectionType selection);
+ void (*inactive) (MetaSelectionSource *source);
+
+ GList * (*get_mimetypes) (MetaSelectionSource *source);
+
+ void (* read_async) (MetaSelectionSource *source,
+ const gchar *mimetype,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GInputStream * (* read_finish) (MetaSelectionSource *source,
+ GAsyncResult *result,
+ GError **error);
+};
+
+void meta_selection_source_read_async (MetaSelectionSource *source,
+ const gchar *mimetype,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+GInputStream * meta_selection_source_read_finish (MetaSelectionSource *source,
+ GAsyncResult *result,
+ GError **error);
+
+GList * meta_selection_source_get_mimetypes (MetaSelectionSource *source);
+
+gboolean meta_selection_source_get_selection (MetaSelectionSource *source,
+ MetaSelectionType *selection);
+
+#endif /* META_SELECTION_SOURCE_H */
diff --git a/src/core/meta-selection.c b/src/core/meta-selection.c
new file mode 100644
index 000000000..4fc864304
--- /dev/null
+++ b/src/core/meta-selection.c
@@ -0,0 +1,305 @@
+/*
+ * Copyright (C) 2018 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-selection.h"
+
+typedef struct TransferRequest TransferRequest;
+
+struct _MetaSelection
+{
+ GObject parent_instance;
+ MetaDisplay *display;
+ MetaSelectionSource *owners[META_N_SELECTION_TYPES];
+};
+
+struct TransferRequest
+{
+ MetaSelectionType selection;
+ GInputStream *istream;
+ GOutputStream *ostream;
+ gssize len;
+};
+
+enum
+{
+ OWNER_CHANGED,
+ N_SIGNALS
+};
+
+static guint signals[N_SIGNALS] = { 0 };
+
+G_DEFINE_TYPE (MetaSelection, meta_selection, G_TYPE_OBJECT)
+
+static void
+meta_selection_finalize (GObject *object)
+{
+ G_OBJECT_CLASS (meta_selection_parent_class)->finalize (object);
+}
+
+static void
+meta_selection_class_init (MetaSelectionClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->finalize = meta_selection_finalize;
+
+ signals[OWNER_CHANGED] =
+ g_signal_new ("owner-changed",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 2,
+ G_TYPE_UINT,
+ META_TYPE_SELECTION_SOURCE);
+}
+
+static void
+meta_selection_init (MetaSelection *selection)
+{
+}
+
+MetaSelection *
+meta_selection_new (MetaDisplay *display)
+{
+ return g_object_new (META_TYPE_SELECTION,
+ NULL);
+}
+
+void
+meta_selection_set_owner (MetaSelection *selection,
+ MetaSelectionType selection_type,
+ MetaSelectionSource *owner)
+{
+ g_return_if_fail (META_IS_SELECTION (selection));
+ g_return_if_fail (selection_type < META_N_SELECTION_TYPES);
+
+ if (selection->owners[selection_type] == owner)
+ return;
+
+ if (selection->owners[selection_type])
+ g_signal_emit_by_name (selection->owners[selection_type], "inactive");
+
+ g_set_object (&selection->owners[selection_type], owner);
+ g_signal_emit_by_name (owner, "active", selection_type);
+ g_signal_emit (selection, signals[OWNER_CHANGED], 0, selection_type, owner);
+}
+
+void
+meta_selection_unset_owner (MetaSelection *selection,
+ MetaSelectionType selection_type,
+ MetaSelectionSource *owner)
+{
+ g_return_if_fail (META_IS_SELECTION (selection));
+ g_return_if_fail (selection_type < META_N_SELECTION_TYPES);
+
+ if (selection->owners[selection_type] == owner)
+ {
+ g_signal_emit_by_name (owner, "inactive");
+ g_clear_object (&selection->owners[selection_type]);
+ g_signal_emit (selection, signals[OWNER_CHANGED], 0,
+ selection_type, NULL);
+ }
+}
+
+GList *
+meta_selection_get_mimetypes (MetaSelection *selection,
+ MetaSelectionType selection_type)
+{
+ g_return_val_if_fail (META_IS_SELECTION (selection), NULL);
+ g_return_val_if_fail (selection_type < META_N_SELECTION_TYPES, NULL);
+
+ if (!selection->owners[selection_type])
+ return NULL;
+
+ return meta_selection_source_get_mimetypes (selection->owners[selection_type]);
+}
+
+static TransferRequest *
+transfer_request_new (GOutputStream *ostream,
+ MetaSelectionType selection,
+ gssize len)
+{
+ TransferRequest *request;
+
+ request = g_new0 (TransferRequest, 1);
+ request->ostream = g_object_ref (ostream);
+ request->selection = selection;
+ request->len = len;
+ return request;
+}
+
+static void
+transfer_request_free (TransferRequest *request)
+{
+ g_clear_object (&request->istream);
+ g_clear_object (&request->ostream);
+ g_free (request);
+}
+
+static void
+splice_cb (GOutputStream *stream,
+ GAsyncResult *result,
+ GTask *task)
+{
+ GError *error = NULL;
+
+ g_output_stream_splice_finish (stream, result, &error);
+ if (error)
+ {
+ g_task_return_error (task, error);
+ g_object_unref (task);
+ return;
+ }
+
+ g_task_return_boolean (task, TRUE);
+ g_object_unref (task);
+}
+
+static void
+write_cb (GOutputStream *stream,
+ GAsyncResult *result,
+ GTask *task)
+{
+ GError *error = NULL;
+
+ g_output_stream_write_bytes_finish (stream, result, &error);
+ if (error)
+ {
+ g_task_return_error (task, error);
+ g_object_unref (task);
+ return;
+ }
+
+ g_task_return_boolean (task, TRUE);
+ g_object_unref (task);
+}
+
+static void
+read_cb (GInputStream *stream,
+ GAsyncResult *result,
+ GTask *task)
+{
+ TransferRequest *request;
+ GError *error = NULL;
+ GBytes *bytes;
+
+ bytes = g_input_stream_read_bytes_finish (stream, result, &error);
+ if (error)
+ {
+ g_task_return_error (task, error);
+ g_object_unref (task);
+ return;
+ }
+
+ request = g_task_get_task_data (task);
+ g_output_stream_write_bytes_async (request->ostream,
+ bytes,
+ G_PRIORITY_DEFAULT,
+ g_task_get_cancellable (task),
+ write_cb,
+ task);
+ g_bytes_unref (bytes);
+}
+
+static void
+source_read_cb (MetaSelectionSource *source,
+ GAsyncResult *result,
+ GTask *task)
+{
+ TransferRequest *request;
+ GInputStream *stream;
+ GError *error = NULL;
+
+ stream = meta_selection_source_read_finish (source, result, &error);
+ if (!stream)
+ {
+ g_task_return_error (task, error);
+ return;
+ }
+
+ request = g_task_get_task_data (task);
+ request->istream = stream;
+
+ if (request->len < 0)
+ {
+ g_output_stream_splice_async (request->ostream,
+ request->istream,
+ G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE |
+ G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
+ G_PRIORITY_DEFAULT,
+ g_task_get_cancellable (task),
+ (GAsyncReadyCallback) splice_cb,
+ task);
+ }
+ else
+ {
+ g_input_stream_read_bytes_async (request->istream,
+ (gsize) request->len,
+ G_PRIORITY_DEFAULT,
+ g_task_get_cancellable (task),
+ (GAsyncReadyCallback) read_cb,
+ task);
+ }
+}
+
+void
+meta_selection_transfer_async (MetaSelection *selection,
+ MetaSelectionType selection_type,
+ const gchar *mimetype,
+ gssize size,
+ GOutputStream *output,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ GTask *task;
+
+ g_return_if_fail (META_IS_SELECTION (selection));
+ g_return_if_fail (selection_type < META_N_SELECTION_TYPES);
+ g_return_if_fail (G_IS_OUTPUT_STREAM (output));
+ g_return_if_fail (mimetype != NULL);
+
+ task = g_task_new (selection, cancellable, callback, user_data);
+ g_task_set_source_tag (task, meta_selection_transfer_async);
+
+ g_task_set_task_data (task,
+ transfer_request_new (output, selection_type, size),
+ (GDestroyNotify) transfer_request_free);
+ meta_selection_source_read_async (selection->owners[selection_type],
+ mimetype,
+ cancellable,
+ (GAsyncReadyCallback) source_read_cb,
+ task);
+}
+
+gboolean
+meta_selection_transfer_finish (MetaSelection *selection,
+ GAsyncResult *result,
+ GError **error)
+{
+ g_return_val_if_fail (g_task_is_valid (result, selection), FALSE);
+ g_return_val_if_fail (g_task_get_source_tag (G_TASK (result)) ==
+ meta_selection_transfer_async, FALSE);
+
+ return g_task_propagate_boolean (G_TASK (result), error);
+}
diff --git a/src/core/meta-selection.h b/src/core/meta-selection.h
new file mode 100644
index 000000000..c0d1f50e3
--- /dev/null
+++ b/src/core/meta-selection.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2018 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>
+ */
+#ifndef META_SELECTION_H
+#define META_SELECTION_H
+
+#include <gio/gio.h>
+
+#include "core/meta-selection-source.h"
+#include "meta/display.h"
+
+#define META_TYPE_SELECTION (meta_selection_get_type ())
+
+G_DECLARE_FINAL_TYPE (MetaSelection,
+ meta_selection,
+ META, SELECTION,
+ GObject)
+
+MetaSelection *
+ meta_selection_new (MetaDisplay *display);
+
+void meta_selection_set_owner (MetaSelection *selection,
+ MetaSelectionType selection_type,
+ MetaSelectionSource *owner);
+void meta_selection_unset_owner (MetaSelection *selection,
+ MetaSelectionType selection_type,
+ MetaSelectionSource *owner);
+
+GList * meta_selection_get_mimetypes (MetaSelection *selection,
+ MetaSelectionType selection_type);
+
+void meta_selection_transfer_async (MetaSelection *selection,
+ MetaSelectionType selection_type,
+ const gchar *mimetype,
+ gssize size,
+ GOutputStream *output,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean meta_selection_transfer_finish (MetaSelection *selection,
+ GAsyncResult *result,
+ GError **error);
+
+#endif /* META_SELECTION_H */
diff --git a/src/meson.build b/src/meson.build
index 5a058f55f..f43710b44 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -329,6 +329,10 @@ mutter_sources = [
'core/meta-inhibit-shortcuts-dialog.c',
'core/meta-inhibit-shortcuts-dialog-default.c',
'core/meta-inhibit-shortcuts-dialog-default-private.h',
+ 'core/meta-selection.c',
+ 'core/meta-selection.h',
+ 'core/meta-selection-source.c',
+ 'core/meta-selection-source.h',
'core/meta-workspace-manager.c',
'core/meta-workspace-manager-private.h',
'core/place.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
