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

removing loadfile. readding later in a simpler way.

Browse source
This commit is contained in:
Enno Boland (tox) 2009-10-13 23:22:25 +02:00
parent 95a6bfcc03
commit fe87a88954
1 changed files with 2 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
surf.c
View file

@ -86,7 +86,6 @@ 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 loaduri(Client *c, const Arg *arg); static void loaduri(Client *c, const Arg *arg);
static void navigate(Client *c, const Arg *arg); static void navigate(Client *c, const Arg *arg);
static Client *newclient(void); static Client *newclient(void);
@ -338,39 +337,6 @@ loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
update(c); 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 void
loaduri(Client *c, const Arg *arg) { loaduri(Client *c, const Arg *arg) {
gchar *u; gchar *u;
@ -725,7 +691,6 @@ zoom(Client *c, const Arg *arg) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int i; int i;
Arg arg; Arg arg;
Client *c;
/* command line args */ /* command line args */
for(i = 1, arg.v = NULL; i < argc; i++) { for(i = 1, arg.v = NULL; i < argc; i++) {
@ -747,12 +712,9 @@ int main(int argc, char *argv[]) {
arg.v = argv[i]; arg.v = argv[i];
} }
setup(); setup();
c = newclient(); newclient();
if(arg.v) { if(arg.v) {
if(strchr("./", ((char *)arg.v)[0]) || strcmp("-", (char *)arg.v) == 0) loaduri(clients, &arg);
loadfile(c, (char *)arg.v);
else
loaduri(c, &arg);
} }
gtk_main(); gtk_main();
cleanup(); cleanup();