#include <signal.h>
#include <X11/X.h>
#include <X11/Xatom.h>
+#include <gtk/gtkx.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
#include <gdk/gdk.h>
#include <limits.h>
#include <stdlib.h>
#include <stdio.h>
-#include <webkit/webkit.h>
+#include <webkit2/webkit2.h>
#include <glib/gstdio.h>
#include <JavaScriptCore/JavaScript.h>
#include <sys/file.h>
typedef struct Client {
GtkWidget *win, *scroll, *vbox, *pane;
+ Window xid;
WebKitWebView *view;
WebKitWebInspector *inspector;
char *title, *linkhover;
static Display *dpy;
static Atom atoms[AtomLast];
static Client *clients = NULL;
-static GdkNativeWindow embed = 0;
+static Window embed = 0;
static gboolean showxid = FALSE;
static char winid[64];
-static gboolean usingproxy = 0;
static char togglestat[9];
static char pagestat[3];
static GTlsDatabase *tlsdb;
static void getpagestat(Client *c);
static char *geturi(Client *c);
static const gchar *getstyle(const char *uri);
+static void setstyle(Client *c, const char *style);
static void handleplumb(Client *c, WebKitWebView *w, const gchar *uri);
static void setatom(Client *c, int a, const char *v);
static void setup(void);
static void sigchld(int unused);
-static void source(Client *c, const Arg *arg);
static void spawn(Client *c, const Arg *arg);
static void stop(Client *c, const Arg *arg);
static void titlechange(WebKitWebView *view, GParamSpec *pspec, Client *c);
g_free(dname);
fpath = g_build_filename(bpath, bname, NULL);
+ g_free(bpath);
g_free(bname);
if (!(f = fopen(fpath, "a")))
unsigned long ldummy;
unsigned char *p = NULL;
- XGetWindowProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window),
- atoms[a], 0L, BUFSIZ, False, XA_STRING,
- &adummy, &idummy, &ldummy, &ldummy, &p);
+ XGetWindowProperty(dpy, c->xid,
+ atoms[a], 0L, BUFSIZ, False, XA_STRING,
+ &adummy, &idummy, &ldummy, &ldummy, &p);
if (p)
strncpy(buf, (char *)p, LENGTH(buf)-1);
else
return "";
}
+void
+setstyle(Client *c, const char *style)
+{
+ WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
+
+ g_object_set(G_OBJECT(settings), "user-stylesheet-uri", style, NULL);
+}
+
void
handleplumb(Client *c, WebKitWebView *w, const gchar *uri)
{
void
inspector(Client *c, const Arg *arg)
{
- if (c->isinspecting)
- webkit_web_inspector_close(c->inspector);
- else
- webkit_web_inspector_show(c->inspector);
+ if (enableinspector) {
+ if (c->isinspecting)
+ webkit_web_inspector_close(c->inspector);
+ else
+ webkit_web_inspector_show(c->inspector);
+ }
}
WebKitWebView *
WebKitWebFrame *frame;
WebKitWebDataSource *src;
WebKitNetworkRequest *request;
- WebKitWebSettings *set = webkit_web_view_get_settings(c->view);
SoupMessage *msg;
char *uri;
}
setatom(c, AtomUri, uri);
- if (enablestyles) {
- g_object_set(G_OBJECT(set), "user-stylesheet-uri",
- getstyle(uri), NULL);
- }
+ if (enablestyle)
+ setstyle(c, getstyle(uri));
break;
case WEBKIT_LOAD_FINISHED:
c->progress = 100;
WebKitWebFrame *frame;
GdkGeometry hints = { 1, 1 };
GdkScreen *screen;
+ GdkWindow *gwin;
gdouble dpi;
char *ua;
addaccelgroup(c);
/* Pane */
- c->pane = gtk_vpaned_new();
+ c->pane = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
/* VBox */
- c->vbox = gtk_vbox_new(FALSE, 0);
+ c->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_paned_pack1(GTK_PANED(c->pane), c->vbox, TRUE, TRUE);
/* Webview */
gtk_widget_show(c->scroll);
gtk_widget_show(GTK_WIDGET(c->view));
gtk_widget_show(c->win);
+ gwin = gtk_widget_get_window(GTK_WIDGET(c->win));
+ c->xid = gdk_x11_window_get_xid(gwin);
gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints,
- GDK_HINT_MIN_SIZE);
- gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK);
- gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
+ GDK_HINT_MIN_SIZE);
+ gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
+ gdk_window_add_filter(gwin, processx, c);
webkit_web_view_set_full_content_zoom(c->view, TRUE);
runscript(frame);
if (!(ua = getenv("SURF_USERAGENT")))
ua = useragent;
g_object_set(G_OBJECT(settings), "user-agent", ua, NULL);
- if (enablestyles) {
- g_object_set(G_OBJECT(settings),
- "user-stylesheet-uri", getstyle("about:blank"),
- NULL);
- }
g_object_set(G_OBJECT(settings),
"auto-load-images", loadimages, NULL);
g_object_set(G_OBJECT(settings),
"default-font-size", defaultfontsize, NULL);
g_object_set(G_OBJECT(settings),
"resizable-text-areas", 1, NULL);
+ if (enablestyle)
+ setstyle(c, getstyle("about:blank"));
/*
* While stupid, CSS specifies that a pixel represents 1/96 of an inch.
* It is equivalent to firefox's "layout.css.devPixelsPerPx" setting.
*/
if (zoomto96dpi) {
- screen = gdk_window_get_screen(GTK_WIDGET(c->win)->window);
+ screen = gdk_window_get_screen(gwin);
dpi = gdk_screen_get_resolution(screen);
if (dpi != -1) {
g_object_set(G_OBJECT(settings),
c->isinspecting = false;
}
- if (runinfullscreen) {
- c->fullscreen = 0;
+ if (runinfullscreen)
fullscreen(c, NULL);
- }
setatom(c, AtomFind, "");
setatom(c, AtomUri, "about:blank");
if (showxid) {
gdk_display_sync(gtk_widget_get_display(c->win));
- printf("%u\n",
- (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+ printf("%lu\n", c->xid);
fflush(NULL);
if (fclose(stdout) != 0) {
die("Error closing stdout");
* context-menu-action-12 stop
*/
- GtkAction *a = NULL;
- const char *name, *uri;
+ const gchar *name, *uri;
GtkClipboard *prisel, *clpbrd;
- a = gtk_activatable_get_related_action(GTK_ACTIVATABLE(item));
- if (a == NULL)
+ name = gtk_actionable_get_action_name(GTK_ACTIONABLE(item));
+ if (name == NULL)
return;
- name = gtk_action_get_name(a);
if (!g_strcmp0(name, "context-menu-action-3")) {
prisel = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
gtk_clipboard_set_text(prisel, c->linkhover, -1);
setatom(Client *c, int a, const char *v)
{
XSync(dpy, False);
- XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window),
- atoms[a], XA_STRING, 8, PropModeReplace,
- (unsigned char *)v, strlen(v) + 1);
+ XChangeProperty(dpy, c->xid,
+ atoms[a], XA_STRING, 8, PropModeReplace,
+ (unsigned char *)v, strlen(v) + 1);
}
void
setup(void)
{
int i;
- char *proxy, *new_proxy;
char *styledirfile, *stylepath;
- SoupURI *puri;
SoupSession *s;
GError *error = NULL;
sigchld(0);
gtk_init(NULL, NULL);
- dpy = GDK_DISPLAY();
+ dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
/* atoms */
atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
}
g_object_set(G_OBJECT(s), "tls-database", tlsdb, NULL);
g_object_set(G_OBJECT(s), "ssl-strict", strictssl, NULL);
-
- /* proxy */
- if ((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
- new_proxy = g_strrstr(proxy, "http://")
- || g_strrstr(proxy, "socks://")
- || g_strrstr(proxy, "socks4://")
- || g_strrstr(proxy, "socks5://")
- ? g_strdup(proxy)
- : g_strdup_printf("http://%s", proxy);
- puri = soup_uri_new(new_proxy);
- g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL);
- soup_uri_free(puri);
- g_free(new_proxy);
- usingproxy = 1;
- }
}
void
while (0 < waitpid(-1, NULL, WNOHANG));
}
-void
-source(Client *c, const Arg *arg)
-{
- Arg a = { .b = FALSE };
- gboolean s;
-
- s = webkit_web_view_get_view_source_mode(c->view);
- webkit_web_view_set_view_source_mode(c->view, !s);
- reload(c, &a);
-}
-
void
spawn(Client *c, const Arg *arg)
{
void
togglestyle(Client *c, const Arg *arg)
{
- WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
-
- enablestyles = !enablestyles;
- g_object_set(G_OBJECT(settings), "user-stylesheet-uri",
- enablestyles ? getstyle(geturi(c)) : "", NULL);
+ enablestyle = !enablestyle;
+ setstyle(c, enablestyle ? getstyle(geturi(c)) : "");
updatetitle(c);
}
g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
togglestat[p++] = value? 'V': 'v';
- togglestat[p++] = enablestyles ? 'M': 'm';
+ togglestat[p++] = enablestyle ? 'M': 'm';
togglestat[p] = '\0';
}
else
pagestat[0] = '-';
- pagestat[1] = usingproxy ? 'P' : '-';
- pagestat[2] = '\0';
+ pagestat[1] = '\0';
}
void
void
updatewinid(Client *c)
{
- snprintf(winid, LENGTH(winid), "%u",
- (int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+ snprintf(winid, LENGTH(winid), "%lu", c->xid);
}
void
usage(void)
{
- die("usage: %s [-bBfFgGiIkKnNpPsSvx] [-a cookiepolicies ] "
+ die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
"[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] "
"[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
}
embed = strtol(EARGF(usage()), NULL, 0);
break;
case 'f':
- runinfullscreen = 1;
+ runinfullscreen = 0;
break;
case 'F':
- runinfullscreen = 0;
+ runinfullscreen = 1;
break;
case 'g':
allowgeolocation = 0;
kioskmode = 1;
break;
case 'm':
- enablestyles = 0;
+ enablestyle = 0;
break;
case 'M':
- enablestyles = 1;
+ enablestyle = 1;
break;
case 'n':
enableinspector = 0;
