changing back/forward buttons

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 0d9988f..89987a8 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -196,18 +196,19 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
        }
        if(ev->state & GDK_CONTROL_MASK) {
                switch(ev->keyval) {
+               case GDK_P:
+                       webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
+                       return TRUE;
                case GDK_p:
                        gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteurl, c);
-                       return TRUE;
                case GDK_y:
                        gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
                        return TRUE;
                case GDK_r:
+                       webkit_web_view_reload(c->view);
+                       return TRUE;
                case GDK_R:
-                       if((ev->state & GDK_SHIFT_MASK))
-                                webkit_web_view_reload_bypass_cache(c->view);
-                       else
-                                webkit_web_view_reload(c->view);
+                       webkit_web_view_reload_bypass_cache(c->view);
                        return TRUE;
                case GDK_b:
                        return TRUE;
@@ -235,10 +236,10 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
                                        !(ev->state & GDK_SHIFT_MASK),
                                        TRUE);
                        return TRUE;
-               case GDK_Left:
+               case GDK_h:
                        webkit_web_view_go_back(c->view);
                        return TRUE;
-               case GDK_Right:
+               case GDK_l:
                        webkit_web_view_go_forward(c->view);
                        return TRUE;
                }
@@ -312,7 +313,7 @@ loadfile(Client *c, const gchar *f) {
 void
 loaduri(Client *c, const gchar *uri) {
        gchar *u;
-       u = g_strrstr(uri, ":") ? g_strdup(uri)
+       u = g_strrstr(uri, "://") ? g_strdup(uri)
                : g_strdup_printf("http://%s", uri);
        webkit_web_view_load_uri(c->view, u);
        c->progress = 0;
@@ -416,6 +417,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
        int idummy;
        unsigned long ldummy;
        unsigned char *buf = NULL;
+
        if(((XEvent *)e)->type == PropertyNotify) {
                ev = &((XEvent *)e)->xproperty;
                if(ev->atom == urlprop && ev->state == PropertyNewValue) {