pinosaur
/
surf.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
80d33d6
)
reappling printing; changing some keys.
author
Enno Boland (tox)
<tox@s01.de>
Sun, 6 Sep 2009 11:54:29 +0000
(13:54 +0200)
committer
Enno Boland (tox)
<tox@s01.de>
Sun, 6 Sep 2009 11:54:29 +0000
(13:54 +0200)
config.h
patch
|
blob
|
history
surf.c
patch
|
blob
|
history
diff --git
a/config.h
b/config.h
index
9406e48
..
e637967
100644
(file)
--- a/
config.h
+++ b/
config.h
@@
-20,6
+20,7
@@
static Key urlbar_keys[] = {
static Key general_keys[] = {
/* modifier keyval function arg stop event */
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 },
{ 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_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 },
};
{ 0, GDK_Escape, stop, {0}, TRUE },
};
diff --git
a/surf.c
b/surf.c
index
2778bee
..
3146967
100644
(file)
--- 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 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 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);
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;
}
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;
void
progresschange(WebKitWebView* view, gint p, Client *c) {
c->progress = p;