 |
tRename mouse functions to clickFUNCTION() - surf - customized build of surf, t… |
 |
git clone git://src.adamsgaard.dk/surf |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit 2d1e42236890b7495c0a9c4bce66420f937da559 |
|
parent 82abf5154f0ab94716223f556638f073f01dbc11 |
|
Author: Quentin Rameau <[email protected]> |
|
Date: Fri, 20 Nov 2015 16:19:24 +0100 |
|
|
|
Rename mouse functions to clickFUNCTION() |
|
|
|
Diffstat: |
|
M config.def.h | 10 +++++----- |
|
M surf.c | 21 ++++++++++++--------- |
|
|
|
2 files changed, 17 insertions(+), 14 deletions(-) |
|
--- |
|
diff --git a/config.def.h b/config.def.h |
|
t@@ -136,9 +136,9 @@ static Key keys[] = { |
|
/* target can be OnDoc, OnLink, OnImg, OnMedia, OnEdit, OnBar, OnSel, OnAny */ |
|
static Button buttons[] = { |
|
/* target event mask button function argument … |
|
- { OnLink, 0, 2, linkopenembed, { 0 }, … |
|
- { OnLink, MODKEY, 2, linkopen, { 0 }, … |
|
- { OnLink, MODKEY, 1, linkopen, { 0 }, … |
|
- { OnAny, 0, 8, navigate, { .i = -1 }, … |
|
- { OnAny, 0, 9, navigate, { .i = +1 }, … |
|
+ { OnLink, 0, 2, clicknewwindow, { .b = 0 }, … |
|
+ { OnLink, MODKEY, 2, clicknewwindow, { .b = 1 }, … |
|
+ { OnLink, MODKEY, 1, clicknewwindow, { .b = 1 }, … |
|
+ { OnAny, 0, 8, clicknavigate, { .i = -1 }, … |
|
+ { OnAny, 0, 9, clicknavigate, { .i = +1 }, … |
|
}; |
|
diff --git a/surf.c b/surf.c |
|
t@@ -164,6 +164,7 @@ static void mousetargetchanged(WebKitWebView *v, WebKitHit… |
|
static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c); |
|
static void loaduri(Client *c, const Arg *arg); |
|
static void navigate(Client *c, const Arg *a); |
|
+static void clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h); |
|
static Client *newclient(Client *c); |
|
static WebKitWebView *newview(Client *c, WebKitWebView *rv); |
|
static void showview(WebKitWebView *v, Client *c); |
|
t@@ -175,8 +176,7 @@ static GdkFilterReturn processx(GdkXEvent *xevent, GdkEven… |
|
gpointer d); |
|
static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c); |
|
static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c); |
|
-static void linkopen(Client *c, const Arg *arg); |
|
-static void linkopenembed(Client *c, const Arg *arg); |
|
+static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h); |
|
static void reload(Client *c, const Arg *arg); |
|
static void scroll_h(Client *c, const Arg *a); |
|
static void scroll_v(Client *c, const Arg *a); |
|
t@@ -868,6 +868,12 @@ navigate(Client *c, const Arg *a) |
|
webkit_web_view_go_forward(c->view); |
|
} |
|
|
|
+void |
|
+clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h) |
|
+{ |
|
+ navigate(c, a); |
|
+} |
|
+ |
|
Client * |
|
newclient(Client *rc) |
|
{ |
|
t@@ -1171,15 +1177,12 @@ progresschanged(WebKitWebView *v, GParamSpec *ps, Clie… |
|
} |
|
|
|
void |
|
-linkopen(Client *c, const Arg *arg) |
|
+clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h) |
|
{ |
|
- newwindow(NULL, arg, 1); |
|
-} |
|
+ Arg arg; |
|
|
|
-void |
|
-linkopenembed(Client *c, const Arg *arg) |
|
-{ |
|
- newwindow(NULL, arg, 0); |
|
+ arg.v = webkit_hit_test_result_get_link_uri(h); |
|
+ newwindow(c, &arg, a->b); |
|
} |
|
|
|
void |
