X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=9b4dbb920e4d5ad32f70d28280a046811a4cdc49;hb=581075796aa380f32a0313c4c64a608e55f8b374;hp=edfc3c313add84906060c5bf5c91502eb009d216;hpb=11fa5a7a4df034aace061c726cc261c5d57e2509;p=surf.git diff --git a/surf.c b/surf.c index edfc3c3..9b4dbb9 100644 --- a/surf.c +++ b/surf.c @@ -56,8 +56,8 @@ enum { }; typedef union { - gboolean b; - gint i; + int b; + int i; const void *v; } Arg; @@ -69,9 +69,8 @@ typedef struct Client { WebKitHitTestResult *mousepos; GTlsCertificateFlags tlsflags; Window xid; - gint progress; - gboolean fullscreen; - const char *title, *targeturi; + int progress, fullscreen; + const char *title, *overtitle, *targeturi; const char *needle; struct Client *next; } Client; @@ -106,9 +105,8 @@ static void sigchld(int unused); static char *buildfile(const char *path); static char *buildpath(const char *path); static Client *newclient(Client *c); -static void addaccelgroup(Client *c); static void loaduri(Client *c, const Arg *a); -static char *geturi(Client *c); +static const char *geturi(Client *c); static void setatom(Client *c, int a, const char *v); static const char *getatom(Client *c, int a); static void updatetitle(Client *c); @@ -116,13 +114,13 @@ static void gettogglestats(Client *c); static void getpagestats(Client *c); static WebKitCookieAcceptPolicy cookiepolicy_get(void); static char cookiepolicy_set(const WebKitCookieAcceptPolicy p); -static const gchar *getstyle(const char *uri); +static const char *getstyle(const char *uri); static void setstyle(Client *c, const char *stylefile); static void runscript(Client *c); static void evalscript(Client *c, const char *jsstr, ...); static void updatewinid(Client *c); -static void handleplumb(Client *c, const gchar *uri); -static void newwindow(Client *c, const Arg *a, gboolean noembed); +static void handleplumb(Client *c, const char *uri); +static void newwindow(Client *c, const Arg *a, int noembed); static void spawn(Client *c, const Arg *a); static void destroyclient(Client *c); static void cleanup(void); @@ -131,9 +129,7 @@ static void cleanup(void); static WebKitWebView *newview(Client *c, WebKitWebView *rv); static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c); -static gboolean buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c); -static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key, - GdkModifierType mods, Client *c); +static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c); static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d); static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c); @@ -185,7 +181,7 @@ static char togglestats[10]; static char pagestats[2]; static Atom atoms[AtomLast]; static Window embed; -static gboolean showxid = FALSE; +static int showxid; static int cookiepolicy; static Display *dpy; static Client *clients; @@ -212,7 +208,7 @@ die(const char *errstr, ...) va_start(ap, errstr); vfprintf(stderr, errstr, ap); va_end(ap); - exit(EXIT_FAILURE); + exit(1); } void @@ -260,7 +256,8 @@ sigchld(int unused) { if (signal(SIGCHLD, sigchld) == SIG_ERR) die("Can't install SIGCHLD handler"); - while (0 < waitpid(-1, NULL, WNOHANG)); + while (waitpid(-1, NULL, WNOHANG) > 0) + ; } char * @@ -333,33 +330,16 @@ newclient(Client *rc) if (!(c = calloc(1, sizeof(Client)))) die("Cannot malloc!\n"); - c->title = NULL; - c->progress = 100; - c->next = clients; clients = c; - c->view = newview(c, rc ? rc->view : NULL); + c->progress = 100; c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; + c->view = newview(c, rc ? rc->view : NULL); return c; } -void -addaccelgroup(Client *c) -{ - int i; - GtkAccelGroup *group = gtk_accel_group_new(); - GClosure *closure; - - for (i = 0; i < LENGTH(keys); i++) { - closure = g_cclosure_new(G_CALLBACK(keypress), c, NULL); - gtk_accel_group_connect(group, keys[i].keyval, keys[i].mod, 0, - closure); - } - gtk_window_add_accel_group(GTK_WINDOW(c->win), group); -} - void loaduri(Client *c, const Arg *a) { @@ -385,19 +365,18 @@ loaduri(Client *c, const Arg *a) reload(c, a); } else { webkit_web_view_load_uri(c->view, url); - c->title = geturi(c); updatetitle(c); } g_free(url); } -char * +const char * geturi(Client *c) { - char *uri; + const char *uri; - if (!(uri = (char *)webkit_web_view_get_uri(c->view))) + if (!(uri = webkit_web_view_get_uri(c->view))) uri = "about:blank"; return uri; } @@ -407,8 +386,8 @@ setatom(Client *c, int a, const char *v) { XSync(dpy, False); XChangeProperty(dpy, c->xid, - atoms[a], XA_STRING, 8, PropModeReplace, - (unsigned char *)v, strlen(v) + 1); + atoms[a], XA_STRING, 8, PropModeReplace, + (unsigned char *)v, strlen(v) + 1); } const char * @@ -435,26 +414,24 @@ void updatetitle(Client *c) { char *title; + const char *name = c->overtitle ? c->overtitle : + c->title ? c->title : ""; if (showindicators) { gettogglestats(c); getpagestats(c); - if (c->progress != 100) { + if (c->progress != 100) title = g_strdup_printf("[%i%%] %s:%s | %s", - c->progress, togglestats, pagestats, - c->targeturi ? c->targeturi : c->title); - } else { + c->progress, togglestats, pagestats, name); + else title = g_strdup_printf("%s:%s | %s", - togglestats, pagestats, - c->targeturi ? c->targeturi : c->title); - } + togglestats, pagestats, name); gtk_window_set_title(GTK_WINDOW(c->win), title); g_free(title); } else { - gtk_window_set_title(GTK_WINDOW(c->win), c->title ? - c->title : ""); + gtk_window_set_title(GTK_WINDOW(c->win), name); } } @@ -489,12 +466,11 @@ cookiepolicy_get(void) return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER; case '@': return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY; + default: /* fallthrough */ case 'A': - default: - break; + return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS; } - return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS; } char @@ -505,15 +481,14 @@ cookiepolicy_set(const WebKitCookieAcceptPolicy p) return 'a'; case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY: return '@'; + default: /* fallthrough */ case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS: - default: - break; + return 'A'; } - return 'A'; } -const gchar * +const char * getstyle(const char *uri) { int i; @@ -582,7 +557,7 @@ updatewinid(Client *c) } void -handleplumb(Client *c, const gchar *uri) +handleplumb(Client *c, const char *uri) { Arg a = (Arg)PLUMB(uri); spawn(c, &a); @@ -649,9 +624,9 @@ spawn(Client *c, const Arg *a) close(ConnectionNumber(dpy)); setsid(); execvp(((char **)a->v)[0], (char **)a->v); - fprintf(stderr, "surf: execvp %s", ((char **)a->v)[0]); + fprintf(stderr, "%s: execvp %s", argv0, ((char **)a->v)[0]); perror(" failed"); - exit(0); + exit(1); } } @@ -750,6 +725,13 @@ newview(Client *c, WebKitWebView *rv) webkit_cookie_manager_set_accept_policy( webkit_web_context_get_cookie_manager(context), cookiepolicy_get()); + /* languages */ + webkit_web_context_set_preferred_languages(context, + preferedlanguages); + webkit_web_context_set_spell_checking_languages(context, + spellinglanguages); + webkit_web_context_set_spell_checking_enabled(context, + enablespellchecking); g_signal_connect(G_OBJECT(context), "download-started", G_CALLBACK(downloadstarted), c); @@ -761,26 +743,26 @@ newview(Client *c, WebKitWebView *rv) NULL); } + g_signal_connect(G_OBJECT(v), "notify::estimated-load-progress", + G_CALLBACK(progresschanged), c); g_signal_connect(G_OBJECT(v), "notify::title", G_CALLBACK(titlechanged), c); - g_signal_connect(G_OBJECT(v), "mouse-target-changed", - G_CALLBACK(mousetargetchanged), c); - g_signal_connect(G_OBJECT(v), "permission-request", - G_CALLBACK(permissionrequested), c); + g_signal_connect(G_OBJECT(v), "button-release-event", + G_CALLBACK(buttonreleased), c); + g_signal_connect(G_OBJECT(v), "close", + G_CALLBACK(closeview), c); g_signal_connect(G_OBJECT(v), "create", G_CALLBACK(createview), c); - g_signal_connect(G_OBJECT(v), "ready-to-show", - G_CALLBACK(showview), c); g_signal_connect(G_OBJECT(v), "decide-policy", G_CALLBACK(decidepolicy), c); g_signal_connect(G_OBJECT(v), "load-changed", G_CALLBACK(loadchanged), c); - g_signal_connect(G_OBJECT(v), "notify::estimated-load-progress", - G_CALLBACK(progresschanged), c); - g_signal_connect(G_OBJECT(v), "button-release-event", - G_CALLBACK(buttonreleased), c); - g_signal_connect(G_OBJECT(v), "close", - G_CALLBACK(closeview), c); + g_signal_connect(G_OBJECT(v), "mouse-target-changed", + G_CALLBACK(mousetargetchanged), c); + g_signal_connect(G_OBJECT(v), "permission-request", + G_CALLBACK(permissionrequested), c); + g_signal_connect(G_OBJECT(v), "ready-to-show", + G_CALLBACK(showview), c); return v; } @@ -814,18 +796,17 @@ createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c) } gboolean -buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c) +buttonreleased(GtkWidget *w, GdkEvent *e, Client *c) { WebKitHitTestResultContext element; - GdkEventButton *eb = (GdkEventButton*)e; int i; element = webkit_hit_test_result_get_context(c->mousepos); for (i = 0; i < LENGTH(buttons); ++i) { if (element & buttons[i].target && - eb->button == buttons[i].button && - CLEANMASK(eb->state) == CLEANMASK(buttons[i].mask) && + e->button.button == buttons[i].button && + CLEANMASK(e->button.state) == CLEANMASK(buttons[i].mask) && buttons[i].func) { buttons[i].func(c, &buttons[i].arg, c->mousepos); return buttons[i].stopevent; @@ -835,28 +816,6 @@ buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c) return FALSE; } -gboolean -keypress(GtkAccelGroup *group, GObject *obj, guint key, GdkModifierType mods, - Client *c) -{ - guint i; - gboolean processed = FALSE; - - mods = CLEANMASK(mods); - key = gdk_keyval_to_lower(key); - updatewinid(c); - for (i = 0; i < LENGTH(keys); i++) { - if (key == keys[i].keyval - && mods == keys[i].mod - && keys[i].func) { - keys[i].func(c, &(keys[i].arg)); - processed = TRUE; - } - } - - return processed; -} - GdkFilterReturn processx(GdkXEvent *e, GdkEvent *event, gpointer d) { @@ -885,29 +844,46 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c) { + int i; + switch (e->type) { + case GDK_ENTER_NOTIFY: + c->overtitle = c->targeturi; + updatetitle(c); + break; + case GDK_KEY_PRESS: + if (!kioskmode) { + for (i = 0; i < LENGTH(keys); ++i) { + if (gdk_keyval_to_lower(e->key.keyval) == + keys[i].keyval && + CLEANMASK(e->key.state) == keys[i].mod && + keys[i].func) { + updatewinid(c); + keys[i].func(c, &(keys[i].arg)); + return TRUE; + } + } + } case GDK_LEAVE_NOTIFY: - c->targeturi = NULL; + c->overtitle = NULL; updatetitle(c); break; - case GDK_WINDOW_STATE: /* fallthrough */ + case GDK_WINDOW_STATE: if (e->window_state.changed_mask == - GDK_WINDOW_STATE_FULLSCREEN) { + GDK_WINDOW_STATE_FULLSCREEN) c->fullscreen = e->window_state.new_window_state & GDK_WINDOW_STATE_FULLSCREEN; - break; - } + break; default: - return FALSE; + break; } - return TRUE; + return FALSE; } void showview(WebKitWebView *v, Client *c) { - GdkGeometry hints = { 1, 1 }; GdkRGBA bgcolor = { 0 }; GdkWindow *gwin; @@ -918,8 +894,6 @@ showview(WebKitWebView *v, Client *c) c->win = createwindow(c); gtk_container_add(GTK_CONTAINER(c->win), GTK_WIDGET(c->view)); - gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints, - GDK_HINT_MIN_SIZE); gtk_widget_show_all(c->win); gtk_widget_grab_focus(GTK_WIDGET(c->view)); @@ -935,7 +909,6 @@ showview(WebKitWebView *v, Client *c) webkit_web_view_set_background_color(c->view, &bgcolor); if (!kioskmode) { - addaccelgroup(c); gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK); gdk_window_add_filter(gwin, processx, c); } @@ -953,6 +926,7 @@ showview(WebKitWebView *v, Client *c) GtkWidget * createwindow(Client *c) { + char *wmstr; GtkWidget *w; if (embed) { @@ -960,25 +934,24 @@ createwindow(Client *c) } else { w = gtk_window_new(GTK_WINDOW_TOPLEVEL); - /* TA: 20091214: Despite what the GNOME docs say, the ICCCM - * is always correct, so we should still call this function. - * But when doing so, we *must* differentiate between a - * WM_CLASS and a resource on the window. By convention, the - * window class (WM_CLASS) is capped, while the resource is in - * lowercase. Both these values come as a pair. - */ - gtk_window_set_wmclass(GTK_WINDOW(w), "surf", "Surf"); + wmstr = g_path_get_basename(argv0); + gtk_window_set_wmclass(GTK_WINDOW(w), wmstr, "Surf"); + g_free(wmstr); - /* TA: 20091214: And set the role here as well -- so that - * sessions can pick this up. - */ - gtk_window_set_role(GTK_WINDOW(w), "Surf"); + wmstr = g_strdup_printf("%s[%lu]", "Surf", + webkit_web_view_get_page_id(c->view)); + gtk_window_set_role(GTK_WINDOW(w), wmstr); + g_free(wmstr); gtk_window_set_default_size(GTK_WINDOW(w), 800, 600); } g_signal_connect(G_OBJECT(w), "destroy", G_CALLBACK(destroywin), c); + g_signal_connect(G_OBJECT(w), "enter-notify-event", + G_CALLBACK(winevent), c); + g_signal_connect(G_OBJECT(w), "key-press-event", + G_CALLBACK(winevent), c); g_signal_connect(G_OBJECT(w), "leave-notify-event", G_CALLBACK(winevent), c); g_signal_connect(G_OBJECT(w), "window-state-event", @@ -990,20 +963,25 @@ createwindow(Client *c) void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c) { + const char *title = geturi(c); + switch (e) { case WEBKIT_LOAD_STARTED: + setatom(c, AtomUri, title); + c->title = title; c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; break; case WEBKIT_LOAD_REDIRECTED: - setatom(c, AtomUri, geturi(c)); + setatom(c, AtomUri, title); + c->title = title; break; case WEBKIT_LOAD_COMMITTED: + setatom(c, AtomUri, title); + c->title = title; if (!webkit_web_view_get_tls_info(c->view, NULL, &(c->tlsflags))) c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; - setatom(c, AtomUri, geturi(c)); - if (enablestyle) setstyle(c, getstyle(geturi(c))); break; @@ -1051,6 +1029,8 @@ mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers, c->targeturi = webkit_hit_test_result_get_media_uri(h); else c->targeturi = NULL; + + c->overtitle = c->targeturi; updatetitle(c); } @@ -1157,10 +1137,10 @@ decideresource(WebKitPolicyDecision *d, Client *c) webkit_response_policy_decision_get_response(r); const gchar *uri = webkit_uri_response_get_uri(res); - if (g_str_has_suffix(uri, "/favicon.ico")) - webkit_uri_request_set_uri( - webkit_response_policy_decision_get_request(r), - "about:blank"); + if (g_str_has_suffix(uri, "/favicon.ico")) { + webkit_policy_decision_ignore(d); + return; + } if (!g_str_has_prefix(uri, "http://") && !g_str_has_prefix(uri, "https://") @@ -1178,6 +1158,7 @@ decideresource(WebKitPolicyDecision *d, Client *c) if (isascii) { handleplumb(c, uri); webkit_policy_decision_ignore(d); + return; } } @@ -1228,15 +1209,14 @@ void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) { Arg a = {.v = text }; - if (!text) + if (text) loaduri((Client *) d, &a); } void reload(Client *c, const Arg *a) { - gboolean nocache = *(gboolean *)a; - if (nocache) + if (a->b) webkit_web_view_reload_bypass_cache(c->view); else webkit_web_view_reload(c->view); @@ -1382,7 +1362,12 @@ void togglestyle(Client *c, const Arg *a) { enablestyle = !enablestyle; - setstyle(c, enablestyle ? getstyle(geturi(c)) : ""); + + if (enablestyle) + setstyle(c, getstyle(geturi(c))); + else + webkit_user_content_manager_remove_all_style_sheets( + webkit_web_view_get_user_content_manager(c->view)); updatetitle(c); } @@ -1444,10 +1429,8 @@ clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h) { Arg arg; - if (webkit_hit_test_result_get_context(h) & OnMedia) { - arg = (Arg)VIDEOPLAY(webkit_hit_test_result_get_media_uri(h)); - spawn(c, &arg); - } + arg = (Arg)VIDEOPLAY(webkit_hit_test_result_get_media_uri(h)); + spawn(c, &arg); } int @@ -1536,13 +1519,13 @@ main(int argc, char *argv[]) stylefile = EARGF(usage()); break; case 'u': - useragent = EARGF(usage()); + fulluseragent = EARGF(usage()); break; case 'v': die("surf-"VERSION", ©2009-2015 surf engineers, " "see LICENSE for details\n"); case 'x': - showxid = TRUE; + showxid = 1; break; case 'z': zoomlevel = strtof(EARGF(usage()), NULL); @@ -1552,18 +1535,18 @@ main(int argc, char *argv[]) } ARGEND; if (argc > 0) arg.v = argv[0]; + else + arg.v = "about:blank"; setup(); c = newclient(NULL); showview(NULL, c); - if (arg.v) - loaduri(clients, &arg); - else - updatetitle(c); + loaduri(c, &arg); + updatetitle(c); gtk_main(); cleanup(); - return EXIT_SUCCESS; + return 0; }