X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=0e3a22acd84ba42657391c1ad2f06eee4277e9e0;hb=61a056a7eb4b1190384432f31ba63d102e8d0230;hp=31895221704829e66a11b6fb0a460d5084e27776;hpb=55287bbffd7ddce57a05316560b225f9701550a4;p=vlc diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index 3189522170..0e3a22acd8 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -1,7 +1,7 @@ /***************************************************************************** * ncurses.c : NCurses interface for vlc ***************************************************************************** - * Copyright (C) 2001-2007 the VideoLAN team + * Copyright © 2001-2007 the VideoLAN team * $Id$ * * Authors: Sam Hocevar @@ -25,13 +25,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +/* + * Note that when we use wide characters (and link with libncursesw), + * we assume that an UTF8 locale is used (or compatible, such as ASCII). + * Other characters encodings are not supported. + */ + /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include /* ENOMEM */ -#include +#include #ifdef HAVE_NCURSESW # define _XOPEN_SOURCE_EXTENDED 1 @@ -44,6 +51,7 @@ #include #include #include +#include #include #include @@ -98,6 +106,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 *****************************************************************************/ @@ -131,7 +141,25 @@ enum BOX_SEARCH, BOX_OPEN, BOX_BROWSE, - BOX_META + BOX_META, + BOX_OBJECTS, + BOX_STATS +}; +enum +{ + C_DEFAULT = 0, + C_TITLE, + C_PLAYLIST_1, + C_PLAYLIST_2, + C_PLAYLIST_3, + C_BOX, + C_STATUS, + C_INFO, + C_ERROR, + C_WARNING, + C_DEBUG, + C_CATEGORY, + C_FOLDER }; enum { @@ -152,6 +180,9 @@ struct intf_sys_t { input_thread_t *p_input; + vlc_bool_t b_color; + vlc_bool_t b_color_started; + float f_slider; float f_slider_old; @@ -178,7 +209,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; @@ -193,7 +226,7 @@ struct intf_sys_t 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 ); @@ -221,10 +254,19 @@ static int Open( vlc_object_t *p_this ) p_sys->i_box_plidx = 0; p_sys->i_box_bidx = 0; p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); + p_sys->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(); @@ -232,9 +274,10 @@ static int Open( vlc_object_t *p_this ) cbreak(); /* Don't echo */ noecho(); - - curs_set(0); - timeout(0); + /* Invisible cursor */ + curs_set( 0 ); + /* Non blocking wgetch() */ + wtimeout( p_sys->w, 0 ); clear(); @@ -302,16 +345,16 @@ static void Close( vlc_object_t *p_this ) 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 ) { @@ -348,6 +391,10 @@ 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 ) ) { @@ -382,8 +429,8 @@ static void Run( intf_thread_t *p_intf ) { 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,6 +460,59 @@ 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; @@ -426,9 +526,6 @@ static char *KeyToUTF8( int i_key, char *psz_part ) psz_part[len] = (char)i_key; -#ifdef HAVE_NCURSESW - psz_utf8 = strdup( psz_part ); -#else psz_utf8 = FromLocaleDup( psz_part ); /* Ugly check for incomplete bytes sequences @@ -449,11 +546,11 @@ static char *KeyToUTF8( int i_key, char *psz_part ) free( psz_utf8 ); return NULL; } -#endif memset( psz_part, 0, 6 ); return psz_utf8; } +#endif static inline int RemoveLastUTF8Entity( char *psz, int len ) { @@ -552,6 +649,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) break; case 'D': case KEY_BACKSPACE: + case 0x7f: case KEY_DC: { playlist_item_t *p_item; @@ -574,8 +672,9 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) } case KEY_ENTER: - case 0x0d: - if( !p_sys->pp_plist || !p_sys->pp_plist[p_sys->i_box_plidx] ) + case '\r': + case '\n': + if( !p_sys->pp_plist[p_sys->i_box_plidx] ) { b_ret = VLC_FALSE; break; @@ -659,15 +758,17 @@ 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 ); + 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 ) @@ -712,7 +813,8 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) } } else if( p_sys->i_box_type == BOX_HELP || p_sys->i_box_type == BOX_INFO || - p_sys->i_box_type == BOX_META ) + p_sys->i_box_type == BOX_META || p_sys->i_box_type == BOX_STATS || + p_sys->i_box_type == BOX_OBJECTS ) { switch( i_key ) { @@ -781,15 +883,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 ); @@ -800,15 +903,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 ) @@ -820,14 +947,12 @@ 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; } @@ -837,11 +962,13 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) switch( i_key ) { - case 0x0c: /* ^l */ + case KEY_CLEAR: + case 0x0c: /* ^l */ clear(); return 1; case KEY_ENTER: - case 0x0d: + case '\r': + case '\n': if( i_chain_len > 0 ) { playlist_item_t *p_parent = p_sys->p_node; @@ -864,14 +991,24 @@ 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 */ + 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 ) @@ -883,6 +1020,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) } free( psz_utf8 ); } +#endif break; } } @@ -893,9 +1031,12 @@ 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 */ + case KEY_EXIT: vlc_object_kill( p_intf->p_libvlc ); return 0; @@ -932,6 +1073,23 @@ 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 'S': + if( p_sys->i_box_type == BOX_STATS ) + p_sys->i_box_type = BOX_NONE; + else + p_sys->i_box_type = BOX_STATS; + 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 ) @@ -1070,7 +1228,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; @@ -1187,7 +1346,7 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) if( i_char_len == (size_t)-1 ) /* an invalid character was encountered */ - abort(); + return; else { i_width = wcswidth( psz_wide, i_char_len ); @@ -1310,6 +1469,28 @@ 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; @@ -1323,29 +1504,30 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) /* Title */ attrset( A_REVERSE ); - int i_len = strlen( "VLC media player [ h for help ]" ); + int i_len = strlen( "VLC media player "PACKAGE_VERSION ); int mid = ( COLS - i_len ) / 2; if( mid < 0 ) mid = 0; int i_size = ( COLS > i_len + 1 ) ? COLS : i_len + 1; char psz_title[i_size]; memset( psz_title, ' ', mid ); - snprintf( &psz_title[mid], i_size, "VLC media player [ h for help ]" ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_TITLE, NULL ); + snprintf( &psz_title[mid], i_size, "VLC media player "PACKAGE_VERSION ); mvnprintw( y, 0, COLS, "%s", psz_title ); attroff( A_REVERSE ); y += 2; - /* Infos */ + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_STATUS, NULL ); - char psz_state[25]; - /* strlen( "[Repeat] [Random] [Loop]" ) == 24, + '\0' */ - psz_state[0] = '\0'; - if( var_GetBool( p_playlist, "repeat" ) ) - strcat( psz_state, "[Repeat] " ); - if( var_GetBool( p_playlist, "random" ) ) - strcat( psz_state, "[Random] " ); - if( var_GetBool( p_playlist, "loop" ) ) - strcat( psz_state, "[Loop]" ); + /* Infos */ + char *psz_state; + if( asprintf( &psz_state, "%s%s%s", + var_GetBool( p_playlist, "repeat" ) ? _( "[Repeat] " ) : "", + var_GetBool( p_playlist, "random" ) ? _( "[Random] " ) : "", + var_GetBool( p_playlist, "loop" ) ? _( "[Loop]" ) : "" ) == -1 ) + psz_state = NULL; if( p_input && !p_input->b_dead ) { @@ -1356,26 +1538,26 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) /* Source */ char *psz_uri = input_item_GetURI( input_GetItem( p_input ) ); - mvnprintw( y++, 0, COLS, " Source : %s", psz_uri ); + mvnprintw( y++, 0, COLS, _(" Source : %s"), psz_uri ); free( psz_uri ); /* State */ var_Get( p_input, "state", &val ); if( val.i_int == PLAYING_S ) { - mvnprintw( y++, 0, COLS, " State : Playing %s", psz_state ); + mvnprintw( y++, 0, COLS, _(" State : Playing %s"), psz_state ); } else if( val.i_int == OPENING_S ) { - mvnprintw( y++, 0, COLS, " State : Opening/Connecting %s", psz_state ); + mvnprintw( y++, 0, COLS, _(" State : Opening/Connecting %s"), psz_state ); } else if( val.i_int == BUFFERING_S ) { - mvnprintw( y++, 0, COLS, " State : Buffering %s", psz_state ); + mvnprintw( y++, 0, COLS, _(" State : Buffering %s"), psz_state ); } else if( val.i_int == PAUSE_S ) { - mvnprintw( y++, 0, COLS, " State : Paused %s", psz_state ); + mvnprintw( y++, 0, COLS, _(" State : Paused %s"), psz_state ); } if( val.i_int != INIT_S && val.i_int != END_S ) @@ -1389,11 +1571,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 ) ) @@ -1401,7 +1583,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 ); } @@ -1412,7 +1594,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 ); } @@ -1424,13 +1606,16 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } else { - mvnprintw( y++, 0, COLS, "Source: %s", psz_state ); - DrawEmptyLine( p_sys->w, y++, 0, COLS ); + mvnprintw( y++, 0, COLS, _(" Source: %s"), psz_state ); DrawEmptyLine( p_sys->w, y++, 0, COLS ); + mvnprintw( y++, 0, COLS, _(" [ h for help ]") ); DrawEmptyLine( p_sys->w, y++, 0, COLS ); } + free( psz_state ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); - DrawBox( p_sys->w, y, 0, 3, COLS, "" ); + DrawBox( p_sys->w, y, 0, 3, COLS, "", p_sys->b_color ); DrawEmptyLine( p_sys->w, y+1, 1, COLS-2); DrawLine( p_sys->w, y+1, 1, (int)(p_intf->p_sys->f_slider/100.0 * (COLS -2)) ); y += 3; @@ -1445,61 +1630,94 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { /* Help box */ int l = 0; - DrawBox( p_sys->w, y++, 0, h, COLS, " Help " ); - - MainBoxWrite( p_intf, l++, 1, "[Display]" ); - MainBoxWrite( p_intf, l++, 1, " h,H Show/Hide help box" ); - MainBoxWrite( p_intf, l++, 1, " i Show/Hide info box" ); - MainBoxWrite( p_intf, l++, 1, " m Show/Hide metadata box" ); - MainBoxWrite( p_intf, l++, 1, " L Show/Hide messages box" ); - MainBoxWrite( p_intf, l++, 1, " P Show/Hide playlist box" ); - MainBoxWrite( p_intf, l++, 1, " B Show/Hide filebrowser" ); + DrawBox( p_sys->w, y++, 0, h, COLS, _(" Help "), p_sys->b_color ); + + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l++, 1, _("[Display]") ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l++, 1, _(" h,H Show/Hide help box") ); + MainBoxWrite( p_intf, l++, 1, _(" i Show/Hide info box") ); + MainBoxWrite( p_intf, l++, 1, _(" m Show/Hide metadata box") ); + MainBoxWrite( p_intf, l++, 1, _(" L Show/Hide messages box") ); + MainBoxWrite( p_intf, l++, 1, _(" P Show/Hide playlist box") ); + MainBoxWrite( p_intf, l++, 1, _(" B Show/Hide filebrowser") ); + MainBoxWrite( p_intf, l++, 1, _(" x Show/Hide objects box") ); + MainBoxWrite( p_intf, l++, 1, _(" S Show/Hide statistics box" ) ); + MainBoxWrite( p_intf, l++, 1, _(" c Switch color on/off") ); + MainBoxWrite( p_intf, l++, 1, _(" Esc Close Add/Search entry") ); MainBoxWrite( p_intf, l++, 1, "" ); - MainBoxWrite( p_intf, l++, 1, "[Global]" ); - MainBoxWrite( p_intf, l++, 1, " q, Q Quit" ); - MainBoxWrite( p_intf, l++, 1, " s Stop" ); - MainBoxWrite( p_intf, l++, 1, " Pause/Play" ); - MainBoxWrite( p_intf, l++, 1, " f Toggle Fullscreen" ); - MainBoxWrite( p_intf, l++, 1, " n, p Next/Previous playlist item" ); - MainBoxWrite( p_intf, l++, 1, " [, ] Next/Previous title" ); - MainBoxWrite( p_intf, l++, 1, " <, > Next/Previous chapter" ); - MainBoxWrite( p_intf, l++, 1, " Seek +1%%" ); - MainBoxWrite( p_intf, l++, 1, " Seek -1%%" ); - MainBoxWrite( p_intf, l++, 1, " a Volume Up" ); - MainBoxWrite( p_intf, l++, 1, " z Volume Down" ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l++, 1, _("[Global]") ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l++, 1, _(" q, Q, Esc Quit") ); + MainBoxWrite( p_intf, l++, 1, _(" s Stop") ); + MainBoxWrite( p_intf, l++, 1, _(" Pause/Play") ); + MainBoxWrite( p_intf, l++, 1, _(" f Toggle Fullscreen") ); + MainBoxWrite( p_intf, l++, 1, _(" n, p Next/Previous playlist item") ); + MainBoxWrite( p_intf, l++, 1, _(" [, ] Next/Previous title") ); + MainBoxWrite( p_intf, l++, 1, _(" <, > Next/Previous chapter") ); + MainBoxWrite( p_intf, l++, 1, _(" Seek +1%%") ); + MainBoxWrite( p_intf, l++, 1, _(" Seek -1%%") ); + MainBoxWrite( p_intf, l++, 1, _(" a Volume Up") ); + MainBoxWrite( p_intf, l++, 1, _(" z Volume Down") ); MainBoxWrite( p_intf, l++, 1, "" ); - MainBoxWrite( p_intf, l++, 1, "[Playlist]" ); - MainBoxWrite( p_intf, l++, 1, " r Toggle Random playing" ); - MainBoxWrite( p_intf, l++, 1, " l Toggle Loop Playlist" ); - MainBoxWrite( p_intf, l++, 1, " R Toggle Repeat item" ); - MainBoxWrite( p_intf, l++, 1, " o Order Playlist by title" ); - MainBoxWrite( p_intf, l++, 1, " O Reverse order Playlist by title" ); - MainBoxWrite( p_intf, l++, 1, " 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" ); + 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 ) @@ -1520,7 +1738,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { /* Info box */ int l = 0; - DrawBox( p_sys->w, y++, 0, h, COLS, " Information " ); + DrawBox( p_sys->w, y++, 0, h, COLS, _(" Information "), p_sys->b_color ); if( p_input ) { @@ -1530,19 +1748,23 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { info_category_t *p_category = input_GetItem(p_input)->pp_categories[i]; if( y >= y_end ) break; - MainBoxWrite( p_intf, l++, 1, " [%s]", p_category->psz_name ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l++, 1, _(" [%s]"), p_category->psz_name ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); for( j = 0; j < p_category->i_infos; j++ ) { info_t *p_info = p_category->pp_infos[j]; if( y >= y_end ) break; - MainBoxWrite( p_intf, l++, 1, " %s: %s", p_info->psz_name, p_info->psz_value ); + MainBoxWrite( p_intf, l++, 1, _(" %s: %s"), p_info->psz_name, p_info->psz_value ); } } vlc_mutex_unlock( &input_GetItem(p_input)->lock ); } else { - MainBoxWrite( p_intf, l++, 1, "No item currently playing" ); + MainBoxWrite( p_intf, l++, 1, _("No item currently playing") ); } p_sys->i_box_lines_total = l; if( p_sys->i_box_start >= p_sys->i_box_lines_total ) @@ -1571,7 +1793,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) strcat( &psz_title[1], VLC_META_INFO_CAT ); psz_title[i_len + 1] = ' '; psz_title[i_len + 2] = '\0'; - DrawBox( p_sys->w, y++, 0, h, COLS, psz_title ); + DrawBox( p_sys->w, y++, 0, h, COLS, psz_title, p_sys->b_color ); if( p_input ) { @@ -1624,7 +1846,11 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) default: psz_meta_title = ""; break; } + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_CATEGORY, NULL ); MainBoxWrite( p_intf, l++, 1, " [%s]", psz_meta_title ); + if( p_sys->b_color ) + wcolor_set( p_sys->w, C_DEFAULT, NULL ); MainBoxWrite( p_intf, l++, 1, " %s", psz_meta ); } } @@ -1632,7 +1858,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } else { - MainBoxWrite( p_intf, l++, 1, "No item currently playing" ); + MainBoxWrite( p_intf, l++, 1, _("No item currently playing") ); } p_sys->i_box_lines_total = l; if( p_sys->i_box_start >= p_sys->i_box_lines_total ) @@ -1655,7 +1881,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; @@ -1677,9 +1903,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 ); @@ -1692,7 +1924,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; @@ -1730,8 +1962,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 ); @@ -1739,6 +1976,133 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } } + else if( p_sys->i_box_type == BOX_OBJECTS ) + { + int l = 0; + DrawBox( p_sys->w, y++, 0, h, COLS, _(" Objects "), p_sys->b_color ); + DumpObject( p_intf, &l, VLC_OBJECT( p_intf->p_libvlc ), 0 ); + + p_sys->i_box_lines_total = l; + if( p_sys->i_box_start >= p_sys->i_box_lines_total ) + p_sys->i_box_start = p_sys->i_box_lines_total - 1; + + if( l - p_sys->i_box_start < p_sys->i_box_lines ) + y += l - p_sys->i_box_start; + else + y += p_sys->i_box_lines; + } + else if( p_sys->i_box_type == BOX_STATS ) + { + DrawBox( p_sys->w, y++, 0, h, COLS, _(" Stats "), p_sys->b_color ); + + if( p_input ) + { + input_item_t *p_item = input_GetItem( p_input ); + assert( p_item ); + vlc_mutex_lock( &p_item->lock ); + vlc_mutex_lock( &p_item->p_stats->lock ); + + int i_audio = 0; + int i_video = 0; + int i; + + if( !p_item->i_es ) + i_video = i_audio = 1; + else + for( i = 0; i < p_item->i_es ; i++ ) + { + i_audio += ( p_item->es[i]->i_cat == AUDIO_ES ); + i_video += ( p_item->es[i]->i_cat == VIDEO_ES ); + } + + int l = 0; + +#define SHOW_ACS(x,c) \ + if(l >= p_sys->i_box_start && l - p_sys->i_box_start < p_sys->i_box_lines) \ + mvaddch( p_sys->i_box_y - p_sys->i_box_start + l, x, c ) + + /* Input */ + if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l, 1, _("+-[Incoming]")); + SHOW_ACS( 1, ACS_ULCORNER ); SHOW_ACS( 2, ACS_HLINE ); l++; + if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l, 1, _("| input bytes read : %8.0f kB"), + (float)(p_item->p_stats->i_read_bytes)/1000 ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| input bitrate : %6.0f kb/s"), + (float)(p_item->p_stats->f_input_bitrate)*8000 ); + MainBoxWrite( p_intf, l, 1, _("| demux bytes read : %8.0f kB"), + (float)(p_item->p_stats->i_demux_read_bytes)/1000 ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| demux bitrate : %6.0f kb/s"), + (float)(p_item->p_stats->f_demux_bitrate)*8000 ); + SHOW_ACS( 1, ACS_VLINE ); l++; SHOW_ACS( 1, ACS_VLINE ); l++; + + /* Video */ + if( i_video ) + { + if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l, 1, _("+-[Video Decoding]")); + SHOW_ACS( 1, ACS_LTEE ); SHOW_ACS( 2, ACS_HLINE ); l++; + if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l, 1, _("| video decoded : %5i"), + p_item->p_stats->i_decoded_video ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| frames displayed : %5i"), + p_item->p_stats->i_displayed_pictures ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| frames lost : %5i"), + p_item->p_stats->i_lost_pictures ); + SHOW_ACS( 1, ACS_VLINE ); l++; SHOW_ACS( 1, ACS_VLINE ); l++; + } + /* Audio*/ + if( i_audio ) + { + if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l, 1, _("+-[Audio Decoding]")); + SHOW_ACS( 1, ACS_LTEE ); SHOW_ACS( 2, ACS_HLINE ); l++; + if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l, 1, _("| audio decoded : %5i"), + p_item->p_stats->i_decoded_audio ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| buffers played : %5i"), + p_item->p_stats->i_played_abuffers ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| buffers lost : %5i"), + p_item->p_stats->i_lost_abuffers ); + SHOW_ACS( 1, ACS_VLINE ); l++; SHOW_ACS( 1, ACS_VLINE ); l++; + } + /* Sout */ + if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); + MainBoxWrite( p_intf, l, 1, _("+-[Streaming]")); + SHOW_ACS( 1, ACS_LTEE ); SHOW_ACS( 2, ACS_HLINE ); l++; + if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); + MainBoxWrite( p_intf, l, 1, _("| packets sent : %5i"), p_item->p_stats->i_sent_packets ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| bytes sent : %8.0f kB"), + (float)(p_item->p_stats->i_sent_bytes)/1000 ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("\\ sending bitrate : %6.0f kb/s"), + (float)(p_item->p_stats->f_send_bitrate*8)*1000 ); + SHOW_ACS( 1, ACS_LLCORNER ); l++; + if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); + +#undef SHOW_ACS + + p_sys->i_box_lines_total = l; + if( p_sys->i_box_start >= p_sys->i_box_lines_total ) + p_sys->i_box_start = p_sys->i_box_lines_total - 1; + + if( l - p_sys->i_box_start < p_sys->i_box_lines ) + y += l - p_sys->i_box_start; + else + y += p_sys->i_box_lines; + + vlc_mutex_unlock( &p_item->p_stats->lock ); + vlc_mutex_unlock( &p_item->lock ); + + } + } else if( p_sys->i_box_type == BOX_PLAYLIST || p_sys->i_box_type == BOX_SEARCH || p_sys->i_box_type == BOX_OPEN ) @@ -1751,16 +2115,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 ) { @@ -1818,8 +2182,12 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { 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 ); @@ -1840,11 +2208,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 ); } } } @@ -1853,7 +2221,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 ); } } @@ -1904,53 +2272,58 @@ static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node, { intf_sys_t *p_sys = p_intf->p_sys; playlist_item_t *p_child; - char *psz_tmp; int k; - psz_tmp = (char *)malloc( strlen( c ) + 4 ); - if( psz_tmp == NULL ) return; for( k = 0; k < p_node->i_children; k++ ) { - struct pl_item_t *p_pl_item; - char *buff; - int i_size; - + char *psz_display; p_child = p_node->pp_children[k]; - i_size = strlen( c ) + strlen( p_child->p_input->psz_name ) + 4; - buff = (char *)malloc( sizeof( char ) * i_size ); - p_pl_item = (struct pl_item_t *)malloc( sizeof( struct pl_item_t ) ); - if( p_pl_item == NULL || buff == NULL ) return; + char *psz_name = input_item_GetTitle( p_child->p_input ); + if( !psz_name || !*psz_name ) + { + free( psz_name ); + psz_name = input_item_GetName( p_child->p_input ); + } - if( strlen( c ) ) + if( c && *c ) { - sprintf( buff, "%s%c-%s", c, k == p_node->i_children - 1 ? - '`' : '|', p_child->p_input->psz_name ); + if( asprintf( &psz_display, "%s%c-%s", c, + k == p_node->i_children - 1 ? '`' : '|', psz_name ) == -1 ) + return; } else { - sprintf( buff, " %s", p_child->p_input->psz_name ); + if( asprintf( &psz_display, " %s", psz_name ) == -1 ) + return; } - p_pl_item->psz_display = strdup( buff ); + free( psz_name ); + struct pl_item_t *p_pl_item = malloc( sizeof( struct pl_item_t ) ); + if( !p_pl_item ) + return; + p_pl_item->psz_display = psz_display; p_pl_item->p_item = p_child; INSERT_ELEM( p_sys->pp_plist, p_sys->i_plist_entries, p_sys->i_plist_entries, p_pl_item ); - free( buff ); i++; if( p_child->i_children > 0 ) { - sprintf( psz_tmp, "%s%c ", c, - k == p_node->i_children - 1 ? ' ' : '|' ); + char *psz_tmp; + if( asprintf( &psz_tmp, "%s%c ", c, + k == p_node->i_children - 1 ? ' ' : '|' ) == -1 ) + return; PlaylistAddNode( p_intf, p_child, i, strlen( c ) ? psz_tmp : " " ); + free( psz_tmp ); } } - free( psz_tmp ); } static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, vlc_value_t oval, vlc_value_t nval, void *param ) { + VLC_UNUSED(p_this); VLC_UNUSED(psz_variable); + VLC_UNUSED(oval); VLC_UNUSED(nval); intf_thread_t *p_intf = (intf_thread_t *)param; playlist_t *p_playlist = pl_Get( p_intf ); p_intf->p_sys->b_need_update = VLC_TRUE; @@ -2107,7 +2480,7 @@ static void Eject( intf_thread_t *p_intf ) intf_Eject( p_intf, psz_device ); } - free(psz_device); + free( psz_device ); return; } @@ -2252,13 +2625,15 @@ static void PlayPause( intf_thread_t *p_intf ) /**************************************************************************** * ****************************************************************************/ -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 ); @@ -2279,6 +2654,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 ); } } @@ -2286,7 +2663,7 @@ static void DrawEmptyLine( WINDOW *win, int y, int x, int w ) { if( w > 0 ) { - mvhline( y, x, ' ', w ); + mvwhline( win, y, x, ' ', w ); } } @@ -2295,7 +2672,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 ); } }