added KEYCMD to statusbar template

2 files changed, 9 insertions, 6 deletions

diff --git a/uzbl.c b/uzbl.c
index 16cde01..d00812c 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -58,7 +58,7 @@
 /* status bar format
    TODO: integrate with the config file
 */
-char *status_format =  "<span background=\"darkblue\" foreground=\"white\">  <b>TITLE</b>  </span> | LOAD_PROGRESS% <span font_family=\"monospace\">LOAD_PROGRESSBAR</span> | <span foreground=\"darkgreen\">URI</span> | NAME | <span foreground=\"black\" background=\"khaki\"> Uzbl browser </span>";
+char *status_format =  "<span background=\"red\" foreground=\"white\">KEYCMD</span> <span background=\"darkblue\" foreground=\"white\">  <b>TITLE</b>  </span> | LOAD_PROGRESS% <span font_family=\"monospace\">LOAD_PROGRESSBAR</span> | <span foreground=\"darkgreen\">URI</span> | NAME | <span foreground=\"black\" background=\"khaki\"> Uzbl browser </span>";
 
 /* housekeeping / internal variables */
 static gchar          selected_url[500] = "\0";
@@ -523,6 +523,10 @@ parse_status_template(const char *template) {
                      g_string_append(ret, 
                          uzbl.state.instance_name?uzbl.state.instance_name:"" );
                      break;
+                 case SYM_KEYCMD:
+                     g_string_append(ret, 
+                         keycmd->str?keycmd->str:"" );
+                     break;
                  default:
                      break;
              }
@@ -788,10 +792,6 @@ update_title (void) {
     }
     g_string_append (string_long, " - Uzbl browser");
     g_string_append (string_short, " - Uzbl browser");
-    if (uzbl.gui.sbar.load_progress < 100)
-        g_string_append_printf (string_long, " (%d%%)", 
-                        uzbl.gui.sbar.load_progress);
-
     if (selected_url[0]!=0) {
         g_string_append_printf (string_long, " -> (%s)", selected_url);
     }
diff --git a/uzbl.h b/uzbl.h
index 297a85d..076f74c 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -1,5 +1,7 @@
 /* statusbar symbols */
-enum { SYM_TITLE, SYM_URI, SYM_NAME, SYM_LOADPRGS, SYM_LOADPRGSBAR};
+enum { SYM_TITLE, SYM_URI, SYM_NAME, 
+       SYM_LOADPRGS, SYM_LOADPRGSBAR,
+       SYM_KEYCMD};
 const struct {
     gchar *symbol_name;
     guint symbol_token;
@@ -7,6 +9,7 @@ const struct {
     {"NAME",                 SYM_NAME},
     {"URI",                  SYM_URI},
     {"TITLE",                SYM_TITLE},
+    {"KEYCMD",               SYM_KEYCMD},
     {"LOAD_PROGRESS",        SYM_LOADPRGS},
     {"LOAD_PROGRESSBAR",     SYM_LOADPRGSBAR},
     {NULL,                   0}