typedef union Arg Arg;
union Arg {
- const gboolean b;
- const gint i;
+ gboolean b;
+ gint i;
const void *v;
};
typedef struct Client {
- GtkWidget *win, *scroll, *vbox, *uribar, *searchbar, *indicator;
+ GtkWidget *win, *scroll, *vbox, *indicator;
GtkWidget **items;
WebKitWebView *view;
WebKitDownload *download;
char *title, *linkhover;
+ const char *uri, *needle;
gint progress;
struct Client *next;
+ gboolean zoomed;
} Client;
typedef struct {
const Arg arg;
} Item;
-typedef enum {
- Browser = 0x0001,
- SearchBar = 0x0010,
- UriBar = 0x0100,
- Any = ~0,
-} KeyFocus;
-
typedef struct {
guint mod;
guint keyval;
void (*func)(Client *c, const Arg *arg);
const Arg arg;
- KeyFocus focus;
} Key;
static Display *dpy;
-static Atom uriprop;
-static SoupCookieJar *cookiejar;
+static Atom uriprop, findprop;
+static SoupCookieJar *cookies;
static SoupSession *session;
static Client *clients = NULL;
static GdkNativeWindow embed = 0;
static gboolean showxid = FALSE;
-static gboolean ignore_once = FALSE;
+static int ignorexprop = 0;
static char winid[64];
static char *progname;
+static gboolean lockcookie = FALSE;
-static const char *autouri(Client *c);
static char *buildpath(const char *path);
static void changecookie(SoupCookieJar *jar, SoupCookie *o, SoupCookie *n, gpointer p);
static void cleanup(void);
static void destroyclient(Client *c);
static void destroywin(GtkWidget* w, Client *c);
static void die(char *str);
-static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
+static void download(Client *c, const Arg *arg);
static void drawindicator(Client *c);
static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
-static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
static char *geturi(Client *c);
-static void hidesearch(Client *c, const Arg *arg);
-static void hideuri(Client *c, const Arg *arg);
+static const char *getatom(Client *c, Atom a);
+static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
static void itemclick(GtkMenuItem *mi, Client *c);
static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c);
static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c);
-static void loadfinished(WebKitWebView *v, WebKitWebFrame *f, Client *c);
static void loadstart(WebKitWebView *v, WebKitWebFrame *f, Client *c);
static void loaduri(Client *c, const Arg *arg);
static void navigate(Client *c, const Arg *arg);
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
static void print(Client *c, const Arg *arg);
static void progresschange(WebKitWebView *v, gint p, Client *c);
+static void reloadcookies();
static void reload(Client *c, const Arg *arg);
-static void reloadcookie();
+static void resize(GtkWidget *w, GtkAllocation *a, Client *c);
static void sigchld(int unused);
+static void setatom(Client *c, Atom a, const char *v);
static void setup(void);
static void spawn(Client *c, const Arg *arg);
static void scroll(Client *c, const Arg *arg);
-static void searchtext(Client *c, const Arg *arg);
+static void find(Client *c, const Arg *arg);
static void source(Client *c, const Arg *arg);
-static void showsearch(Client *c, const Arg *arg);
-static void showuri(Client *c, const Arg *arg);
static void stop(Client *c, const Arg *arg);
static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c);
-static gboolean focusview(GtkWidget *w, GdkEventFocus *e, Client *c);
static void usage(void);
static void update(Client *c);
+static void updatedownload(WebKitDownload *o, GParamSpec *pspec, Client *c);
static void updatewinid(Client *c);
static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c);
static void zoom(Client *c, const Arg *arg);
/* configuration, allows nested code to access above variables */
#include "config.h"
-const char *
-autouri(Client *c) {
- if(GTK_WIDGET_HAS_FOCUS(c->uribar))
- return gtk_entry_get_text(GTK_ENTRY(c->uribar));
- else if(c->linkhover)
- return c->linkhover;
- return NULL;
-}
-
char *
buildpath(const char *path) {
char *apath, *p;
}
void
-changecookie(SoupCookieJar *jar, SoupCookie *oc, SoupCookie *c, gpointer p) {
+changecookie(SoupCookieJar *j, SoupCookie *oc, SoupCookie *c, gpointer p) {
SoupDate *e;
+ SoupCookieJar *jar;
+ if(lockcookie)
+ return;
if(c && c->expires == NULL) {
e = soup_date_new_from_time_t(time(NULL) + sessiontime);
c = soup_cookie_copy(c);
soup_cookie_set_expires(c, e);
- soup_cookie_jar_add_cookie(cookiejar, c);
}
+
+ jar = soup_cookie_jar_text_new(cookiefile, FALSE);
+ if(c)
+ soup_cookie_jar_add_cookie(jar, soup_cookie_copy(c));
+ else
+ soup_cookie_jar_delete_cookie(jar, oc);
+ g_object_unref(jar);
}
void
if(paste)
gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteuri, c);
else
- gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
+ gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), c->linkhover ? c->linkhover : geturi(c), -1);
}
void
gtk_widget_destroy(GTK_WIDGET(c->view));
gtk_widget_destroy(c->scroll);
- gtk_widget_destroy(c->uribar);
- gtk_widget_destroy(c->searchbar);
gtk_widget_destroy(c->vbox);
+ gtk_widget_destroy(c->indicator);
gtk_widget_destroy(c->win);
for(i = 0; i < LENGTH(items); i++)
gtk_widget_destroy(c->items[i]);
gtk_main_quit();
}
+gboolean
+mime_policy_cb(WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, gchar *mime_type, WebKitWebPolicyDecision *policy_decision, gpointer user_data) {
+ if(webkit_web_view_can_show_mime_type(web_view, mime_type))
+ webkit_web_policy_decision_use(policy_decision);
+ else
+ webkit_web_policy_decision_download(policy_decision);
+ return TRUE;
+}
+
gboolean
decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) {
Arg arg;
+
if(webkit_web_navigation_action_get_reason(n) == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
webkit_web_policy_decision_ignore(p);
arg.v = (void *)webkit_network_request_get_uri(r);
void
drawindicator(Client *c) {
gint width;
- char *uri;
+ const char *uri;
GtkWidget *w;
GdkGC *gc;
GdkColor fg;
- uri = geturi(c);
+ uri = getatom(c, uriprop);
w = c->indicator;
width = c->progress * w->allocation.width / 100;
gc = gdk_gc_new(w->window);
}
void
-download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
- WebKitDownloadStatus status;
+download(Client *c, const Arg *arg) {
+ char *uri;
+ WebKitNetworkRequest *r;
+ WebKitDownload *dl;
- status = webkit_download_get_status(c->download);
- if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
- c->progress = (gint)(webkit_download_get_progress(c->download)*100);
- }
- update(c);
+ if(arg->v)
+ uri = (char *)arg->v;
+ else
+ uri = c->linkhover ? c->linkhover : geturi(c);
+ r = webkit_network_request_new(uri);
+ dl = webkit_download_new(r);
+ initdownload(c->view, dl, c);
+}
+
+const char *
+getatom(Client *c, Atom a) {
+ static char buf[BUFSIZ];
+ Atom adummy;
+ int idummy;
+ unsigned long ldummy;
+ unsigned char *p = NULL;
+
+ XGetWindowProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window),
+ a, 0L, BUFSIZ, False, XA_STRING,
+ &adummy, &idummy, &ldummy, &ldummy, &p);
+ if(p)
+ strncpy(buf, (char *)p, LENGTH(buf)-1);
+ else
+ buf[0] = '\0';
+ XFree(p);
+ return buf;
}
gboolean
stop(c, NULL);
c->download = o;
filename = webkit_download_get_suggested_filename(o);
+ if(!strcmp("", filename))
+ filename = "index.html";
uri = g_strconcat("file://", dldir, "/", filename, NULL);
webkit_download_set_destination_uri(c->download, uri);
c->progress = 0;
html = g_strdup_printf("Download <b>%s</b>...", filename);
webkit_web_view_load_html_string(c->view, html,
webkit_download_get_uri(c->download));
- g_signal_connect(c->download, "notify::progress", G_CALLBACK(download), c);
- g_signal_connect(c->download, "notify::status", G_CALLBACK(download), c);
+ g_signal_connect(c->download, "notify::progress", G_CALLBACK(updatedownload), c);
+ g_signal_connect(c->download, "notify::status", G_CALLBACK(updatedownload), c);
webkit_download_start(c->download);
c->title = copystr(&c->title, filename);
char *uri;
if(!(uri = (char *)webkit_web_view_get_uri(c->view)))
- uri = copystr(NULL, "about:blank");
+ uri = "about:blank";
return uri;
}
-void
-hidesearch(Client *c, const Arg *arg) {
- gtk_widget_hide(c->searchbar);
- gtk_widget_grab_focus(GTK_WIDGET(c->view));
-}
-
-void
-hideuri(Client *c, const Arg *arg) {
- gtk_widget_hide(c->uribar);
- gtk_widget_grab_focus(GTK_WIDGET(c->view));
-}
-
void
itemclick(GtkMenuItem *mi, Client *c) {
int i;
gboolean
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
- guint i, focus;
+ guint i;
gboolean processed = FALSE;
- if(ev->type != GDK_KEY_PRESS)
- return FALSE;
- if(GTK_WIDGET_HAS_FOCUS(c->searchbar))
- focus = SearchBar;
- else if(GTK_WIDGET_HAS_FOCUS(c->uribar))
- focus = UriBar;
- else
- focus = Browser;
updatewinid(c);
for(i = 0; i < LENGTH(keys); i++) {
- if(focus & keys[i].focus
- && gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
+ if(gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
&& CLEANMASK(ev->state) == keys[i].mod
&& keys[i].func) {
keys[i].func(c, &(keys[i].arg));
void
loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
- char *uri;
-
- ignore_once = TRUE;
- uri = geturi(c);
- XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), uriprop,
- XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
- strlen(uri) + 1);
-}
-
-void
-loadfinished(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
- reloadcookie();
+ setatom(c, uriprop, geturi(c));
}
void
loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
- reloadcookie();
c->progress = 0;
update(c);
+ reloadcookies();
}
void
char *u;
const char *uri = (char *)arg->v;
- if(!uri)
- uri = autouri(c);
- if(!uri)
- return;
u = g_strrstr(uri, "://") ? g_strdup(uri)
: g_strdup_printf("http://%s", uri);
webkit_web_view_load_uri(c->view, u);
int i;
Client *c;
WebKitWebSettings *settings;
+ GdkGeometry hints = { 1, 1 };
char *uri;
if(!(c = calloc(1, sizeof(Client))))
gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600);
g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(destroywin), c);
g_signal_connect(G_OBJECT(c->win), "key-press-event", G_CALLBACK(keypress), c);
+ g_signal_connect(G_OBJECT(c->win), "size-allocate", G_CALLBACK(resize), c);
if(!(c->items = calloc(1, sizeof(GtkWidget *) * LENGTH(items))))
die("Cannot malloc!\n");
G_CALLBACK(itemclick), c);
}
-
/* VBox */
c->vbox = gtk_vbox_new(FALSE, 0);
c->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
g_signal_connect(G_OBJECT(c->view), "title-changed", G_CALLBACK(titlechange), c);
g_signal_connect(G_OBJECT(c->view), "load-progress-changed", G_CALLBACK(progresschange), c);
- g_signal_connect(G_OBJECT(c->view), "load-finished", G_CALLBACK(loadfinished), c);
g_signal_connect(G_OBJECT(c->view), "load-committed", G_CALLBACK(loadcommit), c);
g_signal_connect(G_OBJECT(c->view), "load-started", G_CALLBACK(loadstart), c);
g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c);
g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c);
g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c);
g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c);
- g_signal_connect(G_OBJECT(c->view), "focus-in-event", G_CALLBACK(focusview), c);
g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c);
- /* uribar */
- c->uribar = gtk_entry_new();
- gtk_entry_set_has_frame(GTK_ENTRY(c->uribar), FALSE);
-
- /* searchbar */
- c->searchbar = gtk_entry_new();
- gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE);
-
/* indicator */
c->indicator = gtk_drawing_area_new();
gtk_widget_set_size_request(c->indicator, 0, 2);
gtk_container_add(GTK_CONTAINER(c->scroll), GTK_WIDGET(c->view));
gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
- gtk_container_add(GTK_CONTAINER(c->vbox), c->searchbar);
- gtk_container_add(GTK_CONTAINER(c->vbox), c->uribar);
gtk_container_add(GTK_CONTAINER(c->vbox), c->indicator);
/* Setup */
- gtk_box_set_child_packing(GTK_BOX(c->vbox), c->uribar, FALSE, FALSE, 0, GTK_PACK_START);
- gtk_box_set_child_packing(GTK_BOX(c->vbox), c->searchbar, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->indicator, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START);
gtk_widget_grab_focus(GTK_WIDGET(c->view));
- gtk_widget_hide_all(c->searchbar);
- gtk_widget_hide_all(c->uribar);
gtk_widget_show(c->vbox);
gtk_widget_show(c->indicator);
gtk_widget_show(c->scroll);
gtk_widget_show(GTK_WIDGET(c->view));
gtk_widget_show(c->win);
+ gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints, GDK_HINT_MIN_SIZE);
gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK);
gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
webkit_web_view_set_full_content_zoom(c->view, TRUE);
uri = g_strconcat("file://", stylefile, NULL);
g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
g_free(uri);
+ setatom(c, findprop, "");
c->download = NULL;
c->title = NULL;
cmd[i++] = "-x";
}
cmd[i++] = "--";
- uri = arg->v ? (char *)arg->v : autouri(c);
+ uri = arg->v ? (char *)arg->v : c->linkhover;
if(uri)
cmd[i++] = uri;
cmd[i++] = NULL;
processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
Client *c = (Client *)d;
XPropertyEvent *ev;
- Atom adummy;
- gint idummy;
- unsigned long ldummy;
- unsigned char *buf = NULL;
Arg arg;
if(((XEvent *)e)->type == PropertyNotify) {
ev = &((XEvent *)e)->xproperty;
- if(ev->atom == uriprop && ev->state == PropertyNewValue) {
- if(ignore_once)
- ignore_once = FALSE;
- else {
- XGetWindowProperty(dpy, ev->window, uriprop, 0L, BUFSIZ, False, XA_STRING,
- &adummy, &idummy, &ldummy, &ldummy, &buf);
- arg.v = buf;
+ if(ignorexprop)
+ ignorexprop--;
+ else if(ev->state == PropertyNewValue) {
+ if(ev->atom == uriprop) {
+ arg.v = getatom(c, uriprop);
loaduri(c, &arg);
- XFree(buf);
+ }
+ else if(ev->atom == findprop) {
+ arg.b = TRUE;
+ find(c, &arg);
}
return GDK_FILTER_REMOVE;
}
}
void
-reloadcookie(void) {
- SoupSession *s;
+reloadcookies() {
+ SoupCookieJar *jar;
+ GSList *l, *e;
- /* This forces the cookie to be written to hdd */
- s = webkit_get_default_session();
- soup_session_remove_feature(s, SOUP_SESSION_FEATURE(cookiejar));
- soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
-}
+ lockcookie = TRUE;
+ for(l = e = soup_cookie_jar_all_cookies(cookies); e; e = e->next)
+ soup_cookie_jar_delete_cookie(cookies, (SoupCookie *)e->data);
+ soup_cookies_free(l);
+ jar = soup_cookie_jar_text_new(cookiefile, TRUE);
+ for(l = e = soup_cookie_jar_all_cookies(jar); e; e = e->next)
+ soup_cookie_jar_add_cookie(cookies, (SoupCookie *)e->data);
+ g_slist_free(l);
+ lockcookie = FALSE;
+ g_object_unref(jar);
+}
void
scroll(Client *c, const Arg *arg) {
gtk_adjustment_set_value(a, v);
}
+void
+resize(GtkWidget *w, GtkAllocation *a, Client *c) {
+ double zoom;
+
+ if(c->zoomed)
+ return;
+ zoom = webkit_web_view_get_zoom_level(c->view);
+ if(a->width * a->height < 300 * 400 && zoom != 0.2)
+ webkit_web_view_set_zoom_level(c->view, 0.2);
+ else if(zoom != 1.0)
+ webkit_web_view_set_zoom_level(c->view, 1.0);
+}
+
void
sigchld(int unused) {
if(signal(SIGCHLD, sigchld) == SIG_ERR)
while(0 < waitpid(-1, NULL, WNOHANG));
}
+void
+setatom(Client *c, Atom a, const char *v) {
+ XSync(dpy, False);
+ ignorexprop++;
+ XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), a,
+ XA_STRING, 8, PropModeReplace, (unsigned char *)v,
+ strlen(v) + 1);
+}
+
void
setup(void) {
SoupSession *s;
dpy = GDK_DISPLAY();
session = webkit_get_default_session();
uriprop = XInternAtom(dpy, "_SURF_URI", False);
+ findprop = XInternAtom(dpy, "_SURF_FIND", False);
/* create dirs and files */
cookiefile = buildpath(cookiefile);
/* cookie persistance */
s = webkit_get_default_session();
- cookiejar = soup_cookie_jar_text_new(cookiefile, FALSE);
- soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
- g_signal_connect(cookiejar, "changed", G_CALLBACK(changecookie), NULL);
-}
-
-void
-showsearch(Client *c, const Arg *arg) {
- hideuri(c, NULL);
- gtk_widget_show(c->searchbar);
- gtk_widget_grab_focus(c->searchbar);
+ cookies = soup_cookie_jar_new();
+ soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookies));
+ g_signal_connect(cookies, "changed", G_CALLBACK(changecookie), NULL);
+ reloadcookies();
}
void
}
void
-searchtext(Client *c, const Arg *arg) {
- const char *text;
- gboolean forward = *(gboolean *)arg;
- text = gtk_entry_get_text(GTK_ENTRY(c->searchbar));
- webkit_web_view_search_text(c->view, text, FALSE, forward, TRUE);
- webkit_web_view_mark_text_matches(c->view, text, FALSE, 0);
-}
+find(Client *c, const Arg *arg) {
+ const char *s;
-void
-showuri(Client *c, const Arg *arg) {
- char *uri;
-
- hidesearch(c, NULL);
- uri = geturi(c);
- gtk_entry_set_text(GTK_ENTRY(c->uribar), uri);
- gtk_widget_show(c->uribar);
- gtk_widget_grab_focus(c->uribar);
+ s = getatom(c, findprop);
+ gboolean forward = *(gboolean *)arg;
+ webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
}
void
update(c);
}
-gboolean
-focusview(GtkWidget *w, GdkEventFocus *e, Client *c) {
- hidesearch(c, NULL);
- hideuri(c, NULL);
- return FALSE;
-}
-
void
usage(void) {
fputs("surf - simple browser\n", stderr);
drawindicator(c);
gtk_window_set_title(GTK_WINDOW(c->win), t);
g_free(t);
+}
+
+void
+updatedownload(WebKitDownload *o, GParamSpec *pspec, Client *c) {
+ WebKitDownloadStatus status;
+ status = webkit_download_get_status(c->download);
+ if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
+ c->progress = (gint)(webkit_download_get_progress(c->download)*100);
+ }
+ update(c);
}
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 */
+ else { /* reset */
+ c->zoomed = FALSE;
webkit_web_view_set_zoom_level(c->view, 1.0);
+ }
}
int main(int argc, char *argv[]) {
