Added a "hide cursor" feature #0000417

git-svn-id: https://svn.musicpd.org/ncmpc/trunk@3307 09075e82-0dd4-0310-85a5-a0d7c8717e4f

diff --git a/ChangeLog b/ChangeLog
index 4a2ac87b1f9a525f6a5c3f4b93839a30de3aaaa6..e6fb3077ddf32476cd793f7cad1a32816bd3b499 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2005-06-03: Kalle Wallin <kaw@linux.se>
+       * Added a "hide cursor" feature #0000417
+
 2005-06-01: Kalle Wallin <kaw@linux.se>
        * main.c: Fixes #0000406, patch from René van Bevern
        * po/de.po: Updates from René van Bevern

diff --git a/doc/config.sample b/doc/config.sample
index 5d53e39d21c7ec50d23b57a9302f9fb74008bc45..8dd3176fe8eb89d84aaf3aa3090a69d3af3aa3bf 100644 (file)
--- a/doc/config.sample
+++ b/doc/config.sample
@@ -26,6 +26,9 @@
 ## enable visible bell on alerts
 #visible-bell = no
 
+## hide playlist cursor after x seconds (0 disables this feature)
+#hide-cursor = 5
+
 ## change the xterm title 
 #set-xterm-title = no
 

diff --git a/src/conf.c b/src/conf.c
index 11dba99933b1967a04f8ce0927d8346c9ab3146f..9222ed18ed70f3aa1e843fa4847ba266f62627b6 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -60,6 +60,7 @@
 #define CONF_ENABLE_MOUSE            "enable-mouse"
 #define CONF_CROSSFADE_TIME          "crossfade-time"
 #define CONF_SEARCH_MODE             "search-mode"
+#define CONF_HIDE_CURSOR             "hide-cursor"
 
 typedef enum {
   KEY_PARSER_UNKNOWN,
@@ -477,6 +478,10 @@ read_rc_file(char *filename, options_t *options)
                {
                  options->search_mode = atoi(value);
                }
+             else if( !strcasecmp(CONF_HIDE_CURSOR, name) )
+               {
+                 options->hide_cursor = atoi(value);
+               }
              else
                {
                  match_found = 0;

diff --git a/src/list_window.c b/src/list_window.c
index c6f5375a12a6c159864fc09b7b64b6d4d7ad6a74..7bbc6e193ac0dbc7fc67dfeaa74628e989c47020 100644 (file)
--- a/src/list_window.c
+++ b/src/list_window.c
@@ -165,12 +165,9 @@ list_window_paint(list_window_t *lw,
 {
   int i;
   int fill = options.wide_cursor;
+  int show_cursor = !(lw->flags & LW_HIDE_CURSOR);
 
-  if( lw->flags & LW_HIDE_CURSOR )
-    {
-      lw->selected = -1;
-    }
-  else
+  if( show_cursor )
     {
       while( lw->selected < lw->start )
        {
@@ -183,7 +180,7 @@ list_window_paint(list_window_t *lw,
          lw->clear=1;
        }
     }
-
+  
   for(i=0; i<lw->rows; i++)
     {
       int highlight = 0;
@@ -203,7 +200,7 @@ list_window_paint(list_window_t *lw,
          else
            colors_use(lw->w, COLOR_LIST);
 
-         if( selected )
+         if( show_cursor && selected )
            wattron(lw->w, A_REVERSE);
          
          waddnstr(lw->w, label, lw->cols);

diff --git a/src/options.h b/src/options.h
index d264dd1fa01cb78de3dcfe5aee2fc802c5736bb4..c3395bbc4e7da2633ff5467102a42f7bbd17bbc9 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -15,6 +15,7 @@ typedef struct
   int   port;
   int   crossfade_time;
   int   search_mode;
+  int   hide_cursor;
   gboolean reconnect;
   gboolean debug;
   gboolean find_wrap;

diff --git a/src/screen_play.c b/src/screen_play.c
index b86c876de7f0e5959683b2c410f061c5b24ce0f6..51c722df54478f9d2cdb25453a5dd1dee6a1cb48 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
@@ -21,6 +21,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <glib.h>
 #include <ncurses.h>
 #include <panel.h>
@@ -341,6 +342,18 @@ play_paint(screen_t *screen, mpdclient_t *c)
 static void
 play_update(screen_t *screen, mpdclient_t *c)
 {
+  /* hide the cursor when mpd are playing and the user are inactive */
+  if( options.hide_cursor>0 && c->status->state == MPD_STATUS_STATE_PLAY &&
+      time(NULL)-screen->input_timestamp >= options.hide_cursor )
+    {
+      lw->flags |= LW_HIDE_CURSOR;
+    }
+  else
+    {
+      lw->flags &= ~LW_HIDE_CURSOR;
+    }
+
+  /* center the cursor */
   if( options.auto_center )
     {
       static int prev_song_id = 0;