[hackers] [surf] Simplify handling of c->title || Quentin Rameau

From: <git_AT_suckless.org>
Date: Sun, 22 Nov 2015 13:24:52 +0100 (CET)

commit d4ac9fb6f4b719607fa7ff13a44a78d057d27be5
Author: Quentin Rameau <quinq_AT_fifth.space>
AuthorDate: Sun Nov 22 13:24:24 2015 +0100
Commit: Quentin Rameau <quinq_AT_fifth.space>
CommitDate: Sun Nov 22 13:24:24 2015 +0100

    Simplify handling of c->title

diff --git a/surf.c b/surf.c
index 5c9520f..1a798ff 100644
--- a/surf.c
+++ b/surf.c
_AT_@ -333,14 +333,12 @@ newclient(Client *rc)
         if (!(c = calloc(1, sizeof(Client))))
                 die("Cannot malloc!\n");
 
- c->title = NULL;
- c->progress = 100;
-
         c->next = clients;
         clients = c;
 
- c->view = newview(c, rc ? rc->view : NULL);
+ c->progress = 100;
         c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
+ c->view = newview(c, rc ? rc->view : NULL);
 
         return c;
 }
_AT_@ -435,26 +433,24 @@ void
 updatetitle(Client *c)
 {
         char *title;
+ const char *name = c->targeturi ? c->targeturi :
+ c->title ? c->title : "";
 
         if (showindicators) {
                 gettogglestats(c);
                 getpagestats(c);
 
- if (c->progress != 100) {
+ if (c->progress != 100)
                         title = g_strdup_printf("[%i%%] %s:%s | %s",
- c->progress, togglestats, pagestats,
- c->targeturi ? c->targeturi : c->title);
- } else {
+ c->progress, togglestats, pagestats, name);
+ else
                         title = g_strdup_printf("%s:%s | %s",
- togglestats, pagestats,
- c->targeturi ? c->targeturi : c->title);
- }
+ togglestats, pagestats, name);
 
                 gtk_window_set_title(GTK_WINDOW(c->win), title);
                 g_free(title);
         } else {
- gtk_window_set_title(GTK_WINDOW(c->win), c->title ?
- c->title : "");
+ gtk_window_set_title(GTK_WINDOW(c->win), name);
         }
 }
 
_AT_@ -1543,15 +1539,15 @@ main(int argc, char *argv[])
         } ARGEND;
         if (argc > 0)
                 arg.v = argv[0];
+ else
+ arg.v = "about:blank";
 
         setup();
         c = newclient(NULL);
         showview(NULL, c);
 
- if (arg.v)
- loaduri(clients, &arg);
- else
- updatetitle(c);
+ loaduri(c, &arg);
+ updatetitle(c);
 
         gtk_main();
         cleanup();
Received on Sun Nov 22 2015 - 13:24:52 CET