From 1bd6d201020f67160872c28534edff532b5198b9 Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Mon, 23 Nov 2015 22:12:00 +0100 Subject: ext: first commit for surf lib --- libsurf-webext.c | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 libsurf-webext.c (limited to 'libsurf-webext.c') diff --git a/libsurf-webext.c b/libsurf-webext.c new file mode 100644 index 0000000..a3bcb3f --- /dev/null +++ b/libsurf-webext.c @@ -0,0 +1,7 @@ +#include + +G_MODULE_EXPORT void +webkit_web_extension_initialize(WebKitWebExtension *e) +{ + return; +} -- cgit v1.2.3 From 7ea0c2f7f8c5cc4616d8dc0676f7b4b59351667b Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Mon, 7 Dec 2015 15:50:00 +0100 Subject: Communicate with webextension via a pipe --- libsurf-webext.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 126 insertions(+), 2 deletions(-) (limited to 'libsurf-webext.c') diff --git a/libsurf-webext.c b/libsurf-webext.c index a3bcb3f..6c3deb7 100644 --- a/libsurf-webext.c +++ b/libsurf-webext.c @@ -1,7 +1,131 @@ +#include +#include +#include +#include + +#include #include +#include +#include + +#define LENGTH(x) (sizeof(x) / sizeof(x[0])) + +#define MSGBUFSZ 32 + +typedef struct Page { + guint64 id; + WebKitWebPage *webpage; + WebKitDOMDOMWindow *view; + struct Page *next; +} Page; + +static int pipein, pipeout; +static Page *pages; + +Page * +newpage(WebKitWebPage *page) +{ + Page *p; + + if (!(p = calloc(1, sizeof(Page)))) + die("Cannot malloc!\n"); + + p->next = pages; + pages = p; + + p->id = webkit_web_page_get_id(page); + p->webpage = page; + + return p; +} + +static void +msgsurf(Page *p, const char *s) +{ + char msg[MSGBUFSZ]; + int ret; + + msg[0] = p ? p->id : 0; + ret = snprintf(&msg[1], sizeof(msg) - 1, "%s", s); + if (ret >= sizeof(msg)) { + fprintf(stderr, "webext: message too long: %d\n", ret); + return; + } + + if (pipeout) { + if (write(pipeout, msg, sizeof(msg)) < 0) + fprintf(stderr, "webext: error sending: %s\n", msg); + } +} + +static gboolean +readpipe(GIOChannel *s, GIOCondition c, gpointer unused) +{ + char msg[MSGBUFSZ]; + gsize msgsz; + GError *gerr = NULL; + glong wh, ww; + Page *p; + + if (g_io_channel_read_chars(s, msg, LENGTH(msg), &msgsz, &gerr) != + G_IO_STATUS_NORMAL) { + fprintf(stderr, "webext: error reading pipe: %s\n", + gerr->message); + g_error_free(gerr); + return TRUE; + } + msg[msgsz] = '\0'; + + for (p = pages; p; p = p->next) { + if (p->id == msg[0]) + break; + } + if (!p || !p->view) + return TRUE; + + switch (msg[1]) { + case 'h': + ww = webkit_dom_dom_window_get_inner_width(p->view); + webkit_dom_dom_window_scroll_by(p->view, + (ww / 100) * msg[2], 0); + break; + case 'v': + wh = webkit_dom_dom_window_get_inner_height(p->view); + webkit_dom_dom_window_scroll_by(p->view, + 0, (wh / 100) * msg[2]); + break; + } + + return TRUE; +} + +static void +documentloaded(WebKitWebPage *wp, Page *p) +{ + p->view = webkit_dom_document_get_default_view( + webkit_web_page_get_dom_document(wp)); +} + +static void +webpagecreated(WebKitWebExtension *e, WebKitWebPage *wp, gpointer unused) +{ + Page *p = newpage(wp); + + g_signal_connect(wp, "document-loaded", G_CALLBACK(documentloaded), p); +} G_MODULE_EXPORT void -webkit_web_extension_initialize(WebKitWebExtension *e) +webkit_web_extension_initialize_with_user_data(WebKitWebExtension *e, GVariant *gv) { - return; + GIOChannel *gchanpipe; + + g_signal_connect(e, "page-created", G_CALLBACK(webpagecreated), NULL); + + g_variant_get(gv, "(ii)", &pipein, &pipeout); + msgsurf(NULL, "i"); + + gchanpipe = g_io_channel_unix_new(pipein); + g_io_channel_set_encoding(gchanpipe, NULL, NULL); + g_io_channel_set_close_on_unref(gchanpipe, TRUE); + g_io_add_watch(gchanpipe, G_IO_IN, readpipe, NULL); } -- cgit v1.2.3 From 1901359efa10fe2e18794df34fc33b81da03a6f5 Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Mon, 4 Jan 2016 16:09:12 +0100 Subject: Add a file for shared functions New common.[hc] files where shared functions between surf and webkitextension will be put. First addition is die(). --- libsurf-webext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libsurf-webext.c') diff --git a/libsurf-webext.c b/libsurf-webext.c index 6c3deb7..4270b47 100644 --- a/libsurf-webext.c +++ b/libsurf-webext.c @@ -8,9 +8,9 @@ #include #include -#define LENGTH(x) (sizeof(x) / sizeof(x[0])) +#include "common.h" -#define MSGBUFSZ 32 +#define LENGTH(x) (sizeof(x) / sizeof(x[0])) typedef struct Page { guint64 id; -- cgit v1.2.3 From 660413256f4c1cc916e6f96b9156a4f5a85dfcc4 Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Mon, 12 Jun 2017 18:19:58 +0200 Subject: ext: get the right DOM on msg When navigating history, the document-loaded signal isn't triggered and we can't directly get back the previous webview, so we have no other choice than to look it up everytime a new message is received. --- libsurf-webext.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'libsurf-webext.c') diff --git a/libsurf-webext.c b/libsurf-webext.c index 4270b47..684d4a5 100644 --- a/libsurf-webext.c +++ b/libsurf-webext.c @@ -15,7 +15,6 @@ typedef struct Page { guint64 id; WebKitWebPage *webpage; - WebKitDOMDOMWindow *view; struct Page *next; } Page; @@ -63,6 +62,7 @@ readpipe(GIOChannel *s, GIOCondition c, gpointer unused) { char msg[MSGBUFSZ]; gsize msgsz; + WebKitDOMDOMWindow *view; GError *gerr = NULL; glong wh, ww; Page *p; @@ -80,18 +80,19 @@ readpipe(GIOChannel *s, GIOCondition c, gpointer unused) if (p->id == msg[0]) break; } - if (!p || !p->view) + if (!p || !(view = webkit_dom_document_get_default_view( + webkit_web_page_get_dom_document(p->webpage)))) return TRUE; switch (msg[1]) { case 'h': - ww = webkit_dom_dom_window_get_inner_width(p->view); - webkit_dom_dom_window_scroll_by(p->view, + ww = webkit_dom_dom_window_get_inner_width(view); + webkit_dom_dom_window_scroll_by(view, (ww / 100) * msg[2], 0); break; case 'v': - wh = webkit_dom_dom_window_get_inner_height(p->view); - webkit_dom_dom_window_scroll_by(p->view, + wh = webkit_dom_dom_window_get_inner_height(view); + webkit_dom_dom_window_scroll_by(view, 0, (wh / 100) * msg[2]); break; } @@ -99,19 +100,10 @@ readpipe(GIOChannel *s, GIOCondition c, gpointer unused) return TRUE; } -static void -documentloaded(WebKitWebPage *wp, Page *p) -{ - p->view = webkit_dom_document_get_default_view( - webkit_web_page_get_dom_document(wp)); -} - static void webpagecreated(WebKitWebExtension *e, WebKitWebPage *wp, gpointer unused) { Page *p = newpage(wp); - - g_signal_connect(wp, "document-loaded", G_CALLBACK(documentloaded), p); } G_MODULE_EXPORT void -- cgit v1.2.3