pinosaur
/
surf.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c54933e
)
Get rid of these gotos.
author
Enno Boland (Gottox)
<gottox@s01.de>
Mon, 8 Jun 2009 15:25:52 +0000
(17:25 +0200)
committer
Enno Boland (Gottox)
<gottox@s01.de>
Mon, 8 Jun 2009 15:25:52 +0000
(17:25 +0200)
surf.c
patch
|
blob
|
history
diff --git
a/surf.c
b/surf.c
index
afbcf32
..
f278ac7
100644
(file)
--- a/
surf.c
+++ b/
surf.c
@@
-60,6
+60,7
@@
static void showsearch(Client *c);
static void showurl(Client *c);
static void stop(Client *c);
static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, gpointer d);
static void showurl(Client *c);
static void stop(Client *c);
static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, gpointer d);
+static void usage();
static void updatetitle(Client *c, const gchar *title);
void
static void updatetitle(Client *c, const gchar *title);
void
@@
-390,6
+391,7
@@
newclient(void) {
gtk_widget_show(c->win);
gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK);
gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
gtk_widget_show(c->win);
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);
c->download = NULL;
c->title = NULL;
c->next = clients;
c->download = NULL;
c->title = NULL;
c->next = clients;
@@
-473,6
+475,12
@@
titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, gpointer d) {
updatetitle(c, t);
}
updatetitle(c, t);
}
+void
+usage() {
+ fputs("surf - simple browser\n", stderr);
+ die("usage: surf [-e] [-x] [-u uri] [-f file]\n");
+}
+
void
updatetitle(Client *c, const char *title) {
char t[512];
void
updatetitle(Client *c, const char *title) {
char t[512];
@@
-490,7
+498,6
@@
updatetitle(Client *c, const char *title) {
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
- gchar *uri = NULL, *file = NULL;
SoupSession *s;
Client *c;
int o;
SoupSession *s;
Client *c;
int o;
@@
-510,28
+517,21
@@
int main(int argc, char *argv[]) {
embed = TRUE;
break;
case 'u':
embed = TRUE;
break;
case 'u':
- if(!(uri = optarg))
- goto argerr;
c = newclient();
c = newclient();
- loaduri(c,
uri
);
+ loaduri(c,
optarg
);
break;
case 'f':
break;
case 'f':
- if(!(file = optarg))
- goto argerr;
c = newclient();
c = newclient();
- loadfile(c,
file
);
+ loadfile(c,
optarg
);
break;
case 'v':
die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
break;
break;
case 'v':
die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
break;
- argerr:
default:
default:
- puts("surf - simple browser");
- die("usage: surf [-e] [-x] [-u uri] [-f file]\n");
- return EXIT_FAILURE;
+ usage();
}
if(optind != argc)
}
if(optind != argc)
-
goto argerr
;
+
usage()
;
if(!clients)
newclient();
if(!clients)
newclient();