[evolution/wip-webkit2] Port text-higlight module to WK2
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip-webkit2] Port text-higlight module to WK2
- Date: Wed, 30 Oct 2013 13:56:55 +0000 (UTC)
commit b7179d065a885a2f500f29c13f907c9356d9e188
Author: Tomas Popela <tpopela redhat com>
Date: Wed Oct 30 14:55:48 2013 +0100
Port text-higlight module to WK2
configure.ac | 1 +
.../e-mail-display-popup-text-highlight.c | 183 ++++++++++++++++----
modules/text-highlight/web-extension/Makefile.am | 18 ++
.../module-text-highlight-web-extension.c | 187 ++++++++++++++++++++
.../module-text-highlight-web-extension.h | 26 +++
5 files changed, 380 insertions(+), 35 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f3223a0..b50e028 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1553,6 +1553,7 @@ modules/settings/Makefile
modules/spamassassin/Makefile
modules/startup-wizard/Makefile
modules/text-highlight/Makefile
+modules/text-highlight/web-extension/Makefile
modules/tnef-attachment/Makefile
modules/vcard-inline/Makefile
modules/web-inspector/Makefile
diff --git a/modules/text-highlight/e-mail-display-popup-text-highlight.c
b/modules/text-highlight/e-mail-display-popup-text-highlight.c
index bd5d82a..3de17d9 100644
--- a/modules/text-highlight/e-mail-display-popup-text-highlight.c
+++ b/modules/text-highlight/e-mail-display-popup-text-highlight.c
@@ -24,6 +24,8 @@
#include <shell/e-shell-window.h>
#include "mail/e-mail-browser.h"
+#include "web-extension/module-text-highlight-web-extension.h"
+
#include <libebackend/libebackend.h>
#include <glib/gi18n-lib.h>
@@ -37,7 +39,8 @@ typedef struct _EMailDisplayPopupTextHighlight {
GtkActionGroup *action_group;
- WebKitDOMDocument *document;
+ GDBusProxy *web_extension;
+ gint web_extension_watch_name_id;
} EMailDisplayPopupTextHighlight;
typedef struct _EMailDisplayPopupTextHighlightClass {
@@ -108,33 +111,104 @@ static GtkActionEntry entries[] = {
};
static void
+web_extension_proxy_created_cb (GDBusProxy *proxy,
+ GAsyncResult *result,
+ EMailDisplayPopupTextHighlight *th_extension)
+{
+ GError *error = NULL;
+
+ th_extension->web_extension = g_dbus_proxy_new_finish (result, &error);
+ if (!th_extension->web_extension) {
+ g_warning ("Error creating web extension proxy: %s\n", error->message);
+ g_error_free (error);
+ }
+}
+
+static void
+web_extension_appeared_cb (GDBusConnection *connection,
+ const gchar *name,
+ const gchar *name_owner,
+ EMailDisplayPopupTextHighlight *th_extension)
+{
+ g_dbus_proxy_new (
+ connection,
+ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
+ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+ NULL,
+ name,
+ MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_OBJECT_PATH,
+ MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_INTERFACE,
+ NULL,
+ (GAsyncReadyCallback)web_extension_proxy_created_cb,
+ th_extension);
+}
+
+static void
+web_extension_vanished_cb (GDBusConnection *connection,
+ const gchar *name,
+ EMailDisplayPopupTextHighlight *th_extension)
+{
+ g_clear_object (&th_extension->web_extension);
+}
+
+static void
+mail_display_popup_prefer_plain_watch_web_extension (EMailDisplayPopupTextHighlight *th_extension)
+{
+ char *service_name;
+
+ service_name = g_strdup_printf ("%s-%u", MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_SERVICE_NAME, getpid ());
+ th_extension->web_extension_watch_name_id =
+ g_bus_watch_name (
+ G_BUS_TYPE_SESSION,
+ service_name,
+ G_BUS_NAME_WATCHER_FLAGS_NONE,
+ (GBusNameAppearedCallback) web_extension_appeared_cb,
+ (GBusNameVanishedCallback) web_extension_vanished_cb,
+ th_extension, NULL);
+
+ g_free (service_name);
+}
+
+static void
reformat (GtkAction *old,
GtkAction *action,
gpointer user_data)
{
EMailDisplayPopupTextHighlight *th_extension;
- WebKitDOMDocument *doc;
- WebKitDOMDOMWindow *window;
- WebKitDOMElement *frame_element;
+ GVariant *result;
SoupURI *soup_uri;
GHashTable *query;
+ const gchar *document_uri;
gchar *uri;
th_extension = E_MAIL_DISPLAY_POPUP_TEXT_HIGHLIGHT (user_data);
- doc = th_extension->document;
- if (!doc)
+
+ if (!th_extension->web_extension)
return;
- uri = webkit_dom_document_get_document_uri (doc);
- soup_uri = soup_uri_new (uri);
- g_free (uri);
+ /* Get URI from saved document */
+ result = g_dbus_proxy_call_sync (
+ th_extension->web_extension,
+ "GetDocumentURI",
+ NULL,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ NULL);
+ if (result) {
+ document_uri = g_variant_get_string (result, NULL);
+ g_variant_unref (result);
+ }
+
+ soup_uri = soup_uri_new (document_uri);
if (!soup_uri)
- goto exit;
+ return;
if (!soup_uri->query) {
soup_uri_free (soup_uri);
- goto exit;
+ return;
}
query = soup_form_decode (soup_uri->query);
@@ -150,16 +224,18 @@ reformat (GtkAction *old,
soup_uri_free (soup_uri);
/* Get frame's window and from the window the actual <iframe> element */
- window = webkit_dom_document_get_default_view (doc);
- frame_element = webkit_dom_dom_window_get_frame_element (window);
- webkit_dom_html_iframe_element_set_src (
- WEBKIT_DOM_HTML_IFRAME_ELEMENT (frame_element), uri);
+ result = g_dbus_proxy_call_sync (
+ th_extension->web_extension,
+ "ChangeIFrameSource",
+ g_variant_new ("(s)", uri),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ NULL);
+ if (result)
+ g_variant_unref (result);
g_free (uri);
-
- /* The frame has been reloaded, the document pointer is invalid now */
-exit:
- th_extension->document = NULL;
}
static GtkActionGroup *
@@ -276,10 +352,16 @@ static void
update_actions (EMailDisplayPopupExtension *extension,
WebKitHitTestResult *context)
{
+ EMailDisplay *display;
EMailDisplayPopupTextHighlight *th_extension;
- WebKitDOMNode *node;
- WebKitDOMDocument *document;
- gchar *uri;
+ const gchar *document_uri;
+ GVariant *result;
+ gint32 x, y;
+ GdkDeviceManager *device_manager;
+ GdkDevice *pointer;
+
+ display = E_MAIL_DISPLAY (e_extension_get_extensible (
+ E_EXTENSION (extension)));
th_extension = E_MAIL_DISPLAY_POPUP_TEXT_HIGHLIGHT (extension);
@@ -287,20 +369,56 @@ update_actions (EMailDisplayPopupExtension *extension,
th_extension->action_group = create_group (extension);
}
- th_extension->document = NULL;
- g_object_get (G_OBJECT (context), "inner-node", &node, NULL);
- document = webkit_dom_node_get_owner_document (node);
- uri = webkit_dom_document_get_document_uri (document);
+ /* In WK2 you can't get the node on what WebKitHitTest was performed,
+ * we have to use other way */
+ device_manager = gdk_display_get_device_manager (
+ gtk_widget_get_display (GTK_WIDGET(display)));
+ pointer = gdk_device_manager_get_client_pointer (device_manager);
+ gdk_window_get_device_position (
+ gtk_widget_get_window (GTK_WIDGET (display)), pointer, &x, &y, NULL);
+
+ if (!th_extension->web_extension)
+ return;
+
+ result = g_dbus_proxy_call_sync (
+ th_extension->web_extension,
+ "SaveDocumentFromPoint",
+ g_variant_new (
+ "(tii)",
+ webkit_web_view_get_page_id (
+ WEBKIT_WEB_VIEW (display)),
+ x, y),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ NULL);
+ if (result)
+ g_variant_unref (result);
+
+ /* Get URI from saved document */
+ result = g_dbus_proxy_call_sync (
+ th_extension->web_extension,
+ "GetDocumentURI",
+ NULL,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ NULL);
+ if (result) {
+ document_uri = g_variant_get_string (result, NULL);
+ g_variant_unref (result);
+ }
+
/* If the part below context menu was made by text-highlight formatter,
* then try to check what formatter it's using at the moment and set
* it as active in the popup menu */
- if (uri && strstr (uri, ".text-highlight") != NULL) {
+ if (document_uri && strstr (document_uri, ".text-highlight") != NULL) {
SoupURI *soup_uri;
gtk_action_group_set_visible (
th_extension->action_group, TRUE);
- soup_uri = soup_uri_new (uri);
+ soup_uri = soup_uri_new (document_uri);
if (soup_uri && soup_uri->query) {
GHashTable *query = soup_form_decode (soup_uri->query);
gchar *highlighter;
@@ -329,13 +447,6 @@ update_actions (EMailDisplayPopupExtension *extension,
gtk_action_group_set_visible (
th_extension->action_group, FALSE);
}
-
- /* Set the th_extension->document AFTER changing the active action to
- * prevent the reformat() from doing some crazy reformatting
- * (reformat() returns immediatelly when th_extension->document is NULL) */
- th_extension->document = document;
-
- g_free (uri);
}
void
@@ -371,4 +482,6 @@ static void
e_mail_display_popup_text_highlight_init (EMailDisplayPopupTextHighlight *extension)
{
extension->action_group = NULL;
+
+ mail_display_popup_prefer_plain_watch_web_extension (extension);
}
diff --git a/modules/text-highlight/web-extension/Makefile.am
b/modules/text-highlight/web-extension/Makefile.am
new file mode 100644
index 0000000..745c47f
--- /dev/null
+++ b/modules/text-highlight/web-extension/Makefile.am
@@ -0,0 +1,18 @@
+webextensions_LTLIBRARIES = libmoduletexthighlightwebextension.la
+
+libmoduletexthighlightwebextension_la_SOURCES = \
+ module-text-highlight-web-extension.c \
+ module-text-highlight-web-extension.h
+
+libmoduletexthighlightwebextension_la_CPPFLAGS = \
+ -DWEBEXTENSIONS_COMPILATION \
+ $(GNOME_PLATFORM_CFLAGS) \
+ $(AM_CPPFLAGS) \
+ $(WEB_EXTENSIONS_CFLAGS)
+
+libmoduletexthighlightwebextension_la_LIBADD = \
+ $(GNOME_PLATFORM_LIBS) \
+ $(WEB_EXTENSIONS_LIBS)
+
+libmoduletexthighlightwebextension_la_LDFLAGS = \
+ -module -avoid-version -no-undefined
diff --git a/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
b/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
new file mode 100644
index 0000000..018295f
--- /dev/null
+++ b/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
@@ -0,0 +1,187 @@
+/*
+ * module-text-highlight-web-extension.c
+ *
+ * This program 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) version 3.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include "module-text-highlight-web-extension.h"
+
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+#include <webkit2/webkit-web-extension.h>
+
+/* FIXME Clean it */
+static GDBusConnection *dbus_connection;
+
+static const char introspection_xml[] =
+"<node>"
+" <interface name='org.gnome.Evolution.Module.TextHighlight.WebExtension'>"
+" <method name='ChangeIFrameSource'>"
+" <arg type='s' name='new_uri' direction='in'/>"
+" </method>"
+" <method name='SaveDocumentFromPoint'>"
+" <arg type='t' name='page_id' direction='in'/>"
+" <arg type='i' name='x' direction='in'/>"
+" <arg type='i' name='y' direction='in'/>"
+" </method>"
+" <method name='GetDocumentURI'>"
+" <arg type='s' name='document_uri' direction='out'/>"
+" </method>"
+" </interface>"
+"</node>";
+
+static WebKitDOMDocument *document_saved = NULL;
+
+static WebKitWebPage *
+get_webkit_web_page_or_return_dbus_error (GDBusMethodInvocation *invocation,
+ WebKitWebExtension *web_extension,
+ guint64 page_id)
+{
+ WebKitWebPage *web_page = webkit_web_extension_get_page (web_extension, page_id);
+ if (!web_page) {
+ g_dbus_method_invocation_return_error (
+ invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
+ "Invalid page ID: %"G_GUINT64_FORMAT, page_id);
+ }
+ return web_page;
+}
+
+static void
+handle_method_call (GDBusConnection *connection,
+ const char *sender,
+ const char *object_path,
+ const char *interface_name,
+ const char *method_name,
+ GVariant *parameters,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data)
+{
+ WebKitWebExtension *web_extension = WEBKIT_WEB_EXTENSION (user_data);
+ WebKitWebPage *web_page;
+ WebKitDOMDocument *document;
+ guint64 page_id;
+
+ if (g_strcmp0 (interface_name, MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_INTERFACE) != 0)
+ return;
+
+ if (g_strcmp0 (method_name, "ChangeIFrameSource") == 0) {
+ WebKitDOMDOMWindow *window;
+ WebKitDOMElement *frame_element;
+ const gchar *new_uri;
+
+ g_variant_get (parameters, "(t&s)", &page_id, &new_uri);
+
+ /* Get frame's window and from the window the actual <iframe> element */
+ window = webkit_dom_document_get_default_view (document_saved);
+ frame_element = webkit_dom_dom_window_get_frame_element (window);
+ webkit_dom_html_iframe_element_set_src (
+ WEBKIT_DOM_HTML_IFRAME_ELEMENT (frame_element), new_uri);
+
+ g_dbus_method_invocation_return_value (invocation, NULL);
+ } else if (g_strcmp0 (method_name, "SaveDocumentFromPoint") == 0) {
+ gint32 x = 0, y = 0;
+ WebKitDOMElement *active_element;
+
+ g_variant_get (parameters, "(tii)", &page_id, &x, &y);
+ web_page = get_webkit_web_page_or_return_dbus_error (invocation, web_extension, page_id);
+ if (!web_page)
+ return;
+
+ document = webkit_web_page_get_dom_document (web_page);
+ document_saved = document;
+
+ if (x == 0 && y == 0)
+ active_element = webkit_dom_html_document_get_active_element
(WEBKIT_DOM_HTML_DOCUMENT (document));
+ else
+ active_element = webkit_dom_document_element_from_point (document, x,y);
+
+ if (WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (active_element)) {
+ document_saved =
+ webkit_dom_html_iframe_element_get_content_document (
+ WEBKIT_DOM_HTML_IFRAME_ELEMENT (active_element));
+ }
+
+ g_dbus_method_invocation_return_value (invocation, NULL);
+ } else if (g_strcmp0 (method_name, "GetDocumentURI") == 0) {
+ gchar *document_uri;
+
+ document_uri = webkit_dom_document_get_document_uri (document_saved);
+
+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", document_uri));
+ }
+}
+
+static const GDBusInterfaceVTable interface_vtable = {
+ handle_method_call,
+ NULL,
+ NULL
+};
+
+static void
+bus_acquired_cb (GDBusConnection *connection,
+ const char *name,
+ gpointer user_data)
+{
+ guint registration_id;
+ GError *error = NULL;
+ static GDBusNodeInfo *introspection_data = NULL;
+
+ if (!introspection_data)
+ introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
+
+ registration_id =
+ g_dbus_connection_register_object (
+ connection,
+ MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_OBJECT_PATH,
+ introspection_data->interfaces[0],
+ &interface_vtable,
+ g_object_ref (user_data),
+ g_object_unref,
+ &error);
+
+ if (!registration_id) {
+ g_warning ("Failed to register object: %s\n", error->message);
+ g_error_free (error);
+ } else {
+ dbus_connection = connection;
+ g_object_add_weak_pointer (G_OBJECT (connection), (gpointer *)&dbus_connection);
+ }
+}
+
+/* Forward declaration */
+G_MODULE_EXPORT void webkit_web_extension_initialize (WebKitWebExtension *extension);
+
+G_MODULE_EXPORT void
+webkit_web_extension_initialize (WebKitWebExtension *extension)
+{
+ char *service_name;
+
+ service_name =
+ g_strdup_printf (
+ "%s-%s",
+ MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_SERVICE_NAME,
+ g_getenv ("MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_ID"));
+
+ g_bus_own_name (
+ G_BUS_TYPE_SESSION,
+ service_name,
+ G_BUS_NAME_OWNER_FLAGS_NONE,
+ bus_acquired_cb,
+ NULL, NULL,
+ g_object_ref (extension),
+ g_object_unref);
+
+ g_free (service_name);
+}
diff --git a/modules/text-highlight/web-extension/module-text-highlight-web-extension.h
b/modules/text-highlight/web-extension/module-text-highlight-web-extension.h
new file mode 100644
index 0000000..7308f65
--- /dev/null
+++ b/modules/text-highlight/web-extension/module-text-highlight-web-extension.h
@@ -0,0 +1,26 @@
+/*
+ * module-text-highlight-web-extension.h
+ *
+ * This program 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) version 3.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_H
+#define MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_H
+
+#define MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_SERVICE_NAME
"org.gnome.Evolution.Module.TextHighlight.WebExtension"
+#define MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_OBJECT_PATH
"/org/gnome/Evolution/Module/TextHighlight/WebExtension"
+#define MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_INTERFACE
"org.gnome.Evolution.Module.TextHighlight.WebExtension"
+
+#endif /* MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
