Changeset 9bd7b3750efafe34f0df0d6c7965f69837b9177d

Timestamp:

10/01/08 19:20:43 (11 months ago)

Author:

Rémi Duraffort <ivoire@videolan.org>

git-committer:

Rémi Duraffort <ivoire@videolan.org> 1199989243 +0000

git-parent:

[627fed2d229fed855c2d2f758dec6bcea586e143]

git-author:

Rémi Duraffort <ivoire@videolan.org> 1199989243 +0000

Message:

ncurses interface:

• support colors if --color is enabled (it is by default)
  
• use _() to permit translation of the interface
  
• matches only ESC, and not special keys combinations (it was boring to have VLC exit when inadvertently hitting alt+something
  
• do not use KeyToUTF8() at all when in wide characters mode, since we assume UTF-8 locale
  
• display the help shortcut when the interface is stopped, rather than in the title
  

Patch by funman.

Files:

• modules/gui/ncurses.c (modified) (52 diffs)

modules/gui/ncurses.c

@@ -2 +2 @@
- * ncurses.c : NCurses interface for vlc
- *****************************************************************************
-(C)
+©
- * $Id$
- *
@@ -26 +26 @@
- *****************************************************************************/
-
+/*
+ * Note that when we use wide characters (and link with libncursesw),
+ * we assume that an UTF8 locale is used (or compatible, such as ASCII).
+ * Other characters encodings are not supported.
+ */
+
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-#include <vlc/vlc.h>
-
-#include <errno.h>                                                 /* ENOMEM */
-#include <time.h>
-
-#ifdef HAVE_NCURSESW
@@ -99 +102 @@
-static void ReadDir        ( intf_thread_t * );
-
+static void start_color_and_pairs ( intf_thread_t * );
+
-/*****************************************************************************
- * Module descriptor
@@ -136 +141 @@
-enum
-{
+    C_DEFAULT = 0,
+    C_TITLE,
+    C_PLAYLIST_1,
+    C_PLAYLIST_2,
+    C_PLAYLIST_3,
+    C_BOX,
+    C_STATUS,
+    C_INFO,
+    C_ERROR,
+    C_WARNING,
+    C_DEBUG,
+    C_CATEGORY,
+    C_FOLDER
+};
+enum
+{
-    VIEW_CATEGORY,
-    VIEW_ONELEVEL
@@ -152 +173 @@
-{
-    input_thread_t *p_input;
+
+    vlc_bool_t      b_color;
+    vlc_bool_t      b_color_started;
-
-    float           f_slider;
@@ -179 +203 @@
-
-    char            *psz_open_chain;
+#ifndef HAVE_NCURSESW
-    char             psz_partial_keys[7];
+#endif
-
-    char            *psz_current_dir;
@@ -194 +220 @@
-};
-
-
+, vlc_bool_t b_color
-static void DrawLine( WINDOW *win, int y, int x, int w );
-static void DrawEmptyLine( WINDOW *win, int y, int x, int w );
@@ -222 +248 @@
-    p_sys->i_box_bidx = 0;
-    p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
+    p_sys->b_color = p_this->p_libvlc->b_color;
+    p_sys->b_color_started = VLC_FALSE;
+
+#ifndef HAVE_NCURSESW
-    memset( p_sys->psz_partial_keys, 0, sizeof( p_sys->psz_partial_keys ) );
+#endif
-
-    /* Initialize the curses library */
-    p_sys->w = initscr();
+
+    if( p_sys->b_color )
+        start_color_and_pairs( p_intf );
+
-    keypad( p_sys->w, TRUE );
-    /* Don't do NL -> CR/NL */
@@ -233 +268 @@
-    /* Don't echo */
-    noecho();
-
-
-
+
+
+
+
-
-    clear();
@@ -387 +423 @@
-            FindIndex( p_intf );
-        }
-
-getch(
+
+wgetch( p_sys->w 
-        {
-            /*
@@ -418 +454 @@
-
-/* following functions are local */
+static void start_color_and_pairs( intf_thread_t *p_intf )
+{
+    assert( p_intf->p_sys->b_color && !p_intf->p_sys->b_color_started );
+
+    if( !has_colors() )
+    {
+        p_intf->p_sys->b_color = VLC_FALSE;
+        msg_Warn( p_intf, "Terminal doesn't support colors" );
+        return;
+    }
+
+    start_color();
+
+    /* Available colors: BLACK RED GREEN YELLOW BLUE MAGENTA CYAN WHITE */
+
+    /* untested, in all my terminals, !can_change_color() --funman */
+    if( can_change_color() )
+        init_color( COLOR_YELLOW, 960, 500, 0 ); /* YELLOW -> ORANGE */
+
+    /* title */
+    init_pair( C_TITLE, COLOR_YELLOW, COLOR_BLACK );
+
+    /* jamaican playlist */
+    init_pair( C_PLAYLIST_1, COLOR_GREEN, COLOR_BLACK );
+    init_pair( C_PLAYLIST_2, COLOR_YELLOW, COLOR_BLACK );
+    init_pair( C_PLAYLIST_3, COLOR_RED, COLOR_BLACK );
+
+    /* used in DrawBox() */
+    init_pair( C_BOX, COLOR_CYAN, COLOR_BLACK );
+    /* Source, State, Position, Volume, Chapters, etc...*/
+    init_pair( C_STATUS, COLOR_BLUE, COLOR_BLACK );
+
+    /* VLC messages, keep the order from highest priority to lowest */
+
+    /* infos */
+    init_pair( C_INFO, COLOR_BLACK, COLOR_WHITE );
+    /* errors */
+    init_pair( C_ERROR, COLOR_RED, COLOR_BLACK );
+    /* warnings */
+    init_pair( C_WARNING, COLOR_YELLOW, COLOR_BLACK );
+/* debug */
+    init_pair( C_DEBUG, COLOR_WHITE, COLOR_BLACK );
+
+    /* Category title (help, info, metadata) */
+    init_pair( C_CATEGORY, COLOR_MAGENTA, COLOR_BLACK );
+
+    /* Folder (BOX_BROWSE) */
+    init_pair( C_FOLDER, COLOR_RED, COLOR_BLACK );
+
+    p_intf->p_sys->b_color_started = VLC_TRUE;
+}
+
+#ifndef HAVE_NCURSESW
-static char *KeyToUTF8( int i_key, char *psz_part )
-{
@@ -431 +520 @@
-    psz_part[len] = (char)i_key;
-
-#ifdef HAVE_NCURSESW
-    psz_utf8 = strdup( psz_part );
-#else
-    psz_utf8 = FromLocaleDup( psz_part );
-
@@ -454 +540 @@
-        return NULL;
-    }
-#endif
-
-    memset( psz_part, 0, 6 );
-    return psz_utf8;
-}
+#endif
-
-static inline int RemoveLastUTF8Entity( char *psz, int len )
@@ -557 +643 @@
-            case 'D':
-            case KEY_BACKSPACE:
+            case 0x7f:
-            case KEY_DC:
-            {
@@ -579 +666 @@
-
-            case KEY_ENTER:
-
+
+
-                if( !p_sys->pp_plist[p_sys->i_box_plidx] )
-                {
@@ -664 +752 @@
-
-            case KEY_ENTER:
-
+
+
-            case ' ':
-                if( p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file || i_key == ' ' )
@@ -787 +876 @@
-    else if( p_sys->i_box_type == BOX_SEARCH && p_sys->psz_search_chain )
-    {
-
-
+
-        switch( i_key )
-        {
+            case KEY_CLEAR:
-            case 0x0c:      /* ^l */
-                clear();
-                return 1;
-            case KEY_ENTER:
-
+
+
-                if( i_chain_len > 0 )
-                {
@@ -806 +896 @@
-                p_sys->i_box_type = BOX_PLAYLIST;
-                return 1;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                p_sys->i_box_plidx = p_sys->i_before_search;
-                p_sys->i_box_type = BOX_PLAYLIST;
-                return 1;
-            case KEY_BACKSPACE:
+            case 0x7f:
-                RemoveLastUTF8Entity( p_sys->psz_search_chain, i_chain_len );
-                break;
-            default:
-            {
+#ifdef HAVE_NCURSESW
+                if( i_chain_len + 1 < SEARCH_CHAIN_SIZE )
+                {
+                    p_sys->psz_search_chain[i_chain_len] = (char) i_key;
+                    p_sys->psz_search_chain[i_chain_len + 1] = '\0';
+                }
+#else
-                char *psz_utf8 = KeyToUTF8( i_key, p_sys->psz_partial_keys );
-
@@ -826 +940 @@
-                    free( psz_utf8 );
-                }
+#endif
-                break;
-            }
@@ -843 +958 @@
-        switch( i_key )
-        {
-
+
+
-                clear();
-                return 1;
-            case KEY_ENTER:
-
+
+
-                if( i_chain_len > 0 )
-                {
@@ -870 +987 @@
-                p_sys->i_box_type = BOX_PLAYLIST;
-                return 1;
-
+
+
+
-                p_sys->i_box_type = BOX_PLAYLIST;
-                return 1;
-            case KEY_BACKSPACE:
+            case 0x7f:
-                RemoveLastUTF8Entity( p_sys->psz_open_chain, i_chain_len );
-                break;
-            default:
-            {
+#ifdef HAVE_NCURSESW
+                if( i_chain_len + 1 < OPEN_CHAIN_SIZE )
+                {
+                    p_sys->psz_open_chain[i_chain_len] = (char) i_key;
+                    p_sys->psz_open_chain[i_chain_len + 1] = '\0';
+                }
+#else
-                char *psz_utf8 = KeyToUTF8( i_key, p_sys->psz_partial_keys );
-
@@ -889 +1016 @@
-                    free( psz_utf8 );
-                }
+#endif
-                break;
-            }
@@ -899 +1027 @@
-    switch( i_key )
-    {
+        case 0x1b:  /* ESC */
+            if( wgetch( p_sys->w ) != ERR )
+                return 0;
-        case 'q':
-        case 'Q':
-0x1b:  /* Esc */
+KEY_EXIT:
-            vlc_object_kill( p_intf->p_libvlc );
-            return 0;
@@ -938 +1069 @@
-                p_sys->i_box_type = BOX_BROWSE;
-            return 1;
+        case 'c':
+            p_sys->b_color = !p_sys->b_color;
+            if( p_sys->b_color && !p_sys->b_color_started )
+                start_color_and_pairs( p_intf );
+            return 1;
-        case 'h':
-        case 'H':
@@ -1076 +1212 @@
-         * ^l should clear and redraw the screen
-         */
-
+
+
-            clear();
-            return 1;
@@ -1193 +1330 @@
-    if( i_char_len == (size_t)-1 )
-        /* an invalid character was encountered */
-abort()
+return
-    else
-    {
@@ -1329 +1466 @@
-    /* Title */
-    attrset( A_REVERSE );
-[ h for help ]"
+"PACKAGE_VERSION
-    int mid = ( COLS - i_len ) / 2;
-    if( mid < 0 )
@@ -1336 +1473 @@
-    char psz_title[i_size];
-    memset( psz_title, ' ', mid );
-
+
+
+
-    mvnprintw( y, 0, COLS, "%s", psz_title );
-    attroff( A_REVERSE );
-    y += 2;
-
+    if( p_sys->b_color )
+        wcolor_set( p_sys->w, C_STATUS, NULL );
+
-    /* Infos */
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-    if( p_input && !p_input->b_dead )
@@ -1362 +1500 @@
-        /* Source */
-        char *psz_uri = input_item_GetURI( input_GetItem( p_input ) );
-" Source   : %s"
+_(" Source   : %s")
-        free( psz_uri );
-
@@ -1369 +1507 @@
-        if( val.i_int == PLAYING_S )
-        {
-" State    : Playing %s"
+_(" State    : Playing %s")
-        }
-        else if( val.i_int == OPENING_S )
-        {
-" State    : Opening/Connecting %s"
+_(" State    : Opening/Connecting %s")
-        }
-        else if( val.i_int == BUFFERING_S )
-        {
-" State    : Buffering %s"
+_(" State    : Buffering %s")
-        }
-        else if( val.i_int == PAUSE_S )
-        {
-" State    : Paused %s"
+_(" State    : Paused %s")
-        }
-
@@ -1395 +1533 @@
-            msecstotimestr( buf2, val.i_time / 1000 );
-
-" Position : %s/%s (%.2f%%)"
+_(" Position : %s/%s (%.2f%%)")
-
-            /* Volume */
-            aout_VolumeGet( p_intf, &i_volume );
-" Volume   : %i%%"
+_(" Volume   : %i%%")
-
-            /* Title */
@@ -1407 +1545 @@
-                if( val_list.p_list->i_count > 0 )
-                {
-" Title    : %d/%d"
+_(" Title    : %d/%d")
-                }
-                var_Change( p_input, "title", VLC_VAR_FREELIST, &val_list, NULL );
@@ -1418 +1556 @@
-                if( val_list.p_list->i_count > 0 )
-                {
-" Chapter  : %d/%d"
+_(" Chapter  : %d/%d")
-                }
-                var_Change( p_input, "chapter", VLC_VAR_FREELIST, &val_list, NULL );
@@ -1430 +1568 @@
-    else
-    {
-"Source: <no current item> %s"
+_(" Source: <no current item> %s")
-        DrawEmptyLine( p_sys->w, y++, 0, COLS );
+        mvnprintw( y++, 0, COLS, _(" [ h for help ]") );
-        DrawEmptyLine( p_sys->w, y++, 0, COLS );
-
-
-
-
+
+
+
+
+
+
-    DrawEmptyLine( p_sys->w, y+1, 1, COLS-2);
-    DrawLine( p_sys->w, y+1, 1, (int)(p_intf->p_sys->f_slider/100.0 * (COLS -2)) );
@@ -1451 +1592 @@
-        /* Help box */
-        int l = 0;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        MainBoxWrite( p_intf, l++, 1, "" );
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        MainBoxWrite( p_intf, l++, 1, "" );
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        MainBoxWrite( p_intf, l++, 1, "" );
-
-
-
-
-
+
+
+
+
+
+
+
+
-        MainBoxWrite( p_intf, l++, 1, "" );
-
-
-
-
+
+
+
+
+
+
+
-        MainBoxWrite( p_intf, l++, 1, "" );
-
-
-
+
+
+
+
+
+
-        MainBoxWrite( p_intf, l++, 1, "" );
-
-
-
+
+
+
+
+
+
-
-        p_sys->i_box_lines_total = l;
@@ -1526 +1698 @@
-        /* Info box */
-        int l = 0;
-" Information "
+_(" Information "), p_sys->b_color
-
-        if( p_input )
@@ -1536 +1708 @@
-                info_category_t *p_category = input_GetItem(p_input)->pp_categories[i];
-                if( y >= y_end ) break;
-
+
+
+
+
+
-                for( j = 0; j < p_category->i_infos; j++ )
-                {
-                    info_t *p_info = p_category->pp_infos[j];
-                    if( y >= y_end ) break;
-"      %s: %s"
+_("      %s: %s")
-                }
-            }
@@ -1548 +1724 @@
-        else
-        {
-"No item currently playing"
+_("No item currently playing")
-        }
-        p_sys->i_box_lines_total = l;
@@ -1577 +1753 @@
-        psz_title[i_len + 1] = ' ';
-        psz_title[i_len + 2] = '\0';
-
+, p_sys->b_color
-
-        if( p_input )
@@ -1630 +1806 @@
-                            psz_meta_title = ""; break;
-                    }
+                    if( p_sys->b_color )
+                        wcolor_set( p_sys->w, C_CATEGORY, NULL );
-                    MainBoxWrite( p_intf, l++, 1, "  [%s]", psz_meta_title );
+                    if( p_sys->b_color )
+                        wcolor_set( p_sys->w, C_DEFAULT, NULL );
-                    MainBoxWrite( p_intf, l++, 1, "      %s", psz_meta );
-                }
@@ -1638 +1818 @@
-        else
-        {
-"No item currently playing"
+_("No item currently playing")
-        }
-        p_sys->i_box_lines_total = l;
@@ -1661 +1841 @@
-        int i_start;
-
-" Logs "
+_(" Logs "), p_sys->b_color
-
-        i_start = p_intf->p_sys->p_sub->i_start;
@@ -1683 +1863 @@
-                break;
-            }
+            if( p_sys->b_color )
+                wcolor_set( p_sys->w, 
+                    p_sys->p_sub->p_msg[i_stop].i_type + C_INFO,
+                    NULL );
-            mvnprintw( y + h-2-i_line, 1, COLS - 2, "   [%s] %s",
-                      ppsz_type[p_sys->p_sub->p_msg[i_stop].i_type],
-                      p_sys->p_sub->p_msg[i_stop].psz_msg );
+            if( p_sys->b_color )
+                wcolor_set( p_sys->w, C_DEFAULT, NULL );
-        }
-
@@ -1698 +1884 @@
-        int        i_start, i_stop;
-        int        i_item;
-" Browse "
+_(" Browse "), p_sys->b_color
-
-        if( p_sys->i_box_bidx >= p_sys->i_dir_entries ) p_sys->i_box_plidx = p_sys->i_dir_entries - 1;
@@ -1736 +1922 @@
-                attrset( A_REVERSE );
-            }
+            if( p_sys->b_color && !p_sys->pp_dir_entries[i_item]->b_file )
+                wcolor_set( p_sys->w, C_FOLDER, NULL );
-            mvnprintw( y++, 1, COLS - 2, " %c %s", p_sys->pp_dir_entries[i_item]->b_file == VLC_TRUE ? ' ' : '+',
-                            p_sys->pp_dir_entries[i_item]->psz_path );
+            if( p_sys->b_color && !p_sys->pp_dir_entries[i_item]->b_file )
+                wcolor_set( p_sys->w, C_DEFAULT, NULL );
+
-            if( b_selected )
-            {
@@ -1757 +1948 @@
-        {
-            case VIEW_ONELEVEL:
-" Playlist (All, one level) "
+_(" Playlist (All, one level) ")
-                break;
-            case VIEW_CATEGORY:
-" Playlist (By category) "
+_(" Playlist (By category) ")
-                break;
-            default:
-" Playlist (Manually added) "
-
-
-
+_(" Playlist (Manually added) ")
+
+
+, p_sys->b_color
-
-        if( p_sys->b_need_update || p_sys->pp_plist == NULL )
@@ -1824 +2015 @@
-                attrset( A_REVERSE );
-            }
+            if( p_sys->b_color )
+                wcolor_set( p_sys->w, i_item % 3 + C_PLAYLIST_1, NULL );
-            mvnprintw( y++, 1, COLS - 2, "%c%s", c,
-                       p_sys->pp_plist[i_item]->psz_display );
+            if( p_sys->b_color )
+                wcolor_set( p_sys->w, C_DEFAULT, NULL );
-            if( b_selected )
-            {
@@ -1846 +2041 @@
-            {
-                /* Searching next entry */
-"Find: %s"
+_("Find: %s")
-            }
-            else
-            {
-"Find: %s"
+_("Find: %s")
-            }
-        }
@@ -1859 +2054 @@
-        {
-            DrawEmptyLine( p_sys->w, 7, 1, COLS-2 );
-"Open: %s"
+_("Open: %s")
-        }
-    }
@@ -2261 +2456 @@
- *
- ****************************************************************************/
-
+, vlc_bool_t b_color
-{
-    int i;
@@ -2268 +2463 @@
-    if( w > 3 && h > 2 )
-    {
+        if( b_color )
+            wcolor_set( win, C_BOX, NULL );
-        if( title == NULL ) title = "";
-        i_len = strlen( title );
@@ -2288 +2485 @@
-        mvwhline( win, y+h-1, x+1,   ACS_HLINE, w - 2 );
-        mvwaddch( win, y+h-1, x+w-1, ACS_LRCORNER );
+        if( b_color )
+            wcolor_set( win, C_DEFAULT, NULL );
-    }
-}