SoupSession *session;
Client *clients = NULL;
Cookie *cookies = NULL;
-gboolean embed = FALSE;
+GdkNativeWindow embed = 0;
gboolean showxid = FALSE;
gboolean ignore_once = FALSE;
+gchar *workdir;
extern char *optarg;
extern gint optind;
static void loadfile(Client *c, const gchar *f);
static void loaduri(Client *c, const Arg *arg);
static void navigate(Client *c, const Arg *arg);
-static Client *newclient();
+static Client *newclient(void);
static WebKitWebView *newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
static void pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d);
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
static void progresschange(WebKitWebView *view, gint p, Client *c);
static void request(SoupSession *s, SoupMessage *m, Client *c);
static void reload(Client *c, const Arg *arg);
-static void rereadcookies();
+static void rereadcookies(void);
static void setcookie(char *name, char *val, char *dom, char *path, long exp);
-static void setup();
+static void setup(void);
static void titlechange(WebKitWebView* view, WebKitWebFrame* frame,
const gchar* title, Client *c);
static void scroll(Client *c, const Arg *arg);
static void showurl(Client *c, const Arg *arg);
static void stop(Client *c, const Arg *arg);
static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c);
-static void usage();
+static gboolean unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c);
+static void usage(void);
static void update(Client *c);
static void zoom(Client *c, const Arg *arg);
TRUE, 0, 0, w->allocation.width, w->allocation.height);
gdk_draw_rectangle(w->window, gc, TRUE, 0, 0, width,
w->allocation.height);
- g_object_unref(gc);/*g_free(gc);*/
+ g_object_unref(gc);
}
gboolean
gboolean
initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
- const gchar *home, *filename;
+ const gchar *filename;
gchar *uri, *path, *html;
stop(c, NULL);
c->download = o;
- home = g_get_home_dir();
filename = webkit_download_get_suggested_filename(o);
- path = g_build_filename(home, ".surf", "dl",
+ path = g_build_filename(workdir, "dl",
filename, NULL);
uri = g_strconcat("file://", path, NULL);
webkit_download_set_destination_uri(c->download, uri);
Client *
newclient(void) {
Client *c;
+ WebKitWebSettings *settings;
+ gchar *filename;
+
if(!(c = calloc(1, sizeof(Client))))
die("Cannot malloc!\n");
/* Window */
if(embed) {
- c->win = gtk_plug_new(0);
+ c->win = gtk_plug_new(embed);
}
else {
c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
/* urlbar */
c->urlbar = gtk_entry_new();
gtk_entry_set_has_frame(GTK_ENTRY(c->urlbar), FALSE);
+ g_signal_connect(G_OBJECT(c->urlbar), "focus-out-event", G_CALLBACK(unfocusbar), c);
/* searchbar */
c->searchbar = gtk_entry_new();
gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE);
+ g_signal_connect(G_OBJECT(c->searchbar), "focus-out-event", G_CALLBACK(unfocusbar), c);
/* indicator */
c->indicator = gtk_drawing_area_new();
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);
+ settings = webkit_web_view_get_settings(c->view);
+ g_object_set (G_OBJECT(settings), "user-agent", "surf", NULL);
+ filename = g_build_filename(workdir, "style.css", NULL);
+ filename = g_strdup_printf("file://%s", filename);
+ g_object_set (G_OBJECT(settings), "user-stylesheet-uri", filename, NULL);
+
c->download = NULL;
c->title = NULL;
c->next = clients;
}
void
-rereadcookies() {
- const gchar *filename, *home;
+rereadcookies(void) {
+ const gchar *filename;
- home = g_get_home_dir();
- filename = g_build_filename(home, ".surf", "cookies", NULL);
+ filename = g_build_filename(workdir, "cookies", NULL);
}
void
}
void
-setup() {
+setup(void) {
+ const gchar *home, *name;
+ SoupSession *s;
+ FILE *tmp;
+
dpy = GDK_DISPLAY();
session = webkit_get_default_session();
urlprop = XInternAtom(dpy, "_SURF_URL", False);
+
+
+ /* create dirs and files */
+ home = g_get_home_dir();
+ workdir = g_build_filename(home, ".surf", NULL);
+ g_mkdir_with_parents(workdir, 0755);
+ name = g_build_filename(workdir, "dl", NULL);
+ g_mkdir(name, 0755);
+ name = g_build_filename(workdir, "style.css", NULL);
+ if((tmp = g_fopen(name, "a")));
+ fclose(tmp);
+
+
+ /* cookie persistance */
+ s = webkit_get_default_session();
+ name = g_build_filename(workdir, "cookies.txt", NULL);
+ cookiejar = soup_cookie_jar_text_new(name, FALSE);
+ soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
}
void
update(c);
}
+gboolean
+unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c) {
+ hidesearch(c, NULL);
+ hideurl(c, NULL);
+ return FALSE;
+}
+
void
-usage() {
+usage(void) {
fputs("surf - simple browser\n", stderr);
- die("usage: surf [-e] [-x] [uri]\n");
+ die("usage: surf [-e Window] [-x] [uri]\n");
}
void
}
int main(int argc, char *argv[]) {
- SoupSession *s;
Client *c;
- gint o;
- const gchar *home, *filename;
+ gint o, a;
Arg arg;
gtk_init(NULL, NULL);
if (!g_thread_supported())
g_thread_init(NULL);
- setup();
- while((o = getopt(argc, argv, "vhxeu:f:")) != -1)
+ while((o = getopt(argc, argv, "vhxe:")) != -1)
switch(o) {
case 'x':
showxid = TRUE;
break;
case 'e':
- showxid = TRUE;
- embed = TRUE;
+ if(!(a = atoi(optarg)))
+ usage();
+ embed = a;
break;
case 'v':
die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
}
else if(optind != argc)
usage();
+ setup();
if(!clients)
newclient();
- /* make dirs */
- home = g_get_home_dir();
- filename = g_build_filename(home, ".surf", "dl", NULL);
- g_mkdir_with_parents(filename, 0755);
-
- /* cookie persistance */
- s = webkit_get_default_session();
- filename = g_build_filename(home, ".surf", "cookies.jar", NULL);
- cookiejar = soup_cookie_jar_text_new(filename, FALSE);
- soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
gtk_main();
cleanup();