Remove source(), it has been removed from webkit2gtk

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 586bde1..724fcf3 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -5,6 +5,7 @@
 #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>
@@ -16,7 +17,7 @@
 #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>
@@ -55,6 +56,7 @@ union Arg {
 
 typedef struct Client {
        GtkWidget *win, *scroll, *vbox, *pane;
+       Window xid;
        WebKitWebView *view;
        WebKitWebInspector *inspector;
        char *title, *linkhover;
@@ -99,10 +101,9 @@ typedef struct {
 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;
@@ -196,7 +197,6 @@ static void scroll(GtkAdjustment *a, const Arg *arg);
 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);
@@ -273,6 +273,7 @@ buildfile(const char *path)
        g_free(dname);
 
        fpath = g_build_filename(bpath, bname, NULL);
+       g_free(bpath);
        g_free(bname);
 
        if (!(f = fopen(fpath, "a")))
@@ -624,9 +625,9 @@ getatom(Client *c, int 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
@@ -869,6 +870,7 @@ newclient(void)
        WebKitWebFrame *frame;
        GdkGeometry hints = { 1, 1 };
        GdkScreen *screen;
+       GdkWindow *gwin;
        gdouble dpi;
        char *ua;
 
@@ -910,10 +912,10 @@ newclient(void)
                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 */
@@ -993,10 +995,12 @@ newclient(void)
        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);
@@ -1030,7 +1034,7 @@ newclient(void)
         * 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),
@@ -1068,8 +1072,7 @@ newclient(void)
 
        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");
@@ -1149,15 +1152,13 @@ menuactivate(GtkMenuItem *item, Client *c)
         * 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);
@@ -1280,18 +1281,16 @@ void
 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;
 
@@ -1299,7 +1298,7 @@ setup(void)
        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);
@@ -1362,21 +1361,6 @@ setup(void)
        }
        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
@@ -1387,17 +1371,6 @@ sigchld(int unused)
        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)
 {
@@ -1581,8 +1554,7 @@ getpagestat(Client *c)
        else
                pagestat[0] = '-';
 
-       pagestat[1] = usingproxy ? 'P' : '-';
-       pagestat[2] = '\0';
+       pagestat[1] = '\0';
 }
 
 void
@@ -1617,8 +1589,7 @@ updatetitle(Client *c)
 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