Added tag 0.5 for changeset f0cea0f2bfc6

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 9a621e6..f7cba3e 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -95,7 +95,6 @@ static void print(Client *c, const Arg *arg);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
 static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c);
 static void reload(Client *c, const Arg *arg);
-static void resize(GtkWidget *w, GtkAllocation *a, Client *c);
 static void scroll_h(Client *c, const Arg *arg);
 static void scroll_v(Client *c, const Arg *arg);
 static void scroll(GtkAdjustment *a, const Arg *arg);
@@ -151,7 +150,7 @@ cleanup(void) {
 }
 
 void
-evalscript(WebKitWebFrame *frame, JSContextRef js, char *script, char* scriptname) {
+evalscript(JSContextRef js, char *script, char* scriptname) {
        JSStringRef jsscript, jsscriptname;
        JSValueRef exception = NULL;
 
@@ -163,12 +162,12 @@ evalscript(WebKitWebFrame *frame, JSContextRef js, char *script, char* scriptnam
 }
 
 void
-runscript(WebKitWebFrame *frame, JSContextRef js) {
+runscript(WebKitWebFrame *frame) {
        char *script;
        GError *error;
 
        if(g_file_get_contents(scriptfile, &script, NULL, &error)) {
-               evalscript(frame, webkit_web_frame_get_global_context(frame), script, scriptfile);
+               evalscript(webkit_web_frame_get_global_context(frame), script, scriptfile);
        }
 }
 
@@ -334,10 +333,8 @@ geturi(Client *c) {
 
 void
 gotheaders(SoupMessage *msg, gpointer v) {
-       SoupURI *uri;
        GSList *l, *p;
 
-       uri = soup_message_get_uri(msg);
        for(p = l = soup_cookies_from_response(msg); p;
                p = g_slist_next(p))  {
                setcookie((SoupCookie *)p->data);
@@ -476,7 +473,6 @@ newclient(void) {
        gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600);
        g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(destroywin), c);
        g_signal_connect(G_OBJECT(c->win), "key-press-event", G_CALLBACK(keypress), c);
-       g_signal_connect(G_OBJECT(c->win), "size-allocate", G_CALLBACK(resize), c);
 
        /* VBox */
        c->vbox = gtk_vbox_new(FALSE, 0);
@@ -524,7 +520,7 @@ newclient(void) {
        gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
        webkit_web_view_set_full_content_zoom(c->view, TRUE);
        frame = webkit_web_view_get_main_frame(c->view);
-       runscript(frame, webkit_web_frame_get_global_context(frame));
+       runscript(frame);
        settings = webkit_web_view_get_settings(c->view);
        if(!(ua = getenv("SURF_USERAGENT")))
                ua = useragent;
@@ -650,19 +646,6 @@ reload(Client *c, const Arg *arg) {
                 webkit_web_view_reload(c->view);
 }
 
-void
-resize(GtkWidget *w, GtkAllocation *a, Client *c) {
-       double zoom;
-
-       if(c->zoomed)
-               return;
-       zoom = webkit_web_view_get_zoom_level(c->view);
-       if(a->width * a->height < 300 * 400 && zoom != 0.2)
-               webkit_web_view_set_zoom_level(c->view, 0.2);
-       else if(zoom != 1.0)
-               webkit_web_view_set_zoom_level(c->view, 1.0);
-}
-
 void
 scroll_h(Client *c, const Arg *arg) {
  scroll(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(c->scroll)), arg);
@@ -799,7 +782,7 @@ spawn(Client *c, const Arg *arg) {
 void
 eval(Client *c, const Arg *arg) {
        WebKitWebFrame *frame = webkit_web_view_get_main_frame(c->view);
-       evalscript(frame, webkit_web_frame_get_global_context(frame), ((char **)arg->v)[0], "");
+       evalscript(webkit_web_frame_get_global_context(frame), ((char **)arg->v)[0], "");
 }
 
 void
@@ -842,7 +825,7 @@ usage(void) {
 
 void
 windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) {
-       runscript(frame, js);
+       runscript(frame);
 }
 
 void