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

Adapt find()

Browse source 
Slightly new behaviour: searching again for the same string (via MOD+/)
resets the search (ie restarts search from document top).
Searching for an empty string stops the search (ie all highlights are
removed).
This commit is contained in:
Quentin Rameau 2015-11-20 01:12:28 +01:00
parent 320e4e4388
commit 526b974c33
2 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config.def.h
View file

@ -35,6 +35,9 @@ static Bool loadimages = TRUE;
static Bool hidebackground = FALSE; static Bool hidebackground = FALSE;
static Bool allowgeolocation = TRUE; static Bool allowgeolocation = TRUE;
static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
WEBKIT_FIND_OPTIONS_WRAP_AROUND;
#define SETPROP(p, q) { \ #define SETPROP(p, q) { \
.v = (char *[]){ "/bin/sh", "-c", \ .v = (char *[]){ "/bin/sh", "-c", \
"prop=\"`xprop -id $2 $0 " \ "prop=\"`xprop -id $2 $0 " \
@ -116,8 +119,8 @@ static Key keys[] = {
{ MODKEY, GDK_KEY_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, { MODKEY, GDK_KEY_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") },
{ MODKEY, GDK_KEY_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, { MODKEY, GDK_KEY_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") },
{ MODKEY, GDK_KEY_n, find, { .b = TRUE } }, { MODKEY, GDK_KEY_n, find, { .i = +1 } },
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_n, find, { .b = FALSE } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_n, find, { .i = -1 } },
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_c, toggle, { .v = "enable-caret-browsing" } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_c, toggle, { .v = "enable-caret-browsing" } },
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_i, toggle, { .v = "auto-load-images" } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_i, toggle, { .v = "auto-load-images" } },

32
surf.c
View file

@ -59,6 +59,7 @@ typedef struct Client {
Window xid; Window xid;
WebKitWebView *view; WebKitWebView *view;
WebKitWebInspector *inspector; WebKitWebInspector *inspector;
WebKitFindController *finder;
WebKitHitTestResult *mousepos; WebKitHitTestResult *mousepos;
GTlsCertificateFlags tlsflags; GTlsCertificateFlags tlsflags;
const char *title, *targeturi; const char *title, *targeturi;
@ -126,7 +127,7 @@ static void destroywin(GtkWidget* w, Client *c);
static void die(const char *errstr, ...); static void die(const char *errstr, ...);
static void evalscript(Client *c, const char *jsstr, ...); static void evalscript(Client *c, const char *jsstr, ...);
static void runscript(Client *c); static void runscript(Client *c);
static void find(Client *c, const Arg *arg); static void find(Client *c, const Arg *a);
static void togglefullscreen(Client *c, const Arg *a); static void togglefullscreen(Client *c, const Arg *a);
static gboolean permissionrequested(WebKitWebView *v, static gboolean permissionrequested(WebKitWebView *v,
WebKitPermissionRequest *r, Client *c); WebKitPermissionRequest *r, Client *c);
@ -581,13 +582,27 @@ die(const char *errstr, ...)
} }
void void
find(Client *c, const Arg *arg) find(Client *c, const Arg *a)
{ {
const char *s; const char *s, *f;
s = getatom(c, AtomFind); if (a && a->i) {
gboolean forward = *(gboolean *)arg; if (a->i > 0)
webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE); webkit_find_controller_search_next(c->finder);
else
webkit_find_controller_search_previous(c->finder);
} else {
s = getatom(c, AtomFind);
f = webkit_find_controller_get_search_text(c->finder);
if (g_strcmp0(f, s) == 0) /* reset search */
webkit_find_controller_search(c->finder, "", findopts, G_MAXUINT);
webkit_find_controller_search(c->finder, s, findopts, G_MAXUINT);
if (strcmp(s, "") == 0)
webkit_find_controller_search_finish(c->finder);
}
} }
void void
@ -979,6 +994,8 @@ showview(WebKitWebView *v, Client *c)
if (enableinspector) if (enableinspector)
c->inspector = webkit_web_view_get_inspector(c->view); c->inspector = webkit_web_view_get_inspector(c->view);
c->finder = webkit_web_view_get_find_controller(c->view);
if (!kioskmode) if (!kioskmode)
addaccelgroup(c); addaccelgroup(c);
@ -1122,8 +1139,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d)
ev = &((XEvent *)e)->xproperty; ev = &((XEvent *)e)->xproperty;
if (ev->state == PropertyNewValue) { if (ev->state == PropertyNewValue) {
if (ev->atom == atoms[AtomFind]) { if (ev->atom == atoms[AtomFind]) {
arg.b = TRUE; find(c, NULL);
find(c, &arg);
return GDK_FILTER_REMOVE; return GDK_FILTER_REMOVE;
} else if (ev->atom == atoms[AtomGo]) { } else if (ev->atom == atoms[AtomGo]) {