X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=e1f190a3f503a6562d79d8d8ae4b0517c3f05797;hb=1fd11f79ab5c45fd63daeb99a4953686eed0736f;hp=6b3a5a331e25f12682cf379660f8ffca94b931d8;hpb=0eee76217926fb5a2ea884a79143843a5d953fce;p=vlc diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index 6b3a5a331e..e1f190a3f5 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -1,13 +1,14 @@ /***************************************************************************** - * ncurses.c : NCurses plugin for vlc + * ncurses.c : NCurses interface for vlc ***************************************************************************** - * Copyright (C) 2001-2004 VideoLAN + * Copyright © 2001-2007 the VideoLAN team * $Id$ * * Authors: Sam Hocevar * Laurent Aimar * Yoann Peronneau * Derk-Jan Hartman + * Rafaël Carré * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,43 +22,46 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * 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 /* malloc(), free() */ -#include -#include /* ENOMEM */ -#include -#include - -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include -#include -#include -#include +#include +#include -#ifdef HAVE_SYS_STAT_H -# include -#endif -#if (!defined( WIN32 ) || defined(__MINGW32__)) -/* Mingw has its own version of dirent */ -# include +#ifdef HAVE_NCURSESW +# define _XOPEN_SOURCE_EXTENDED 1 +# include #endif -#ifdef HAVE_CDDAX -#define CDDA_MRL "cddax://" -#else -#define CDDA_MRL "cdda://" -#endif +#include -#ifdef HAVE_VCDX -#define VCD_MRL "vcdx://" -#else -#define VCD_MRL "vcdx://" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#ifdef HAVE_SYS_STAT_H +# include #endif #define SEARCH_CHAIN_SIZE 20 @@ -75,16 +79,23 @@ static void Eject ( intf_thread_t * ); static int HandleKey ( intf_thread_t *, int ); static void Redraw ( intf_thread_t *, time_t * ); + +static playlist_item_t *PlaylistGetRoot( intf_thread_t * ); static void PlaylistRebuild( intf_thread_t * ); -static void PlaylistAddNode( intf_thread_t *, playlist_item_t *, int, char *); +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 void FindIndex ( intf_thread_t * ); +static inline bool PlaylistIsPlaying( playlist_t *, playlist_item_t * ); +static void FindIndex ( intf_thread_t *, playlist_t * ); static void SearchPlaylist ( intf_thread_t *, char * ); +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 *****************************************************************************/ @@ -94,15 +105,16 @@ static void ReadDir ( intf_thread_t * ); "This option allows you to specify the directory the ncurses filebrowser " \ "will show you initially.") -vlc_module_begin(); - set_description( _("ncurses interface") ); - set_capability( "interface", 10 ); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_GENERAL ); - set_callbacks( Open, Close ); - add_shortcut( "curses" ); - add_directory( "browse-dir", NULL, NULL, BROWSE_TEXT, BROWSE_LONGTEXT, VLC_FALSE ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "Ncurses" ) + 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, false ) +vlc_module_end () /***************************************************************************** * intf_sys_t: description and status of ncurses interface @@ -116,11 +128,35 @@ enum BOX_PLAYLIST, BOX_SEARCH, BOX_OPEN, - BOX_BROWSE + BOX_BROWSE, + 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 +{ + VIEW_CATEGORY, + VIEW_ONELEVEL }; struct dir_entry_t { - vlc_bool_t b_file; + bool b_file; char *psz_path; }; struct pl_item_t @@ -130,8 +166,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; @@ -146,9 +185,10 @@ struct intf_sys_t int i_box_plidx; /* Playlist index */ int b_box_plidx_follow; - playlist_item_t *p_plnode; /* Playlist node */ 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 */ @@ -158,18 +198,22 @@ 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; + 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 */ }; -static void DrawBox( WINDOW *win, int y, int x, int h, int w, 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 ); @@ -180,11 +224,12 @@ static int Open( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; intf_sys_t *p_sys; - vlc_value_t val; /* 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; @@ -192,15 +237,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->p_plnode = NULL; p_sys->i_box_bidx = 0; - p_sys->p_sub = msg_Subscribe( p_intf ); +// FIXME 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(); @@ -208,49 +262,46 @@ 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(); /* exported function */ p_intf->pf_run = Run; - /* Set quiet mode */ - val.i_int = -1; - var_Set( p_intf->p_vlc, "verbose", val ); + /* Stop printing errors to the console */ + freopen( "/dev/null", "wb", stderr ); /* Set defaul playlist view */ - p_sys->i_current_view = VIEW_SIMPLE; + 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 ); + p_sys->psz_search_chain = malloc( SEARCH_CHAIN_SIZE + 1 ); p_sys->psz_old_search = NULL; p_sys->i_before_search = 0; /* Initialize open chain */ - p_sys->psz_open_chain = (char *)malloc( OPEN_CHAIN_SIZE + 1 ); + p_sys->psz_open_chain = malloc( OPEN_CHAIN_SIZE + 1 ); /* Initialize browser options */ - var_Create( p_intf, "browse-dir", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Get( p_intf, "browse-dir", &val); - - if( val.psz_string && *val.psz_string ) - { - p_sys->psz_current_dir = strdup( val.psz_string); - free( val.psz_string ); - } + char* psz_tmp = var_CreateGetString( p_intf, "browse-dir" ); + if( psz_tmp && *psz_tmp ) + p_sys->psz_current_dir = psz_tmp; else { - p_sys->psz_current_dir = strdup( p_intf->p_vlc->psz_homedir ); + p_sys->psz_current_dir = config_GetUserDir( VLC_HOME_DIR ); + free( psz_tmp ); } p_sys->i_dir_entries = 0; p_sys->pp_dir_entries = NULL; + p_sys->b_show_hidden_files = false; ReadDir( p_intf ); return VLC_SUCCESS; @@ -263,42 +314,32 @@ 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 ); - } /* Close the ncurses interface */ endwin(); - msg_Unsubscribe( p_intf, p_sys->p_sub ); +// FIXME msg_Unsubscribe( p_intf, p_sys->p_sub ); /* Destroy structure */ free( p_sys ); @@ -310,62 +351,51 @@ 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_Get( p_intf ); + p_sys->p_playlist = p_playlist; int i_key; time_t t_last_refresh; + int canc = vlc_savecancel(); /* * 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, "playlist-item-append", PlaylistChanged, p_intf ); - while( !p_intf->b_die ) + while( vlc_object_alive( p_intf ) ) { msleep( INTF_IDLE_SLEEP ); /* Update the input */ - if( p_sys->p_playlist == NULL ) + 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 ); - } + p_sys->p_input = playlist_CurrentInput( p_playlist ); } - if( p_sys->p_playlist ) + else if( p_sys->p_input->b_dead ) { - vlc_mutex_lock( &p_sys->p_playlist->object_lock ); - if( p_sys->p_input == NULL ) - { - p_sys->p_input = p_sys->p_playlist->p_input; - if( p_sys->p_input ) - { - if( !p_sys->p_input->b_dead ) - { - 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 ); + 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; } - if( p_sys->b_box_plidx_follow && p_sys->p_playlist->i_index >= 0 ) + PL_LOCK; + if( p_sys->b_box_plidx_follow && playlist_CurrentPlayingItem(p_playlist) ) { - FindIndex( p_intf ); + PL_UNLOCK; + FindIndex( p_intf, p_playlist ); } + else + PL_UNLOCK; - while( ( i_key = getch()) != -1 ) + while( ( i_key = wgetch( p_sys->w ) ) != -1 ) { /* * HandleKey returns 1 if the screen needs to be redrawn @@ -380,7 +410,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; } /* @@ -392,70 +422,180 @@ 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, "playlist-item-append", PlaylistChanged, p_intf ); + vlc_restorecancel( canc ); } /* 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; + int len = strlen( psz_part ); + if( len == 6 ) + { + /* overflow error - should not happen */ + memset( psz_part, 0, 6 ); + return NULL; + } + + psz_part[len] = (char)i_key; + + psz_utf8 = FromLocaleDup( psz_part ); + + /* Ugly check for incomplete bytes sequences + * (in case of non-UTF8 multibyte local encoding) */ + char *psz; + for( psz = psz_utf8; *psz; psz++ ) + if( ( *psz == '?' ) && ( *psz_utf8 != '?' ) ) + { + /* incomplete bytes sequence detected + * (VLC core inserted dummy question marks) */ + free( psz_utf8 ); + return NULL; + } + + /* Check for incomplete UTF8 bytes sequence */ + if( EnsureUTF8( psz_utf8 ) == NULL ) + { + free( psz_utf8 ); + return NULL; + } + + memset( psz_part, 0, 6 ); + return psz_utf8; +} +#endif + +static inline int RemoveLastUTF8Entity( char *psz, int len ) +{ + while( len && ( (psz[--len] & 0xc0) == 0x80 ) ); + /* UTF8 continuation byte */ + + psz[len] = '\0'; + return len; +} static int HandleKey( intf_thread_t *p_intf, int i_key ) { intf_sys_t *p_sys = p_intf->p_sys; - vlc_value_t val; + int i_ret = 1; - if( p_sys->i_box_type == BOX_PLAYLIST && p_sys->p_playlist ) + playlist_t *p_playlist = pl_Get( p_intf ); + + if( p_sys->i_box_type == BOX_PLAYLIST ) { - int b_ret = VLC_TRUE; + 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 ); - val.b_bool = !val.b_bool; - var_Set( p_sys->p_playlist, "random", val ); - return 1; + var_ToggleBool( p_playlist, "random" ); + goto end; case 'l': - var_Get( p_sys->p_playlist, "loop", &val ); - val.b_bool = !val.b_bool; - var_Set( p_sys->p_playlist, "loop", val ); - return 1; + var_ToggleBool( p_playlist, "loop" ); + goto end; case 'R': - var_Get( p_sys->p_playlist, "repeat", &val ); - val.b_bool = !val.b_bool; - var_Set( p_sys->p_playlist, "repeat", val ); - return 1; + var_ToggleBool( p_playlist, "repeat" ); + goto end; /* Playlist sort */ case 'o': - playlist_Sort( p_sys->p_playlist, SORT_TITLE, ORDER_NORMAL ); - return 1; + playlist_RecursiveNodeSort( p_playlist, + PlaylistGetRoot( p_intf ), + SORT_TITLE_NODES_FIRST, ORDER_NORMAL ); + p_sys->b_need_update = true; + goto end; case 'O': - playlist_Sort( p_sys->p_playlist, SORT_TITLE, ORDER_REVERSE ); - return 1; + playlist_RecursiveNodeSort( p_playlist, + PlaylistGetRoot( p_intf ), + SORT_TITLE_NODES_FIRST, ORDER_REVERSE ); + p_sys->b_need_update = true; + goto end; /* Playlist view */ case 'v': switch( p_sys->i_current_view ) { - case VIEW_SIMPLE: - p_sys->i_current_view = VIEW_CATEGORY; - break; case VIEW_CATEGORY: - p_sys->i_current_view = VIEW_ALL; + p_sys->i_current_view = VIEW_ONELEVEL; break; default: - p_sys->i_current_view = VIEW_SIMPLE; + p_sys->i_current_view = VIEW_CATEGORY; } + //p_sys->b_need_update = true; PlaylistRebuild( p_intf ); - FindIndex( p_intf ); - return 1; + goto end; /* Playlist navigation */ + case 'g': + FindIndex( p_intf, p_playlist ); + 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->i_size - 1; + p_sys->i_box_plidx = p_playlist->items.i_size - 1; break; case KEY_UP: p_sys->i_box_plidx--; @@ -471,82 +611,96 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) break; case 'D': case KEY_BACKSPACE: + case 0x7f: case KEY_DC: { - int i_item = p_sys->p_playlist->i_index; + playlist_item_t *p_item; - playlist_LockDelete( p_sys->p_playlist, p_sys->i_box_plidx ); - if( i_item < p_sys->p_playlist->i_size && - i_item != p_sys->p_playlist->i_index ) + PL_LOCK; + p_item = p_sys->pp_plist[p_sys->i_box_plidx]->p_item; + if( p_item->i_children == -1 ) { - playlist_Goto( p_sys->p_playlist, i_item ); + playlist_DeleteFromInput( p_playlist, + p_item->p_input, pl_Locked ); } + else + { + playlist_NodeDelete( p_playlist, p_item, + true , false ); + } + PL_UNLOCK; + PlaylistRebuild( p_intf ); break; } case KEY_ENTER: - case 0x0d: - if( p_sys->i_current_view == VIEW_ALL ) + case '\r': + case '\n': + if( !p_sys->pp_plist[p_sys->i_box_plidx] ) { - playlist_Goto( p_sys->p_playlist, p_sys->i_box_plidx ); + b_ret = false; + break; + } + if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children + == -1 ) + { + playlist_item_t *p_item, *p_parent; + p_item = p_parent = + p_sys->pp_plist[p_sys->i_box_plidx]->p_item; + + if( !p_parent ) + p_parent = p_playlist->p_root_onelevel; + while( p_parent->p_parent ) + p_parent = p_parent->p_parent; + 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 { - if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children - == -1 ) - { - playlist_Control( p_sys->p_playlist, PLAYLIST_ITEMPLAY, - p_sys->pp_plist[p_sys->i_box_plidx]->p_item ); - } - else - { - playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY, - p_sys->i_current_view, - 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 ); } - p_sys->b_box_plidx_follow = VLC_TRUE; + b_box_plidx_follow = true; break; default: - b_ret = VLC_FALSE; + b_ret = false; break; } if( b_ret ) { int i_max = p_sys->i_plist_entries; - if( p_sys->i_current_view == VIEW_ALL ) - i_max = p_sys->p_playlist->i_size; if( p_sys->i_box_plidx >= i_max ) p_sys->i_box_plidx = i_max - 1; if( p_sys->i_box_plidx < 0 ) p_sys->i_box_plidx = 0; - if( p_sys->i_current_view == VIEW_ALL ) - { - if( p_sys->i_box_plidx == p_sys->p_playlist->i_index ) - p_sys->b_box_plidx_follow = VLC_TRUE; - else - p_sys->b_box_plidx_follow = VLC_FALSE; - } - else - { - if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item == - p_sys->p_playlist->status.p_item ) - p_sys->b_box_plidx_follow = VLC_TRUE; - else - p_sys->b_box_plidx_follow = VLC_FALSE; - } - return 1; + + PL_LOCK; + if( PlaylistIsPlaying( p_playlist, + p_sys->pp_plist[p_sys->i_box_plidx]->p_item ) ) + b_box_plidx_follow = true; + PL_UNLOCK; + p_sys->b_box_plidx_follow = b_box_plidx_follow; + goto end; } } 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; @@ -562,76 +716,104 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) case KEY_NPAGE: p_sys->i_box_bidx += p_sys->i_box_lines; break; + case '.': /* Toggle show hidden files */ + p_sys->b_show_hidden_files = ( p_sys->b_show_hidden_files == + true ? false : true ); + ReadDir( p_intf ); + break; case KEY_ENTER: - case 0x0d: - if( p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file ) + 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 ) + - 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 ); - playlist_Add( p_sys->p_playlist, psz_uri, - psz_uri, - PLAYLIST_APPEND, PLAYLIST_END ); + char* psz_uri; + if( asprintf( &psz_uri, "%s://%s/%s", + p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file ? + "file" : "directory", + p_sys->psz_current_dir, + p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path + ) == -1 ) + { + psz_uri = NULL; + } + + playlist_item_t *p_parent = p_sys->p_node; + if( !p_parent ) + { + PL_LOCK; + p_parent = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL; + PL_UNLOCK; + if( !p_parent ) + p_parent = p_playlist->p_local_onelevel; + } + + while( p_parent->p_parent && p_parent->p_parent->p_parent ) + p_parent = p_parent->p_parent; + + 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 ); } else { - int i_size_entry = 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 ); - - p_sys->psz_current_dir = strdup( psz_uri ); - ReadDir( p_intf ); - free( psz_uri ); + if( asprintf( &(p_sys->psz_current_dir), "%s/%s", p_sys->psz_current_dir, + p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) != -1 ) + ReadDir( p_intf ); } 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; + goto end; } } - else if( p_sys->i_box_type == BOX_HELP || p_sys->i_box_type == BOX_INFO ) + 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_STATS || + p_sys->i_box_type == BOX_OBJECTS ) { switch( i_key ) { case KEY_HOME: p_sys->i_box_start = 0; - return 1; + goto end; +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif case KEY_END: p_sys->i_box_start = p_sys->i_box_lines_total - 1; - return 1; + goto end; case KEY_UP: if( p_sys->i_box_start > 0 ) p_sys->i_box_start--; - return 1; + goto end; case KEY_DOWN: if( p_sys->i_box_start < p_sys->i_box_lines_total - 1 ) { p_sys->i_box_start++; } - return 1; + goto end; 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; + goto end; 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; + goto end; default: break; } @@ -643,21 +825,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; + goto end; +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif case KEY_END: p_sys->f_slider = 99.9; ManageSlider( p_intf ); - return 1; + goto end; 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; + goto end; 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; + goto end; default: break; @@ -665,15 +850,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; + goto end; 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 ); @@ -683,83 +869,154 @@ 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. */ + goto end; + 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 ) + { + i_ret = 0; + goto end; + } p_sys->i_box_plidx = p_sys->i_before_search; p_sys->i_box_type = BOX_PLAYLIST; - return 1; + goto end; case KEY_BACKSPACE: - if( i_chain_len > 0 ) - { - p_sys->psz_search_chain[ i_chain_len - 1 ] = '\0'; - } + case 0x7f: + RemoveLastUTF8Entity( p_sys->psz_search_chain, i_chain_len ); break; default: - if( i_chain_len < SEARCH_CHAIN_SIZE ) + { +#ifdef HAVE_NCURSESW + if( i_chain_len + 1 < SEARCH_CHAIN_SIZE ) { - p_sys->psz_search_chain[ i_chain_len++ ] = i_key; - p_sys->psz_search_chain[ i_chain_len ] = 0; + 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 ) + { + if( i_chain_len + strlen( psz_utf8 ) < SEARCH_CHAIN_SIZE ) + { + strcpy( p_sys->psz_search_chain + i_chain_len, + psz_utf8 ); + } + 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; + goto end; } 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; + break; case KEY_ENTER: - case 0x0d: - if( p_playlist && i_chain_len > 0 ) + case '\r': + case '\n': + if( i_chain_len > 0 ) { - playlist_Add( p_playlist, p_sys->psz_open_chain, - p_sys->psz_open_chain, - PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END ); - p_sys->b_box_plidx_follow = VLC_TRUE; + playlist_item_t *p_parent = p_sys->p_node; + + PL_LOCK; + if( !p_parent ) + p_parent = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL; + if( !p_parent ) + p_parent = p_playlist->p_local_onelevel; + + while( p_parent->p_parent && p_parent->p_parent->p_parent ) + p_parent = p_parent->p_parent; + PL_UNLOCK; + + playlist_Add( p_playlist, p_sys->psz_open_chain, NULL, + PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END, + 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. */ - p_sys->i_box_type = BOX_PLAYLIST; - return 1; - case KEY_BACKSPACE: - if( i_chain_len > 0 ) + break; + case 0x1b: /* ESC */ + if( wgetch( p_sys->w ) != ERR ) { - p_sys->psz_open_chain[ i_chain_len - 1 ] = '\0'; + i_ret = 0; + break; } + p_sys->i_box_type = BOX_PLAYLIST; + break; + case KEY_BACKSPACE: + case 0x7f: + RemoveLastUTF8Entity( p_sys->psz_open_chain, i_chain_len ); break; default: - if( i_chain_len < OPEN_CHAIN_SIZE ) + { +#ifdef HAVE_NCURSESW + if( i_chain_len + 1 < OPEN_CHAIN_SIZE ) { - p_sys->psz_open_chain[ i_chain_len++ ] = i_key; - p_sys->psz_open_chain[ i_chain_len ] = 0; + p_sys->psz_open_chain[i_chain_len] = (char) i_key; + p_sys->psz_open_chain[i_chain_len + 1] = '\0'; } - break; +#else + char *psz_utf8 = KeyToUTF8( i_key, p_sys->psz_partial_keys ); + + if( psz_utf8 != NULL ) + { + if( i_chain_len + strlen( psz_utf8 ) < OPEN_CHAIN_SIZE ) + { + strcpy( p_sys->psz_open_chain + i_chain_len, + psz_utf8 ); + } + free( psz_utf8 ); + } +#endif + } } - return 1; + goto end; } /* Common keys */ switch( i_key ) { + case 0x1b: /* ESC */ + if( wgetch( p_sys->w ) != ERR ) + { + i_ret = 0; + break; + } case 'q': case 'Q': - case 0x1b: /* Esc */ - p_intf->p_vlc->b_die = VLC_TRUE; - return 0; + case KEY_EXIT: + libvlc_Quit( p_intf->p_libvlc ); + i_ret = 0; + break; /* Box switching */ case 'i': @@ -768,25 +1025,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; + break; + 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; + break; 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; + break; 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; + break; 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; + break; + 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; + break; + 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; + break; + 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 ); + break; case 'h': case 'H': if( p_sys->i_box_type == BOX_HELP ) @@ -794,145 +1075,126 @@ 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; + break; case '/': if( p_sys->i_box_type != BOX_SEARCH ) { - if( p_sys->psz_search_chain == NULL ) + if( p_sys->psz_search_chain ) { - return 1; + p_sys->psz_search_chain[0] = '\0'; + p_sys->b_box_plidx_follow = false; + p_sys->i_before_search = p_sys->i_box_plidx; + p_sys->i_box_type = BOX_SEARCH; } - p_sys->psz_search_chain[0] = '\0'; - p_sys->b_box_plidx_follow = VLC_FALSE; - p_sys->i_before_search = p_sys->i_box_plidx; - p_sys->i_box_type = BOX_SEARCH; } - return 1; + break; case 'A': /* Open */ if( p_sys->i_box_type != BOX_OPEN ) { - if( p_sys->psz_open_chain == NULL ) + if( p_sys->psz_open_chain ) { - return 1; + p_sys->psz_open_chain[0] = '\0'; + p_sys->i_box_type = BOX_OPEN; } - p_sys->psz_open_chain[0] = '\0'; - p_sys->i_box_type = BOX_OPEN; } - return 1; + break; /* 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; + break; 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; + break; /* Common control */ case 'f': { - vout_thread_t *p_vout; + bool fs = var_ToggleBool( p_playlist, "fullscreen" ); if( p_intf->p_sys->p_input ) { - p_vout = vlc_object_find( p_intf->p_sys->p_input, - VLC_OBJECT_VOUT, FIND_CHILD ); + vout_thread_t *p_vout = input_GetVout( p_intf->p_sys->p_input ); if( p_vout ) { - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; + var_SetBool( p_vout, "fullscreen", fs ); vlc_object_release( p_vout ); } } - return 0; + i_ret = 0; + break; } case ' ': PlayPause( p_intf ); - return 1; + break; case 's': - if( p_intf->p_sys->p_playlist ) - { - playlist_Stop( p_intf->p_sys->p_playlist ); - } - return 1; + playlist_Stop( p_playlist ); + break; case 'e': Eject( p_intf ); - return 1; + break; case '[': if( p_sys->p_input ) - { - val.b_bool = VLC_TRUE; - var_Set( p_sys->p_input, "prev-title", val ); - } - return 1; + var_TriggerCallback( p_sys->p_input, "prev-title" ); + break; case ']': if( p_sys->p_input ) - { - val.b_bool = VLC_TRUE; - var_Set( p_sys->p_input, "next-title", val ); - } - return 1; + var_TriggerCallback( p_sys->p_input, "next-title" ); + break; case '<': if( p_sys->p_input ) - { - val.b_bool = VLC_TRUE; - var_Set( p_sys->p_input, "prev-chapter", val ); - } - return 1; + var_TriggerCallback( p_sys->p_input, "prev-chapter" ); + break; case '>': if( p_sys->p_input ) - { - val.b_bool = VLC_TRUE; - var_Set( p_sys->p_input, "next-chapter", val ); - } - return 1; + var_TriggerCallback( p_sys->p_input, "next-chapter" ); + break; case 'p': - if( p_intf->p_sys->p_playlist ) - { - playlist_Prev( p_intf->p_sys->p_playlist ); - } + playlist_Prev( p_playlist ); clear(); - return 1; + break; case 'n': - if( p_intf->p_sys->p_playlist ) - { - playlist_Next( p_intf->p_sys->p_playlist ); - } + playlist_Next( p_playlist ); clear(); - return 1; + break; case 'a': - aout_VolumeUp( p_intf, 1, NULL ); + aout_VolumeUp( p_playlist, 1, NULL ); clear(); - return 1; + break; case 'z': - aout_VolumeDown( p_intf, 1, NULL ); + aout_VolumeDown( p_playlist, 1, NULL ); clear(); - return 1; + break; /* * ^l should clear and redraw the screen */ - case 0x0c: + case KEY_CLEAR: + case 0x0c: /* ^l */ clear(); - return 1; + break; default: - return 0; + i_ret = 0; } + +end: + return i_ret; } static void ManageSlider( intf_thread_t *p_intf ) @@ -968,15 +1230,15 @@ static void ManageSlider( intf_thread_t *p_intf ) static void SearchPlaylist( intf_thread_t *p_intf, char *psz_searchstring ) { - bool b_ok = false; - int i_current; + int i_max; int i_first = 0 ; int i_item = -1; intf_sys_t *p_sys = p_intf->p_sys; - playlist_t *p_playlist = p_sys->p_playlist; if( p_sys->i_before_search >= 0 ) + { i_first = p_sys->i_before_search; + } if( ( ! psz_searchstring ) || strlen( psz_searchstring ) <= 0 ) { @@ -984,38 +1246,36 @@ static void SearchPlaylist( intf_thread_t *p_intf, char *psz_searchstring ) return; } - for( i_current = i_first + 1; i_current < p_playlist->i_size; - i_current++ ) + i_max = p_sys->i_plist_entries; + + i_item = SubSearchPlaylist( p_intf, psz_searchstring, i_first + 1, i_max ); + if( i_item < 0 ) { - if( strcasestr( p_playlist->pp_items[i_current]->input.psz_name, - psz_searchstring ) != NULL - || strcasestr( p_playlist->pp_items[i_current]->input.psz_uri, - psz_searchstring ) != NULL ) - { - i_item = i_current; - b_ok = true; - break; - } + i_item = SubSearchPlaylist( p_intf, psz_searchstring, 0, i_first ); } - if( !b_ok ) + + if( i_item < 0 || i_item >= i_max ) return; + + p_sys->i_box_plidx = i_item; +} + +static int SubSearchPlaylist( intf_thread_t *p_intf, char *psz_searchstring, + int i_start, int i_stop ) +{ + intf_sys_t *p_sys = p_intf->p_sys; + int i, i_item = -1; + + for( i = i_start + 1; i < i_stop; i++ ) { - for( i_current = 0; i_current < i_first; i_current++ ) + if( strcasestr( p_sys->pp_plist[i]->psz_display, + psz_searchstring ) != NULL ) { - if( strcasestr( p_playlist->pp_items[i_current]->input.psz_name, - psz_searchstring ) != NULL - || strcasestr( p_playlist->pp_items[i_current]->input.psz_uri, - psz_searchstring ) != NULL ) - { - i_item = i_current; - b_ok = true; - break; - } + i_item = i; + break; } } - if( i_item < 0 || i_item >= p_playlist->i_size ) return; - - p_sys->i_box_plidx = i_item; + return i_item; } @@ -1025,41 +1285,128 @@ 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 ); - vasprintf( &p_buf, p_fmt, vl_args ); + if( vasprintf( &p_buf, p_fmt, vl_args ) == -1 ) + return; va_end( vl_args ); - if( p_buf == NULL ) + 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 */ { + free( p_buf ); return; } - if( w > 0 ) + else { - if( ( i_len = strlen( p_buf ) ) > w ) - { - int i_cut = i_len - w; - int x1 = i_len/2 - i_cut/2; - int x2 = x1 + i_cut; - - if( i_len > x2 ) + i_width = wcswidth( psz_wide, i_char_len ); + if( i_width == (size_t)-1 ) + { + /* a non printable character was encountered */ + unsigned int i; + int i_cwidth; + i_width = 0; + for( i = 0 ; i < i_char_len ; i++ ) { - memmove( &p_buf[x1], &p_buf[x2], i_len - x2 ); + i_cwidth = wcwidth( psz_wide[i] ); + if( i_cwidth != -1 ) + i_width += i_cwidth; } - p_buf[w] = '\0'; - if( w > 7 ) + } + } + if( i_width > (size_t)w ) + { + int i_total_width = 0; + int i = 0; + while( i_total_width < w ) + { + i_total_width += wcwidth( psz_wide[i] ); + if( w > 7 && i_total_width >= w/2 ) { - p_buf[w/2-1] = '.'; - p_buf[w/2 ] = '.'; - p_buf[w/2+1] = '.'; + psz_wide[i ] = '.'; + psz_wide[i+1] = '.'; + i_total_width -= wcwidth( psz_wide[i] ) - 2; + if( i > 0 ) + { + /* we require this check only if at least one character + * 4 or more columns wide exists (which i doubt) */ + psz_wide[i-1] = '.'; + i_total_width -= wcwidth( psz_wide[i-1] ) - 1; + } + + /* find the widest string */ + int j, i_2nd_width = 0; + for( j = i_char_len - 1; i_2nd_width < w - i_total_width; j-- ) + i_2nd_width += wcwidth( psz_wide[j] ); + + /* we already have i_total_width columns filled, and we can't + * have more than w columns */ + if( i_2nd_width > w - i_total_width ) + j++; + + wmemmove( &psz_wide[i+2], &psz_wide[j+1], i_char_len - j - 1 ); + psz_wide[i + 2 + i_char_len - j - 1] = '\0'; + break; } - mvprintw( y, x, "%s", p_buf ); + i++; } - else + if( w <= 7 ) /* we don't add the '...' else we lose too much chars */ + psz_wide[i] = '\0'; + + size_t i_wlen = wcslen( psz_wide ) * 6 + 1; /* worst case */ + char psz_ellipsized[i_wlen]; + wcstombs( psz_ellipsized, psz_wide, i_wlen ); + mvprintw( y, x, "%s", psz_ellipsized ); + } + else + { + mvprintw( y, x, "%s", p_buf ); + mvhline( y, x + i_width, ' ', w - i_width ); + } + +#else + if( i_len > w ) + { + int i_cut = i_len - w; + int x1 = i_len/2 - i_cut/2; + int x2 = x1 + i_cut; + + if( i_len > x2 ) + { + memmove( &p_buf[x1], &p_buf[x2], i_len - x2 ); + } + p_buf[w] = '\0'; + if( w > 7 ) { - mvprintw( y, x, "%s", p_buf ); - mvhline( y, x + i_len, ' ', w - i_len ); + p_buf[w/2-1] = '.'; + p_buf[w/2 ] = '.'; + p_buf[w/2+1] = '.'; } + char *psz_local = ToLocale( p_buf ); + mvprintw( y, x, "%s", psz_local ); + LocaleFree( p_buf ); + } + else + { + char *psz_local = ToLocale( p_buf ); + mvprintw( y, x, "%s", psz_local ); + LocaleFree( p_buf ); + 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, ... ) { @@ -1074,96 +1421,132 @@ static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt } va_start( vl_args, p_fmt ); - vasprintf( &p_buf, p_fmt, vl_args ); + if( vasprintf( &p_buf, p_fmt, vl_args ) == -1 ) + 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 ) +{ + char *psz_name = vlc_object_get_name( p_obj ); + if( psz_name ) { - return; + MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s \"%s\" (%p)", + p_obj->psz_object_type, psz_name, p_obj ); + free( psz_name ); } + else + MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s (%o)", + p_obj->psz_object_type, p_obj ); - mvnprintw( p_sys->i_box_y + l - p_sys->i_box_start, x, COLS - x - 1, "%s", p_buf ); + vlc_list_t *list = vlc_list_children( p_obj ); + for( int i = 0; i < list->i_count ; i++ ) + { + 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 ); + } + 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_Get( p_intf ); int y = 0; int h; int y_end; - //clear(); - /* Title */ attrset( A_REVERSE ); - mvnprintw( y, 0, COLS, "VLC media player" " (ncurses interface) [ 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 ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_TITLE, NULL ); + strlcpy( &psz_title[mid], "VLC media player "PACKAGE_VERSION, i_size ); + 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 */ + 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 ) { char buf1[MSTRTIME_MAX_SIZE]; char buf2[MSTRTIME_MAX_SIZE]; vlc_value_t val; - vlc_value_t val_list; /* Source */ - mvnprintw( y++, 0, COLS, " Source : %s", - p_input->input.p_item->psz_uri ); + char *psz_uri = input_item_GetURI( input_GetItem( p_input ) ); + 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" ); + mvnprintw( y++, 0, COLS, _(" State : Playing %s"), psz_state ); } - else if( val.i_int == PAUSE_S ) + else if( val.i_int == OPENING_S ) { - mvnprintw( y++, 0, COLS, " State : Paused" ); + mvnprintw( y++, 0, COLS, _(" State : Opening/Connecting %s"), psz_state ); } - else + else if( val.i_int == PAUSE_S ) { - y++; + mvnprintw( y++, 0, COLS, _(" State : Paused %s"), psz_state ); } + if( val.i_int != INIT_S && val.i_int != END_S ) { audio_volume_t i_volume; /* Position */ var_Get( p_input, "time", &val ); - msecstotimestr( buf1, val.i_time / 1000 ); + secstotimestr( buf1, val.i_time / CLOCK_FREQ ); var_Get( p_input, "length", &val ); - msecstotimestr( buf2, val.i_time / 1000 ); + secstotimestr( buf2, val.i_time / CLOCK_FREQ ); - 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 ); + aout_VolumeGet( p_playlist, &i_volume ); + mvnprintw( y++, 0, COLS, _(" Volume : %i%%"), i_volume*200/AOUT_VOLUME_MAX ); /* Title */ if( !var_Get( p_input, "title", &val ) ) { - 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 ); - } - var_Change( p_input, "title", VLC_VAR_FREELIST, &val_list, NULL ); + int i_title_count = var_CountChoices( p_input, "title" ); + if( i_title_count > 0 ) + mvnprintw( y++, 0, COLS, _(" Title : %"PRId64"/%d"), + val.i_int, i_title_count ); } /* Chapter */ if( !var_Get( p_input, "chapter", &val ) ) { - 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 ); - } - var_Change( p_input, "chapter", VLC_VAR_FREELIST, &val_list, NULL ); + int i_chapter_count = var_CountChoices( p_input, "chapter" ); + if( i_chapter_count > 0 ) + mvnprintw( y++, 0, COLS, _(" Chapter : %"PRId64"/%d"), + val.i_int, i_chapter_count ); } } else @@ -1173,13 +1556,16 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } else { - mvnprintw( y++, 0, COLS, "Source: " ); - 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; @@ -1194,53 +1580,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, " 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 Random" ); - MainBoxWrite( p_intf, l++, 1, " l Loop Playlist" ); - MainBoxWrite( p_intf, l++, 1, " R 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, "[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, _("[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, "[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, _("[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, "[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, _("[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, "" ); + + 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 ) @@ -1261,29 +1688,121 @@ 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 ) { int i,j; - vlc_mutex_lock( &p_input->input.p_item->lock ); - for( i = 0; i < p_input->input.p_item->i_categories; i++ ) + vlc_mutex_lock( &input_GetItem(p_input)->lock ); + for( i = 0; i < input_GetItem(p_input)->i_categories; i++ ) { - info_category_t *p_category = p_input->input.p_item->pp_categories[i]; + 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") ); + } + 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_META ) + { + /* Meta data box */ + int l = 0; + + DrawBox( p_sys->w, y++, 0, h, COLS, _("Meta-information"), + p_sys->b_color ); + + if( p_input ) + { + int i; + input_item_t *p_item = input_GetItem( p_input ); + vlc_mutex_lock( &p_item->lock ); + for( i=0; i= y_end ) break; + const char *psz_meta = vlc_meta_Get( p_item->p_meta, i ); + if( psz_meta && *psz_meta ) + { + const char *psz_meta_title; + switch( i ) + { + case 0: + psz_meta_title = VLC_META_TITLE; break; + case 1: + psz_meta_title = VLC_META_ARTIST; break; + case 2: + psz_meta_title = VLC_META_GENRE ; break; + case 3: + psz_meta_title = VLC_META_COPYRIGHT; break; + case 4: + psz_meta_title = VLC_META_ALBUM; break; + case 5: + psz_meta_title = VLC_META_TRACK_NUMBER; break; + case 6: + psz_meta_title = VLC_META_DESCRIPTION; break; + case 7: + psz_meta_title = VLC_META_RATING; break; + case 8: + psz_meta_title = VLC_META_DATE; break; + case 9: + psz_meta_title = VLC_META_SETTING; break; + case 10: + psz_meta_title = VLC_META_URL; break; + case 11: + psz_meta_title = VLC_META_LANGUAGE; break; + case 12: + psz_meta_title = VLC_META_NOW_PLAYING; break; + case 13: + psz_meta_title = VLC_META_PUBLISHER; break; + case 14: + psz_meta_title = VLC_META_ENCODED_BY; break; + case 15: + psz_meta_title = VLC_META_ART_URL; break; + case 16: + psz_meta_title = VLC_META_TRACKID; break; + 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 ); } } - vlc_mutex_unlock( &p_input->input.p_item->lock ); + vlc_mutex_unlock( &p_item->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 ) @@ -1302,11 +1821,14 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } else if( p_sys->i_box_type == BOX_LOG ) { +#warning Deprecated API +#if 0 int i_line = 0; 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; @@ -1328,22 +1850,29 @@ 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 ); p_intf->p_sys->p_sub->i_start = i_stop; vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock ); y = y_end; +#endif } else if( p_sys->i_box_type == BOX_BROWSE ) { /* 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; @@ -1374,15 +1903,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 ); @@ -1390,44 +1924,175 @@ 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 KiB"), + (float)(p_item->p_stats->i_read_bytes)/1024 ); + 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 KiB"), + (float)(p_item->p_stats->i_demux_read_bytes)/1024 ); + 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++; + DrawEmptyLine( p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2 ); + 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 : %"PRId64), + p_item->p_stats->i_decoded_video ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| frames displayed : %"PRId64), + p_item->p_stats->i_displayed_pictures ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| frames lost : %"PRId64), + p_item->p_stats->i_lost_pictures ); + SHOW_ACS( 1, ACS_VLINE ); l++; + DrawEmptyLine( p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2 ); + 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 : %"PRId64), + p_item->p_stats->i_decoded_audio ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| buffers played : %"PRId64), + p_item->p_stats->i_played_abuffers ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| buffers lost : %"PRId64), + p_item->p_stats->i_lost_abuffers ); + SHOW_ACS( 1, ACS_VLINE ); l++; + DrawEmptyLine( p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2 ); + 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 KiB"), + (float)(p_item->p_stats->i_sent_bytes)/1024 ); + 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 */ - playlist_t *p_playlist = p_sys->p_playlist; int i_start, i_stop, i_max = p_sys->i_plist_entries; int i_item; char *psz_title; switch( p_sys->i_current_view ) { - case VIEW_ALL: - psz_title = strdup( " Playlist (All, unsorted) " ); - i_max = p_playlist->i_size; + case VIEW_ONELEVEL: + 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->i_current_view != VIEW_ALL && - ( p_sys->b_need_update || p_sys->pp_plist == NULL ) ) + if( p_sys->b_need_update || p_sys->pp_plist == NULL ) { PlaylistRebuild( p_intf ); } - if( p_sys->b_box_plidx_follow && - ( p_sys->pp_plist[p_sys->i_box_plidx]->p_item != - p_sys->p_playlist->status.p_item ) ) + if( p_sys->b_box_plidx_follow ) { - FindIndex( p_intf ); + FindIndex( p_intf, p_playlist ); } if( p_sys->i_box_plidx < 0 ) p_sys->i_box_plidx = 0; + if( p_sys->i_box_plidx < 0 ) p_sys->i_box_plidx = 0; + if( p_sys->i_box_plidx >= i_max ) p_sys->i_box_plidx = i_max - 1; if( p_sys->i_box_plidx < (h - 2)/2 ) { @@ -1453,65 +2118,46 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) i_stop = i_max; } - if( p_sys->i_current_view == VIEW_ALL ) - { - - 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 = p_playlist->i_index == i_item ? '>' : ' '; - - if( y >= y_end ) break; - if( b_selected ) - { - attrset( A_REVERSE ); - } - if( !strcmp( p_playlist->pp_items[i_item]->input.psz_name, - p_playlist->pp_items[i_item]->input.psz_uri ) ) - { - mvnprintw( y++, 1, COLS - 2, "%c %d - '%s'", - c, - i_item, - p_playlist->pp_items[i_item]->input.psz_uri ); - } - else - { - mvnprintw( y++, 1, COLS - 2, "%c %d - '%s' (%s)", - c, - i_item, - p_playlist->pp_items[i_item]->input.psz_uri, - p_playlist->pp_items[i_item]->input.psz_name ); - } - if( b_selected ) - { - attroff( A_REVERSE ); - } - } - - } - else - { - 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 = ( p_playlist->status.p_item == - 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 = ' '; + input_thread_t *p_input2 = playlist_CurrentInput( p_playlist ); + + PL_LOCK; + assert( p_item ); + playlist_item_t *p_current_playing_item = playlist_CurrentPlayingItem(p_playlist); + if( ( p_node && p_item->p_input == p_node->p_input ) || + ( !p_node && p_input2 && p_current_playing_item && + p_item->p_input == p_current_playing_item->p_input ) ) + c = '*'; + else if( p_item == p_node || ( p_item != p_node && + PlaylistIsPlaying( p_playlist, p_item ) ) ) + c = '>'; + PL_UNLOCK; + + if( p_input2 ) + vlc_object_release( p_input2 ); 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 ); } } - } } else { @@ -1522,15 +2168,15 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) DrawEmptyLine( p_sys->w, 7, 1, COLS-2 ); if( p_sys->psz_search_chain ) { - if( strlen( p_sys->psz_search_chain ) == 0 && + if( *p_sys->psz_search_chain == '\0' && 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 ); } } } @@ -1539,7 +2185,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 ); } } @@ -1553,126 +2199,153 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) *t_last_refresh = time( 0 ); } -static void PlaylistRebuild( intf_thread_t *p_intf ) +static playlist_item_t *PlaylistGetRoot( intf_thread_t *p_intf ) { intf_sys_t *p_sys = p_intf->p_sys; - playlist_view_t *p_view; - playlist_t *p_playlist = p_sys->p_playlist; + playlist_t *p_playlist = pl_Get( p_intf ); + playlist_item_t *p_item; - if( p_playlist == NULL ) + switch( p_sys->i_current_view ) { - return; + case VIEW_CATEGORY: + p_item = p_playlist->p_root_category; + break; + default: + p_item = p_playlist->p_root_onelevel; } + return p_item; +} - vlc_mutex_lock( &p_playlist->object_lock ); +static void PlaylistRebuild( intf_thread_t *p_intf ) +{ + intf_sys_t *p_sys = p_intf->p_sys; + playlist_t *p_playlist = pl_Get( p_intf ); - p_view = playlist_ViewFind( p_playlist, p_intf->p_sys->i_current_view ); + PL_LOCK; /* First clear the old one */ PlaylistDestroy( p_intf ); /* Build the new one */ - PlaylistAddNode( p_intf, p_view->p_root, 0, "" ); + PlaylistAddNode( p_intf, PlaylistGetRoot( p_intf ), 0, "" ); - p_sys->b_need_update = VLC_FALSE; + p_sys->b_need_update = false; - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; } static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node, - int i, char *c ) + int i, const char *c ) { 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->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_GetTitleFbName( p_child->p_input ); - if( strlen( c ) ) + if( c && *c ) { - sprintf( buff, "%s%c-%s", c, k == p_node->i_children - 1 ? - '`' : '|', p_child->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->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_Get( p_intf ); + p_intf->p_sys->b_need_update = true; + p_intf->p_sys->p_node = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL; return VLC_SUCCESS; } -static void FindIndex( intf_thread_t *p_intf ) +/* Playlist suxx */ +/* This function have to be called with the playlist locked */ +static inline bool PlaylistIsPlaying( playlist_t *p_playlist, + playlist_item_t *p_item ) +{ + playlist_item_t *p_played_item = playlist_CurrentPlayingItem( 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 ); +} + +static void FindIndex( intf_thread_t *p_intf, playlist_t *p_playlist ) { intf_sys_t *p_sys = p_intf->p_sys; int i; - if( p_sys->i_current_view == VIEW_ALL ) + if( p_sys->i_box_plidx < p_sys->i_plist_entries && p_sys->i_box_plidx >= 0 ) { - p_sys->i_box_plidx = p_sys->p_playlist->i_index; + playlist_item_t *p_item = p_sys->pp_plist[p_sys->i_box_plidx]->p_item; + PL_LOCK; + if( ( p_item->i_children == 0 && p_item == p_sys->p_node ) || + PlaylistIsPlaying( p_playlist, p_item ) ) + { + PL_UNLOCK; + return; + } } - else + + for( i = 0; i < p_sys->i_plist_entries; i++ ) { - for( i = 0; i < p_sys->i_plist_entries; i++ ) + 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_playlist, p_sys->pp_plist[i]->p_item ) ) { - if( p_sys->pp_plist[i]->p_item == - p_sys->p_playlist->status.p_item ) - { - p_sys->i_box_plidx = i; - break; - } + p_sys->i_box_plidx = i; + break; } } + PL_UNLOCK; } 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 ) @@ -1685,30 +2358,22 @@ 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_Get( p_intf ); + PL_LOCK; - if( p_playlist->i_index < 0 ) + if( playlist_CurrentPlayingItem(p_playlist) == NULL ) { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); + PL_UNLOCK; return; } - psz_name = p_playlist->pp_items[ p_playlist->i_index ]->input.psz_name; + psz_name = playlist_CurrentPlayingItem(p_playlist)->p_input->psz_name; if( psz_name ) { - if( !strncmp(psz_name, "dvd://", 4) ) + if( !strncmp(psz_name, "dvd://", 6) ) { - switch( psz_name[strlen("dvd://")] ) + switch( psz_name[6] ) { case '\0': case '@': @@ -1720,23 +2385,23 @@ static void Eject( intf_thread_t *p_intf ) break; } } - else if( !strncmp(psz_name, VCD_MRL, strlen(VCD_MRL)) ) + else if( !strncmp(psz_name, "vcd://", 6) ) { - switch( psz_name[strlen(VCD_MRL)] ) + switch( psz_name[6] ) { case '\0': case '@': - psz_device = config_GetPsz( p_intf, VCD_MRL ); + psz_device = config_GetPsz( p_intf, "vcd" ); break; default: /* Omit the beginning MRL-selector characters */ - psz_device = strdup( psz_name + strlen(VCD_MRL) ); + psz_device = strdup( psz_name + 6 ); break; } } - else if( !strncmp(psz_name, CDDA_MRL, strlen(CDDA_MRL) ) ) + else if( !strncmp(psz_name, "cdda://", 7 ) ) { - switch( psz_name[strlen(CDDA_MRL)] ) + switch( psz_name[7] ) { case '\0': case '@': @@ -1744,7 +2409,7 @@ static void Eject( intf_thread_t *p_intf ) break; default: /* Omit the beginning MRL-selector characters */ - psz_device = strdup( psz_name + strlen(CDDA_MRL) ); + psz_device = strdup( psz_name + 7 ); break; } } @@ -1754,8 +2419,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 ) { @@ -1763,7 +2427,6 @@ static void Eject( intf_thread_t *p_intf ) } /* Remove what we have after @ */ - psz_parser = psz_device; for( psz_parser = psz_device ; *psz_parser ; psz_parser++ ) { if( *psz_parser == '@' ) @@ -1781,31 +2444,41 @@ static void Eject( intf_thread_t *p_intf ) intf_Eject( p_intf, psz_device ); } - free(psz_device); - return; + free( psz_device ); +} + +static int comp_dir_entries( const void *pp_dir_entry1, + const void *pp_dir_entry2 ) +{ + struct dir_entry_t *p_dir_entry1 = *(struct dir_entry_t**)pp_dir_entry1; + struct dir_entry_t *p_dir_entry2 = *(struct dir_entry_t**)pp_dir_entry2; + if ( p_dir_entry1->b_file == p_dir_entry2->b_file ) { + return strcasecmp( p_dir_entry1->psz_path, p_dir_entry2->psz_path ); + } + else + { + return ( p_dir_entry1->b_file ? 1 : -1 ); + } } static void ReadDir( intf_thread_t *p_intf ) { - intf_sys_t *p_sys = p_intf->p_sys; - DIR * p_current_dir; - struct dirent * p_dir_content; + intf_sys_t *p_sys = p_intf->p_sys; + DIR *p_current_dir; int i; if( p_sys->psz_current_dir && *p_sys->psz_current_dir ) { + char *psz_entry; + /* Open the dir */ - p_current_dir = opendir( p_sys->psz_current_dir ); + p_current_dir = vlc_opendir( p_sys->psz_current_dir ); if( p_current_dir == NULL ) { /* something went bad, get out of here ! */ -#ifdef HAVE_ERRNO_H - msg_Warn( p_intf, "cannot open directory `%s' (%s)", - p_sys->psz_current_dir, strerror(errno)); -#else - msg_Warn( p_intf, "cannot open directory `%s'", p_sys->psz_current_dir ); -#endif + msg_Warn( p_intf, "cannot open directory `%s' (%m)", + p_sys->psz_current_dir ); return; } @@ -1820,55 +2493,67 @@ static void ReadDir( intf_thread_t *p_intf ) p_sys->pp_dir_entries = NULL; p_sys->i_dir_entries = 0; - /* get the first directory entry */ - p_dir_content = readdir( p_current_dir ); - /* while we still have entries in the directory */ - while( p_dir_content != NULL ) + while( ( psz_entry = vlc_readdir( p_current_dir ) ) != NULL ) { #if defined( S_ISDIR ) struct stat stat_data; #endif struct dir_entry_t *p_dir_entry; - int i_size_entry = strlen( p_sys->psz_current_dir ) + - strlen( p_dir_content->d_name ) + 2; - char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry); + char *psz_uri; - sprintf( psz_uri, "%s/%s", p_sys->psz_current_dir, - p_dir_content->d_name ); + if( p_sys->b_show_hidden_files == false && + ( strlen( psz_entry ) && psz_entry[0] == '.' ) && + strcmp( psz_entry, ".." ) ) + { + free( psz_entry ); + continue; + } + + if( asprintf( &psz_uri, "%s/%s", p_sys->psz_current_dir, + psz_entry ) == -1) + { + free( psz_entry ); + continue; + } if( !( p_dir_entry = malloc( sizeof( struct dir_entry_t) ) ) ) { - free( psz_uri); - return; + free( psz_uri ); + free( psz_entry ); + continue; } #if defined( S_ISDIR ) - stat( psz_uri, &stat_data ); - if( S_ISDIR(stat_data.st_mode) ) -#elif defined( DT_DIR ) - if( p_dir_content->d_type & DT_DIR ) + if( !vlc_stat( psz_uri, &stat_data ) + && S_ISDIR(stat_data.st_mode) ) +/*#elif defined( DT_DIR ) + if( p_dir_content->d_type & DT_DIR )*/ #else if( 0 ) #endif { - p_dir_entry->psz_path = strdup( p_dir_content->d_name ); - p_dir_entry->b_file = VLC_FALSE; + p_dir_entry->psz_path = strdup( psz_entry ); + 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( p_dir_content->d_name ); - p_dir_entry->b_file = VLC_TRUE; + p_dir_entry->psz_path = strdup( psz_entry ); + 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 ); } free( psz_uri ); - /* Read next entry */ - p_dir_content = readdir( p_current_dir ); + free( psz_entry ); } + + /* Sort */ + qsort( p_sys->pp_dir_entries, p_sys->i_dir_entries, + sizeof(struct dir_entry_t*), &comp_dir_entries ); + closedir( p_current_dir ); return; } @@ -1882,6 +2567,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_Get( p_intf ); vlc_value_t val; if( p_input ) @@ -1897,22 +2583,22 @@ 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 ); } /**************************************************************************** * ****************************************************************************/ -static void DrawBox( WINDOW *win, int y, int x, int h, int w, 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 ); @@ -1933,6 +2619,8 @@ static void DrawBox( WINDOW *win, int y, int x, int h, int w, 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 ); } } @@ -1940,7 +2628,7 @@ static void DrawEmptyLine( WINDOW *win, int y, int x, int w ) { if( w > 0 ) { - mvhline( y, x, ' ', w ); + mvwhline( win, y, x, ' ', w ); } } @@ -1949,7 +2637,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 ); } }