summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2019-02-09 15:39:01 +0100
committerKarel Kočí <cynerd@email.cz>2019-02-09 15:39:01 +0100
commit5105baa9342399c74dd5feb5697efcf041f8c80c (patch)
tree8052c578e1cb87818cbb5d91b16e43dc15ca01d0
parentefc49f30352636d72095703058bf4983f012235f (diff)
parentd068a3878b6b9f2841a49cd7948cdf9d62b55585 (diff)
downloadsurf-1c15d8c5bfc132cfa4b6f22b6f10d68d8a3e9825.tar.gz
surf-1c15d8c5bfc132cfa4b6f22b6f10d68d8a3e9825.tar.bz2
surf-1c15d8c5bfc132cfa4b6f22b6f10d68d8a3e9825.zip
Merge branch 'surf-webkit2' into mysurfv2.0.8
-rw-r--r--Makefile21
-rw-r--r--common.h2
-rw-r--r--config.h4
-rw-r--r--config.mk2
-rw-r--r--libsurf-webext.c37
-rw-r--r--surf.c26
6 files changed, 55 insertions, 37 deletions
diff --git a/Makefile b/Makefile
index 09b4a81..f5a1dfb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,11 @@
include config.mk
-SRC = surf.c common.c
-OBJ = $(SRC:.c=.o)
+SRC = surf.c
+CSRC = common.c
WEBEXTSRC = libsurf-webext.c
+OBJ = $(SRC:.c=.o)
+COBJ = $(CSRC:.c=.o)
WEBEXTOBJ = $(WEBEXTSRC:.c=.o)
all: options libsurf-webext.so surf
@@ -25,18 +27,21 @@ config.h:
cp config.def.h $@
$(OBJ): config.h common.h config.mk
+$(COBJ): config.h common.h config.mk
+$(WEBEXTOBJ): config.h common.h config.mk
-$(WEBEXTOBJ): $(WEBEXTSRC) config.h common.h config.mk
+$(WEBEXTOBJ): $(WEBEXTSRC)
$(CC) $(WEBEXTCFLAGS) $(CFLAGS) -c $(WEBEXTSRC)
-libsurf-webext.so: $(WEBEXTOBJ)
- $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $< $(WEBEXTLIBS) -lc
+libsurf-webext.so: $(WEBEXTOBJ) $(COBJ)
+ $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ \
+ $(WEBEXTOBJ) $(COBJ) $(WEBEXTLIBS)
-surf: $(OBJ)
- $(CC) $(SURFLDLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+surf: $(OBJ) $(COBJ)
+ $(CC) $(SURFLDFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(COBJ) $(LIBS)
clean:
- rm -f surf $(OBJ)
+ rm -f surf $(OBJ) $(COBJ)
rm -f libsurf-webext.so $(WEBEXTOBJ)
distclean: clean
diff --git a/common.h b/common.h
index 527c4f7..2778029 100644
--- a/common.h
+++ b/common.h
@@ -1,3 +1,3 @@
-#define MSGBUFSZ 32
+#define MSGBUFSZ 8
void die(char *, ...);
diff --git a/config.h b/config.h
index b7077cb..17af18a 100644
--- a/config.h
+++ b/config.h
@@ -150,8 +150,8 @@ static Key keys[] = {
/* vertical and horizontal scrolling, in viewport percentage */
{ MODKEY, GDK_KEY_j, scrollv, { .i = +10 } },
{ MODKEY, GDK_KEY_k, scrollv, { .i = -10 } },
- { MODKEY, GDK_KEY_b, scrollv, { .i = +50 } },
- { MODKEY, GDK_KEY_space, scrollv, { .i = -50 } },
+ { MODKEY, GDK_KEY_space, scrollv, { .i = +50 } },
+ { MODKEY, GDK_KEY_b, scrollv, { .i = -50 } },
{ MODKEY, GDK_KEY_i, scrollh, { .i = +10 } },
{ MODKEY, GDK_KEY_u, scrollh, { .i = -10 } },
diff --git a/config.mk b/config.mk
index 2b6314f..c147c40 100644
--- a/config.mk
+++ b/config.mk
@@ -24,7 +24,7 @@ LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0
# flags
CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \
-D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
-SURFCFLAGS = $(INCS) $(CPPFLAGS)
+SURFCFLAGS = $(INCS) $(CPPFLAGS) -fPIC
WEBEXTCFLAGS = -fPIC $(WEBEXTINC)
# compiler
diff --git a/libsurf-webext.c b/libsurf-webext.c
index 684d4a5..ec9a235 100644
--- a/libsurf-webext.c
+++ b/libsurf-webext.c
@@ -41,59 +41,64 @@ newpage(WebKitWebPage *page)
static void
msgsurf(Page *p, const char *s)
{
- char msg[MSGBUFSZ];
+ static char msg[MSGBUFSZ];
+ size_t sln = strlen(s);
int ret;
- msg[0] = p ? p->id : 0;
- ret = snprintf(&msg[1], sizeof(msg) - 1, "%s", s);
- if (ret >= sizeof(msg)) {
+ if ((ret = snprintf(msg, sizeof(msg), "%c%c%s",
+ 2 + sln, p ? p->id : 0, s))
+ >= 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);
- }
+ if (pipeout && write(pipeout, msg, sizeof(msg)) < 0)
+ fprintf(stderr, "webext: error sending: %.*s\n", ret-2, msg+2);
}
static gboolean
readpipe(GIOChannel *s, GIOCondition c, gpointer unused)
{
- char msg[MSGBUFSZ];
- gsize msgsz;
+ static char msg[MSGBUFSZ], msgsz;
WebKitDOMDOMWindow *view;
GError *gerr = NULL;
glong wh, ww;
Page *p;
- if (g_io_channel_read_chars(s, msg, LENGTH(msg), &msgsz, &gerr) !=
+ if (g_io_channel_read_chars(s, msg, LENGTH(msg), NULL, &gerr) !=
G_IO_STATUS_NORMAL) {
fprintf(stderr, "webext: error reading pipe: %s\n",
gerr->message);
g_error_free(gerr);
return TRUE;
}
- msg[msgsz] = '\0';
+ if ((msgsz = msg[0]) < 3) {
+ fprintf(stderr, "webext: message too short: %d\n", msgsz);
+ return TRUE;
+ }
for (p = pages; p; p = p->next) {
- if (p->id == msg[0])
+ if (p->id == msg[1])
break;
}
if (!p || !(view = webkit_dom_document_get_default_view(
webkit_web_page_get_dom_document(p->webpage))))
return TRUE;
- switch (msg[1]) {
+ switch (msg[2]) {
case 'h':
+ if (msgsz != 4)
+ return TRUE;
ww = webkit_dom_dom_window_get_inner_width(view);
webkit_dom_dom_window_scroll_by(view,
- (ww / 100) * msg[2], 0);
+ (ww / 100) * msg[3], 0);
break;
case 'v':
+ if (msgsz != 4)
+ return TRUE;
wh = webkit_dom_dom_window_get_inner_height(view);
webkit_dom_dom_window_scroll_by(view,
- 0, (wh / 100) * msg[2]);
+ 0, (wh / 100) * msg[3]);
break;
}
diff --git a/surf.c b/surf.c
index a3f141c..b76f19c 100644
--- a/surf.c
+++ b/surf.c
@@ -1209,20 +1209,22 @@ newview(Client *c, WebKitWebView *rv)
static gboolean
readpipe(GIOChannel *s, GIOCondition ioc, gpointer unused)
{
- char msg[MSGBUFSZ];
- gsize msgsz;
+ static char msg[MSGBUFSZ], msgsz;
GError *gerr = NULL;
- if (g_io_channel_read_chars(s, msg, sizeof(msg), &msgsz, &gerr) !=
+ if (g_io_channel_read_chars(s, msg, sizeof(msg), NULL, &gerr) !=
G_IO_STATUS_NORMAL) {
fprintf(stderr, "surf: error reading pipe: %s\n",
gerr->message);
g_error_free(gerr);
return TRUE;
}
- msg[msgsz] = '\0';
+ if ((msgsz = msg[0]) < 3) {
+ fprintf(stderr, "surf: message too short: %d\n", msgsz);
+ return TRUE;
+ }
- switch (msg[1]) {
+ switch (msg[2]) {
case 'i':
close(pipein[1]);
close(pipeout[0]);
@@ -1843,12 +1845,18 @@ zoom(Client *c, const Arg *a)
static void
msgext(Client *c, char type, const Arg *a)
{
- char msg[MSGBUFSZ] = { c->pageid, type, a->i, '\0' };
+ static char msg[MSGBUFSZ];
+ int ret;
- if (pipeout[1]) {
- if (write(pipeout[1], msg, sizeof(msg)) < 0)
- fprintf(stderr, "surf: error sending: %s\n", msg);
+ if ((ret = snprintf(msg, sizeof(msg), "%c%c%c%c",
+ 4, c->pageid, type, a->i))
+ >= sizeof(msg)) {
+ fprintf(stderr, "surf: message too long: %d\n", ret);
+ return;
}
+
+ if (pipeout[1] && write(pipeout[1], msg, sizeof(msg)) < 0)
+ fprintf(stderr, "surf: error sending: %.*s\n", ret-2, msg+2);
}
void