X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=7c48bb60ea3fb793941b46f54644ccd86b81caf6;hb=526b974c33a17b7ef77f4268bd8602e2d51ad1b9;hp=8a98e74d8c390c7ecb5b0ad54fdeb498fde5aa54;hpb=42fdc77f5e4929fd618ab63e600ed550d52a0326;p=surf.git diff --git a/surf.c b/surf.c index 8a98e74..7c48bb6 100644 --- a/surf.c +++ b/surf.c @@ -59,13 +59,14 @@ typedef struct Client { Window xid; WebKitWebView *view; WebKitWebInspector *inspector; + WebKitFindController *finder; WebKitHitTestResult *mousepos; GTlsCertificateFlags tlsflags; const char *title, *targeturi; const char *needle; gint progress; struct Client *next; - gboolean zoomed, fullscreen; + gboolean fullscreen; } Client; typedef struct { @@ -126,7 +127,7 @@ static void destroywin(GtkWidget* w, Client *c); static void die(const char *errstr, ...); static void evalscript(Client *c, const char *jsstr, ...); 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 gboolean permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c); @@ -152,7 +153,7 @@ static void mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers, Client *c); static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c); static void loaduri(Client *c, const Arg *arg); -static void navigate(Client *c, const Arg *arg); +static void navigate(Client *c, const Arg *a); static Client *newclient(Client *c); static WebKitWebView *newview(Client *c, WebKitWebView *rv); static void showview(WebKitWebView *v, Client *c); @@ -182,7 +183,7 @@ static void togglestyle(Client *c, const Arg *arg); static void updatetitle(Client *c); static void updatewinid(Client *c); static void usage(void); -static void zoom(Client *c, const Arg *arg); +static void zoom(Client *c, const Arg *a); /* configuration, allows nested code to access above variables */ #include "config.h" @@ -581,13 +582,27 @@ die(const char *errstr, ...) } void -find(Client *c, const Arg *arg) +find(Client *c, const Arg *a) { - const char *s; + const char *s, *f; - s = getatom(c, AtomFind); - gboolean forward = *(gboolean *)arg; - webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE); + if (a && a->i) { + if (a->i > 0) + 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 @@ -836,10 +851,12 @@ loaduri(Client *c, const Arg *arg) } void -navigate(Client *c, const Arg *arg) +navigate(Client *c, const Arg *a) { - int steps = *(int *)arg; - webkit_web_view_go_back_or_forward(c->view, steps); + if (a->i < 0) + webkit_web_view_go_back(c->view); + else if (a->i > 0) + webkit_web_view_go_forward(c->view); } Client * @@ -977,6 +994,8 @@ showview(WebKitWebView *v, Client *c) if (enableinspector) c->inspector = webkit_web_view_get_inspector(c->view); + c->finder = webkit_web_view_get_find_controller(c->view); + if (!kioskmode) addaccelgroup(c); @@ -994,7 +1013,6 @@ showview(WebKitWebView *v, Client *c) gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK); gdk_window_add_filter(gwin, processx, c); - /* This might conflict with _zoomto96dpi_. */ if (zoomlevel != 1.0) webkit_web_view_set_zoom_level(c->view, zoomlevel); @@ -1121,8 +1139,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) ev = &((XEvent *)e)->xproperty; if (ev->state == PropertyNewValue) { if (ev->atom == atoms[AtomFind]) { - arg.b = TRUE; - find(c, &arg); + find(c, NULL); return GDK_FILTER_REMOVE; } else if (ev->atom == atoms[AtomGo]) { @@ -1421,20 +1438,16 @@ usage(void) } void -zoom(Client *c, const Arg *arg) -{ - c->zoomed = TRUE; - if (arg->i < 0) { - /* zoom out */ - webkit_web_view_zoom_out(c->view); - } else if (arg->i > 0) { - /* zoom in */ - webkit_web_view_zoom_in(c->view); - } else { - /* reset */ - c->zoomed = FALSE; +zoom(Client *c, const Arg *a) +{ + if (a->i > 0) + webkit_web_view_set_zoom_level(c->view, zoomlevel + 0.1); + else if (a->i < 0) + webkit_web_view_set_zoom_level(c->view, zoomlevel - 0.1); + else webkit_web_view_set_zoom_level(c->view, 1.0); - } + + zoomlevel = webkit_web_view_get_zoom_level(c->view); } int