From 4384cf198a38951839dfbd6abcab72d75076c593 Mon Sep 17 00:00:00 2001 From: "Enno Boland (tox)" Date: Sun, 6 Sep 2009 13:54:29 +0200 Subject: [PATCH] reappling printing; changing some keys. --- config.h | 5 +++-- surf.c | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config.h b/config.h index 9406e48..e637967 100644 --- a/config.h +++ b/config.h @@ -20,6 +20,7 @@ static Key urlbar_keys[] = { static Key general_keys[] = { /* modifier keyval function arg stop event */ + { GDK_CONTROL_MASK, GDK_P, print, {0}, TRUE }, { GDK_CONTROL_MASK, GDK_p, clipboard, {.b = TRUE }, TRUE }, { GDK_CONTROL_MASK, GDK_y, clipboard, {.b = FALSE}, TRUE }, { GDK_CONTROL_MASK, GDK_R, reload, {.b = TRUE}, TRUE }, @@ -32,8 +33,8 @@ static Key general_keys[] = { { GDK_CONTROL_MASK, GDK_0, zoompage, {.f = +1.0 }, TRUE }, { GDK_CONTROL_MASK, GDK_n, searchtext, {.b = TRUE}, TRUE }, { GDK_CONTROL_MASK, GDK_N, searchtext, {.b = FALSE}, TRUE }, - { GDK_CONTROL_MASK, GDK_Right, navigate, {.b = TRUE}, TRUE }, - { GDK_CONTROL_MASK, GDK_Left, navigate, {.b = FALSE}, TRUE }, + { GDK_CONTROL_MASK, GDK_h, navigate, {.b = TRUE}, TRUE }, + { GDK_CONTROL_MASK, GDK_l, navigate, {.b = FALSE}, TRUE }, { 0, GDK_Escape, stop, {0}, TRUE }, }; diff --git a/surf.c b/surf.c index 2778bee..3146967 100644 --- a/surf.c +++ b/surf.c @@ -98,11 +98,12 @@ static Client *newclient(); static WebKitWebView *newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c); static void pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d); static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d); +static void print(Client *c, const Arg *arg); static void progresschange(WebKitWebView *view, gint p, Client *c); static void request(SoupSession *s, SoupMessage *m, Client *c); static void setcookie(char *name, char *val, char *dom, char *path, long exp); static void reload(Client *c, const Arg *arg); -static void setup(void); +static void setup(); static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c); static void searchtext(Client *c, const Arg *arg); @@ -472,6 +473,11 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) { return GDK_FILTER_CONTINUE; } +void +print(Client *c, const Arg *arg) { + webkit_web_frame_print(webkit_web_view_get_main_frame(c->view)); +} + void progresschange(WebKitWebView* view, gint p, Client *c) { c->progress = p;