Merge branch 'master' into configure

src/command/cmd_funcs.c

@@ -1483,9 +1483,9 @@ _cmd_help_cmd_list(const char *const tag)
     cons_show("");
     ProfWin *console = wins_get_console();
     if (tag) {
-        win_println(console, THEME_WHITE_BOLD, '-', "%s commands", tag);
+        win_println(console, THEME_HELP_HEADER, '-', "%s commands", tag);
     } else {
-        win_println(console, THEME_WHITE_BOLD, '-', "All commands");
+        win_println(console, THEME_HELP_HEADER, '-', "All commands");
     }
 
     GList *ordered_commands = NULL;

src/config/theme.c

@@ -81,6 +81,7 @@ theme_init(const char *const theme_name)
     g_hash_table_insert(defaults, strdup("main.text.me"),            strdup("white"));
     g_hash_table_insert(defaults, strdup("main.text.them"),          strdup("white"));
     g_hash_table_insert(defaults, strdup("main.splash"),             strdup("cyan"));
+    g_hash_table_insert(defaults, strdup("main.help.header"),        strdup("white"));
     g_hash_table_insert(defaults, strdup("error"),                   strdup("red"));
     g_hash_table_insert(defaults, strdup("incoming"),                strdup("yellow"));
     g_hash_table_insert(defaults, strdup("mention"),                 strdup("yellow"));
@@ -731,6 +732,7 @@ theme_attrs(theme_item_t attrs)
     case THEME_TEXT_ME:                 _theme_prep_fgnd("main.text.me",            lookup_str, &bold); break;
     case THEME_TEXT_THEM:               _theme_prep_fgnd("main.text.them",          lookup_str, &bold); break;
     case THEME_SPLASH:                  _theme_prep_fgnd("main.splash",             lookup_str, &bold); break;
+    case THEME_HELP_HEADER:             _theme_prep_fgnd("main.help.header",        lookup_str, &bold); break;
     case THEME_ERROR:                   _theme_prep_fgnd("error",                   lookup_str, &bold); break;
     case THEME_INCOMING:                _theme_prep_fgnd("incoming",                lookup_str, &bold); break;
     case THEME_MENTION:                 _theme_prep_fgnd("mention",                 lookup_str, &bold); break;

src/config/theme.h

@@ -46,6 +46,7 @@ typedef enum {
     THEME_TEXT_ME,
     THEME_TEXT_THEM,
     THEME_SPLASH,
+    THEME_HELP_HEADER,
     THEME_ERROR,
     THEME_INCOMING,
     THEME_MENTION,

src/event/server_events.c

@@ -988,7 +988,7 @@ sv_ev_certfail(const char *const errormsg, TLSCertificate *cert)
     }
 
     if (g_strcmp0(cmd, "/tls allow") == 0) {
-        cons_show("Coninuing with connection.");
+        cons_show("Continuing with connection.");
         tlscerts_set_current(cert->fingerprint);
         free(cmd);
         return 1;

src/ui/console.c

@@ -110,20 +110,20 @@ cons_show_help(const char *const cmd, CommandHelp *help)
     ProfWin *console = wins_get_console();
 
     cons_show("");
-    win_println(console, THEME_WHITE_BOLD, '-', "%s", &cmd[1]);
+    win_println(console, THEME_HELP_HEADER, '-', "%s", &cmd[1]);
-    win_print(console, THEME_WHITE_BOLD, '-', "");
+    win_print(console, THEME_HELP_HEADER, '-', "");
     int i;
     for (i = 0; i < strlen(cmd) - 1 ; i++) {
-        win_append(console, THEME_WHITE_BOLD, "-");
+        win_append(console, THEME_HELP_HEADER, "-");
     }
-    win_appendln(console, THEME_WHITE_BOLD, "");
+    win_appendln(console, THEME_HELP_HEADER, "");
     cons_show("");
 
-    win_println(console, THEME_WHITE_BOLD, '-', "Synopsis");
+    win_println(console, THEME_HELP_HEADER, '-', "Synopsis");
     ui_show_lines(console, help->synopsis);
     cons_show("");
 
-    win_println(console, THEME_WHITE_BOLD, '-', "Description");
+    win_println(console, THEME_HELP_HEADER, '-', "Description");
     win_println(console, THEME_DEFAULT, '-', "%s", help->desc);
 
     int maxlen = 0;
@@ -134,7 +134,7 @@ cons_show_help(const char *const cmd, CommandHelp *help)
 
     if (i > 0) {
         cons_show("");
-        win_println(console, THEME_WHITE_BOLD, '-', "Arguments");
+        win_println(console, THEME_HELP_HEADER, '-', "Arguments");
         for (i = 0; help->args[i][0] != NULL; i++) {
             win_println_indent(console, maxlen + 3, "%-*s: %s", maxlen + 1, help->args[i][0], help->args[i][1]);
         }
@@ -142,7 +142,7 @@ cons_show_help(const char *const cmd, CommandHelp *help)
 
     if (g_strv_length((gchar**)help->examples) > 0) {
         cons_show("");
-        win_println(console, THEME_WHITE_BOLD, '-', "Arguments");
+        win_println(console, THEME_HELP_HEADER, '-', "Arguments");
         ui_show_lines(console, help->examples);
     }
 }
@@ -2063,7 +2063,7 @@ cons_navigation_help(void)
 {
     ProfWin *console = wins_get_console();
     cons_show("");
-    win_println(console, THEME_WHITE_BOLD, '-', "Navigation");
+    win_println(console, THEME_HELP_HEADER, '-', "Navigation");
     cons_show("Alt-1..Alt-0, F1..F10    : Choose window.");
     cons_show("Alt-LEFT, Alt-RIGHT      : Previous/next chat window.");
     cons_show("PAGEUP, PAGEDOWN         : Page the main window.");

themes/aqua

@@ -22,6 +22,7 @@ main.text=blue
 main.text.me=bold_cyan
 main.text.them=bold_white
 main.splash=bold_white
+main.help.header=bold_blue
 main.time=cyan
 input.text=white
 subscribed=bold_cyan

themes/batman

@@ -12,6 +12,7 @@ main.text=white
 input.text=yellow
 main.time=white
 main.splash=yellow
+main.help.header=bold_white
 online=green
 away=yellow
 chat=green

themes/bios

@@ -22,6 +22,7 @@ main.text=bold_white
 main.text.me=bold_white
 main.text.them=bold_white
 main.splash=bold_green
+main.help.header=bold_white
 main.time=bold_green
 input.text=bold_white
 subscribed=bold_green

themes/boothj5

@@ -22,6 +22,7 @@ main.text=white
 main.text.me=cyan
 main.text.them=bold_white
 main.splash=bold_red
+main.help.header=bold_white
 main.time=yellow
 input.text=bold_green
 subscribed=green

themes/boothj5_laptop

@@ -22,6 +22,7 @@ main.text=white
 main.text.me=cyan
 main.text.them=bold_white
 main.splash=bold_red
+main.help.header=bold_white
 main.time=yellow
 input.text=bold_green
 subscribed=green

themes/boothj5_slack

@@ -22,6 +22,7 @@ main.text=white
 main.text.me=cyan
 main.text.them=bold_white
 main.splash=bold_red
+main.help.header=bold_white
 main.time=yellow
 input.text=bold_green
 subscribed=green

themes/forest

@@ -22,6 +22,7 @@ main.text=bold_cyan
 main.text.me=yellow
 main.text.them=green
 main.splash=bold_yellow
+main.help.header=bold_yellow
 main.time=bold_green
 input.text=bold_blue
 subscribed=green
@@ -76,9 +77,3 @@ roster.room.trigger=bold_green
 occupants.header=bold_green
 receipt.sent=bold_black
 
-[ui]
-titlebar.position=1
-inputwin.position=2
-statusbar.position=3
-mainwin.position=4
-

themes/hacker

@@ -22,6 +22,7 @@ main.text=green
 main.text.me=green
 main.text.them=green
 main.splash=bold_green
+main.help.header=bold_green
 main.time=bold_green
 input.text=bold_green
 subscribed=bold_green

themes/headache

@@ -22,6 +22,7 @@ main.text=blue
 main.text.me=white
 main.text.them=bold_white
 main.splash=red
+main.help.header=bold_blue
 main.time=green
 input.text=yellow
 subscribed=bold_magenta

themes/orange

@@ -22,6 +22,7 @@ main.text=black
 main.text.me=black
 main.text.them=green
 main.splash=blue
+main.help.header=black
 main.time=blue
 input.text=black
 subscribed=blue

themes/original

@@ -22,6 +22,7 @@ main.text=white
 main.text.me=white
 main.text.them=white
 main.splash=cyan
+main.help.header=white
 main.time=white
 input.text=white
 subscribed=green

themes/original_bright

@@ -22,6 +22,7 @@ main.text=bold_white
 main.text.me=bold_white
 main.text.them=bold_white
 main.splash=bold_cyan
+main.help.header=bold_white
 main.time=bold_white
 input.text=bold_white
 subscribed=bold_green

themes/whiteness

@@ -22,6 +22,7 @@ main.text=black
 main.text.me=black
 main.text.them=black
 main.splash=black
+main.help.header=black
 main.time=black
 input.text=black
 subscribed=green