X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=d93d0a7deefd672fa244674277b3f6b5129f4517;hb=72e25cde23ab4299ea6ce3a2f0218a947dd867e4;hp=f64b0c03aa874418040aea4fddf1ca216468b9ef;hpb=e6e564bd147222187e1a79315fef9973b54e10ac;p=vlc diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index f64b0c03aa..d93d0a7dee 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -38,7 +38,8 @@ # include "config.h" #endif -#include +#include +#include #ifdef HAVE_NCURSESW # define _XOPEN_SOURCE_EXTENDED 1 @@ -56,6 +57,8 @@ #include #include +#include + #ifdef HAVE_SYS_STAT_H # include #endif @@ -120,7 +123,7 @@ static void start_color_and_pairs ( intf_thread_t * ); vlc_module_begin(); set_shortname( "Ncurses" ); - set_description( _("Ncurses interface") ); + set_description( N_("Ncurses interface") ); set_capability( "interface", 10 ); set_category( CAT_INTERFACE ); set_subcategory( SUBCAT_INTERFACE_MAIN ); @@ -243,6 +246,8 @@ 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 ) ); + if( !p_sys ) + return VLC_ENOMEM; p_sys->p_node = NULL; p_sys->p_input = NULL; p_sys->f_slider = 0.0; @@ -255,7 +260,7 @@ static int Open( vlc_object_t *p_this ) p_sys->b_box_cleared = false; p_sys->i_box_plidx = 0; p_sys->i_box_bidx = 0; - p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); + p_sys->p_sub = msg_Subscribe( p_intf ); p_sys->b_color = var_CreateGetBool( p_intf, "color" ); p_sys->b_color_started = false; @@ -314,13 +319,14 @@ static int Open( vlc_object_t *p_this ) if( val.psz_string && *val.psz_string ) { p_sys->psz_current_dir = strdup( val.psz_string ); - free( val.psz_string ); } else { - p_sys->psz_current_dir = strdup( p_intf->p_libvlc->psz_homedir ); + p_sys->psz_current_dir = strdup( config_GetHomeDir() ); } + free( val.psz_string ); + p_sys->i_dir_entries = 0; p_sys->pp_dir_entries = NULL; p_sys->b_show_hidden_files = false; @@ -336,15 +342,14 @@ static void Close( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; intf_sys_t *p_sys = p_intf->p_sys; - int i; PlaylistDestroy( p_intf ); - for( i = 0; i < p_sys->i_dir_entries; i++ ) + while( p_sys->i_dir_entries ) { - struct dir_entry_t *p_dir_entry = p_sys->pp_dir_entries[i]; + struct dir_entry_t *p_dir_entry = p_sys->pp_dir_entries[0]; free( p_dir_entry->psz_path ); - REMOVE_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, i ); + REMOVE_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, 0 ); free( p_dir_entry ); } p_sys->pp_dir_entries = NULL; @@ -396,6 +401,7 @@ static void Run( intf_thread_t *p_intf ) PlaylistRebuild( p_intf ); var_AddCallback( p_playlist, "intf-change", PlaylistChanged, p_intf ); var_AddCallback( p_playlist, "item-append", PlaylistChanged, p_intf ); + var_AddCallback( p_playlist, "item-change", PlaylistChanged, p_intf ); while( !intf_ShouldDie( p_intf ) ) { @@ -427,7 +433,7 @@ static void Run( intf_thread_t *p_intf ) { FindIndex( p_intf ); } - + while( ( i_key = wgetch( p_sys->w ) ) != -1 ) { /* @@ -457,6 +463,7 @@ static void Run( intf_thread_t *p_intf ) } var_DelCallback( p_playlist, "intf-change", PlaylistChanged, p_intf ); var_DelCallback( p_playlist, "item-append", PlaylistChanged, p_intf ); + var_DelCallback( p_playlist, "item-change", PlaylistChanged, p_intf ); } /* following functions are local */ @@ -565,14 +572,18 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) { intf_sys_t *p_sys = p_intf->p_sys; vlc_value_t val; - + #define ReturnTrue \ + do { \ vlc_object_release( p_playlist ); \ - return 1 - + return 1; \ + } while(0) + #define ReturnFalse \ + do { \ vlc_object_release( p_playlist ); \ - return 0 + return 0; \ + } while(0) playlist_t *p_playlist = pl_Yield( p_intf ); @@ -668,7 +679,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) if( p_item->i_children == -1 ) { playlist_DeleteFromInput( p_playlist, - p_item->p_input->i_id, true ); + p_item->p_input->i_id, pl_Locked ); } else { @@ -700,7 +711,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) while( p_parent->p_parent ) p_parent = p_parent->p_parent; playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, - true, p_parent, p_item ); + pl_Unlocked, p_parent, p_item ); } else if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children == 0 ) @@ -711,7 +722,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) else { p_sys->p_node = p_sys->pp_plist[p_sys->i_box_plidx]->p_item; - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, p_sys->pp_plist[p_sys->i_box_plidx]->p_item, NULL ); } b_box_plidx_follow = true; @@ -790,7 +801,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) playlist_Add( p_playlist, psz_uri, NULL, PLAYLIST_APPEND, PLAYLIST_END, - p_parent->p_input == + p_parent->p_input == p_playlist->p_local_onelevel->p_input , false ); @@ -922,7 +933,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) * 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 + * 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. * @@ -976,12 +987,12 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) clear(); ReturnTrue; case KEY_ENTER: - case '\r': + case '\r': case '\n': if( i_chain_len > 0 ) { playlist_item_t *p_parent = p_sys->p_node; - + if( !p_parent ) p_parent = p_playlist->status.p_node; if( !p_parent ) @@ -992,7 +1003,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) playlist_Add( p_playlist, p_sys->psz_open_chain, NULL, PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END, - p_parent->p_input == + p_parent->p_input == p_playlist->p_local_onelevel->p_input , false ); @@ -1241,6 +1252,8 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) default: ReturnFalse; } +#undef ReturnFalse +#undef ReturnTrue } static void ManageSlider( intf_thread_t *p_intf ) @@ -1331,27 +1344,30 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) char *p_buf = NULL; int i_len; + if( w <= 0 ) + return; + va_start( vl_args, p_fmt ); if( vasprintf( &p_buf, p_fmt, vl_args ) == -1 ) return; va_end( vl_args ); - if( ( p_buf == NULL ) || ( w <= 0 ) ) - return; - i_len = strlen( p_buf ); #ifdef HAVE_NCURSESW wchar_t psz_wide[i_len + 1]; - + EnsureUTF8( p_buf ); size_t i_char_len = mbstowcs( psz_wide, p_buf, i_len ); size_t i_width; /* number of columns */ if( i_char_len == (size_t)-1 ) - /* an invalid character was encountered */ + /* an invalid character was encountered */ + { + free( p_buf ); return; + } else { i_width = wcswidth( psz_wide, i_char_len ); @@ -1418,6 +1434,7 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) mvprintw( y, x, "%s", p_buf ); mvhline( y, x + i_width, ' ', w - i_width ); } + #else if( i_len > w ) { @@ -1448,6 +1465,7 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) mvhline( y, x + i_len, ' ', w - i_len ); } #endif + free( p_buf ); } static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt, ... ) { @@ -1466,18 +1484,12 @@ static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt return; va_end( vl_args ); - if( p_buf == NULL ) - { - return; - } - mvnprintw( p_sys->i_box_y + l - p_sys->i_box_start, x, COLS - x - 1, "%s", p_buf ); + free( p_buf ); } static void DumpObject( intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int i_level ) { - 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, @@ -1485,15 +1497,15 @@ static void DumpObject( intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int 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++ ) + + vlc_list_t *list = vlc_list_children( p_obj ); + for( int i = 0; i < list->i_count ; i++ ) { - MainBoxWrite( p_intf, *l, 1 + 2 * i_level, - i == p_obj->i_children - 1 ? "`-" : "|-" ); - DumpObject( p_intf, l, p_obj->pp_children[i], i_level + 1 ); + MainBoxWrite( p_intf, *l, 1 + 2 * i_level, + i == list->i_count - 1 ? "`-" : "|-" ); + DumpObject( p_intf, l, list->p_values[i].p_object, i_level + 1 ); } - - vlc_object_release( p_obj ); + vlc_list_release( list ); } static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) @@ -1505,8 +1517,6 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) int h; int y_end; - clear(); - /* Title */ attrset( A_REVERSE ); int i_len = strlen( "VLC media player "PACKAGE_VERSION ); @@ -1552,6 +1562,10 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { mvnprintw( y++, 0, COLS, _(" State : Playing %s"), psz_state ); } + else if( val.i_int == STOP_S ) + { + mvnprintw( y++, 0, COLS, _(" State : Stopped %s"), psz_state ); + } else if( val.i_int == OPENING_S ) { mvnprintw( y++, 0, COLS, _(" State : Opening/Connecting %s"), psz_state ); @@ -1903,7 +1917,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) break; } if( p_sys->b_color ) - wcolor_set( p_sys->w, + 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", @@ -2124,6 +2138,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } DrawBox( p_sys->w, y++, 0, h, COLS, psz_title, p_sys->b_color ); + free( psz_title ); if( p_sys->b_need_update || p_sys->pp_plist == NULL ) { @@ -2245,6 +2260,7 @@ static playlist_item_t *PlaylistGetRoot( intf_thread_t *p_intf ) { case VIEW_CATEGORY: p_item = p_playlist->p_root_category; + break; default: p_item = p_playlist->p_root_onelevel; } @@ -2268,7 +2284,7 @@ static void PlaylistRebuild( intf_thread_t *p_intf ) p_sys->b_need_update = false; PL_UNLOCK; - + vlc_object_release( p_playlist ); } @@ -2316,7 +2332,7 @@ static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node, char *psz_tmp; if( asprintf( &psz_tmp, "%s%c ", c, k == p_node->i_children - 1 ? ' ' : '|' ) == -1 ) - return; + return; PlaylistAddNode( p_intf, p_child, i, strlen( c ) ? psz_tmp : " " ); free( psz_tmp ); @@ -2377,17 +2393,15 @@ static void FindIndex( intf_thread_t *p_intf ) static void PlaylistDestroy( intf_thread_t *p_intf ) { intf_sys_t *p_sys = p_intf->p_sys; - int i; - for( i = 0; i < p_sys->i_plist_entries; i++ ) + while( p_sys->i_plist_entries ) { - struct pl_item_t *p_pl_item = p_sys->pp_plist[i]; + struct pl_item_t *p_pl_item = p_sys->pp_plist[0]; free( p_pl_item->psz_display ); - REMOVE_ELEM( p_sys->pp_plist, p_sys->i_plist_entries, i ); + REMOVE_ELEM( p_sys->pp_plist, p_sys->i_plist_entries, 0 ); free( p_pl_item ); } p_sys->pp_plist = NULL; - p_sys->i_plist_entries = 0; } static void Eject( intf_thread_t *p_intf )