Add support for loading Webkit extensions

This commit is contained in:
Quentin Rameau 2015-11-23 22:12:00 +01:00
parent c64c368d86
commit da5290a41a
2 changed files with 11 additions and 1 deletions

View file

@ -6,6 +6,7 @@ VERSION = 0.6
# paths # paths
PREFIX = /usr/local PREFIX = /usr/local
MANPREFIX = ${PREFIX}/share/man MANPREFIX = ${PREFIX}/share/man
LIBPREFIX = ${PREFIX}/lib/surf
X11INC = /usr/X11R6/include X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib X11LIB = /usr/X11R6/lib
@ -18,7 +19,7 @@ INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
# flags # flags
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE
CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
LDFLAGS = -s ${LIBS} LDFLAGS = -s ${LIBS}

9
surf.c
View file

@ -175,6 +175,7 @@ static void cleanup(void);
/* GTK/WebKit */ /* GTK/WebKit */
static WebKitWebView *newview(Client *c, WebKitWebView *rv); static WebKitWebView *newview(Client *c, WebKitWebView *rv);
static void initwebextensions(WebKitWebContext *wc, Client *c);
static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a, static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
Client *c); Client *c);
static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c); static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c);
@ -980,6 +981,8 @@ newview(Client *c, WebKitWebView *rv)
g_signal_connect(G_OBJECT(context), "download-started", g_signal_connect(G_OBJECT(context), "download-started",
G_CALLBACK(downloadstarted), c); G_CALLBACK(downloadstarted), c);
g_signal_connect(G_OBJECT(context), "initialize-web-extensions",
G_CALLBACK(initwebextensions), c);
v = g_object_new(WEBKIT_TYPE_WEB_VIEW, v = g_object_new(WEBKIT_TYPE_WEB_VIEW,
"settings", settings, "settings", settings,
@ -1012,6 +1015,12 @@ newview(Client *c, WebKitWebView *rv)
return v; return v;
} }
void
initwebextensions(WebKitWebContext *wc, Client *c)
{
webkit_web_context_set_web_extensions_directory(wc, WEBEXTDIR);
}
GtkWidget * GtkWidget *
createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c) createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
{ {