Code

added option "welcome-screen-list"
authorDavid Shakaryan <omp@gentoo.org>
Mon, 22 Sep 2008 03:59:56 +0000 (05:59 +0200)
committerMax Kellermann <max@duempel.org>
Mon, 22 Sep 2008 06:05:45 +0000 (08:05 +0200)
"welcome-screen-list" shows the screen list in the top row shortly
after startup, and is enabled by default.

src/conf.c
src/options.c
src/options.h
src/screen.c

index ac48e9cdb5cde94f644fdbc19bb22c9585c76dcf..c02df52cf42f79e19273c0b8ca96aef27076f8d9 100644 (file)
@@ -71,6 +71,7 @@
 #define CONF_SCROLL                  "scroll"
 #define CONF_SCROLL_SEP              "scroll-sep"
 #define CONF_VISIBLE_BITRATE         "visible-bitrate"
+#define CONF_WELCOME_SCREEN_LIST     "welcome-screen-list"
 
 typedef enum {
   KEY_PARSER_UNKNOWN,
@@ -463,6 +464,10 @@ read_rc_file(char *filename, options_t *options)
                {
                  options->wide_cursor = str2bool(value);
                }
+             /* welcome screen list */
+             else if (!strcasecmp(CONF_WELCOME_SCREEN_LIST, name)) {
+                 options->welcome_screen_list = str2bool(value);
+             }
              /* visible bitrate */
              else if (!strcasecmp(CONF_VISIBLE_BITRATE, name)) {
                      options->visible_bitrate = str2bool(value);
index 34772460f2045041a531d9544890690b63dbf60d..1ac3195317e335d1f607b23dbc4a5480a266f090 100644 (file)
@@ -341,6 +341,7 @@ options_init( void )
        options.reconnect = TRUE;
        options.find_wrap = TRUE;
        options.wide_cursor = TRUE;
+       options.welcome_screen_list = TRUE;
        options.audible_bell = TRUE;
        options.crossfade_time = DEFAULT_CROSSFADE_TIME;
        options.seek_time = 1;
index 58eaff13073cf52455171c86668890ae3d32e0b6..f29014cbd19f91fa26beb0aa5b01a6f6e964c35a 100644 (file)
@@ -38,6 +38,7 @@ typedef struct {
        gboolean enable_mouse;
        gboolean scroll;
        gboolean visible_bitrate;
+       gboolean welcome_screen_list;
 } options_t;
 
 #ifndef NO_GLOBAL_OPTIONS
index c526e66cc57d93cbd39c15f0a3db8d9ec19ce602..2999b598ed0e3ae2403b4125c98161932b88ae25 100644 (file)
@@ -724,7 +724,8 @@ screen_update(mpdclient_t *c)
        }
 
        /* update title/header window */
-       if (welcome && screen.last_cmd==CMD_NONE &&
+       if (welcome && options.welcome_screen_list &&
+           screen.last_cmd==CMD_NONE &&
            time(NULL)-screen.start_timestamp <= SCREEN_WELCOME_TIME)
                paint_top_window("", c, 0);
        else if (mode_fn->get_title != NULL) {