X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=d93d0a7deefd672fa244674277b3f6b5129f4517;hb=72e25cde23ab4299ea6ce3a2f0218a947dd867e4;hp=e375c972cfd9991b26533627b5d644a6f3880a8b;hpb=ff6ab8ff686cd6f5254e09bd0e0a17af9a0300f6;p=vlc diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index e375c972cf..d93d0a7dee 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -1,7 +1,7 @@ /***************************************************************************** * ncurses.c : NCurses interface for vlc ***************************************************************************** - * Copyright (C) 2001-2007 the VideoLAN team + * Copyright © 2001-2007 the VideoLAN team * $Id$ * * Authors: Sam Hocevar @@ -25,16 +25,25 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +/* + * 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 +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include /* ENOMEM */ -#include +#include +#include #ifdef HAVE_NCURSESW # define _XOPEN_SOURCE_EXTENDED 1 +# include #endif #include @@ -44,9 +53,12 @@ #include #include #include +#include #include #include +#include + #ifdef HAVE_SYS_STAT_H # include #endif @@ -89,7 +101,7 @@ static void PlaylistAddNode( intf_thread_t *, playlist_item_t *, int, const char static void PlaylistDestroy( intf_thread_t * ); static int PlaylistChanged( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ); -static inline vlc_bool_t PlaylistIsPlaying( intf_thread_t *, +static inline bool PlaylistIsPlaying( intf_thread_t *, playlist_item_t * ); static void FindIndex ( intf_thread_t * ); static void SearchPlaylist ( intf_thread_t *, char * ); @@ -98,6 +110,8 @@ static int SubSearchPlaylist( intf_thread_t *, char *, int, int ); static void ManageSlider ( intf_thread_t * ); static void ReadDir ( intf_thread_t * ); +static void start_color_and_pairs ( intf_thread_t * ); + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -109,13 +123,13 @@ static void ReadDir ( intf_thread_t * ); vlc_module_begin(); set_shortname( "Ncurses" ); - set_description( _("Ncurses interface") ); + set_description( N_("Ncurses interface") ); set_capability( "interface", 10 ); set_category( CAT_INTERFACE ); set_subcategory( SUBCAT_INTERFACE_MAIN ); set_callbacks( Open, Close ); add_shortcut( "curses" ); - add_directory( "browse-dir", NULL, NULL, BROWSE_TEXT, BROWSE_LONGTEXT, VLC_FALSE ); + add_directory( "browse-dir", NULL, NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false ); vlc_module_end(); /***************************************************************************** @@ -131,7 +145,25 @@ enum BOX_SEARCH, BOX_OPEN, BOX_BROWSE, - BOX_META + BOX_META, + BOX_OBJECTS, + BOX_STATS +}; +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 { @@ -140,7 +172,7 @@ enum }; struct dir_entry_t { - vlc_bool_t b_file; + bool b_file; char *psz_path; }; struct pl_item_t @@ -150,8 +182,11 @@ struct pl_item_t }; struct intf_sys_t { - playlist_t *p_playlist; input_thread_t *p_input; + playlist_t *p_playlist; + + bool b_color; + bool b_color_started; float f_slider; float f_slider_old; @@ -168,6 +203,8 @@ struct intf_sys_t int b_box_plidx_follow; int i_box_bidx; /* browser index */ + playlist_item_t *p_node; /* current node */ + int b_box_cleared; msg_subscription_t* p_sub; /* message bank subscription */ @@ -177,22 +214,24 @@ struct intf_sys_t int i_before_search; char *psz_open_chain; +#ifndef HAVE_NCURSESW char psz_partial_keys[7]; +#endif char *psz_current_dir; int i_dir_entries; struct dir_entry_t **pp_dir_entries; - vlc_bool_t b_show_hidden_files; + bool b_show_hidden_files; int i_current_view; /* playlist view */ struct pl_item_t **pp_plist; int i_plist_entries; - vlc_bool_t b_need_update; /* for playlist view */ + bool b_need_update; /* for playlist view */ int i_verbose; /* stores verbosity level */ }; -static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title ); +static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title, bool b_color ); static void DrawLine( WINDOW *win, int y, int x, int w ); static void DrawEmptyLine( WINDOW *win, int y, int x, int w ); @@ -207,7 +246,9 @@ static int Open( vlc_object_t *p_this ) /* Allocate instance and initialize some members */ p_sys = p_intf->p_sys = malloc( sizeof( intf_sys_t ) ); - p_sys->p_playlist = NULL; + if( !p_sys ) + return VLC_ENOMEM; + p_sys->p_node = NULL; p_sys->p_input = NULL; p_sys->f_slider = 0.0; p_sys->f_slider_old = 0.0; @@ -215,15 +256,24 @@ static int Open( vlc_object_t *p_this ) p_sys->i_box_lines = 0; p_sys->i_box_start= 0; p_sys->i_box_lines_total = 0; - p_sys->b_box_plidx_follow = VLC_TRUE; - p_sys->b_box_cleared = VLC_FALSE; + p_sys->b_box_plidx_follow = true; + p_sys->b_box_cleared = false; p_sys->i_box_plidx = 0; p_sys->i_box_bidx = 0; - p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); + p_sys->p_sub = msg_Subscribe( p_intf ); + p_sys->b_color = var_CreateGetBool( p_intf, "color" ); + p_sys->b_color_started = 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 */ nonl(); @@ -231,9 +281,10 @@ static int Open( vlc_object_t *p_this ) cbreak(); /* Don't echo */ noecho(); - - curs_set(0); - timeout(0); + /* Invisible cursor */ + curs_set( 0 ); + /* Non blocking wgetch() */ + wtimeout( p_sys->w, 0 ); clear(); @@ -251,7 +302,7 @@ static int Open( vlc_object_t *p_this ) p_sys->i_current_view = VIEW_CATEGORY; p_sys->pp_plist = NULL; p_sys->i_plist_entries = 0; - p_sys->b_need_update = VLC_FALSE; + p_sys->b_need_update = false; /* Initialize search chain */ p_sys->psz_search_chain = (char *)malloc( SEARCH_CHAIN_SIZE + 1 ); @@ -268,16 +319,17 @@ static int Open( vlc_object_t *p_this ) if( val.psz_string && *val.psz_string ) { p_sys->psz_current_dir = strdup( val.psz_string ); - free( val.psz_string ); } else { - p_sys->psz_current_dir = strdup( p_intf->p_libvlc->psz_homedir ); + p_sys->psz_current_dir = strdup( config_GetHomeDir() ); } + free( val.psz_string ); + p_sys->i_dir_entries = 0; p_sys->pp_dir_entries = NULL; - p_sys->b_show_hidden_files = VLC_FALSE; + p_sys->b_show_hidden_files = false; ReadDir( p_intf ); return VLC_SUCCESS; @@ -290,37 +342,28 @@ static void Close( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; intf_sys_t *p_sys = p_intf->p_sys; - int i; - - var_DelCallback( p_sys->p_playlist, "intf-change", PlaylistChanged, - p_intf ); - var_DelCallback( p_sys->p_playlist, "item-append", PlaylistChanged, - p_intf ); PlaylistDestroy( p_intf ); - for( i = 0; i < p_sys->i_dir_entries; i++ ) + while( p_sys->i_dir_entries ) { - struct dir_entry_t *p_dir_entry = p_sys->pp_dir_entries[i]; - if( p_dir_entry->psz_path ) free( p_dir_entry->psz_path ); - REMOVE_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, i ); - if( p_dir_entry ) free( p_dir_entry ); + struct dir_entry_t *p_dir_entry = p_sys->pp_dir_entries[0]; + free( p_dir_entry->psz_path ); + REMOVE_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, 0 ); + free( p_dir_entry ); } p_sys->pp_dir_entries = NULL; - if( p_sys->psz_current_dir ) free( p_sys->psz_current_dir ); - if( p_sys->psz_search_chain ) free( p_sys->psz_search_chain ); - if( p_sys->psz_old_search ) free( p_sys->psz_old_search ); - if( p_sys->psz_open_chain ) free( p_sys->psz_open_chain ); + free( p_sys->psz_current_dir ); + free( p_sys->psz_search_chain ); + free( p_sys->psz_old_search ); + free( p_sys->psz_open_chain ); if( p_sys->p_input ) { vlc_object_release( p_sys->p_input ); } - if( p_sys->p_playlist ) - { - vlc_object_release( p_sys->p_playlist ); - } + pl_Release( p_intf ); /* Close the ncurses interface */ endwin(); @@ -342,6 +385,8 @@ static void Close( vlc_object_t *p_this ) static void Run( intf_thread_t *p_intf ) { intf_sys_t *p_sys = p_intf->p_sys; + playlist_t *p_playlist = pl_Yield( p_intf ); + p_sys->p_playlist = p_playlist; int i_key; time_t t_last_refresh; @@ -350,54 +395,46 @@ static void Run( intf_thread_t *p_intf ) * force drawing the interface for the first time */ t_last_refresh = ( time( 0 ) - 1); + /* + * force building of the playlist array + */ + PlaylistRebuild( p_intf ); + var_AddCallback( p_playlist, "intf-change", PlaylistChanged, p_intf ); + var_AddCallback( p_playlist, "item-append", PlaylistChanged, p_intf ); + var_AddCallback( p_playlist, "item-change", PlaylistChanged, p_intf ); while( !intf_ShouldDie( p_intf ) ) { msleep( INTF_IDLE_SLEEP ); /* Update the input */ - if( p_sys->p_playlist == NULL ) + PL_LOCK; + if( p_sys->p_input == NULL ) { - p_sys->p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_sys->p_playlist ) - { - var_AddCallback( p_sys->p_playlist, "intf-change", - PlaylistChanged, p_intf ); - var_AddCallback( p_sys->p_playlist, "item-append", - PlaylistChanged, p_intf ); - } - } - if( p_sys->p_playlist ) - { - vlc_mutex_lock( &p_sys->p_playlist->object_lock ); - if( p_sys->p_input == NULL ) + p_sys->p_input = p_playlist->p_input; + if( p_sys->p_input ) { - p_sys->p_input = p_sys->p_playlist->p_input; - if( p_sys->p_input ) + if( !p_sys->p_input->b_dead ) { - if( !p_sys->p_input->b_dead ) - { - vlc_object_yield( p_sys->p_input ); - } + vlc_object_yield( p_sys->p_input ); } } - else if( p_sys->p_input->b_dead ) - { - vlc_object_release( p_sys->p_input ); - p_sys->p_input = NULL; - p_sys->f_slider = p_sys->f_slider_old = 0.0; - p_sys->b_box_cleared = VLC_FALSE; - } - vlc_mutex_unlock( &p_sys->p_playlist->object_lock ); } + else if( p_sys->p_input->b_dead ) + { + vlc_object_release( p_sys->p_input ); + p_sys->p_input = NULL; + p_sys->f_slider = p_sys->f_slider_old = 0.0; + p_sys->b_box_cleared = false; + } + PL_UNLOCK; - if( p_sys->b_box_plidx_follow && p_sys->p_playlist->status.p_item ) + if( p_sys->b_box_plidx_follow && p_playlist->status.p_item ) { FindIndex( p_intf ); } - while( ( i_key = getch() ) != -1 ) + while( ( i_key = wgetch( p_sys->w ) ) != -1 ) { /* * HandleKey returns 1 if the screen needs to be redrawn @@ -412,7 +449,7 @@ static void Run( intf_thread_t *p_intf ) { clear(); Redraw( p_intf, &t_last_refresh ); - p_sys->b_box_cleared = VLC_TRUE; + p_sys->b_box_cleared = true; } /* @@ -424,9 +461,65 @@ static void Run( intf_thread_t *p_intf ) Redraw( p_intf, &t_last_refresh ); } } + var_DelCallback( p_playlist, "intf-change", PlaylistChanged, p_intf ); + var_DelCallback( p_playlist, "item-append", PlaylistChanged, p_intf ); + var_DelCallback( p_playlist, "item-change", PlaylistChanged, p_intf ); } /* 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 = 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 = true; +} + +#ifndef HAVE_NCURSESW static char *KeyToUTF8( int i_key, char *psz_part ) { char *psz_utf8; @@ -440,9 +533,6 @@ static char *KeyToUTF8( int i_key, char *psz_part ) psz_part[len] = (char)i_key; -#ifdef HAVE_NCURSESW - psz_utf8 = strdup( psz_part ); -#else psz_utf8 = FromLocaleDup( psz_part ); /* Ugly check for incomplete bytes sequences @@ -463,11 +553,11 @@ static char *KeyToUTF8( int i_key, char *psz_part ) free( psz_utf8 ); return NULL; } -#endif memset( psz_part, 0, 6 ); return psz_utf8; } +#endif static inline int RemoveLastUTF8Entity( char *psz, int len ) { @@ -483,44 +573,58 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) intf_sys_t *p_sys = p_intf->p_sys; vlc_value_t val; - if( p_sys->i_box_type == BOX_PLAYLIST && p_sys->p_playlist ) + #define ReturnTrue \ + do { \ + vlc_object_release( p_playlist ); \ + return 1; \ + } while(0) + + #define ReturnFalse \ + do { \ + vlc_object_release( p_playlist ); \ + return 0; \ + } while(0) + + playlist_t *p_playlist = pl_Yield( p_intf ); + + if( p_sys->i_box_type == BOX_PLAYLIST ) { - int b_ret = VLC_TRUE; - vlc_bool_t b_box_plidx_follow = VLC_FALSE; + int b_ret = true; + bool b_box_plidx_follow = false; switch( i_key ) { vlc_value_t val; /* Playlist Settings */ case 'r': - var_Get( p_sys->p_playlist, "random", &val ); + var_Get( p_playlist, "random", &val ); val.b_bool = !val.b_bool; - var_Set( p_sys->p_playlist, "random", val ); - return 1; + var_Set( p_playlist, "random", val ); + ReturnTrue; case 'l': - var_Get( p_sys->p_playlist, "loop", &val ); + var_Get( p_playlist, "loop", &val ); val.b_bool = !val.b_bool; - var_Set( p_sys->p_playlist, "loop", val ); - return 1; + var_Set( p_playlist, "loop", val ); + ReturnTrue; case 'R': - var_Get( p_sys->p_playlist, "repeat", &val ); + var_Get( p_playlist, "repeat", &val ); val.b_bool = !val.b_bool; - var_Set( p_sys->p_playlist, "repeat", val ); - return 1; + var_Set( p_playlist, "repeat", val ); + ReturnTrue; /* Playlist sort */ case 'o': - playlist_RecursiveNodeSort( p_sys->p_playlist, + playlist_RecursiveNodeSort( p_playlist, PlaylistGetRoot( p_intf ), SORT_TITLE_NODES_FIRST, ORDER_NORMAL ); - p_sys->b_need_update = VLC_TRUE; - return 1; + p_sys->b_need_update = true; + ReturnTrue; case 'O': - playlist_RecursiveNodeSort( p_sys->p_playlist, + playlist_RecursiveNodeSort( p_playlist, PlaylistGetRoot( p_intf ), SORT_TITLE_NODES_FIRST, ORDER_REVERSE ); - p_sys->b_need_update = VLC_TRUE; - return 1; + p_sys->b_need_update = true; + ReturnTrue; /* Playlist view */ case 'v': @@ -532,16 +636,24 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) default: p_sys->i_current_view = VIEW_CATEGORY; } - //p_sys->b_need_update = VLC_TRUE; + //p_sys->b_need_update = true; PlaylistRebuild( p_intf ); - return 1; + ReturnTrue; /* Playlist navigation */ + case 'g': + FindIndex( p_intf ); + break; case KEY_HOME: p_sys->i_box_plidx = 0; break; +#ifdef __FreeBSD__ +/* workaround for FreeBSD + xterm: + * see http://www.nabble.com/curses-vs.-xterm-key-mismatch-t3574377.html */ + case KEY_SELECT: +#endif case KEY_END: - p_sys->i_box_plidx = p_sys->p_playlist->items.i_size - 1; + p_sys->i_box_plidx = p_playlist->items.i_size - 1; break; case KEY_UP: p_sys->i_box_plidx--; @@ -557,33 +669,34 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) break; case 'D': case KEY_BACKSPACE: + case 0x7f: case KEY_DC: { - playlist_t *p_playlist = p_sys->p_playlist; playlist_item_t *p_item; - vlc_mutex_lock( &p_playlist->object_lock ); + PL_LOCK; p_item = p_sys->pp_plist[p_sys->i_box_plidx]->p_item; if( p_item->i_children == -1 ) { playlist_DeleteFromInput( p_playlist, - p_item->p_input->i_id, VLC_TRUE ); + p_item->p_input->i_id, pl_Locked ); } else { playlist_NodeDelete( p_playlist, p_item, - VLC_TRUE , VLC_FALSE ); + true , false ); } - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; PlaylistRebuild( p_intf ); break; } case KEY_ENTER: - case 0x0d: - if( !p_sys->pp_plist || !p_sys->pp_plist[p_sys->i_box_plidx] ) + case '\r': + case '\n': + if( !p_sys->pp_plist[p_sys->i_box_plidx] ) { - b_ret = VLC_FALSE; + b_ret = false; break; } if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children @@ -594,23 +707,28 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) p_sys->pp_plist[p_sys->i_box_plidx]->p_item; if( !p_parent ) - p_parent = p_sys->p_playlist->p_root_onelevel; + p_parent = p_playlist->p_root_onelevel; while( p_parent->p_parent ) p_parent = p_parent->p_parent; - playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY, - VLC_TRUE, p_parent, p_item ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, + pl_Unlocked, p_parent, p_item ); + } + else if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children + == 0 ) + { /* We only want to set the current node */ + playlist_Stop( p_playlist ); + p_sys->p_node = p_sys->pp_plist[p_sys->i_box_plidx]->p_item; } else - { /* FIXME doesn't work if the node is empty */ - playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY, - VLC_TRUE, - p_sys->pp_plist[p_sys->i_box_plidx]->p_item, - NULL ); + { + p_sys->p_node = p_sys->pp_plist[p_sys->i_box_plidx]->p_item; + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, + p_sys->pp_plist[p_sys->i_box_plidx]->p_item, NULL ); } - b_box_plidx_follow = VLC_TRUE; + b_box_plidx_follow = true; break; default: - b_ret = VLC_FALSE; + b_ret = false; break; } @@ -621,20 +739,23 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) if( p_sys->i_box_plidx < 0 ) p_sys->i_box_plidx = 0; if( PlaylistIsPlaying( p_intf, p_sys->pp_plist[p_sys->i_box_plidx]->p_item ) ) - b_box_plidx_follow = VLC_TRUE; + b_box_plidx_follow = true; p_sys->b_box_plidx_follow = b_box_plidx_follow; - return 1; + ReturnTrue; } } if( p_sys->i_box_type == BOX_BROWSE ) { - vlc_bool_t b_ret = VLC_TRUE; + bool b_ret = true; /* Browser navigation */ switch( i_key ) { case KEY_HOME: p_sys->i_box_bidx = 0; break; +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif case KEY_END: p_sys->i_box_bidx = p_sys->i_dir_entries - 1; break; @@ -652,32 +773,38 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) break; case '.': /* Toggle show hidden files */ p_sys->b_show_hidden_files = ( p_sys->b_show_hidden_files == - VLC_TRUE ? VLC_FALSE : VLC_TRUE ); + true ? false : true ); ReadDir( p_intf ); break; case KEY_ENTER: - case 0x0d: + case '\r': + case '\n': case ' ': if( p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file || i_key == ' ' ) { - int i_size_entry = strlen( p_sys->psz_current_dir ) + + int i_size_entry = strlen( "directory://" ) + + strlen( p_sys->psz_current_dir ) + strlen( p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) + 2; char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry); - sprintf( psz_uri, "%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ); + sprintf( psz_uri, "directory://%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ); - playlist_item_t *p_parent = p_sys->p_playlist->status.p_node; + playlist_item_t *p_parent = p_sys->p_node; if( !p_parent ) - p_parent = p_sys->p_playlist->p_root_onelevel; + p_parent = p_playlist->status.p_node; + if( !p_parent ) + p_parent = p_playlist->p_local_onelevel; - while( p_parent->p_parent ) + while( p_parent->p_parent && p_parent->p_parent->p_parent ) p_parent = p_parent->p_parent; - playlist_Add( p_sys->p_playlist, psz_uri, NULL, - PLAYLIST_APPEND, PLAYLIST_END, - p_parent == p_sys->p_playlist->p_root_onelevel - , VLC_FALSE ); + playlist_Add( p_playlist, psz_uri, NULL, PLAYLIST_APPEND, + PLAYLIST_END, + p_parent->p_input == + p_playlist->p_local_onelevel->p_input + , false ); + p_sys->i_box_type = BOX_PLAYLIST; free( psz_uri ); } @@ -695,47 +822,51 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) } break; default: - b_ret = VLC_FALSE; + b_ret = false; break; } if( b_ret ) { if( p_sys->i_box_bidx >= p_sys->i_dir_entries ) p_sys->i_box_bidx = p_sys->i_dir_entries - 1; if( p_sys->i_box_bidx < 0 ) p_sys->i_box_bidx = 0; - return 1; + ReturnTrue; } } else if( p_sys->i_box_type == BOX_HELP || p_sys->i_box_type == BOX_INFO || - p_sys->i_box_type == BOX_META ) + p_sys->i_box_type == BOX_META || p_sys->i_box_type == BOX_STATS || + p_sys->i_box_type == BOX_OBJECTS ) { switch( i_key ) { case KEY_HOME: p_sys->i_box_start = 0; - return 1; + ReturnTrue; +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif case KEY_END: p_sys->i_box_start = p_sys->i_box_lines_total - 1; - return 1; + ReturnTrue; case KEY_UP: if( p_sys->i_box_start > 0 ) p_sys->i_box_start--; - return 1; + ReturnTrue; case KEY_DOWN: if( p_sys->i_box_start < p_sys->i_box_lines_total - 1 ) { p_sys->i_box_start++; } - return 1; + ReturnTrue; case KEY_PPAGE: p_sys->i_box_start -= p_sys->i_box_lines; if( p_sys->i_box_start < 0 ) p_sys->i_box_start = 0; - return 1; + ReturnTrue; case KEY_NPAGE: p_sys->i_box_start += p_sys->i_box_lines; if( p_sys->i_box_start >= p_sys->i_box_lines_total ) { p_sys->i_box_start = p_sys->i_box_lines_total - 1; } - return 1; + ReturnTrue; default: break; } @@ -747,21 +878,24 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) case KEY_HOME: p_sys->f_slider = 0; ManageSlider( p_intf ); - return 1; + ReturnTrue; +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif case KEY_END: p_sys->f_slider = 99.9; ManageSlider( p_intf ); - return 1; + ReturnTrue; case KEY_UP: p_sys->f_slider += 5.0; if( p_sys->f_slider >= 99.0 ) p_sys->f_slider = 99.0; ManageSlider( p_intf ); - return 1; + ReturnTrue; case KEY_DOWN: p_sys->f_slider -= 5.0; if( p_sys->f_slider < 0.0 ) p_sys->f_slider = 0.0; ManageSlider( p_intf ); - return 1; + ReturnTrue; default: break; @@ -769,15 +903,16 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) } else if( p_sys->i_box_type == BOX_SEARCH && p_sys->psz_search_chain ) { - int i_chain_len; - i_chain_len = strlen( p_sys->psz_search_chain ); + int i_chain_len = strlen( p_sys->psz_search_chain ); switch( i_key ) { + case KEY_CLEAR: case 0x0c: /* ^l */ clear(); - return 1; + ReturnTrue; case KEY_ENTER: - case 0x0d: + case '\r': + case '\n': if( i_chain_len > 0 ) { p_sys->psz_old_search = strdup( p_sys->psz_search_chain ); @@ -787,16 +922,40 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) SearchPlaylist( p_intf, p_sys->psz_old_search ); } p_sys->i_box_type = BOX_PLAYLIST; - return 1; - case 0x1b: /* Esc. */ + ReturnTrue; + case 0x1b: /* ESC */ + /* Alt+key combinations return 2 keys in the terminal keyboard: + * ESC, and the 2nd key. + * If some other key is available immediately (where immediately + * means after wgetch() 1 second delay ), that means that the + * ESC key was not pressed. + * + * man 3X curs_getch says: + * + * Use of the escape key by a programmer for a single + * character function is discouraged, as it will cause a delay + * of up to one second while the keypad code looks for a + * following function-key sequence. + * + */ + if( wgetch( p_sys->w ) != ERR ) + ReturnFalse; p_sys->i_box_plidx = p_sys->i_before_search; p_sys->i_box_type = BOX_PLAYLIST; - return 1; + ReturnTrue; 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 ); if( psz_utf8 != NULL ) @@ -808,54 +967,68 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) } free( psz_utf8 ); } +#endif break; } } - if( p_sys->psz_old_search ) - { - free( p_sys->psz_old_search ); - p_sys->psz_old_search = NULL; - } + free( p_sys->psz_old_search ); + p_sys->psz_old_search = NULL; SearchPlaylist( p_intf, p_sys->psz_search_chain ); - return 1; + ReturnTrue; } else if( p_sys->i_box_type == BOX_OPEN && p_sys->psz_open_chain ) { int i_chain_len = strlen( p_sys->psz_open_chain ); - playlist_t *p_playlist = p_sys->p_playlist; switch( i_key ) { - case 0x0c: /* ^l */ + case KEY_CLEAR: + case 0x0c: /* ^l */ clear(); - return 1; + ReturnTrue; case KEY_ENTER: - case 0x0d: - if( p_playlist && i_chain_len > 0 ) + case '\r': + case '\n': + if( i_chain_len > 0 ) { - playlist_item_t *p_parent = p_sys->p_playlist->status.p_node; + playlist_item_t *p_parent = p_sys->p_node; + if( !p_parent ) - p_parent = p_sys->p_playlist->p_root_onelevel; + p_parent = p_playlist->status.p_node; + if( !p_parent ) + p_parent = p_playlist->p_local_onelevel; - while( p_parent->p_parent ) + while( p_parent->p_parent && p_parent->p_parent->p_parent ) p_parent = p_parent->p_parent; playlist_Add( p_playlist, p_sys->psz_open_chain, NULL, PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END, - p_parent == p_sys->p_playlist->p_root_onelevel - , VLC_FALSE ); - p_sys->b_box_plidx_follow = VLC_TRUE; + p_parent->p_input == + p_playlist->p_local_onelevel->p_input + , false ); + + p_sys->b_box_plidx_follow = true; } p_sys->i_box_type = BOX_PLAYLIST; - return 1; - case 0x1b: /* Esc. */ + ReturnTrue; + case 0x1b: /* ESC */ + if( wgetch( p_sys->w ) != ERR ) + ReturnFalse; p_sys->i_box_type = BOX_PLAYLIST; - return 1; + ReturnTrue; 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 ); if( psz_utf8 != NULL ) @@ -867,21 +1040,25 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) } free( psz_utf8 ); } +#endif break; } } - return 1; + ReturnTrue; } /* Common keys */ switch( i_key ) { + case 0x1b: /* ESC */ + if( wgetch( p_sys->w ) != ERR ) + ReturnFalse; case 'q': case 'Q': - case 0x1b: /* Esc */ + case KEY_EXIT: vlc_object_kill( p_intf->p_libvlc ); - return 0; + ReturnFalse; /* Box switching */ case 'i': @@ -890,32 +1067,49 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) else p_sys->i_box_type = BOX_INFO; p_sys->i_box_lines_total = 0; - return 1; + ReturnTrue; case 'm': if( p_sys->i_box_type == BOX_META ) p_sys->i_box_type = BOX_NONE; else p_sys->i_box_type = BOX_META; p_sys->i_box_lines_total = 0; - return 1; + ReturnTrue; case 'L': if( p_sys->i_box_type == BOX_LOG ) p_sys->i_box_type = BOX_NONE; else p_sys->i_box_type = BOX_LOG; - return 1; + ReturnTrue; case 'P': if( p_sys->i_box_type == BOX_PLAYLIST ) p_sys->i_box_type = BOX_NONE; else p_sys->i_box_type = BOX_PLAYLIST; - return 1; + ReturnTrue; case 'B': if( p_sys->i_box_type == BOX_BROWSE ) p_sys->i_box_type = BOX_NONE; else p_sys->i_box_type = BOX_BROWSE; - return 1; + ReturnTrue; + case 'x': + if( p_sys->i_box_type == BOX_OBJECTS ) + p_sys->i_box_type = BOX_NONE; + else + p_sys->i_box_type = BOX_OBJECTS; + ReturnTrue; + case 'S': + if( p_sys->i_box_type == BOX_STATS ) + p_sys->i_box_type = BOX_NONE; + else + p_sys->i_box_type = BOX_STATS; + ReturnTrue; + 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 ); + ReturnTrue; case 'h': case 'H': if( p_sys->i_box_type == BOX_HELP ) @@ -923,44 +1117,40 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) else p_sys->i_box_type = BOX_HELP; p_sys->i_box_lines_total = 0; - return 1; + ReturnTrue; case '/': if( p_sys->i_box_type != BOX_SEARCH ) { if( p_sys->psz_search_chain == NULL ) - { - return 1; - } + ReturnTrue; p_sys->psz_search_chain[0] = '\0'; - p_sys->b_box_plidx_follow = VLC_FALSE; + p_sys->b_box_plidx_follow = false; p_sys->i_before_search = p_sys->i_box_plidx; p_sys->i_box_type = BOX_SEARCH; } - return 1; + ReturnTrue; case 'A': /* Open */ if( p_sys->i_box_type != BOX_OPEN ) { if( p_sys->psz_open_chain == NULL ) - { - return 1; - } + ReturnTrue; p_sys->psz_open_chain[0] = '\0'; p_sys->i_box_type = BOX_OPEN; } - return 1; + ReturnTrue; /* Navigation */ case KEY_RIGHT: p_sys->f_slider += 1.0; if( p_sys->f_slider > 99.9 ) p_sys->f_slider = 99.9; ManageSlider( p_intf ); - return 1; + ReturnTrue; case KEY_LEFT: p_sys->f_slider -= 1.0; if( p_sys->f_slider < 0.0 ) p_sys->f_slider = 0.0; ManageSlider( p_intf ); - return 1; + ReturnTrue; /* Common control */ case 'f': @@ -979,104 +1169,91 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) } else { - playlist_t *p_playlist; - p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist ) - { - var_Get( p_playlist, "fullscreen", &val ); - val.b_bool = !val.b_bool; - var_Set( p_playlist, "fullscreen", val ); - vlc_object_release( p_playlist ); - } + var_Get( p_playlist, "fullscreen", &val ); + val.b_bool = !val.b_bool; + var_Set( p_playlist, "fullscreen", val ); } } - return 0; + ReturnFalse; } case ' ': PlayPause( p_intf ); - return 1; + ReturnTrue; case 's': - if( p_intf->p_sys->p_playlist ) - { - playlist_Stop( p_intf->p_sys->p_playlist ); - } - return 1; + playlist_Stop( p_playlist ); + ReturnTrue; case 'e': Eject( p_intf ); - return 1; + ReturnTrue; case '[': if( p_sys->p_input ) { - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_sys->p_input, "prev-title", val ); } - return 1; + ReturnTrue; case ']': if( p_sys->p_input ) { - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_sys->p_input, "next-title", val ); } - return 1; + ReturnTrue; case '<': if( p_sys->p_input ) { - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_sys->p_input, "prev-chapter", val ); } - return 1; + ReturnTrue; case '>': if( p_sys->p_input ) { - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_sys->p_input, "next-chapter", val ); } - return 1; + ReturnTrue; case 'p': - if( p_intf->p_sys->p_playlist ) - { - playlist_Prev( p_intf->p_sys->p_playlist ); - } + playlist_Prev( p_playlist ); clear(); - return 1; + ReturnTrue; case 'n': - if( p_intf->p_sys->p_playlist ) - { - playlist_Next( p_intf->p_sys->p_playlist ); - } + playlist_Next( p_playlist ); clear(); - return 1; + ReturnTrue; case 'a': aout_VolumeUp( p_intf, 1, NULL ); clear(); - return 1; + ReturnTrue; case 'z': aout_VolumeDown( p_intf, 1, NULL ); clear(); - return 1; + ReturnTrue; /* * ^l should clear and redraw the screen */ - case 0x0c: + case KEY_CLEAR: + case 0x0c: /* ^l */ clear(); - return 1; + ReturnTrue; default: - return 0; + ReturnFalse; } +#undef ReturnFalse +#undef ReturnTrue } static void ManageSlider( intf_thread_t *p_intf ) @@ -1167,33 +1344,46 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) char *p_buf = NULL; int i_len; + if( w <= 0 ) + return; + va_start( vl_args, p_fmt ); if( vasprintf( &p_buf, p_fmt, vl_args ) == -1 ) return; va_end( vl_args ); - if( ( p_buf == NULL ) || ( w <= 0 ) ) - return; - i_len = strlen( p_buf ); #ifdef HAVE_NCURSESW wchar_t psz_wide[i_len + 1]; - + EnsureUTF8( p_buf ); size_t i_char_len = mbstowcs( psz_wide, p_buf, i_len ); size_t i_width; /* number of columns */ if( i_char_len == (size_t)-1 ) - /* an invalid character was encountered */ - abort(); + /* an invalid character was encountered */ + { + free( p_buf ); + return; + } else { i_width = wcswidth( psz_wide, i_char_len ); if( i_width == (size_t)-1 ) + { /* a non printable character was encountered */ - abort(); + unsigned int i; + int i_cwidth; + i_width = 0; + for( i = 0 ; i < i_char_len ; i++ ) + { + i_cwidth = wcwidth( psz_wide[i] ); + if( i_cwidth != -1 ) + i_width += i_cwidth; + } + } } if( i_width > (size_t)w ) { @@ -1244,6 +1434,7 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) mvprintw( y, x, "%s", p_buf ); mvhline( y, x + i_width, ' ', w - i_width ); } + #else if( i_len > w ) { @@ -1274,6 +1465,7 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) mvhline( y, x + i_len, ' ', w - i_len ); } #endif + free( p_buf ); } static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt, ... ) { @@ -1292,49 +1484,65 @@ static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt return; va_end( vl_args ); - if( p_buf == NULL ) + mvnprintw( p_sys->i_box_y + l - p_sys->i_box_start, x, COLS - x - 1, "%s", p_buf ); + free( p_buf ); +} + +static void DumpObject( intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int i_level ) +{ + if( p_obj->psz_object_name ) + MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s \"%s\" (%d)", + p_obj->psz_object_type, p_obj->psz_object_name, + p_obj->i_object_id ); + else + MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s (%d)", + p_obj->psz_object_type, p_obj->i_object_id ); + + vlc_list_t *list = vlc_list_children( p_obj ); + for( int i = 0; i < list->i_count ; i++ ) { - return; + MainBoxWrite( p_intf, *l, 1 + 2 * i_level, + i == list->i_count - 1 ? "`-" : "|-" ); + DumpObject( p_intf, l, list->p_values[i].p_object, i_level + 1 ); } - - mvnprintw( p_sys->i_box_y + l - p_sys->i_box_start, x, COLS - x - 1, "%s", p_buf ); + vlc_list_release( list ); } static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { intf_sys_t *p_sys = p_intf->p_sys; input_thread_t *p_input = p_sys->p_input; + playlist_t *p_playlist = pl_Yield( p_intf ); int y = 0; int h; int y_end; - clear(); - /* Title */ attrset( A_REVERSE ); - int i_len = strlen( "VLC media player [ h for help ]" ); + int i_len = strlen( "VLC media player "PACKAGE_VERSION ); int mid = ( COLS - i_len ) / 2; if( mid < 0 ) mid = 0; int i_size = ( COLS > i_len + 1 ) ? COLS : i_len + 1; char psz_title[i_size]; memset( psz_title, ' ', mid ); - snprintf( &psz_title[mid], i_size, "VLC media player [ h for help ]" ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_TITLE, NULL ); + snprintf( &psz_title[mid], i_size, "VLC media player "PACKAGE_VERSION ); mvnprintw( y, 0, COLS, "%s", psz_title ); attroff( A_REVERSE ); y += 2; - /* Infos */ + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_STATUS, NULL ); - char psz_state[25]; - /* strlen( "[Repeat] [Random] [Loop]" ) == 24, + '\0' */ - psz_state[0] = '\0'; - if( var_GetBool( p_sys->p_playlist, "repeat" ) ) - strcat( psz_state, "[Repeat] " ); - if( var_GetBool( p_sys->p_playlist, "random" ) ) - strcat( psz_state, "[Random] " ); - if( var_GetBool( p_sys->p_playlist, "loop" ) ) - strcat( psz_state, "[Loop]" ); + /* Infos */ + char *psz_state; + if( asprintf( &psz_state, "%s%s%s", + var_GetBool( p_playlist, "repeat" ) ? _( "[Repeat] " ) : "", + var_GetBool( p_playlist, "random" ) ? _( "[Random] " ) : "", + var_GetBool( p_playlist, "loop" ) ? _( "[Loop]" ) : "" ) == -1 ) + psz_state = NULL; if( p_input && !p_input->b_dead ) { @@ -1345,26 +1553,30 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) /* Source */ char *psz_uri = input_item_GetURI( input_GetItem( p_input ) ); - mvnprintw( y++, 0, COLS, " Source : %s", psz_uri ); + mvnprintw( y++, 0, COLS, _(" Source : %s"), psz_uri ); free( psz_uri ); /* State */ var_Get( p_input, "state", &val ); if( val.i_int == PLAYING_S ) { - mvnprintw( y++, 0, COLS, " State : Playing %s", psz_state ); + mvnprintw( y++, 0, COLS, _(" State : Playing %s"), psz_state ); + } + else if( val.i_int == STOP_S ) + { + mvnprintw( y++, 0, COLS, _(" State : Stopped %s"), psz_state ); } else if( val.i_int == OPENING_S ) { - mvnprintw( y++, 0, COLS, " State : Opening/Connecting %s", psz_state ); + mvnprintw( y++, 0, COLS, _(" State : Opening/Connecting %s"), psz_state ); } else if( val.i_int == BUFFERING_S ) { - mvnprintw( y++, 0, COLS, " State : Buffering %s", psz_state ); + mvnprintw( y++, 0, COLS, _(" State : Buffering %s"), psz_state ); } else if( val.i_int == PAUSE_S ) { - mvnprintw( y++, 0, COLS, " State : Paused %s", psz_state ); + mvnprintw( y++, 0, COLS, _(" State : Paused %s"), psz_state ); } if( val.i_int != INIT_S && val.i_int != END_S ) @@ -1378,11 +1590,11 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) var_Get( p_input, "length", &val ); msecstotimestr( buf2, val.i_time / 1000 ); - mvnprintw( y++, 0, COLS, " Position : %s/%s (%.2f%%)", buf1, buf2, p_sys->f_slider ); + mvnprintw( y++, 0, COLS, _(" Position : %s/%s (%.2f%%)"), buf1, buf2, p_sys->f_slider ); /* Volume */ aout_VolumeGet( p_intf, &i_volume ); - mvnprintw( y++, 0, COLS, " Volume : %i%%", i_volume*200/AOUT_VOLUME_MAX ); + mvnprintw( y++, 0, COLS, _(" Volume : %i%%"), i_volume*200/AOUT_VOLUME_MAX ); /* Title */ if( !var_Get( p_input, "title", &val ) ) @@ -1390,7 +1602,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) var_Change( p_input, "title", VLC_VAR_GETCHOICES, &val_list, NULL ); if( val_list.p_list->i_count > 0 ) { - mvnprintw( y++, 0, COLS, " Title : %d/%d", val.i_int, val_list.p_list->i_count ); + mvnprintw( y++, 0, COLS, _(" Title : %d/%d"), val.i_int, val_list.p_list->i_count ); } var_Change( p_input, "title", VLC_VAR_FREELIST, &val_list, NULL ); } @@ -1401,7 +1613,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) var_Change( p_input, "chapter", VLC_VAR_GETCHOICES, &val_list, NULL ); if( val_list.p_list->i_count > 0 ) { - mvnprintw( y++, 0, COLS, " Chapter : %d/%d", val.i_int, val_list.p_list->i_count ); + mvnprintw( y++, 0, COLS, _(" Chapter : %d/%d"), val.i_int, val_list.p_list->i_count ); } var_Change( p_input, "chapter", VLC_VAR_FREELIST, &val_list, NULL ); } @@ -1413,13 +1625,16 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } else { - mvnprintw( y++, 0, COLS, "Source: %s", psz_state ); - DrawEmptyLine( p_sys->w, y++, 0, COLS ); + mvnprintw( y++, 0, COLS, _(" Source: %s"), psz_state ); DrawEmptyLine( p_sys->w, y++, 0, COLS ); + mvnprintw( y++, 0, COLS, _(" [ h for help ]") ); DrawEmptyLine( p_sys->w, y++, 0, COLS ); } + free( psz_state ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); - DrawBox( p_sys->w, y, 0, 3, COLS, "" ); + DrawBox( p_sys->w, y, 0, 3, COLS, "", p_sys->b_color ); 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)) ); y += 3; @@ -1434,60 +1649,94 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { /* Help box */ int l = 0; - DrawBox( p_sys->w, y++, 0, h, COLS, " Help " ); - - MainBoxWrite( p_intf, l++, 1, "[Display]" ); - MainBoxWrite( p_intf, l++, 1, " h,H Show/Hide help box" ); - MainBoxWrite( p_intf, l++, 1, " i Show/Hide info box" ); - MainBoxWrite( p_intf, l++, 1, " m Show/Hide metadata box" ); - MainBoxWrite( p_intf, l++, 1, " L Show/Hide messages box" ); - MainBoxWrite( p_intf, l++, 1, " P Show/Hide playlist box" ); - MainBoxWrite( p_intf, l++, 1, " B Show/Hide filebrowser" ); + DrawBox( p_sys->w, y++, 0, h, COLS, _(" Help "), p_sys->b_color ); + + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l++, 1, _("[Display]") ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l++, 1, _(" h,H Show/Hide help box") ); + MainBoxWrite( p_intf, l++, 1, _(" i Show/Hide info box") ); + MainBoxWrite( p_intf, l++, 1, _(" m Show/Hide metadata box") ); + MainBoxWrite( p_intf, l++, 1, _(" L Show/Hide messages box") ); + MainBoxWrite( p_intf, l++, 1, _(" P Show/Hide playlist box") ); + MainBoxWrite( p_intf, l++, 1, _(" B Show/Hide filebrowser") ); + MainBoxWrite( p_intf, l++, 1, _(" x Show/Hide objects box") ); + MainBoxWrite( p_intf, l++, 1, _(" S Show/Hide statistics box" ) ); + MainBoxWrite( p_intf, l++, 1, _(" c Switch color on/off") ); + MainBoxWrite( p_intf, l++, 1, _(" Esc Close Add/Search entry") ); MainBoxWrite( p_intf, l++, 1, "" ); - MainBoxWrite( p_intf, l++, 1, "[Global]" ); - MainBoxWrite( p_intf, l++, 1, " q, Q Quit" ); - MainBoxWrite( p_intf, l++, 1, " s Stop" ); - MainBoxWrite( p_intf, l++, 1, " Pause/Play" ); - MainBoxWrite( p_intf, l++, 1, " f Toggle Fullscreen" ); - MainBoxWrite( p_intf, l++, 1, " n, p Next/Previous playlist item" ); - MainBoxWrite( p_intf, l++, 1, " [, ] Next/Previous title" ); - MainBoxWrite( p_intf, l++, 1, " <, > Next/Previous chapter" ); - MainBoxWrite( p_intf, l++, 1, " Seek +1%%" ); - MainBoxWrite( p_intf, l++, 1, " Seek -1%%" ); - MainBoxWrite( p_intf, l++, 1, " a Volume Up" ); - MainBoxWrite( p_intf, l++, 1, " z Volume Down" ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l++, 1, _("[Global]") ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l++, 1, _(" q, Q, Esc Quit") ); + MainBoxWrite( p_intf, l++, 1, _(" s Stop") ); + MainBoxWrite( p_intf, l++, 1, _(" Pause/Play") ); + MainBoxWrite( p_intf, l++, 1, _(" f Toggle Fullscreen") ); + MainBoxWrite( p_intf, l++, 1, _(" n, p Next/Previous playlist item") ); + MainBoxWrite( p_intf, l++, 1, _(" [, ] Next/Previous title") ); + MainBoxWrite( p_intf, l++, 1, _(" <, > Next/Previous chapter") ); + MainBoxWrite( p_intf, l++, 1, _(" Seek +1%%") ); + MainBoxWrite( p_intf, l++, 1, _(" Seek -1%%") ); + MainBoxWrite( p_intf, l++, 1, _(" a Volume Up") ); + MainBoxWrite( p_intf, l++, 1, _(" z Volume Down") ); MainBoxWrite( p_intf, l++, 1, "" ); - MainBoxWrite( p_intf, l++, 1, "[Playlist]" ); - MainBoxWrite( p_intf, l++, 1, " r Toggle Random playing" ); - MainBoxWrite( p_intf, l++, 1, " l Toggle Loop Playlist" ); - MainBoxWrite( p_intf, l++, 1, " R Toggle Repeat item" ); - MainBoxWrite( p_intf, l++, 1, " o Order Playlist by title" ); - MainBoxWrite( p_intf, l++, 1, " O Reverse order Playlist by title" ); - MainBoxWrite( p_intf, l++, 1, " / Look for an item" ); - MainBoxWrite( p_intf, l++, 1, " A Add an entry" ); - MainBoxWrite( p_intf, l++, 1, " D, Delete an entry" ); - MainBoxWrite( p_intf, l++, 1, " Delete an entry" ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l++, 1, _("[Playlist]") ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l++, 1, _(" r Toggle Random playing") ); + MainBoxWrite( p_intf, l++, 1, _(" l Toggle Loop Playlist") ); + MainBoxWrite( p_intf, l++, 1, _(" R Toggle Repeat item") ); + MainBoxWrite( p_intf, l++, 1, _(" o Order Playlist by title") ); + MainBoxWrite( p_intf, l++, 1, _(" O Reverse order Playlist by title") ); + MainBoxWrite( p_intf, l++, 1, _(" g Go to the current playing item") ); + MainBoxWrite( p_intf, l++, 1, _(" / Look for an item") ); + MainBoxWrite( p_intf, l++, 1, _(" A Add an entry") ); + MainBoxWrite( p_intf, l++, 1, _(" D, Delete an entry") ); + MainBoxWrite( p_intf, l++, 1, _(" Delete an entry") ); + MainBoxWrite( p_intf, l++, 1, _(" e Eject (if stopped)") ); MainBoxWrite( p_intf, l++, 1, "" ); - MainBoxWrite( p_intf, l++, 1, "[Filebrowser]" ); - MainBoxWrite( p_intf, l++, 1, " Add the selected file to the playlist" ); - MainBoxWrite( p_intf, l++, 1, " Add the selected directory to the playlist" ); - MainBoxWrite( p_intf, l++, 1, " . Show/Hide hidden files" ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l++, 1, _("[Filebrowser]") ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l++, 1, _(" Add the selected file to the playlist") ); + MainBoxWrite( p_intf, l++, 1, _(" Add the selected directory to the playlist") ); + MainBoxWrite( p_intf, l++, 1, _(" . Show/Hide hidden files") ); MainBoxWrite( p_intf, l++, 1, "" ); - MainBoxWrite( p_intf, l++, 1, "[Boxes]" ); - MainBoxWrite( p_intf, l++, 1, " , Navigate through the box line by line" ); - MainBoxWrite( p_intf, l++, 1, " , Navigate through the box page by page" ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l++, 1, _("[Boxes]") ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l++, 1, _(" , Navigate through the box line by line") ); + MainBoxWrite( p_intf, l++, 1, _(" , Navigate through the box page by page") ); MainBoxWrite( p_intf, l++, 1, "" ); - MainBoxWrite( p_intf, l++, 1, "[Player]" ); - MainBoxWrite( p_intf, l++, 1, " , Seek +/-5%%" ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l++, 1, _("[Player]") ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l++, 1, _(" , Seek +/-5%%") ); MainBoxWrite( p_intf, l++, 1, "" ); - MainBoxWrite( p_intf, l++, 1, "[Miscellaneous]" ); - MainBoxWrite( p_intf, l++, 1, " Ctrl-l Refresh the screen" ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l++, 1, _("[Miscellaneous]") ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l++, 1, _(" Ctrl-l Refresh the screen") ); p_sys->i_box_lines_total = l; if( p_sys->i_box_start >= p_sys->i_box_lines_total ) @@ -1508,7 +1757,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { /* Info box */ int l = 0; - DrawBox( p_sys->w, y++, 0, h, COLS, " Information " ); + DrawBox( p_sys->w, y++, 0, h, COLS, _(" Information "), p_sys->b_color ); if( p_input ) { @@ -1518,19 +1767,23 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { info_category_t *p_category = input_GetItem(p_input)->pp_categories[i]; if( y >= y_end ) break; - MainBoxWrite( p_intf, l++, 1, " [%s]", p_category->psz_name ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l++, 1, _(" [%s]"), p_category->psz_name ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); for( j = 0; j < p_category->i_infos; j++ ) { info_t *p_info = p_category->pp_infos[j]; if( y >= y_end ) break; - MainBoxWrite( p_intf, l++, 1, " %s: %s", p_info->psz_name, p_info->psz_value ); + MainBoxWrite( p_intf, l++, 1, _(" %s: %s"), p_info->psz_name, p_info->psz_value ); } } vlc_mutex_unlock( &input_GetItem(p_input)->lock ); } else { - MainBoxWrite( p_intf, l++, 1, "No item currently playing" ); + MainBoxWrite( p_intf, l++, 1, _("No item currently playing") ); } p_sys->i_box_lines_total = l; if( p_sys->i_box_start >= p_sys->i_box_lines_total ) @@ -1552,14 +1805,8 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) /* Meta data box */ int l = 0; - int i_len = strlen( VLC_META_INFO_CAT ); - char psz_title[i_len + 3]; - psz_title[0] = ' '; - psz_title[1] = '\0'; - strcat( &psz_title[1], VLC_META_INFO_CAT ); - psz_title[i_len + 1] = ' '; - psz_title[i_len + 2] = '\0'; - DrawBox( p_sys->w, y++, 0, h, COLS, psz_title ); + DrawBox( p_sys->w, y++, 0, h, COLS, _("Meta-information"), + p_sys->b_color ); if( p_input ) { @@ -1584,9 +1831,9 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) case 3: psz_meta_title = VLC_META_COPYRIGHT; break; case 4: - psz_meta_title = VLC_META_COLLECTION; break; + psz_meta_title = VLC_META_ALBUM; break; case 5: - psz_meta_title = VLC_META_SEQ_NUM; break; + psz_meta_title = VLC_META_TRACK_NUMBER; break; case 6: psz_meta_title = VLC_META_DESCRIPTION; break; case 7: @@ -1612,7 +1859,11 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) default: 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 ); } } @@ -1620,7 +1871,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } else { - MainBoxWrite( p_intf, l++, 1, "No item currently playing" ); + MainBoxWrite( p_intf, l++, 1, _("No item currently playing") ); } p_sys->i_box_lines_total = l; if( p_sys->i_box_start >= p_sys->i_box_lines_total ) @@ -1643,7 +1894,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) int i_stop; int i_start; - DrawBox( p_sys->w, y++, 0, h, COLS, " Logs " ); + DrawBox( p_sys->w, y++, 0, h, COLS, _(" Logs "), p_sys->b_color ); i_start = p_intf->p_sys->p_sub->i_start; @@ -1665,9 +1916,15 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { 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 ); } vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); @@ -1680,7 +1937,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) /* Filebrowser box */ int i_start, i_stop; int i_item; - DrawBox( p_sys->w, y++, 0, h, COLS, " Browse " ); + DrawBox( p_sys->w, y++, 0, h, COLS, _(" 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; if( p_sys->i_box_bidx < 0 ) p_sys->i_box_bidx = 0; @@ -1711,15 +1968,20 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) for( i_item = i_start; i_item < i_stop; i_item++ ) { - vlc_bool_t b_selected = ( p_sys->i_box_bidx == i_item ); + bool b_selected = ( p_sys->i_box_bidx == i_item ); if( y >= y_end ) break; if( b_selected ) { attrset( A_REVERSE ); } - mvnprintw( y++, 1, COLS - 2, " %c %s", p_sys->pp_dir_entries[i_item]->b_file == VLC_TRUE ? ' ' : '+', + 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 == 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 ) { attroff( A_REVERSE ); @@ -1727,9 +1989,136 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } } - else if( ( p_sys->i_box_type == BOX_PLAYLIST || + else if( p_sys->i_box_type == BOX_OBJECTS ) + { + int l = 0; + DrawBox( p_sys->w, y++, 0, h, COLS, _(" Objects "), p_sys->b_color ); + DumpObject( p_intf, &l, VLC_OBJECT( p_intf->p_libvlc ), 0 ); + + p_sys->i_box_lines_total = l; + if( p_sys->i_box_start >= p_sys->i_box_lines_total ) + p_sys->i_box_start = p_sys->i_box_lines_total - 1; + + if( l - p_sys->i_box_start < p_sys->i_box_lines ) + y += l - p_sys->i_box_start; + else + y += p_sys->i_box_lines; + } + else if( p_sys->i_box_type == BOX_STATS ) + { + DrawBox( p_sys->w, y++, 0, h, COLS, _(" Stats "), p_sys->b_color ); + + if( p_input ) + { + input_item_t *p_item = input_GetItem( p_input ); + assert( p_item ); + vlc_mutex_lock( &p_item->lock ); + vlc_mutex_lock( &p_item->p_stats->lock ); + + int i_audio = 0; + int i_video = 0; + int i; + + if( !p_item->i_es ) + i_video = i_audio = 1; + else + for( i = 0; i < p_item->i_es ; i++ ) + { + i_audio += ( p_item->es[i]->i_cat == AUDIO_ES ); + i_video += ( p_item->es[i]->i_cat == VIDEO_ES ); + } + + int l = 0; + +#define SHOW_ACS(x,c) \ + if(l >= p_sys->i_box_start && l - p_sys->i_box_start < p_sys->i_box_lines) \ + mvaddch( p_sys->i_box_y - p_sys->i_box_start + l, x, c ) + + /* Input */ + if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l, 1, _("+-[Incoming]")); + SHOW_ACS( 1, ACS_ULCORNER ); SHOW_ACS( 2, ACS_HLINE ); l++; + if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l, 1, _("| input bytes read : %8.0f kB"), + (float)(p_item->p_stats->i_read_bytes)/1000 ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| input bitrate : %6.0f kb/s"), + (float)(p_item->p_stats->f_input_bitrate)*8000 ); + MainBoxWrite( p_intf, l, 1, _("| demux bytes read : %8.0f kB"), + (float)(p_item->p_stats->i_demux_read_bytes)/1000 ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| demux bitrate : %6.0f kb/s"), + (float)(p_item->p_stats->f_demux_bitrate)*8000 ); + SHOW_ACS( 1, ACS_VLINE ); l++; SHOW_ACS( 1, ACS_VLINE ); l++; + + /* Video */ + if( i_video ) + { + if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l, 1, _("+-[Video Decoding]")); + SHOW_ACS( 1, ACS_LTEE ); SHOW_ACS( 2, ACS_HLINE ); l++; + if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l, 1, _("| video decoded : %5i"), + p_item->p_stats->i_decoded_video ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| frames displayed : %5i"), + p_item->p_stats->i_displayed_pictures ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| frames lost : %5i"), + p_item->p_stats->i_lost_pictures ); + SHOW_ACS( 1, ACS_VLINE ); l++; SHOW_ACS( 1, ACS_VLINE ); l++; + } + /* Audio*/ + if( i_audio ) + { + if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l, 1, _("+-[Audio Decoding]")); + SHOW_ACS( 1, ACS_LTEE ); SHOW_ACS( 2, ACS_HLINE ); l++; + if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l, 1, _("| audio decoded : %5i"), + p_item->p_stats->i_decoded_audio ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| buffers played : %5i"), + p_item->p_stats->i_played_abuffers ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| buffers lost : %5i"), + p_item->p_stats->i_lost_abuffers ); + SHOW_ACS( 1, ACS_VLINE ); l++; SHOW_ACS( 1, ACS_VLINE ); l++; + } + /* Sout */ + if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l, 1, _("+-[Streaming]")); + SHOW_ACS( 1, ACS_LTEE ); SHOW_ACS( 2, ACS_HLINE ); l++; + if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l, 1, _("| packets sent : %5i"), p_item->p_stats->i_sent_packets ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| bytes sent : %8.0f kB"), + (float)(p_item->p_stats->i_sent_bytes)/1000 ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("\\ sending bitrate : %6.0f kb/s"), + (float)(p_item->p_stats->f_send_bitrate*8)*1000 ); + SHOW_ACS( 1, ACS_LLCORNER ); l++; + if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); + +#undef SHOW_ACS + + p_sys->i_box_lines_total = l; + if( p_sys->i_box_start >= p_sys->i_box_lines_total ) + p_sys->i_box_start = p_sys->i_box_lines_total - 1; + + if( l - p_sys->i_box_start < p_sys->i_box_lines ) + y += l - p_sys->i_box_start; + else + y += p_sys->i_box_lines; + + vlc_mutex_unlock( &p_item->p_stats->lock ); + vlc_mutex_unlock( &p_item->lock ); + + } + } + else if( p_sys->i_box_type == BOX_PLAYLIST || p_sys->i_box_type == BOX_SEARCH || - p_sys->i_box_type == BOX_OPEN ) && p_sys->p_playlist ) + p_sys->i_box_type == BOX_OPEN ) { /* Playlist box */ int i_start, i_stop, i_max = p_sys->i_plist_entries; @@ -1739,16 +2128,17 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) switch( p_sys->i_current_view ) { case VIEW_ONELEVEL: - psz_title = strdup( " Playlist (All, one level) " ); + psz_title = strdup( _(" Playlist (All, one level) ") ); break; case VIEW_CATEGORY: - psz_title = strdup( " Playlist (By category) " ); + psz_title = strdup( _(" Playlist (By category) ") ); break; default: - psz_title = strdup( " Playlist (Manually added) " ); + psz_title = strdup( _(" Playlist (Manually added) ") ); } - DrawBox( p_sys->w, y++, 0, h, COLS, psz_title ); + DrawBox( p_sys->w, y++, 0, h, COLS, psz_title, p_sys->b_color ); + free( psz_title ); if( p_sys->b_need_update || p_sys->pp_plist == NULL ) { @@ -1789,17 +2179,29 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) for( i_item = i_start; i_item < i_stop; i_item++ ) { - vlc_bool_t b_selected = ( p_sys->i_box_plidx == i_item ); - int c = ( PlaylistIsPlaying( p_intf, - p_sys->pp_plist[i_item]->p_item ) ) ? '>' : ' '; + bool b_selected = ( p_sys->i_box_plidx == i_item ); + playlist_item_t *p_item = p_sys->pp_plist[i_item]->p_item; + playlist_item_t *p_node = p_sys->p_node; + int c = ' '; + if( ( p_node && p_item->p_input == p_node->p_input ) || + ( !p_node && p_item->p_input == + p_playlist->status.p_node->p_input ) ) + c = '*'; + else if( p_item == p_node || ( p_item != p_node && + PlaylistIsPlaying( p_intf, p_item ) ) ) + c = '>'; if( y >= y_end ) break; if( b_selected ) { 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 ) { attroff( A_REVERSE ); @@ -1820,11 +2222,11 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) p_sys->psz_old_search != NULL ) { /* Searching next entry */ - mvnprintw( 7, 1, COLS-2, "Find: %s", p_sys->psz_old_search ); + mvnprintw( 7, 1, COLS-2, _("Find: %s"), p_sys->psz_old_search ); } else { - mvnprintw( 7, 1, COLS-2, "Find: %s", p_sys->psz_search_chain ); + mvnprintw( 7, 1, COLS-2, _("Find: %s"), p_sys->psz_search_chain ); } } } @@ -1833,7 +2235,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) if( p_sys->psz_open_chain ) { DrawEmptyLine( p_sys->w, 7, 1, COLS-2 ); - mvnprintw( 7, 1, COLS-2, "Open: %s", p_sys->psz_open_chain ); + mvnprintw( 7, 1, COLS-2, _("Open: %s"), p_sys->psz_open_chain ); } } @@ -1845,38 +2247,33 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) refresh(); *t_last_refresh = time( 0 ); + vlc_object_release( p_playlist ); } static playlist_item_t *PlaylistGetRoot( intf_thread_t *p_intf ) { intf_sys_t *p_sys = p_intf->p_sys; - playlist_t *p_playlist = p_sys->p_playlist; - - if( p_playlist == NULL ) - { - return NULL; - } + playlist_t *p_playlist = pl_Yield( p_intf ); + playlist_item_t *p_item; switch( p_sys->i_current_view ) { case VIEW_CATEGORY: - return p_playlist->p_root_category; + p_item = p_playlist->p_root_category; + break; default: - return p_playlist->p_root_onelevel; + p_item = p_playlist->p_root_onelevel; } + vlc_object_release( p_playlist ); + return p_item; } static void PlaylistRebuild( intf_thread_t *p_intf ) { intf_sys_t *p_sys = p_intf->p_sys; - playlist_t *p_playlist = p_sys->p_playlist; - - if( p_playlist == NULL ) - { - return; - } + playlist_t *p_playlist = pl_Yield( p_intf ); - vlc_mutex_lock( &p_playlist->object_lock ); + PL_LOCK; /* First clear the old one */ PlaylistDestroy( p_intf ); @@ -1884,9 +2281,11 @@ static void PlaylistRebuild( intf_thread_t *p_intf ) /* Build the new one */ PlaylistAddNode( p_intf, PlaylistGetRoot( p_intf ), 0, "" ); - p_sys->b_need_update = VLC_FALSE; + p_sys->b_need_update = false; + + PL_UNLOCK; - vlc_mutex_unlock( &p_playlist->object_lock ); + vlc_object_release( p_playlist ); } static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node, @@ -1894,63 +2293,73 @@ static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node, { intf_sys_t *p_sys = p_intf->p_sys; playlist_item_t *p_child; - char *psz_tmp; int k; - psz_tmp = (char *)malloc( strlen( c ) + 4 ); - if( psz_tmp == NULL ) return; for( k = 0; k < p_node->i_children; k++ ) { - struct pl_item_t *p_pl_item; - char *buff; - int i_size; - + char *psz_display; p_child = p_node->pp_children[k]; - i_size = strlen( c ) + strlen( p_child->p_input->psz_name ) + 4; - buff = (char *)malloc( sizeof( char ) * i_size ); - p_pl_item = (struct pl_item_t *)malloc( sizeof( struct pl_item_t ) ); - if( p_pl_item == NULL || buff == NULL ) return; + char *psz_name = input_item_GetTitle( p_child->p_input ); + if( !psz_name || !*psz_name ) + { + free( psz_name ); + psz_name = input_item_GetName( p_child->p_input ); + } - if( strlen( c ) ) + if( c && *c ) { - sprintf( buff, "%s%c-%s", c, k == p_node->i_children - 1 ? - '`' : '|', p_child->p_input->psz_name ); + if( asprintf( &psz_display, "%s%c-%s", c, + k == p_node->i_children - 1 ? '`' : '|', psz_name ) == -1 ) + return; } else { - sprintf( buff, " %s", p_child->p_input->psz_name ); + if( asprintf( &psz_display, " %s", psz_name ) == -1 ) + return; } - p_pl_item->psz_display = strdup( buff ); + free( psz_name ); + struct pl_item_t *p_pl_item = malloc( sizeof( struct pl_item_t ) ); + if( !p_pl_item ) + return; + p_pl_item->psz_display = psz_display; p_pl_item->p_item = p_child; INSERT_ELEM( p_sys->pp_plist, p_sys->i_plist_entries, p_sys->i_plist_entries, p_pl_item ); - free( buff ); i++; if( p_child->i_children > 0 ) { - sprintf( psz_tmp, "%s%c ", c, - k == p_node->i_children - 1 ? ' ' : '|' ); + char *psz_tmp; + if( asprintf( &psz_tmp, "%s%c ", c, + k == p_node->i_children - 1 ? ' ' : '|' ) == -1 ) + return; PlaylistAddNode( p_intf, p_child, i, strlen( c ) ? psz_tmp : " " ); + free( psz_tmp ); } } - free( psz_tmp ); } static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, vlc_value_t oval, vlc_value_t nval, void *param ) { + VLC_UNUSED(p_this); VLC_UNUSED(psz_variable); + VLC_UNUSED(oval); VLC_UNUSED(nval); intf_thread_t *p_intf = (intf_thread_t *)param; - p_intf->p_sys->b_need_update = VLC_TRUE; + playlist_t *p_playlist = pl_Yield( p_intf ); + p_intf->p_sys->b_need_update = true; + p_intf->p_sys->p_node = p_playlist->status.p_node; + vlc_object_release( p_playlist ); return VLC_SUCCESS; } /* Playlist suxx */ -static inline vlc_bool_t PlaylistIsPlaying( intf_thread_t *p_intf, +static inline bool PlaylistIsPlaying( intf_thread_t *p_intf, playlist_item_t *p_item ) { - playlist_item_t *p_played_item = p_intf->p_sys->p_playlist->status.p_item; + playlist_t *p_playlist = pl_Yield( p_intf ); + playlist_item_t *p_played_item = p_playlist->status.p_item; + vlc_object_release( p_playlist ); return( p_item != NULL && p_played_item != NULL && p_item->p_input != NULL && p_played_item->p_input != NULL && p_item->p_input->i_id == p_played_item->p_input->i_id ); @@ -1961,17 +2370,19 @@ static void FindIndex( intf_thread_t *p_intf ) intf_sys_t *p_sys = p_intf->p_sys; int i; - if( p_sys->i_box_plidx < p_sys->i_plist_entries && - p_sys->i_box_plidx >= 0 && - PlaylistIsPlaying( p_intf, - p_sys->pp_plist[p_sys->i_box_plidx]->p_item ) ) + if( p_sys->i_box_plidx < p_sys->i_plist_entries && p_sys->i_box_plidx >= 0 ) { - return; + playlist_item_t *p_item = p_sys->pp_plist[p_sys->i_box_plidx]->p_item; + if( ( p_item->i_children == 0 && p_item == p_sys->p_node ) || + PlaylistIsPlaying( p_intf, p_item ) ) + return; } for( i = 0; i < p_sys->i_plist_entries; i++ ) { - if( PlaylistIsPlaying( p_intf, p_sys->pp_plist[i]->p_item ) ) + playlist_item_t *p_item = p_sys->pp_plist[i]->p_item; + if( ( p_item->i_children == 0 && p_item == p_sys->p_node ) || + PlaylistIsPlaying( p_intf, p_sys->pp_plist[i]->p_item ) ) { p_sys->i_box_plidx = i; break; @@ -1982,17 +2393,15 @@ static void FindIndex( intf_thread_t *p_intf ) static void PlaylistDestroy( intf_thread_t *p_intf ) { intf_sys_t *p_sys = p_intf->p_sys; - int i; - for( i = 0; i < p_sys->i_plist_entries; i++ ) + while( p_sys->i_plist_entries ) { - struct pl_item_t *p_pl_item = p_sys->pp_plist[i]; + struct pl_item_t *p_pl_item = p_sys->pp_plist[0]; free( p_pl_item->psz_display ); - REMOVE_ELEM( p_sys->pp_plist, p_sys->i_plist_entries, i ); + REMOVE_ELEM( p_sys->pp_plist, p_sys->i_plist_entries, 0 ); free( p_pl_item ); } p_sys->pp_plist = NULL; - p_sys->i_plist_entries = 0; } static void Eject( intf_thread_t *p_intf ) @@ -2005,19 +2414,12 @@ static void Eject( intf_thread_t *p_intf ) * If it's neither of these, then return */ - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - - if( p_playlist == NULL ) - { - return; - } - - vlc_mutex_lock( &p_playlist->object_lock ); + playlist_t * p_playlist = pl_Yield( p_intf ); + PL_LOCK; if( p_playlist->status.p_item == NULL ) { - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; vlc_object_release( p_playlist ); return; } @@ -2074,8 +2476,7 @@ static void Eject( intf_thread_t *p_intf ) } } - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); + PL_UNLOCK; if( psz_device == NULL ) { @@ -2101,7 +2502,8 @@ static void Eject( intf_thread_t *p_intf ) intf_Eject( p_intf, psz_device ); } - free(psz_device); + free( psz_device ); + vlc_object_release( p_playlist ); return; } @@ -2162,7 +2564,7 @@ static void ReadDir( intf_thread_t *p_intf ) strlen( psz_entry ) + 2; char *psz_uri; - if( p_sys->b_show_hidden_files == VLC_FALSE && + if( p_sys->b_show_hidden_files == false && ( strlen( psz_entry ) && psz_entry[0] == '.' ) && strcmp( psz_entry, ".." ) ) { @@ -2190,14 +2592,14 @@ static void ReadDir( intf_thread_t *p_intf ) #endif { p_dir_entry->psz_path = strdup( psz_entry ); - p_dir_entry->b_file = VLC_FALSE; + p_dir_entry->b_file = false; INSERT_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, p_sys->i_dir_entries, p_dir_entry ); } else { p_dir_entry->psz_path = strdup( psz_entry ); - p_dir_entry->b_file = VLC_TRUE; + p_dir_entry->b_file = true; INSERT_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, p_sys->i_dir_entries, p_dir_entry ); } @@ -2223,6 +2625,7 @@ static void ReadDir( intf_thread_t *p_intf ) static void PlayPause( intf_thread_t *p_intf ) { input_thread_t *p_input = p_intf->p_sys->p_input; + playlist_t *p_playlist = pl_Yield( p_intf ); vlc_value_t val; if( p_input ) @@ -2238,22 +2641,24 @@ static void PlayPause( intf_thread_t *p_intf ) } var_Set( p_input, "state", val ); } - else if( p_intf->p_sys->p_playlist ) - { - playlist_Play( p_intf->p_sys->p_playlist ); - } + else + playlist_Play( p_playlist ); + + vlc_object_release( p_playlist ); } /**************************************************************************** * ****************************************************************************/ -static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title ) +static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title, bool b_color ) { int i; int i_len; if( w > 3 && h > 2 ) { + if( b_color ) + wcolor_set( win, C_BOX, NULL ); if( title == NULL ) title = ""; i_len = strlen( title ); @@ -2274,6 +2679,8 @@ static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title mvwaddch( win, y+h-1, x, ACS_LLCORNER ); 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 ); } } @@ -2281,7 +2688,7 @@ static void DrawEmptyLine( WINDOW *win, int y, int x, int w ) { if( w > 0 ) { - mvhline( y, x, ' ', w ); + mvwhline( win, y, x, ' ', w ); } } @@ -2290,7 +2697,7 @@ static void DrawLine( WINDOW *win, int y, int x, int w ) if( w > 0 ) { attrset( A_REVERSE ); - mvhline( y, x, ' ', w ); + mvwhline( win, y, x, ' ', w ); attroff( A_REVERSE ); } }