preparing sourcecode feature coming with webkit-1.1.14.

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 47005b7..c0debf0 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -17,19 +17,19 @@
 #include <glib/gstdio.h>
 
 #define LENGTH(x) (sizeof x / sizeof x[0])
+#define CLEANMASK(mask)         (mask & ~(GDK_MOD2_MASK))
 
 Display *dpy;
 Atom urlprop;
 typedef union Arg Arg;
 union Arg {
        const gboolean b;
-       const int i;
-       const unsigned int ui;
+       const gint i;
        const void *v;
 } ;
 
 typedef struct Client {
-       GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar;
+       GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar, *indicator;
        WebKitWebView *view;
        WebKitDownload *download;
        gchar *title;
@@ -68,7 +68,7 @@ gboolean embed = FALSE;
 gboolean showxid = FALSE;
 gboolean ignore_once = FALSE;
 extern char *optarg;
-extern int optind;
+extern gint optind;
 
 static void cleanup(void);
 static void proccookies(SoupMessage *m, Client *c);
@@ -77,6 +77,8 @@ static void destroyclient(Client *c);
 static void destroywin(GtkWidget* w, Client *c);
 static void die(char *str);
 static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
+static void drawindicator(Client *c);
+static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
 static gboolean initdownload(WebKitWebView *view, WebKitDownload *o, Client *c);
 static gchar *geturi(Client *c);
 static void hidesearch(Client *c, const Arg *arg);
@@ -102,13 +104,14 @@ static void setup();
 static void titlechange(WebKitWebView* view, WebKitWebFrame* frame,
                const gchar* title, Client *c);
 static void searchtext(Client *c, const Arg *arg);
+static void source(Client *c, const Arg *arg);
 static void showsearch(Client *c, const Arg *arg);
 static void showurl(Client *c, const Arg *arg);
 static void stop(Client *c, const Arg *arg);
 static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c);
 static void usage();
-static void updatetitle(Client *c, const gchar *title);
-static void zoompage(Client *c, const Arg *arg);
+static void update(Client *c, const gchar *title);
+static void zoom(Client *c, const Arg *arg);
 
 #include "config.h"
 
@@ -173,15 +176,44 @@ die(char *str) {
        exit(EXIT_FAILURE);
 }
 
+void
+drawindicator(Client *c) {
+       gint width;
+       gchar *uri;
+       GtkWidget *w;
+       GdkGC *gc;
+       GdkColor fg;
+
+       uri = geturi(c);
+       w = c->indicator;
+       width = c->progress * w->allocation.width / 100;
+       gc = gdk_gc_new(w->window);
+       gdk_color_parse(strstr(uri, "https://") == uri ?
+                       progress_trust : progress, &fg);
+       gdk_gc_set_rgb_fg_color(gc, &fg);
+       gdk_draw_rectangle(w->window,
+                       w->style->bg_gc[GTK_WIDGET_STATE(w)],
+                       TRUE, 0, 0, w->allocation.width, w->allocation.height);
+       gdk_draw_rectangle(w->window, gc, TRUE, 0, 0, width,
+                       w->allocation.height);
+       g_object_unref(gc);/*g_free(gc);*/
+}
+
+gboolean
+exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) {
+       drawindicator(c);
+       return TRUE;
+}
+
 void
 download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
        WebKitDownloadStatus status;
 
        status = webkit_download_get_status(c->download);
        if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
-               c->progress = (int)(webkit_download_get_progress(c->download)*100);
+               c->progress = (gint)(webkit_download_get_progress(c->download)*100);
        }
-       updatetitle(c, NULL);
+       update(c, NULL);
 }
 
 gboolean
@@ -205,7 +237,7 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
        g_signal_connect(c->download, "notify::progress", G_CALLBACK(download), c);
        g_signal_connect(c->download, "notify::status", G_CALLBACK(download), c);
        webkit_download_start(c->download);
-       updatetitle(c, filename);
+       update(c, filename);
        g_free(html);
        return TRUE;
 }
@@ -233,7 +265,7 @@ hideurl(Client *c, const Arg *arg) {
 
 gboolean
 keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
-       unsigned int i, focus;
+       guint i, focus;
        gboolean processed = FALSE;
 
        if(ev->type != GDK_KEY_PRESS)
@@ -246,7 +278,8 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
                focus = BROWSER;
        for(i = 0; i < LENGTH(keys); i++) {
                if(focus & keys[i].focus && ev->keyval == keys[i].keyval &&
-                               (ev->state == keys[i].mod || ev->state & keys[i].mod)
+                               (CLEANMASK(ev->state) == keys[i].mod ||
+                                CLEANMASK(ev->state) & keys[i].mod)
                                && keys[i].func) {
                        keys[i].func(c, &(keys[i].arg));
                        processed = TRUE;
@@ -260,7 +293,7 @@ linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c) {
        if(l)
                gtk_window_set_title(GTK_WINDOW(c->win), l);
        else
-               updatetitle(c, NULL);
+               update(c, NULL);
 }
 
 void
@@ -277,7 +310,7 @@ loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
 void
 loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
        c->progress = 0;
-       updatetitle(c, NULL);
+       update(c, NULL);
 }
 
 void
@@ -308,7 +341,7 @@ loadfile(Client *c, const gchar *f) {
                arg.v = uri = g_strdup_printf("file://%s", f);
                loaduri(c, &arg);
        }
-       updatetitle(c, uri);
+       update(c, uri);
        g_free(uri);
 }
 
@@ -322,7 +355,7 @@ loaduri(Client *c, const Arg *arg) {
                : g_strdup_printf("http://%s", uri);
        webkit_web_view_load_uri(c->view, u);
        c->progress = 0;
-       updatetitle(c, u);
+       update(c, u);
        g_free(u);
 }
 
@@ -376,6 +409,12 @@ newclient(void) {
        c->searchbar = gtk_entry_new();
        gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE);
 
+       /* indicator */
+       c->indicator = gtk_drawing_area_new();
+       gtk_widget_set_size_request(c->indicator, 0, 2);
+       g_signal_connect (G_OBJECT (c->indicator), "expose_event",
+                       G_CALLBACK (exposeindicator), c);
+
        /* downloadbar */
 
        /* Arranging */
@@ -384,15 +423,18 @@ newclient(void) {
        gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
        gtk_container_add(GTK_CONTAINER(c->vbox), c->searchbar);
        gtk_container_add(GTK_CONTAINER(c->vbox), c->urlbar);
+       gtk_container_add(GTK_CONTAINER(c->vbox), c->indicator);
 
        /* Setup */
        gtk_box_set_child_packing(GTK_BOX(c->vbox), c->urlbar, FALSE, FALSE, 0, GTK_PACK_START);
        gtk_box_set_child_packing(GTK_BOX(c->vbox), c->searchbar, FALSE, FALSE, 0, GTK_PACK_START);
+       gtk_box_set_child_packing(GTK_BOX(c->vbox), c->indicator, FALSE, FALSE, 0, GTK_PACK_START);
        gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START);
        gtk_widget_grab_focus(GTK_WIDGET(c->view));
        gtk_widget_hide_all(c->searchbar);
        gtk_widget_hide_all(c->urlbar);
        gtk_widget_show(c->vbox);
+       gtk_widget_show(c->indicator);
        gtk_widget_show(c->scroll);
        gtk_widget_show(GTK_WIDGET(c->view));
        gtk_widget_show(c->win);
@@ -403,8 +445,11 @@ newclient(void) {
        c->title = NULL;
        c->next = clients;
        clients = c;
-       if(showxid)
-               printf("%u\n", (unsigned int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+       if(showxid) {
+               gdk_display_sync(gtk_widget_get_display(c->win));
+               printf("%u\n", (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+               fflush(NULL);
+       }
        return c;
 }
 
@@ -427,7 +472,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
        Client *c = (Client *)d;
        XPropertyEvent *ev;
        Atom adummy;
-       int idummy;
+       gint idummy;
        unsigned long ldummy;
        unsigned char *buf = NULL;
        Arg arg;
@@ -458,7 +503,7 @@ print(Client *c, const Arg *arg) {
 void
 progresschange(WebKitWebView* view, gint p, Client *c) {
        c->progress = p;
-       updatetitle(c, NULL);
+       update(c, NULL);
 }
 
 void
@@ -503,6 +548,16 @@ showsearch(Client *c, const Arg *arg) {
        gtk_widget_grab_focus(c->searchbar);
 }
 
+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, c->source);*/
+       reload(c, &a);
+}
+
 void
 searchtext(Client *c, const Arg *arg) {
        gboolean forward = *(gboolean *)arg;
@@ -535,7 +590,7 @@ stop(Client *c, const Arg *arg) {
 
 void
 titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
-       updatetitle(c, t);
+       update(c, t);
 }
 
 void
@@ -545,7 +600,7 @@ usage() {
 }
 
 void
-updatetitle(Client *c, const char *title) {
+update(Client *c, const char *title) {
        gchar *t;
 
        if(title) {
@@ -557,13 +612,14 @@ updatetitle(Client *c, const char *title) {
                t = g_strdup(c->title);
        else
                t = g_strdup_printf("%s [%i%%]", c->title, c->progress);
+       drawindicator(c);
        gtk_window_set_title(GTK_WINDOW(c->win), t);
        g_free(t);
 
 }
 
 void
-zoompage(Client *c, const Arg *arg) {
+zoom(Client *c, const Arg *arg) {
        if(arg->i < 0)          /* zoom out */
                webkit_web_view_zoom_out(c->view);
        else if(arg->i > 0)     /* zoom in */
@@ -575,7 +631,7 @@ zoompage(Client *c, const Arg *arg) {
 int main(int argc, char *argv[]) {
        SoupSession *s;
        Client *c;
-       int o;
+       gint o;
        const gchar *home, *filename;
        Arg arg;
 
@@ -614,8 +670,6 @@ int main(int argc, char *argv[]) {
 
        /* make dirs */
        home = g_get_home_dir();
-       filename = g_build_filename(home, ".surf", NULL);
-       g_mkdir_with_parents(filename, 0711);
        filename = g_build_filename(home, ".surf", "dl", NULL);
        g_mkdir_with_parents(filename, 0755);