/* modifier 0 means no modifier */
-static char *useragent = "Mozilla/5.0 (X11; U; Linux; en-us) AppleWebKit/531.2+ (KHTML, like Gecko, surf-"VERSION") Safari/531.2+";
+static char *useragent = "Surf/"VERSION" (X11; U; Unix; en-US) AppleWebKit/531.2+ Compatible (Safari)";
static char *progress = "#FF0000";
static char *progress_trust = "#00FF00";
static char *stylefile = ".surf/style.css";
static char *scriptfile = ".surf/script.js";
static char *cookiefile = ".surf/cookies.txt";
-static time_t sessiontime = 3600;
+static time_t sessiontime = 0;
#define NOBACKGROUND 0
-#define SETPROP(p, q) { \
- .v = (char *[]){ "sh", "-c", \
+#define SETPROP(p, q) { .v = (char *[]){ "/bin/sh", "-c", \
"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
p, q, winid, NULL } }
-#define DOWNLOAD(p) { \
- .v = (char *[]){ "/bin/sh", "-c", \
- "prop=\"`xprop -id $1 $0 | cut -d '\"' -f 2 | tr -d '\\''`\";" \
- "xterm -e \"wget --load-cookies '~/.surf/cookies.txt' '$prop';\"", \
- p, winid, NULL } }
-
#define MODKEY GDK_CONTROL_MASK
static Key keys[] = {
/* modifier keyval function arg Focus */
- { MODKEY, GDK_s, spawn, DOWNLOAD("_SURF_HILIGHT") },
{ MODKEY|GDK_SHIFT_MASK,GDK_r, reload, { .b = TRUE } },
{ MODKEY, GDK_r, reload, { .b = FALSE } },
{ MODKEY|GDK_SHIFT_MASK,GDK_p, print, { 0 } },
static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c);
static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c);
static void loaduri(Client *c, const Arg *arg);
-static void mousemove(GtkWidget *w, GdkEventMotion *e, Client *c);
static void navigate(Client *c, const Arg *arg);
static Client *newclient(void);
static void newwindow(Client *c, const Arg *arg);
}
}
-void
-mousemove(GtkWidget *w, GdkEventMotion *e, Client *c) {
- int result;
- GdkEventButton coord;
- WebKitHitTestResult *hit;
-
- coord.x = e->x;
- coord.y = e->y;
- hit = webkit_web_view_get_hit_test_result(c->view, &coord);
- g_object_get(hit, "context", &result, NULL);
- if(result & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE && !c->linkhover) {
- puts("Picture");
- }
-}
-
void
navigate(Client *c, const Arg *arg) {
int steps = *(int *)arg;
g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c);
g_signal_connect(G_OBJECT(c->view), "notify::load-status", G_CALLBACK(loadstatuschange), c);
g_signal_connect(G_OBJECT(c->view), "notify::progress", G_CALLBACK(progresschange), c);
- g_signal_connect(G_OBJECT(c->view), "motion-notify-event", G_CALLBACK(mousemove), c);
/* Indicator */
c->indicator = gtk_drawing_area_new();
setatom(c, AtomFind, "");
setatom(c, AtomUri, "about:blank");
- setatom(c, AtomHiLight, "about:blank");
if(NOBACKGROUND)
webkit_web_view_set_transparent(c->view, TRUE);
update(Client *c) {
char *t;
- if(c->progress != 100) {
+ if(c->progress != 100)
t = g_strdup_printf("[%i%%] %s", c->progress, c->title);
- }
else if(c->linkhover)
t = g_strdup(c->linkhover);
else
t = g_strdup(c->title);
- setatom(c, AtomHiLight, c->linkhover ? c->linkhover : geturi(c));
drawindicator(c);
gtk_window_set_title(GTK_WINDOW(c->win), t);
g_free(t);