#include <gdk/gdkkeysyms.h>
#include <string.h>
#include <unistd.h>
-#include <getopt.h>
#include <stdlib.h>
#include <stdio.h>
#include <webkit/webkit.h>
const gboolean b;
const gint i;
const void *v;
-} ;
+};
typedef struct Client {
GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar, *indicator;
} Cookie;
typedef enum {
- BROWSER = 0x0001,
- SEARCHBAR = 0x0010,
- URLBAR = 0x0100,
- ALWAYS = ~0,
+ Browser = 0x0001,
+ SearchBar = 0x0010,
+ UrlBar = 0x0100,
+ Any = ~0,
} KeyFocus;
typedef struct {
static GdkNativeWindow embed = 0;
static gboolean showxid = FALSE;
static gboolean ignore_once = FALSE;
-static gchar *workdir;
-extern char *optarg;
-extern gint optind;
+static gchar *buildpath(const gchar *path);
static void cleanup(void);
static void clipboard(Client *c, const Arg *arg);
static gchar *copystr(gchar **str, const gchar *src);
static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c);
static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c);
static void loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c);
-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(void);
static void rereadcookies(void);
static void setcookie(char *name, char *val, char *dom, char *path, long exp);
static void setup(void);
-static void titlechange(WebKitWebView* view, WebKitWebFrame* frame,
- const gchar* title, Client *c);
+static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c);
static void scroll(Client *c, const Arg *arg);
static void searchtext(Client *c, const Arg *arg);
static void source(Client *c, const Arg *arg);
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"
+gchar *
+buildpath(const gchar *path) {
+ gchar *apath, *p;
+ FILE *f;
+
+ /* creating directory */
+ if(path[0] == '/')
+ apath = g_strdup(path);
+ else
+ apath = g_strconcat(g_get_home_dir(), "/", path, NULL);
+ if((p = strrchr(apath, '/'))) {
+ *p = '\0';
+ g_mkdir_with_parents(apath, 0755);
+ *p = '/';
+ }
+ /* creating file (gives error when apath ends with "/") */
+ if((f = g_fopen(apath, "a")))
+ fclose(f);
+ return apath;
+}
+
void
cleanup(void) {
while(clients)
destroyclient(clients);
- g_free(workdir);
+ g_free(cookiefile);
+ g_free(dldir);
+ g_free(scriptfile);
+ g_free(stylefile);
}
void
destroyclient(Client *c) {
Client *p;
- gtk_widget_destroy(GTK_WIDGET(webkit_web_view_new()));
+ gtk_widget_destroy(GTK_WIDGET(c->view));
gtk_widget_destroy(c->scroll);
gtk_widget_destroy(c->urlbar);
gtk_widget_destroy(c->searchbar);
gboolean
initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
const gchar *filename;
- gchar *uri, *path, *html;
+ gchar *uri, *html;
stop(c, NULL);
c->download = o;
filename = webkit_download_get_suggested_filename(o);
- path = g_build_filename(workdir, "dl",
- filename, NULL);
- uri = g_strconcat("file://", path, NULL);
+ uri = g_strconcat("file://", dldir, "/", filename, NULL);
webkit_download_set_destination_uri(c->download, uri);
c->progress = 0;
g_free(uri);
if(ev->type != GDK_KEY_PRESS)
return FALSE;
if(GTK_WIDGET_HAS_FOCUS(c->searchbar))
- focus = SEARCHBAR;
+ focus = SearchBar;
else if(GTK_WIDGET_HAS_FOCUS(c->urlbar))
- focus = URLBAR;
+ focus = UrlBar;
else
- focus = BROWSER;
+ focus = Browser;
for(i = 0; i < LENGTH(keys); i++) {
if(focus & keys[i].focus
&& gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
update(c);
}
-void
-loadfile(Client *c, const gchar *f) {
- GIOChannel *chan = NULL;
- GError *e = NULL;
- GString *code;
- gchar *line, *uri;
- Arg arg;
-
- if(strcmp(f, "-") == 0) {
- chan = g_io_channel_unix_new(STDIN_FILENO);
- if (chan) {
- code = g_string_new("");
- while(g_io_channel_read_line(chan, &line, NULL, NULL,
- &e) == G_IO_STATUS_NORMAL) {
- g_string_append(code, line);
- g_free(line);
- }
- webkit_web_view_load_html_string(c->view, code->str,
- "file://.");
- g_io_channel_shutdown(chan, FALSE, NULL);
- g_string_free(code, TRUE);
- }
- arg.v = uri = g_strdup("stdin");
- }
- else {
- arg.v = uri = g_strdup_printf("file://%s", f);
- loaduri(c, &arg);
- }
- c->title = copystr(&c->title, uri);
- update(c);
- g_free(uri);
-}
-
void
loaduri(Client *c, const Arg *arg) {
gchar *u;
newclient(void) {
Client *c;
WebKitWebSettings *settings;
- gchar *filename;
+ gchar *uri;
if(!(c = calloc(1, sizeof(Client))))
die("Cannot malloc!\n");
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);
+ g_object_set(G_OBJECT(settings), "user-agent", useragent, NULL);
+ uri = g_strconcat("file://", stylefile, NULL);
+ g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
+ g_free(uri);
c->download = NULL;
c->title = NULL;
void
rereadcookies(void) {
- const gchar *filename;
-
- filename = g_build_filename(workdir, "cookies", NULL);
}
void
void
setup(void) {
- const gchar *home, *name;
SoupSession *s;
- FILE *tmp;
+
+ gtk_init(NULL, NULL);
+ if (!g_thread_supported())
+ g_thread_init(NULL);
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_strdup(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);
- name = g_build_filename(workdir, "script.js", NULL);
- if((tmp = g_fopen(name, "a")));
- fclose(tmp);
-
+ cookiefile = buildpath(cookiefile);
+ dldir = buildpath(dldir);
+ scriptfile = buildpath(scriptfile);
+ stylefile = buildpath(stylefile);
/* cookie persistance */
s = webkit_get_default_session();
- name = g_build_filename(workdir, "cookies.txt", NULL);
- cookiejar = soup_cookie_jar_text_new(name, FALSE);
+ cookiejar = soup_cookie_jar_text_new(cookiefile, FALSE);
soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
}
void
source(Client *c, const Arg *arg) {
Arg a = { .b = FALSE };
- /*gboolean s;
+ gboolean s;
s = webkit_web_view_get_view_source_mode(c->view);
- webkit_web_view_set_view_source_mode(c->view, c->source);*/
+ webkit_web_view_set_view_source_mode(c->view, !s);
reload(c, &a);
}
void
windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) {
JSStringRef jsscript;
- gchar *script, *filename;
+ gchar *script;
JSValueRef exception = NULL;
GError *error;
- filename = g_build_filename(workdir, "script.js", NULL);
- if(g_file_get_contents(filename, &script, NULL, &error)) {
- script = g_strdup_printf("window.addEventListener"
- "('DOMContentLoaded', function () { %s }, true);",
- script);
- jsscript = JSStringCreateWithUTF8CString (script);
- JSEvaluateScript (js, jsscript, JSContextGetGlobalObject(js), NULL, 0, &exception);
+ if(g_file_get_contents(scriptfile, &script, NULL, &error)) {
+ jsscript = JSStringCreateWithUTF8CString(script);
+ JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), NULL, 0, &exception);
}
}
}
int main(int argc, char *argv[]) {
- Client *c;
- gint o, a;
+ int i;
Arg arg;
- gtk_init(NULL, NULL);
- if (!g_thread_supported())
- g_thread_init(NULL);
- while((o = getopt(argc, argv, "vhxe:")) != -1)
- switch(o) {
- case 'x':
+ /* command line args */
+ for(i = 1, arg.v = NULL; i < argc; i++) {
+ if(!strcmp(argv[i], "-x"))
showxid = TRUE;
- break;
- case 'e':
- if(!(a = atoi(optarg)))
+ else if(!strcmp(argv[i], "-e")) {
+ if(++i < argc)
+ embed = atoi(argv[i]);
+ else
usage();
- embed = a;
+ }
+ else if(!strcmp(argv[i], "--"))
break;
- case 'v':
+ else if(!strcmp(argv[i], "-v"))
die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
- break;
- default:
+ else if(argv[i][0] == '-')
usage();
- }
- setup();
- if(optind + 1 == argc) {
- c = newclient();
- arg.v = argv[optind];
- if(strchr("./", argv[optind][0]) || strcmp("-", argv[optind]) == 0)
- loadfile(c, argv[optind]);
else
- loaduri(c, &arg);
-
+ arg.v = argv[i];
+ }
+ setup();
+ newclient();
+ if(arg.v) {
+ loaduri(clients, &arg);
}
- else if(optind != argc)
- usage();
- if(!clients)
- newclient();
-
-
gtk_main();
cleanup();
return EXIT_SUCCESS;
