adding config.h patch from quaker4lyf. Thanks :)
This commit is contained in:
parent
96edaa8412
commit
2221ee15bd
250
surf.c
250
surf.c
|
@ -20,6 +20,15 @@
|
||||||
|
|
||||||
Display *dpy;
|
Display *dpy;
|
||||||
Atom urlprop;
|
Atom urlprop;
|
||||||
|
typedef union Arg Arg;
|
||||||
|
union Arg {
|
||||||
|
const gboolean b;
|
||||||
|
const int i;
|
||||||
|
const unsigned int ui;
|
||||||
|
const float f;
|
||||||
|
const void *v;
|
||||||
|
} ;
|
||||||
|
|
||||||
typedef struct Client {
|
typedef struct Client {
|
||||||
GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar;
|
GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar;
|
||||||
WebKitWebView *view;
|
WebKitWebView *view;
|
||||||
|
@ -28,6 +37,27 @@ typedef struct Client {
|
||||||
gint progress;
|
gint progress;
|
||||||
struct Client *next;
|
struct Client *next;
|
||||||
} Client;
|
} Client;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
guint mod;
|
||||||
|
guint keyval;
|
||||||
|
void (*func)(Client *c, const Arg *arg);
|
||||||
|
const Arg arg;
|
||||||
|
gboolean stop; /* do not propagate keypress event/stop matching keys */
|
||||||
|
} Key;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
NONE,
|
||||||
|
SEARCHBAR,
|
||||||
|
URLBAR,
|
||||||
|
} Keypressmode;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
Key *keys;
|
||||||
|
unsigned int numkeys;
|
||||||
|
Keypressmode mode;
|
||||||
|
} KeySet;
|
||||||
|
|
||||||
SoupCookieJar *cookiejar;
|
SoupCookieJar *cookiejar;
|
||||||
Client *clients = NULL;
|
Client *clients = NULL;
|
||||||
gboolean embed = FALSE;
|
gboolean embed = FALSE;
|
||||||
|
@ -37,32 +67,39 @@ extern char *optarg;
|
||||||
extern int optind;
|
extern int optind;
|
||||||
|
|
||||||
static void cleanup(void);
|
static void cleanup(void);
|
||||||
|
static void clipboard(Client *c, const Arg *arg);
|
||||||
static void destroyclient(Client *c);
|
static void destroyclient(Client *c);
|
||||||
static void destroywin(GtkWidget* w, Client *c);
|
static void destroywin(GtkWidget* w, Client *c);
|
||||||
static void die(char *str);
|
static void die(char *str);
|
||||||
static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
|
static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
|
||||||
static gboolean initdownload(WebKitWebView *view, WebKitDownload *o, Client *c);
|
static gboolean initdownload(WebKitWebView *view, WebKitDownload *o, Client *c);
|
||||||
static gchar *geturi(Client *c);
|
static gchar *geturi(Client *c);
|
||||||
static void hidesearch(Client *c);
|
static void hidesearch(Client *c, const Arg *arg);
|
||||||
static void hideurl(Client *c);
|
static void hideurl(Client *c, const Arg *arg);
|
||||||
static gboolean keypress(GtkWidget* w, GdkEventKey *ev, Client *c);
|
static gboolean keypress(GtkWidget* w, GdkEventKey *ev, Client *c);
|
||||||
static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c);
|
static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c);
|
||||||
static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c);
|
static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c);
|
||||||
static void loadstart(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 loadfile(Client *c, const gchar *f);
|
||||||
static void loaduri(Client *c, const gchar *uri);
|
static void loaduri(Client *c, const Arg *arg);
|
||||||
|
static void navigate(Client *c, const Arg *arg);
|
||||||
static Client *newclient();
|
static Client *newclient();
|
||||||
static WebKitWebView *newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
|
static WebKitWebView *newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
|
||||||
static void pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d);
|
static void pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d);
|
||||||
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
|
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
|
||||||
static void progresschange(WebKitWebView *view, gint p, Client *c);
|
static void progresschange(WebKitWebView *view, gint p, Client *c);
|
||||||
|
static void reload(Client *c, const Arg *arg);
|
||||||
static void setup(void);
|
static void setup(void);
|
||||||
static void showsearch(Client *c);
|
static void searchtext(Client *c, const Arg *arg);
|
||||||
static void showurl(Client *c);
|
static void showsearch(Client *c, const Arg *arg);
|
||||||
static void stop(Client *c);
|
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 titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c);
|
||||||
static void usage();
|
static void usage();
|
||||||
static void updatetitle(Client *c, const gchar *title);
|
static void updatetitle(Client *c, const gchar *title);
|
||||||
|
static void zoompage(Client *c, const Arg *arg);
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
void
|
void
|
||||||
cleanup(void) {
|
cleanup(void) {
|
||||||
|
@ -70,6 +107,15 @@ cleanup(void) {
|
||||||
destroyclient(clients);
|
destroyclient(clients);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
clipboard(Client *c, const Arg *arg) {
|
||||||
|
gboolean paste = *(gboolean *)arg;
|
||||||
|
if(paste)
|
||||||
|
gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteurl, c);
|
||||||
|
else
|
||||||
|
gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
destroyclient(Client *c) {
|
destroyclient(Client *c) {
|
||||||
Client *p;
|
Client *p;
|
||||||
|
@ -117,7 +163,7 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
|
||||||
const gchar *home, *filename;
|
const gchar *home, *filename;
|
||||||
gchar *uri, *path, *html;
|
gchar *uri, *path, *html;
|
||||||
|
|
||||||
stop(c);
|
stop(c, NULL);
|
||||||
c->download = o;
|
c->download = o;
|
||||||
home = g_get_home_dir();
|
home = g_get_home_dir();
|
||||||
filename = webkit_download_get_suggested_filename(o);
|
filename = webkit_download_get_suggested_filename(o);
|
||||||
|
@ -148,106 +194,53 @@ geturi(Client *c) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
hidesearch(Client *c) {
|
hidesearch(Client *c, const Arg *arg) {
|
||||||
gtk_widget_hide(c->searchbar);
|
gtk_widget_hide(c->searchbar);
|
||||||
gtk_widget_grab_focus(GTK_WIDGET(c->view));
|
gtk_widget_grab_focus(GTK_WIDGET(c->view));
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
hideurl(Client *c) {
|
hideurl(Client *c, const Arg *arg) {
|
||||||
gtk_widget_hide(c->urlbar);
|
gtk_widget_hide(c->urlbar);
|
||||||
gtk_widget_grab_focus(GTK_WIDGET(c->view));
|
gtk_widget_grab_focus(GTK_WIDGET(c->view));
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
|
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
|
||||||
|
unsigned int n, m;
|
||||||
|
|
||||||
if(ev->type != GDK_KEY_PRESS)
|
if(ev->type != GDK_KEY_PRESS)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
if(GTK_WIDGET_HAS_FOCUS(c->searchbar)) {
|
|
||||||
switch(ev->keyval) {
|
for(n = 0; n < LENGTH(keysets); n++)
|
||||||
case GDK_Escape:
|
switch(keysets[n].mode) {
|
||||||
hidesearch(c);
|
case SEARCHBAR:
|
||||||
return TRUE;
|
if(GTK_WIDGET_HAS_FOCUS(c->searchbar))
|
||||||
case GDK_Return:
|
goto matchkeys;
|
||||||
webkit_web_view_search_text(c->view,
|
break;
|
||||||
gtk_entry_get_text(GTK_ENTRY(c->searchbar)),
|
case URLBAR:
|
||||||
FALSE,
|
if(GTK_WIDGET_HAS_FOCUS(c->urlbar))
|
||||||
!(ev->state & GDK_SHIFT_MASK),
|
goto matchkeys;
|
||||||
TRUE);
|
break;
|
||||||
return TRUE;
|
case NONE:
|
||||||
case GDK_Left:
|
goto matchkeys;
|
||||||
case GDK_Right:
|
default:
|
||||||
return FALSE;
|
fprintf(stderr, "keypress(): Unknown Keypressmode\n");
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else if(GTK_WIDGET_HAS_FOCUS(c->urlbar)) {
|
if(n < LENGTH(keysets)) {
|
||||||
switch(ev->keyval) {
|
matchkeys:
|
||||||
case GDK_Escape:
|
for(m = 0; m < keysets[n].numkeys; m++) {
|
||||||
hideurl(c);
|
Key *keys = keysets[n].keys;
|
||||||
return TRUE;
|
if(ev->keyval == keys[m].keyval
|
||||||
case GDK_Return:
|
&& (ev->state == keys[m].mod
|
||||||
loaduri(c, gtk_entry_get_text(GTK_ENTRY(c->urlbar)));
|
|| (ev->state & keys[m].mod))
|
||||||
hideurl(c);
|
&& keys[m].func) {
|
||||||
return TRUE;
|
keys[m].func(c, &(keys[m].arg));
|
||||||
case GDK_Left:
|
if(keys[m].stop)
|
||||||
case GDK_Right:
|
return TRUE;
|
||||||
return FALSE;
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
if(ev->state & GDK_CONTROL_MASK) {
|
|
||||||
switch(ev->keyval) {
|
|
||||||
case GDK_p:
|
|
||||||
gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteurl, c);
|
|
||||||
return TRUE;
|
|
||||||
case GDK_y:
|
|
||||||
gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
|
|
||||||
return TRUE;
|
|
||||||
case GDK_r:
|
|
||||||
case GDK_R:
|
|
||||||
if((ev->state & GDK_SHIFT_MASK))
|
|
||||||
webkit_web_view_reload_bypass_cache(c->view);
|
|
||||||
else
|
|
||||||
webkit_web_view_reload(c->view);
|
|
||||||
return TRUE;
|
|
||||||
case GDK_b:
|
|
||||||
return TRUE;
|
|
||||||
case GDK_g:
|
|
||||||
showurl(c);
|
|
||||||
return TRUE;
|
|
||||||
case GDK_slash:
|
|
||||||
showsearch(c);
|
|
||||||
return TRUE;
|
|
||||||
case GDK_plus:
|
|
||||||
case GDK_equal:
|
|
||||||
webkit_web_view_zoom_in(c->view);
|
|
||||||
return TRUE;
|
|
||||||
case GDK_minus:
|
|
||||||
webkit_web_view_zoom_out(c->view);
|
|
||||||
return TRUE;
|
|
||||||
case GDK_0:
|
|
||||||
webkit_web_view_set_zoom_level(c->view, 1.0);
|
|
||||||
return TRUE;
|
|
||||||
case GDK_n:
|
|
||||||
case GDK_N:
|
|
||||||
webkit_web_view_search_text(c->view,
|
|
||||||
gtk_entry_get_text(GTK_ENTRY(c->searchbar)),
|
|
||||||
FALSE,
|
|
||||||
!(ev->state & GDK_SHIFT_MASK),
|
|
||||||
TRUE);
|
|
||||||
return TRUE;
|
|
||||||
case GDK_Left:
|
|
||||||
webkit_web_view_go_back(c->view);
|
|
||||||
return TRUE;
|
|
||||||
case GDK_Right:
|
|
||||||
webkit_web_view_go_forward(c->view);
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
switch(ev->keyval) {
|
|
||||||
case GDK_Escape:
|
|
||||||
stop(c);
|
|
||||||
return TRUE;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -284,6 +277,7 @@ loadfile(Client *c, const gchar *f) {
|
||||||
GError *e = NULL;
|
GError *e = NULL;
|
||||||
GString *code;
|
GString *code;
|
||||||
gchar *line, *uri;
|
gchar *line, *uri;
|
||||||
|
Arg arg;
|
||||||
|
|
||||||
if(strcmp(f, "-") == 0) {
|
if(strcmp(f, "-") == 0) {
|
||||||
chan = g_io_channel_unix_new(STDIN_FILENO);
|
chan = g_io_channel_unix_new(STDIN_FILENO);
|
||||||
|
@ -299,19 +293,22 @@ loadfile(Client *c, const gchar *f) {
|
||||||
g_io_channel_shutdown(chan, FALSE, NULL);
|
g_io_channel_shutdown(chan, FALSE, NULL);
|
||||||
g_string_free(code, TRUE);
|
g_string_free(code, TRUE);
|
||||||
}
|
}
|
||||||
uri = g_strdup("stdin");
|
arg.v = uri = g_strdup("stdin");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
uri = g_strdup_printf("file://%s", f);
|
arg.v = uri = g_strdup_printf("file://%s", f);
|
||||||
loaduri(c, uri);
|
loaduri(c, &arg);
|
||||||
}
|
}
|
||||||
updatetitle(c, uri);
|
updatetitle(c, uri);
|
||||||
g_free(uri);
|
g_free(uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
loaduri(Client *c, const gchar *uri) {
|
loaduri(Client *c, const Arg *arg) {
|
||||||
gchar *u;
|
gchar *u;
|
||||||
|
const gchar *uri = (gchar *)arg->v;
|
||||||
|
if(!uri)
|
||||||
|
uri = gtk_entry_get_text(GTK_ENTRY(c->urlbar));
|
||||||
u = g_strrstr(uri, ":") ? g_strdup(uri)
|
u = g_strrstr(uri, ":") ? g_strdup(uri)
|
||||||
: g_strdup_printf("http://%s", uri);
|
: g_strdup_printf("http://%s", uri);
|
||||||
webkit_web_view_load_uri(c->view, u);
|
webkit_web_view_load_uri(c->view, u);
|
||||||
|
@ -320,6 +317,15 @@ loaduri(Client *c, const gchar *uri) {
|
||||||
g_free(u);
|
g_free(u);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
navigate(Client *c, const Arg *arg) {
|
||||||
|
gboolean forward = *(gboolean *)arg;
|
||||||
|
if(forward)
|
||||||
|
webkit_web_view_go_forward(c->view);
|
||||||
|
else
|
||||||
|
webkit_web_view_go_back(c->view);
|
||||||
|
}
|
||||||
|
|
||||||
Client *
|
Client *
|
||||||
newclient(void) {
|
newclient(void) {
|
||||||
Client *c;
|
Client *c;
|
||||||
|
@ -404,8 +410,9 @@ newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
|
||||||
|
|
||||||
void
|
void
|
||||||
pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d) {
|
pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d) {
|
||||||
|
Arg arg = {.v = text };
|
||||||
if(text != NULL)
|
if(text != NULL)
|
||||||
loaduri((Client *) d, text);
|
loaduri((Client *) d, &arg);
|
||||||
}
|
}
|
||||||
|
|
||||||
GdkFilterReturn
|
GdkFilterReturn
|
||||||
|
@ -416,6 +423,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
|
||||||
int idummy;
|
int idummy;
|
||||||
unsigned long ldummy;
|
unsigned long ldummy;
|
||||||
unsigned char *buf = NULL;
|
unsigned char *buf = NULL;
|
||||||
|
Arg arg;
|
||||||
if(((XEvent *)e)->type == PropertyNotify) {
|
if(((XEvent *)e)->type == PropertyNotify) {
|
||||||
ev = &((XEvent *)e)->xproperty;
|
ev = &((XEvent *)e)->xproperty;
|
||||||
if(ev->atom == urlprop && ev->state == PropertyNewValue) {
|
if(ev->atom == urlprop && ev->state == PropertyNewValue) {
|
||||||
|
@ -424,7 +432,8 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
|
||||||
else {
|
else {
|
||||||
XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING,
|
XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING,
|
||||||
&adummy, &idummy, &ldummy, &ldummy, &buf);
|
&adummy, &idummy, &ldummy, &ldummy, &buf);
|
||||||
loaduri(c, (gchar *)buf);
|
arg.v = buf;
|
||||||
|
loaduri(c, &arg);
|
||||||
XFree(buf);
|
XFree(buf);
|
||||||
}
|
}
|
||||||
return GDK_FILTER_REMOVE;
|
return GDK_FILTER_REMOVE;
|
||||||
|
@ -439,23 +448,42 @@ progresschange(WebKitWebView* view, gint p, Client *c) {
|
||||||
updatetitle(c, NULL);
|
updatetitle(c, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
reload(Client *c, const Arg *arg) {
|
||||||
|
gboolean nocache = *(gboolean *)arg;
|
||||||
|
if(nocache)
|
||||||
|
webkit_web_view_reload_bypass_cache(c->view);
|
||||||
|
else
|
||||||
|
webkit_web_view_reload(c->view);
|
||||||
|
}
|
||||||
|
|
||||||
void setup(void) {
|
void setup(void) {
|
||||||
dpy = GDK_DISPLAY();
|
dpy = GDK_DISPLAY();
|
||||||
urlprop = XInternAtom(dpy, "_SURF_URL", False);
|
urlprop = XInternAtom(dpy, "_SURF_URL", False);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
showsearch(Client *c) {
|
showsearch(Client *c, const Arg *arg) {
|
||||||
hideurl(c);
|
hideurl(c, NULL);
|
||||||
gtk_widget_show(c->searchbar);
|
gtk_widget_show(c->searchbar);
|
||||||
gtk_widget_grab_focus(c->searchbar);
|
gtk_widget_grab_focus(c->searchbar);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
showurl(Client *c) {
|
searchtext(Client *c, const Arg *arg) {
|
||||||
|
gboolean forward = *(gboolean *)arg;
|
||||||
|
webkit_web_view_search_text(c->view,
|
||||||
|
gtk_entry_get_text(GTK_ENTRY(c->searchbar)),
|
||||||
|
FALSE,
|
||||||
|
forward,
|
||||||
|
TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
showurl(Client *c, const Arg *arg) {
|
||||||
gchar *uri;
|
gchar *uri;
|
||||||
|
|
||||||
hidesearch(c);
|
hidesearch(c, NULL);
|
||||||
uri = geturi(c);
|
uri = geturi(c);
|
||||||
gtk_entry_set_text(GTK_ENTRY(c->urlbar), uri);
|
gtk_entry_set_text(GTK_ENTRY(c->urlbar), uri);
|
||||||
gtk_widget_show(c->urlbar);
|
gtk_widget_show(c->urlbar);
|
||||||
|
@ -463,7 +491,7 @@ showurl(Client *c) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
stop(Client *c) {
|
stop(Client *c, const Arg *arg) {
|
||||||
if(c->download)
|
if(c->download)
|
||||||
webkit_download_cancel(c->download);
|
webkit_download_cancel(c->download);
|
||||||
else
|
else
|
||||||
|
@ -500,11 +528,22 @@ updatetitle(Client *c, const char *title) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
zoompage(Client *c, const Arg *arg) {
|
||||||
|
if(*(float *)arg < 0) /* zoom out */
|
||||||
|
webkit_web_view_zoom_out(c->view);
|
||||||
|
else if(*(float *)arg == 0) /* zoom in */
|
||||||
|
webkit_web_view_zoom_in(c->view);
|
||||||
|
else /* absolute level */
|
||||||
|
webkit_web_view_set_zoom_level(c->view, *(float *)arg);
|
||||||
|
}
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
SoupSession *s;
|
SoupSession *s;
|
||||||
Client *c;
|
Client *c;
|
||||||
int o;
|
int o;
|
||||||
const gchar *home, *filename;
|
const gchar *home, *filename;
|
||||||
|
Arg arg;
|
||||||
|
|
||||||
gtk_init(NULL, NULL);
|
gtk_init(NULL, NULL);
|
||||||
if (!g_thread_supported())
|
if (!g_thread_supported())
|
||||||
|
@ -521,7 +560,8 @@ int main(int argc, char *argv[]) {
|
||||||
break;
|
break;
|
||||||
case 'u':
|
case 'u':
|
||||||
c = newclient();
|
c = newclient();
|
||||||
loaduri(c, optarg);
|
arg.v = optarg;
|
||||||
|
loaduri(c, &arg);
|
||||||
break;
|
break;
|
||||||
case 'f':
|
case 'f':
|
||||||
c = newclient();
|
c = newclient();
|
||||||
|
|
Loading…
Reference in New Issue