eeeck/surf
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Communicate through a Unix socket instead of a pipe pair

Browse Source
This commit is contained in:
Quentin Rameau
2019-09-07 13:20:09 +02:00
parent f61cfc720c
commit e92fd1aa5f
2 changed files with 65 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webext-surf.c
+33 -27
View File
@@ -1,6 +1,8 @@
#include <sys/socket.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <gio/gio.h>
@@ -18,7 +20,7 @@ typedef struct Page {
struct Page *next;
} Page;
static int pipein, pipeout;
static int sock;
static Page *pages;
Page *
@@ -47,60 +49,64 @@ msgsurf(Page *p, const char *s)
size_t sln = strlen(s);
int ret;
if ((ret = snprintf(msg, sizeof(msg), "%c%c%s",
2 + sln, p ? p->id : 0, s))
if ((ret = snprintf(msg, sizeof(msg), "%c%s", p ? p->id : 0, s))
>= sizeof(msg)) {
fprintf(stderr, "webext: message too long: %d\n", ret);
fprintf(stderr, "webext: msg: message too long: %d\n", ret);
return;
}
if (pipeout && write(pipeout, msg, sizeof(msg)) < 0)
fprintf(stderr, "webext: error sending: %.*s\n", ret-2, msg+2);
if (send(sock, msg, ret, 0) < 0)
fprintf(stderr, "webext: error sending: %s\n", msg+1);
}
static gboolean
readpipe(GIOChannel *s, GIOCondition c, gpointer unused)
readsock(GIOChannel *s, GIOCondition c, gpointer unused)
{
static char msg[MSGBUFSZ], msgsz;
static char msg[MSGBUFSZ];
WebKitDOMDOMWindow *view;
GError *gerr = NULL;
gsize msgsz;
glong wh, ww;
Page *p;
if (g_io_channel_read_chars(s, msg, LENGTH(msg), NULL, &gerr) !=
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);
if (gerr) {
fprintf(stderr, "webext: error reading socket: %s\n",
gerr->message);
g_error_free(gerr);
}
return TRUE;
}
if ((msgsz = msg[0]) < 3) {
fprintf(stderr, "webext: message too short: %d\n", msgsz);
if (msgsz < 2) {
fprintf(stderr, "webext: readsock: message too short: %d\n",
msgsz);
return TRUE;
}
for (p = pages; p; p = p->next) {
if (p->id == msg[1])
if (p->id == msg[0])
break;
}
if (!p || !(view = webkit_dom_document_get_default_view(
webkit_web_page_get_dom_document(p->webpage))))
return TRUE;
switch (msg[2]) {
switch (msg[1]) {
case 'h':
if (msgsz != 4)
if (msgsz != 3)
return TRUE;
ww = webkit_dom_dom_window_get_inner_width(view);
webkit_dom_dom_window_scroll_by(view,
(ww / 100) * msg[3], 0);
(ww / 100) * msg[2], 0);
break;
case 'v':
if (msgsz != 4)
if (msgsz != 3)
return TRUE;
wh = webkit_dom_dom_window_get_inner_height(view);
webkit_dom_dom_window_scroll_by(view,
0, (wh / 100) * msg[3]);
0, (wh / 100) * msg[2]);
break;
}
@@ -116,15 +122,15 @@ webpagecreated(WebKitWebExtension *e, WebKitWebPage *wp, gpointer unused)
G_MODULE_EXPORT void
webkit_web_extension_initialize_with_user_data(WebKitWebExtension *e, GVariant *gv)
{
GIOChannel *gchanpipe;
GIOChannel *gchansock;
g_signal_connect(e, "page-created", G_CALLBACK(webpagecreated), NULL);
g_variant_get(gv, "(ii)", &pipein, &pipeout);
msgsurf(NULL, "i");
g_variant_get(gv, "i", &sock);
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);
gchansock = g_io_channel_unix_new(sock);
g_io_channel_set_encoding(gchansock, NULL, NULL);
g_io_channel_set_flags(gchansock, G_IO_FLAG_NONBLOCK, NULL);
g_io_channel_set_close_on_unref(gchansock, TRUE);
g_io_add_watch(gchansock, G_IO_IN, readsock, NULL);
}