diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 40ec9f4434..94ef6d0c27 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -399,6 +399,7 @@ gtk_private_h_sources = \ gtkcolorswatchprivate.h \ gtkcoloreditorprivate.h \ gtkcolorpickerprivate.h \ + gtkcolorpickerportalprivate.h \ gtkcolorplaneprivate.h \ gtkcolorscaleprivate.h \ gtkcolorchooserprivate.h \ @@ -677,6 +678,7 @@ gtk_base_c_sources = \ gtkcolorchooserdialog.c \ gtkcoloreditor.c \ gtkcolorpicker.c \ + gtkcolorpickerportal.c \ gtkcolorplane.c \ gtkcolorscale.c \ gtkcolorswatch.c \ diff --git a/gtk/gtkcolorpicker.c b/gtk/gtkcolorpicker.c index 230761ec34..d270a06be2 100644 --- a/gtk/gtkcolorpicker.c +++ b/gtk/gtkcolorpicker.c @@ -18,6 +18,8 @@ #include "config.h" #include "gtkcolorpickerprivate.h" +#include "gtkcolorpickerportalprivate.h" +#include "gtkprivate.h" #include @@ -48,6 +50,9 @@ gtk_color_picker_pick_finish (GtkColorPicker *picker, GtkColorPicker * gtk_color_picker_new (void) { - return NULL; + if (gtk_should_use_portal ()) + return gtk_color_picker_portal_new (); + else + return NULL; } diff --git a/gtk/gtkcolorpickerportal.c b/gtk/gtkcolorpickerportal.c new file mode 100644 index 0000000000..429c414f4b --- /dev/null +++ b/gtk/gtkcolorpickerportal.c @@ -0,0 +1,240 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) 2018, Red Hat, Inc + * + * 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 . + */ + +#include "config.h" + +#include "gtkcolorpickerportalprivate.h" +#include + +struct _GtkColorPickerPortal +{ + GObject parent_instance; + + GDBusProxy *portal_proxy; + guint portal_signal_id; + GTask *task; +}; + +struct _GtkColorPickerPortalClass +{ + GObjectClass parent_class; +}; + +static GInitableIface *initable_parent_iface; +static void gtk_color_picker_portal_initable_iface_init (GInitableIface *iface); +static void gtk_color_picker_portal_iface_init (GtkColorPickerInterface *iface); + +G_DEFINE_TYPE_WITH_CODE (GtkColorPickerPortal, gtk_color_picker_portal, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gtk_color_picker_portal_initable_iface_init) + G_IMPLEMENT_INTERFACE (GTK_TYPE_COLOR_PICKER, gtk_color_picker_portal_iface_init)) + +static gboolean +gtk_color_picker_portal_initable_init (GInitable *initable, + GCancellable *cancellable, + GError **error) +{ + GtkColorPickerPortal *picker = GTK_COLOR_PICKER_PORTAL (initable); + char *owner; + GVariant *ret; + guint version; + + picker->portal_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.freedesktop.portal.Desktop", + "/org/freedesktop/portal/desktop", + "org.freedesktop.portal.Screenshot", + NULL, + error); + + if (picker->portal_proxy == NULL) + { + g_debug ("Failed to create screnshot portal proxy"); + return FALSE; + } + + owner = g_dbus_proxy_get_name_owner (picker->portal_proxy); + if (owner == NULL) + { + g_debug ("org.freedesktop.portal.Screenshot not provided"); + g_clear_object (&picker->portal_proxy); + return FALSE; + } + g_free (owner); + + ret = g_dbus_proxy_get_cached_property (picker->portal_proxy, "version"); + g_variant_get (ret, "u", &version); + g_variant_unref (ret); + if (version != 2) + { + g_debug ("Screenshot portal version: %u", version); + g_clear_object (&picker->portal_proxy); + return FALSE; + } + + return TRUE; +} + +static void +gtk_color_picker_portal_initable_iface_init (GInitableIface *iface) +{ + initable_parent_iface = g_type_interface_peek_parent (iface); + iface->init = gtk_color_picker_portal_initable_init; +} + +static void +gtk_color_picker_portal_init (GtkColorPickerPortal *picker) +{ +} + +static void +gtk_color_picker_portal_finalize (GObject *object) +{ + GtkColorPickerPortal *picker = GTK_COLOR_PICKER_PORTAL (object); + + g_clear_object (&picker->portal_proxy); + + G_OBJECT_CLASS (gtk_color_picker_portal_parent_class)->finalize (object); +} + +static void +gtk_color_picker_portal_class_init (GtkColorPickerPortalClass *class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (class); + + object_class->finalize = gtk_color_picker_portal_finalize; +} + +GtkColorPicker * +gtk_color_picker_portal_new (void) +{ + return GTK_COLOR_PICKER (g_initable_new (GTK_TYPE_COLOR_PICKER_PORTAL, NULL, NULL, NULL)); +} + +static void +portal_response_received (GDBusConnection *connection, + const char *sender_name, + const char *object_path, + const char *interface_name, + const char *signal_name, + GVariant *parameters, + gpointer user_data) +{ + GtkColorPickerPortal *picker = user_data; + guint32 response; + GVariant *ret; + + g_dbus_connection_signal_unsubscribe (connection, picker->portal_signal_id); + picker->portal_signal_id = 0; + + g_variant_get (parameters, "(u@a{sv})", &response, &ret); + + if (response == 0) + { + GdkRGBA c; + + c.alpha = 1.0; + if (g_variant_lookup (ret, "color", "(ddd)", &c.red, &c.green, &c.blue)) + g_task_return_pointer (picker->task, gdk_rgba_copy (&c), (GDestroyNotify)gdk_rgba_free); + else + g_task_return_new_error (picker->task, + G_IO_ERROR, + G_IO_ERROR_FAILED, + "No color received"); + } + else + g_task_return_new_error (picker->task, + G_IO_ERROR, + G_IO_ERROR_FAILED, + "PickColor error"); + + g_variant_unref (ret); + + g_clear_object (&picker->task); +} + +static void +gtk_color_picker_portal_pick (GtkColorPicker *cp, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GtkColorPickerPortal *picker = GTK_COLOR_PICKER_PORTAL (cp); + GVariantBuilder options; + char *token; + GDBusConnection *connection; + char *sender; + char *handle; + int i; + + if (picker->task) + return; + + picker->task = g_task_new (picker, NULL, callback, user_data); + + connection = g_dbus_proxy_get_connection (picker->portal_proxy); + + token = g_strdup_printf ("gtk%d", g_random_int_range (0, G_MAXINT)); + sender = g_strdup (g_dbus_connection_get_unique_name (connection) + 1); + for (i = 0; sender[i]; i++) + if (sender[i] == '.') + sender[i] = '_'; + + handle = g_strdup_printf ("/org/freedesktop/portal/desktop/request/%s/%s", sender, token); + picker->portal_signal_id = g_dbus_connection_signal_subscribe (connection, + "org.freedesktop.portal.Desktop", + "org.freedesktop.portal.Request", + "Response", + handle, + NULL, + G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE, + portal_response_received, + picker, + NULL); + + g_free (handle); + g_free (sender); + + g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT); + g_variant_builder_add (&options, "{sv}", "handle_token", g_variant_new_string (token)); + g_free (token); + + g_dbus_proxy_call (picker->portal_proxy, + "PickColor", + g_variant_new ("(sa{sv})", "", &options), + 0, + -1, + NULL, + NULL, + NULL); +} + +static GdkRGBA * +gtk_color_picker_portal_pick_finish (GtkColorPicker *cp, + GAsyncResult *res, + GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, cp), NULL); + + return g_task_propagate_pointer (G_TASK (res), error); +} + +static void +gtk_color_picker_portal_iface_init (GtkColorPickerInterface *iface) +{ + iface->pick = gtk_color_picker_portal_pick; + iface->pick_finish = gtk_color_picker_portal_pick_finish; +} diff --git a/gtk/gtkcolorpickerportalprivate.h b/gtk/gtkcolorpickerportalprivate.h new file mode 100644 index 0000000000..1069c5ee9d --- /dev/null +++ b/gtk/gtkcolorpickerportalprivate.h @@ -0,0 +1,41 @@ +/* + * GTK - The GIMP Toolkit + * Copyright (C) 2018 Red Hat, Inc. + * All rights reserved. + * + * This Library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library. If not, see . + */ + +#ifndef __GTK_COLOR_PICKER_PORTAL_H__ +#define __GTK_COLOR_PICKER_PORTAL_H__ + + +#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + +#include + +G_BEGIN_DECLS + + +#define GTK_TYPE_COLOR_PICKER_PORTAL gtk_color_picker_portal_get_type () +G_DECLARE_FINAL_TYPE (GtkColorPickerPortal, gtk_color_picker_portal, GTK, COLOR_PICKER_PORTAL, GObject) + +GDK_AVAILABLE_IN_ALL +GtkColorPicker * gtk_color_picker_portal_new (void); + +G_END_DECLS + +#endif /* __GTK_COLOR_PICKER_PORTAL_H__ */