X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=2d636472a5a7cec58162ebbdd66876b2a8fdfa98;hb=7326fad1f18a82b58db09d0a0ddc7c086c60c62e;hp=d14f0a8f9988e7b6119c55bfb3ec1452711f136d;hpb=0900f11014557ea895a290d2c1518d739f97a8b6;p=vlc diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index d14f0a8f99..2d636472a5 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-2006 the VideoLAN team + * 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 @@ -24,23 +25,34 @@ * 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 *****************************************************************************/ -#define _GNU_SOURCE -#include /* malloc(), free() */ -#include -#include /* ENOMEM */ -#include -#include - -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include -#include -#include -#include -#include "charset.h" + +#ifdef HAVE_NCURSESW +# define _XOPEN_SOURCE_EXTENDED 1 +#endif + +#include + +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_SYS_STAT_H # include @@ -59,7 +71,7 @@ #ifdef HAVE_VCDX #define VCD_MRL "vcdx://" #else -#define VCD_MRL "vcdx://" +#define VCD_MRL "vcd://" #endif #define SEARCH_CHAIN_SIZE 20 @@ -80,7 +92,7 @@ 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 * ); @@ -93,6 +105,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 *****************************************************************************/ @@ -125,7 +139,25 @@ enum BOX_PLAYLIST, BOX_SEARCH, BOX_OPEN, - BOX_BROWSE + BOX_BROWSE, + BOX_META, + BOX_OBJECTS +}; +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 { @@ -144,9 +176,11 @@ struct pl_item_t }; struct intf_sys_t { - playlist_t *p_playlist; input_thread_t *p_input; + vlc_bool_t b_color; + vlc_bool_t b_color_started; + float f_slider; float f_slider_old; @@ -160,9 +194,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 */ @@ -172,7 +207,9 @@ 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; @@ -182,10 +219,12 @@ struct intf_sys_t 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 */ + vlc_bool_t 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, vlc_bool_t b_color ); static void DrawLine( WINDOW *win, int y, int x, int w ); static void DrawEmptyLine( WINDOW *win, int y, int x, int w ); @@ -200,7 +239,7 @@ 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; + p_sys->p_node = NULL; p_sys->p_input = NULL; p_sys->f_slider = 0.0; p_sys->f_slider_old = 0.0; @@ -211,13 +250,21 @@ static int Open( vlc_object_t *p_this ) p_sys->b_box_plidx_follow = VLC_TRUE; p_sys->b_box_cleared = VLC_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, MSG_QUEUE_NORMAL ); + p_sys->b_color = p_this->p_libvlc->b_color; + p_sys->b_color_started = VLC_FALSE; + +#ifndef HAVE_NCURSESW memset( p_sys->psz_partial_keys, 0, sizeof( p_sys->psz_partial_keys ) ); +#endif /* Initialize the curses library */ p_sys->w = initscr(); + + if( p_sys->b_color ) + start_color_and_pairs( p_intf ); + keypad( p_sys->w, TRUE ); /* Don't do NL -> CR/NL */ nonl(); @@ -225,15 +272,19 @@ 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; + /* Remember verbosity level */ + var_Get( p_intf->p_libvlc, "verbose", &val ); + p_sys->i_verbose = val.i_int; /* Set quiet mode */ val.i_int = -1; var_Set( p_intf->p_libvlc, "verbose", val ); @@ -281,43 +332,44 @@ 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; + playlist_t *p_playlist = pl_Get( p_intf ); int i; - var_DelCallback( p_sys->p_playlist, "intf-change", PlaylistChanged, - p_intf ); - var_DelCallback( p_sys->p_playlist, "item-append", PlaylistChanged, - p_intf ); + var_DelCallback( p_playlist, "intf-change", PlaylistChanged, p_intf ); + var_DelCallback( p_playlist, "item-append", PlaylistChanged, p_intf ); PlaylistDestroy( p_intf ); for( i = 0; i < p_sys->i_dir_entries; i++ ) { 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 ); + 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 ); + 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(); msg_Unsubscribe( p_intf, p_sys->p_sub ); + /* Restores initial verbose setting */ + vlc_value_t val; + val.i_int = p_sys->i_verbose; + var_Set( p_intf->p_libvlc, "verbose", val ); + /* Destroy structure */ free( p_sys ); } @@ -328,6 +380,7 @@ 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 ); int i_key; time_t t_last_refresh; @@ -336,54 +389,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 ); while( !intf_ShouldDie( p_intf ) ) { msleep( INTF_IDLE_SLEEP ); /* Update the input */ - if( p_sys->p_playlist == 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 ) + var_AddCallback( p_playlist, "intf-change", PlaylistChanged, p_intf ); + var_AddCallback( p_playlist, "item-append", PlaylistChanged, p_intf ); + + PL_LOCK; + if( p_sys->p_input == NULL ) { - 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 = VLC_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 @@ -413,10 +458,62 @@ static void Run( intf_thread_t *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 = VLC_FALSE; + msg_Warn( p_intf, "Terminal doesn't support colors" ); + return; + } + + start_color(); + + /* Available colors: BLACK RED GREEN YELLOW BLUE MAGENTA CYAN WHITE */ + + /* untested, in all my terminals, !can_change_color() --funman */ + if( can_change_color() ) + init_color( COLOR_YELLOW, 960, 500, 0 ); /* YELLOW -> ORANGE */ + + /* title */ + init_pair( C_TITLE, COLOR_YELLOW, COLOR_BLACK ); + + /* jamaican playlist */ + init_pair( C_PLAYLIST_1, COLOR_GREEN, COLOR_BLACK ); + init_pair( C_PLAYLIST_2, COLOR_YELLOW, COLOR_BLACK ); + init_pair( C_PLAYLIST_3, COLOR_RED, COLOR_BLACK ); + + /* used in DrawBox() */ + init_pair( C_BOX, COLOR_CYAN, COLOR_BLACK ); + /* Source, State, Position, Volume, Chapters, etc...*/ + init_pair( C_STATUS, COLOR_BLUE, COLOR_BLACK ); + + /* VLC messages, keep the order from highest priority to lowest */ + + /* infos */ + init_pair( C_INFO, COLOR_BLACK, COLOR_WHITE ); + /* errors */ + init_pair( C_ERROR, COLOR_RED, COLOR_BLACK ); + /* warnings */ + init_pair( C_WARNING, COLOR_YELLOW, COLOR_BLACK ); +/* debug */ + init_pair( C_DEBUG, COLOR_WHITE, COLOR_BLACK ); + + /* Category title (help, info, metadata) */ + init_pair( C_CATEGORY, COLOR_MAGENTA, COLOR_BLACK ); + + /* Folder (BOX_BROWSE) */ + init_pair( C_FOLDER, COLOR_RED, COLOR_BLACK ); + + p_intf->p_sys->b_color_started = VLC_TRUE; +} + +#ifndef HAVE_NCURSESW static char *KeyToUTF8( int i_key, char *psz_part ) { - char *psz_utf8, *psz; + char *psz_utf8; int len = strlen( psz_part ); if( len == 6 ) { @@ -431,6 +528,7 @@ static char *KeyToUTF8( int i_key, char *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 != '?' ) ) { @@ -450,6 +548,7 @@ static char *KeyToUTF8( int i_key, char *psz_part ) memset( psz_part, 0, 6 ); return psz_utf8; } +#endif static inline int RemoveLastUTF8Entity( char *psz, int len ) { @@ -464,8 +563,9 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) { intf_sys_t *p_sys = p_intf->p_sys; vlc_value_t val; + playlist_t *p_playlist = pl_Get( p_intf ); - if( p_sys->i_box_type == BOX_PLAYLIST && p_sys->p_playlist ) + if( p_sys->i_box_type == BOX_PLAYLIST ) { int b_ret = VLC_TRUE; vlc_bool_t b_box_plidx_follow = VLC_FALSE; @@ -475,30 +575,30 @@ static int HandleKey( intf_thread_t *p_intf, int 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 ); + var_Set( p_playlist, "random", val ); return 1; 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 ); + var_Set( p_playlist, "loop", val ); return 1; 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 ); + var_Set( p_playlist, "repeat", val ); return 1; /* 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; 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; @@ -519,11 +619,19 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) return 1; /* 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--; @@ -539,44 +647,61 @@ 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 ); + p_item->p_input->i_id, VLC_TRUE ); } else { playlist_NodeDelete( p_playlist, p_item, VLC_TRUE , VLC_FALSE ); } - vlc_mutex_unlock( &p_playlist->object_lock ); - p_sys->b_need_update = VLC_TRUE; - + PL_UNLOCK; + PlaylistRebuild( p_intf ); break; } case KEY_ENTER: - case 0x0d: + case '\r': + case '\n': + if( !p_sys->pp_plist[p_sys->i_box_plidx] ) + { + b_ret = VLC_FALSE; + break; + } if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children == -1 ) { - playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY, - VLC_TRUE, NULL, - p_sys->pp_plist[p_sys->i_box_plidx]->p_item ); + 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, + VLC_TRUE, 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 { - 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, VLC_TRUE, + p_sys->pp_plist[p_sys->i_box_plidx]->p_item, NULL ); } b_box_plidx_follow = VLC_TRUE; break; @@ -606,6 +731,9 @@ static int HandleKey( intf_thread_t *p_intf, int 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; @@ -628,20 +756,33 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) 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 ); - /* XXX - playlist_Add( p_sys->p_playlist, psz_uri, - psz_uri, - PLAYLIST_APPEND, PLAYLIST_END ); - */ + 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_node; + if( !p_parent ) + p_parent = p_playlist->status.p_node; + 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 + , VLC_FALSE ); + p_sys->i_box_type = BOX_PLAYLIST; free( psz_uri ); } @@ -669,13 +810,17 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) return 1; } } - 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_OBJECTS ) { switch( i_key ) { case KEY_HOME: p_sys->i_box_start = 0; return 1; +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif case KEY_END: p_sys->i_box_start = p_sys->i_box_lines_total - 1; return 1; @@ -711,6 +856,9 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) p_sys->f_slider = 0; ManageSlider( p_intf ); return 1; +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif case KEY_END: p_sys->f_slider = 99.9; ManageSlider( p_intf ); @@ -732,15 +880,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; 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 ); @@ -751,15 +900,39 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) } p_sys->i_box_type = BOX_PLAYLIST; return 1; - case 0x1b: /* Esc. */ + 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 ) + return 0; p_sys->i_box_plidx = p_sys->i_before_search; p_sys->i_box_type = BOX_PLAYLIST; return 1; case KEY_BACKSPACE: + case 0x7f: RemoveLastUTF8Entity( p_sys->psz_search_chain, i_chain_len ); break; default: { +#ifdef HAVE_NCURSESW + if( i_chain_len + 1 < SEARCH_CHAIN_SIZE ) + { + p_sys->psz_search_chain[i_chain_len] = (char) i_key; + p_sys->psz_search_chain[i_chain_len + 1] = '\0'; + } +#else char *psz_utf8 = KeyToUTF8( i_key, p_sys->psz_partial_keys ); if( psz_utf8 != NULL ) @@ -771,48 +944,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; } 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; 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 ); - */ + playlist_item_t *p_parent = p_sys->p_node; + + if( !p_parent ) + p_parent = p_playlist->status.p_node; + 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, p_sys->psz_open_chain, NULL, + PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END, + p_parent->p_input == + p_playlist->p_local_onelevel->p_input + , VLC_FALSE ); + p_sys->b_box_plidx_follow = VLC_TRUE; } p_sys->i_box_type = BOX_PLAYLIST; return 1; - case 0x1b: /* Esc. */ + case 0x1b: /* ESC */ + if( wgetch( p_sys->w ) != ERR ) + return 0; p_sys->i_box_type = BOX_PLAYLIST; return 1; case KEY_BACKSPACE: + case 0x7f: RemoveLastUTF8Entity( p_sys->psz_open_chain, i_chain_len ); break; default: { +#ifdef HAVE_NCURSESW + if( i_chain_len + 1 < OPEN_CHAIN_SIZE ) + { + p_sys->psz_open_chain[i_chain_len] = (char) i_key; + p_sys->psz_open_chain[i_chain_len + 1] = '\0'; + } +#else char *psz_utf8 = KeyToUTF8( i_key, p_sys->psz_partial_keys ); if( psz_utf8 != NULL ) @@ -824,6 +1017,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) } free( psz_utf8 ); } +#endif break; } } @@ -834,10 +1028,13 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) /* Common keys */ switch( i_key ) { + case 0x1b: /* ESC */ + if( wgetch( p_sys->w ) != ERR ) + return 0; case 'q': case 'Q': - case 0x1b: /* Esc */ - p_intf->p_libvlc->b_die = VLC_TRUE; + case KEY_EXIT: + vlc_object_kill( p_intf->p_libvlc ); return 0; /* Box switching */ @@ -848,6 +1045,13 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) p_sys->i_box_type = BOX_INFO; p_sys->i_box_lines_total = 0; return 1; + 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; case 'L': if( p_sys->i_box_type == BOX_LOG ) p_sys->i_box_type = BOX_NONE; @@ -866,6 +1070,17 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) else p_sys->i_box_type = BOX_BROWSE; return 1; + 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; + return 1; + case 'c': + p_sys->b_color = !p_sys->b_color; + if( p_sys->b_color && !p_sys->b_color_started ) + start_color_and_pairs( p_intf ); + return 1; case 'h': case 'H': if( p_sys->i_box_type == BOX_HELP ) @@ -929,16 +1144,9 @@ 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; @@ -949,10 +1157,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) return 1; case 's': - if( p_intf->p_sys->p_playlist ) - { - playlist_Stop( p_intf->p_sys->p_playlist ); - } + playlist_Stop( p_playlist ); return 1; case 'e': @@ -992,18 +1197,12 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) return 1; case 'p': - if( p_intf->p_sys->p_playlist ) - { - playlist_Prev( p_intf->p_sys->p_playlist ); - } + playlist_Prev( p_playlist ); clear(); return 1; case 'n': - if( p_intf->p_sys->p_playlist ) - { - playlist_Next( p_intf->p_sys->p_playlist ); - } + playlist_Next( p_playlist ); clear(); return 1; @@ -1020,7 +1219,8 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) /* * ^l should clear and redraw the screen */ - case 0x0c: + case KEY_CLEAR: + case 0x0c: /* ^l */ clear(); return 1; @@ -1118,45 +1318,122 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) int i_len; 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 ) - { + if( ( p_buf == NULL ) || ( w <= 0 ) ) return; - } - if( w > 0 ) - { - if( ( i_len = strlen( p_buf ) ) > w ) - { - char *psz_local; - int i_cut = i_len - w; - int x1 = i_len/2 - i_cut/2; - int x2 = x1 + i_cut; - if( i_len > x2 ) + 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 */ + return; + else + { + 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; } - psz_local = ToLocale( p_buf ); - mvprintw( y, x, "%s", psz_local ); - LocaleFree( 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 ) { - char *psz_local = ToLocale( p_buf ); - mvprintw( y, x, "%s", psz_local ); - LocaleFree( p_buf ); - mvhline( y, x + i_len, ' ', w - i_len ); + memmove( &p_buf[x1], &p_buf[x2], i_len - x2 ); } + p_buf[w] = '\0'; + if( w > 7 ) + { + 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 } static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt, ... ) { @@ -1171,7 +1448,8 @@ 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 ) @@ -1182,10 +1460,33 @@ static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt mvnprintw( p_sys->i_box_y + l - p_sys->i_box_start, x, COLS - x - 1, "%s", p_buf ); } +static void DumpObject( intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int i_level ) +{ + vlc_object_yield( p_obj ); + + 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 ); + int i; + for( i = 0; i < p_obj->i_children ; i++ ) + { + MainBoxWrite( p_intf, *l, 1 + 2 * i_level, + i == p_obj->i_children - 1 ? "`-" : "|-" ); + DumpObject( p_intf, l, p_obj->pp_children[i], i_level + 1 ); + } + + vlc_object_release( p_obj ); +} + 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; @@ -1194,11 +1495,31 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) /* 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 ); + snprintf( &psz_title[mid], i_size, "VLC media player "PACKAGE_VERSION ); + 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]; @@ -1207,31 +1528,29 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) 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 == OPENING_S ) { - mvnprintw( y++, 0, COLS, " State : Openning/Connecting" ); + mvnprintw( y++, 0, COLS, _(" State : Opening/Connecting %s"), psz_state ); } else if( val.i_int == BUFFERING_S ) { - mvnprintw( y++, 0, COLS, " State : Buffering" ); + mvnprintw( y++, 0, COLS, _(" State : Buffering %s"), psz_state ); } else if( val.i_int == PAUSE_S ) { - mvnprintw( y++, 0, COLS, " State : Paused" ); - } - else - { - 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; @@ -1243,11 +1562,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 ) ) @@ -1255,7 +1574,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 ); } @@ -1266,7 +1585,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 ); } @@ -1278,13 +1597,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; @@ -1299,59 +1621,93 @@ 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, _(" 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, "[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 ) @@ -1372,29 +1728,127 @@ 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( &p_input->input.p_item->lock ); + 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 ) + { + 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; + + 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, 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; + char *psz_meta = p_item->p_meta->ppsz_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_COLLECTION; break; + case 5: + psz_meta_title = VLC_META_SEQ_NUM; 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_item->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 ) @@ -1417,7 +1871,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; @@ -1439,9 +1893,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 ); @@ -1454,7 +1914,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; @@ -1492,8 +1952,13 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { attrset( A_REVERSE ); } + if( p_sys->b_color && !p_sys->pp_dir_entries[i_item]->b_file ) + wcolor_set( p_sys->w, C_FOLDER, NULL ); mvnprintw( y++, 1, COLS - 2, " %c %s", p_sys->pp_dir_entries[i_item]->b_file == VLC_TRUE ? ' ' : '+', p_sys->pp_dir_entries[i_item]->psz_path ); + if( p_sys->b_color && !p_sys->pp_dir_entries[i_item]->b_file ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); + if( b_selected ) { attroff( A_REVERSE ); @@ -1501,9 +1966,24 @@ 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_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; @@ -1513,16 +1993,16 @@ 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 ); if( p_sys->b_need_update || p_sys->pp_plist == NULL ) { @@ -1564,16 +2044,28 @@ 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 ) ) ? '>' : ' '; + 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 ); @@ -1594,11 +2086,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 ); } } } @@ -1607,7 +2099,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 ); } } @@ -1624,12 +2116,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) 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_Get( p_intf ); switch( p_sys->i_current_view ) { @@ -1643,14 +2130,9 @@ static playlist_item_t *PlaylistGetRoot( intf_thread_t *p_intf ) 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_Get( p_intf ); - vlc_mutex_lock( &p_playlist->object_lock ); + PL_LOCK; /* First clear the old one */ PlaylistDestroy( p_intf ); @@ -1660,63 +2142,70 @@ static void PlaylistRebuild( intf_thread_t *p_intf ) p_sys->b_need_update = VLC_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->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; + playlist_t *p_playlist = pl_Get( p_intf ); p_intf->p_sys->b_need_update = VLC_TRUE; + p_intf->p_sys->p_node = p_playlist->status.p_node; return VLC_SUCCESS; } @@ -1724,7 +2213,8 @@ static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, static inline vlc_bool_t 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_Get( p_intf ); + playlist_item_t *p_played_item = p_playlist->status.p_item; 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 ); @@ -1735,17 +2225,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; @@ -1779,20 +2271,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_Get( p_intf ); + PL_LOCK; if( p_playlist->status.p_item == NULL ) { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); + PL_UNLOCK; return; } @@ -1848,8 +2332,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 ) { @@ -1875,7 +2358,7 @@ static void Eject( intf_thread_t *p_intf ) intf_Eject( p_intf, psz_device ); } - free(psz_device); + free( psz_device ); return; } @@ -1901,7 +2384,7 @@ static void ReadDir( intf_thread_t *p_intf ) if( p_sys->psz_current_dir && *p_sys->psz_current_dir ) { - const char *psz_entry; + char *psz_entry; /* Open the dir */ p_current_dir = utf8_opendir( p_sys->psz_current_dir ); @@ -1909,12 +2392,8 @@ static void ReadDir( intf_thread_t *p_intf ) 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; } @@ -1929,11 +2408,8 @@ 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 */ - psz_entry = utf8_readdir( p_current_dir ); - /* while we still have entries in the directory */ - while( psz_entry != NULL ) + while( ( psz_entry = utf8_readdir( p_current_dir ) ) != NULL ) { #if defined( S_ISDIR ) struct stat stat_data; @@ -1948,7 +2424,6 @@ static void ReadDir( intf_thread_t *p_intf ) strcmp( psz_entry, ".." ) ) { free( psz_entry ); - psz_entry = utf8_readdir( p_current_dir ); continue; } @@ -1957,13 +2432,14 @@ static void ReadDir( intf_thread_t *p_intf ) 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 ) - utf8_stat( psz_uri, &stat_data ); - if( S_ISDIR(stat_data.st_mode) ) + if( !utf8_stat( psz_uri, &stat_data ) + && S_ISDIR(stat_data.st_mode) ) /*#elif defined( DT_DIR ) if( p_dir_content->d_type & DT_DIR )*/ #else @@ -1985,8 +2461,6 @@ static void ReadDir( intf_thread_t *p_intf ) free( psz_uri ); free( psz_entry ); - /* Read next entry */ - psz_entry = utf8_readdir( p_current_dir ); } /* Sort */ @@ -2006,6 +2480,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 ) @@ -2021,22 +2496,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, const char *title ) +static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title, vlc_bool_t 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 ); @@ -2057,6 +2532,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 ); } } @@ -2064,7 +2541,7 @@ static void DrawEmptyLine( WINDOW *win, int y, int x, int w ) { if( w > 0 ) { - mvhline( y, x, ' ', w ); + mvwhline( win, y, x, ' ', w ); } } @@ -2073,7 +2550,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 ); } }