gui: Remove welcome message.
authorAndre Noll <maan@systemlinux.org>
Tue, 7 Jan 2014 19:20:13 +0000 (19:20 +0000)
committerAndre Noll <maan@systemlinux.org>
Sun, 4 May 2014 13:48:53 +0000 (15:48 +0200)
The only information shown by print_welcome() that is not already
contained in the status bar is the name of the current theme. This
is not very interesting, so remove the function and the corresponding
color pair.

gui.c
gui.h
gui_theme.c

diff --git a/gui.c b/gui.c
index 63e0090..284de0c 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -73,7 +73,6 @@ enum gui_color_pair {
        COLOR_OUTPUT,
        COLOR_MSG,
        COLOR_ERRMSG,
-       COLOR_WELCOME,
        COLOR_SEPARATOR,
        COLOR_TOP,
        COLOR_BOT,
@@ -589,15 +588,6 @@ __noreturn __printf_2_3 static void msg_n_exit(int ret, const char* fmt, ...)
        kill_pg_and_die(ret);
 }
 
-static void print_welcome(void)
-{
-       if (loglevel > LL_NOTICE)
-               return;
-       outputf(COLOR_WELCOME, "Welcome to %s. Theme: %s",
-               version_single_line("gui"), theme.name);
-       wclrtoeol(bot.win);
-}
-
 /*
  * init all windows
  */
@@ -813,7 +803,6 @@ static void init_colors_or_die(void)
        init_pair_or_die(COLOR_OUTPUT, theme.output_fg, theme.output_bg);
        init_pair_or_die(COLOR_MSG, theme.msg_fg, theme.msg_bg);
        init_pair_or_die(COLOR_ERRMSG, theme.err_msg_fg, theme.err_msg_bg);
-       init_pair_or_die(COLOR_WELCOME, theme.welcome_fg, theme.welcome_bg);
        init_pair_or_die(COLOR_SEPARATOR, theme.sep_fg, theme.sep_bg);
        init_pair_or_die(COLOR_TOP, theme.default_fg, theme.default_bg);
        init_pair_or_die(COLOR_BOT, theme.default_fg, theme.default_bg);
@@ -1537,7 +1526,6 @@ int main(int argc, char *argv[])
        setlocale(LC_CTYPE, "");
        initscr(); /* needed only once, always successful */
        init_curses();
-       print_welcome();
        for (;;) {
                print_status_bar();
                ret = do_select(GETCH_MODE);
diff --git a/gui.h b/gui.h
index 8f25c76..6f7349b 100644 (file)
--- a/gui.h
+++ b/gui.h
@@ -20,7 +20,6 @@ struct gui_theme {
        int output_fg, output_bg;
        int msg_fg, msg_bg;
        int err_msg_fg, err_msg_bg;
-       int welcome_fg, welcome_bg;
        int sep_fg, sep_bg;
        const char *sep_str;
        int default_fg, default_bg;
index fa63e90..279ad91 100644 (file)
@@ -26,8 +26,6 @@ static void init_theme_simple(struct gui_theme *t)
        t->msg_fg = COLOR_YELLOW;
        t->err_msg_bg = COLOR_RED;
        t->err_msg_fg = COLOR_WHITE;
-       t->welcome_bg = COLOR_BLUE;
-       t->welcome_fg = COLOR_WHITE;
        t->sep_bg = COLOR_BLUE;
        t->sep_fg = COLOR_CYAN;
        t->default_fg = COLOR_WHITE;
@@ -85,8 +83,6 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
        t->msg_fg = COLOR_WHITE;
        t->err_msg_bg = COLOR_RED;
        t->err_msg_fg = COLOR_WHITE;
-       t->welcome_bg = COLOR_BLUE;
-       t->welcome_fg = COLOR_WHITE;
        t->sep_bg = COLOR_BLACK; /* color of the separator */
        t->sep_fg = COLOR_BLUE;
        t->sep_str = "-";