nilix/surf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

getting rid or most gpointers, sorting functions alphabetical, using gchar * where ever possible.

Browse source
This commit is contained in:
Enno Boland (Gottox) 2009-06-09 10:29:47 +02:00
parent 1a88579f3e
commit a122748ae7
1 changed files with 55 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
surf.c
View file

@ -38,28 +38,28 @@ extern int optind;
static void cleanup(void); static void cleanup(void);
static void destroyclient(Client *c); static void destroyclient(Client *c);
static void destroywin(GtkWidget* w, gpointer d); static void destroywin(GtkWidget* w, Client *c);
static void die(char *str); static void die(char *str);
static void download(WebKitDownload *o, GParamSpec *pspec, gpointer d); static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
static gboolean initdownload(WebKitWebView *view, WebKitDownload *o, gpointer d); 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);
static void hideurl(Client *c); static void hideurl(Client *c);
static gboolean keypress(GtkWidget* w, GdkEventKey *ev, gpointer d); static gboolean keypress(GtkWidget* w, GdkEventKey *ev, Client *c);
static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d); static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c);
static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d); static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c);
static void loadstart(WebKitWebView *view, WebKitWebFrame *f, gpointer d); 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 gchar *uri);
static Client *newclient(); static Client *newclient();
static WebKitWebView *newwindow(WebKitWebView *v, WebKitWebFrame *f, gpointer d); static WebKitWebView *newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
static void progresschange(WebKitWebView *view, gint p, gpointer d); static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer data); static void progresschange(WebKitWebView *view, gint p, Client *c);
static void setup(void); static void setup(void);
static void showsearch(Client *c); static void showsearch(Client *c);
static void showurl(Client *c); static void showurl(Client *c);
static void stop(Client *c); static void stop(Client *c);
static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, gpointer d); 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);
@ -90,9 +90,7 @@ destroyclient(Client *c) {
} }
void void
destroywin(GtkWidget* w, gpointer d) { destroywin(GtkWidget* w, Client *c) {
Client *c = (Client *)d;
destroyclient(c); destroyclient(c);
} }
@ -103,8 +101,7 @@ die(char *str) {
} }
void void
download(WebKitDownload *o, GParamSpec *pspec, gpointer d) { download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
Client *c = (Client *) d;
WebKitDownloadStatus status; WebKitDownloadStatus status;
status = webkit_download_get_status(c->download); status = webkit_download_get_status(c->download);
@ -118,11 +115,9 @@ download(WebKitDownload *o, GParamSpec *pspec, gpointer d) {
} }
gboolean gboolean
initdownload(WebKitWebView *view, WebKitDownload *o, gpointer d) { initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
Client *c = (Client *) d;
const gchar *home, *filename; const gchar *home, *filename;
gchar *uri, *path; gchar *uri, *path, *html;
GString *html = g_string_new("");
stop(c); stop(c);
c->download = o; c->download = o;
@ -134,15 +129,14 @@ initdownload(WebKitWebView *view, WebKitDownload *o, gpointer d) {
webkit_download_set_destination_uri(c->download, uri); webkit_download_set_destination_uri(c->download, uri);
c->progress = 0; c->progress = 0;
g_free(uri); g_free(uri);
html = g_string_append(html, "Downloading <b>"); html = g_strdup_printf("Download <b>%s</b>...", filename);
html = g_string_append(html, filename); webkit_web_view_load_html_string(c->view, html,
html = g_string_append(html, "</b>...");
webkit_web_view_load_html_string(c->view, html->str,
webkit_download_get_uri(c->download)); webkit_download_get_uri(c->download));
g_signal_connect(c->download, "notify::progress", G_CALLBACK(download), c); 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::status", G_CALLBACK(download), c);
webkit_download_start(c->download); webkit_download_start(c->download);
updatetitle(c, filename); updatetitle(c, filename);
g_free(html);
return TRUE; return TRUE;
} }
@ -168,9 +162,7 @@ hideurl(Client *c) {
} }
gboolean gboolean
keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) { keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
Client *c = (Client *)d;
if(ev->type != GDK_KEY_PRESS) if(ev->type != GDK_KEY_PRESS)
return FALSE; return FALSE;
if(GTK_WIDGET_HAS_FOCUS(c->searchbar)) { if(GTK_WIDGET_HAS_FOCUS(c->searchbar)) {
@ -258,9 +250,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
} }
void void
linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) { linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c) {
Client *c = (Client *)d;
if(l) if(l)
gtk_window_set_title(GTK_WINDOW(c->win), l); gtk_window_set_title(GTK_WINDOW(c->win), l);
else else
@ -268,8 +258,7 @@ linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) {
} }
void void
loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d) { loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
Client *c = (Client *)d;
gchar *uri; gchar *uri;
ignore_once = TRUE; ignore_once = TRUE;
@ -280,24 +269,24 @@ loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d) {
} }
void void
loadstart(WebKitWebView *view, WebKitWebFrame *f, gpointer d) { loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
Client *c = (Client *)d;
if(c->download) if(c->download)
stop(c); stop(c);
c->progress = 0;
updatetitle(c, NULL);
} }
void void
loadfile(Client *c, const gchar *f) { loadfile(Client *c, const gchar *f) {
GIOChannel *chan = NULL; GIOChannel *chan = NULL;
GError *e = NULL; GError *e = NULL;
GString *code = g_string_new(""); GString *code;
GString *uri = g_string_new(f); gchar *line, *uri;
gchar *line;
if(strcmp(f, "-") == 0) { if(strcmp(f, "-") == 0) {
chan = g_io_channel_unix_new(STDIN_FILENO); chan = g_io_channel_unix_new(STDIN_FILENO);
if (chan) { if (chan) {
code = g_string_new("");
while(g_io_channel_read_line(chan, &line, NULL, NULL, while(g_io_channel_read_line(chan, &line, NULL, NULL,
&e) == G_IO_STATUS_NORMAL) { &e) == G_IO_STATUS_NORMAL) {
g_string_append(code, line); g_string_append(code, line);
@ -306,24 +295,27 @@ loadfile(Client *c, const gchar *f) {
webkit_web_view_load_html_string(c->view, code->str, webkit_web_view_load_html_string(c->view, code->str,
"file://."); "file://.");
g_io_channel_shutdown(chan, FALSE, NULL); g_io_channel_shutdown(chan, FALSE, NULL);
g_string_free(code, TRUE);
} }
uri = g_strdup("stdin");
} }
else { else {
g_string_prepend(uri, "file://"); uri = g_strdup_printf("file://%s", f);
loaduri(c, uri->str); loaduri(c, uri);
} }
updatetitle(c, uri->str); updatetitle(c, uri);
g_free(uri);
} }
void void
loaduri(Client *c, const gchar *uri) { loaduri(Client *c, const gchar *uri) {
GString* u = g_string_new(uri); gchar *u;
if(g_strrstr(u->str, ":") == NULL) u = g_strrstr(uri, ":") ? g_strdup(uri)
g_string_prepend(u, "http://"); : g_strdup_printf("http://%s", uri);
webkit_web_view_load_uri(c->view, u->str); webkit_web_view_load_uri(c->view, u);
c->progress = 0; c->progress = 0;
updatetitle(c, u->str); updatetitle(c, u);
g_string_free(u, TRUE); g_free(u);
} }
Client * Client *
@ -402,23 +394,15 @@ newclient(void) {
} }
WebKitWebView * WebKitWebView *
newwindow(WebKitWebView *v, WebKitWebFrame *f, gpointer d) { newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
Client *c = newclient(); Client *n = newclient();
return c->view; return n->view;
}
void
progresschange(WebKitWebView* view, gint p, gpointer d) {
Client *c = (Client *)d;
c->progress = p;
updatetitle(c, NULL);
} }
GdkFilterReturn GdkFilterReturn
processx(GdkXEvent *e, GdkEvent *event, gpointer d) { processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
XPropertyEvent *ev;
Client *c = (Client *)d; Client *c = (Client *)d;
XPropertyEvent *ev;
Atom adummy; Atom adummy;
int idummy; int idummy;
unsigned long ldummy; unsigned long ldummy;
@ -440,6 +424,12 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
return GDK_FILTER_CONTINUE; return GDK_FILTER_CONTINUE;
} }
void
progresschange(WebKitWebView* view, gint p, Client *c) {
c->progress = p;
updatetitle(c, NULL);
}
void setup(void) { void setup(void) {
dpy = GDK_DISPLAY(); dpy = GDK_DISPLAY();
urlprop = XInternAtom(dpy, "_SURF_URL", False); urlprop = XInternAtom(dpy, "_SURF_URL", False);
@ -473,9 +463,7 @@ stop(Client *c) {
} }
void void
titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, gpointer d) { titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
Client *c = (Client *)d;
updatetitle(c, t); updatetitle(c, t);
} }
@ -487,7 +475,7 @@ usage() {
void void
updatetitle(Client *c, const char *title) { updatetitle(Client *c, const char *title) {
char t[512]; gchar *t;
if(title) { if(title) {
if(c->title) if(c->title)
@ -495,10 +483,12 @@ updatetitle(Client *c, const char *title) {
c->title = g_strdup(title); c->title = g_strdup(title);
} }
if(c->progress == 100) if(c->progress == 100)
snprintf(t, LENGTH(t), "%s", c->title); t = g_strdup(c->title);
else else
snprintf(t, LENGTH(t), "%s [%i%%]", c->title, c->progress); t = g_strdup_printf("%s [%i%%]", c->title, c->progress);
gtk_window_set_title(GTK_WINDOW(c->win), t); gtk_window_set_title(GTK_WINDOW(c->win), t);
g_free(t);
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {