nilix/surf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reappling printing; changing some keys.

Browse source
This commit is contained in:
Enno Boland (tox) 2009-09-06 13:54:29 +02:00
parent 80d33d696d
commit 4384cf198a
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config.h
View file

@ -20,6 +20,7 @@ static Key urlbar_keys[] = {
static Key general_keys[] = { static Key general_keys[] = {
/* modifier keyval function arg stop event */ /* 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_p, clipboard, {.b = TRUE }, TRUE },
{ GDK_CONTROL_MASK, GDK_y, clipboard, {.b = FALSE}, TRUE }, { GDK_CONTROL_MASK, GDK_y, clipboard, {.b = FALSE}, TRUE },
{ GDK_CONTROL_MASK, GDK_R, reload, {.b = TRUE}, 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_0, zoompage, {.f = +1.0 }, TRUE },
{ GDK_CONTROL_MASK, GDK_n, searchtext, {.b = TRUE}, TRUE }, { GDK_CONTROL_MASK, GDK_n, searchtext, {.b = TRUE}, TRUE },
{ GDK_CONTROL_MASK, GDK_N, searchtext, {.b = FALSE}, TRUE }, { GDK_CONTROL_MASK, GDK_N, searchtext, {.b = FALSE}, TRUE },
{ GDK_CONTROL_MASK, GDK_Right, navigate, {.b = TRUE}, TRUE }, { GDK_CONTROL_MASK, GDK_h, navigate, {.b = TRUE}, TRUE },
{ GDK_CONTROL_MASK, GDK_Left, navigate, {.b = FALSE}, TRUE }, { GDK_CONTROL_MASK, GDK_l, navigate, {.b = FALSE}, TRUE },
{ 0, GDK_Escape, stop, {0}, TRUE }, { 0, GDK_Escape, stop, {0}, TRUE },
}; };

8
surf.c
View file

@ -98,11 +98,12 @@ static Client *newclient();
static WebKitWebView *newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c); static WebKitWebView *newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
static void pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d); static void pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d);
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, 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 progresschange(WebKitWebView *view, gint p, Client *c);
static void request(SoupSession *s, SoupMessage *m, 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 setcookie(char *name, char *val, char *dom, char *path, long exp);
static void reload(Client *c, const Arg *arg); static void reload(Client *c, const Arg *arg);
static void setup(void); static void setup();
static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, static void titlechange(WebKitWebView* view, WebKitWebFrame* frame,
const gchar* title, Client *c); const gchar* title, Client *c);
static void searchtext(Client *c, const Arg *arg); static void searchtext(Client *c, const Arg *arg);
@ -472,6 +473,11 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
return GDK_FILTER_CONTINUE; return GDK_FILTER_CONTINUE;
} }
void
print(Client *c, const Arg *arg) {
webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
}
void void
progresschange(WebKitWebView* view, gint p, Client *c) { progresschange(WebKitWebView* view, gint p, Client *c) {
c->progress = p; c->progress = p;