X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=d93d0a7deefd672fa244674277b3f6b5129f4517;hb=1c8685fb7d890424ec06ff9a2e3cbc1da984e617;hp=a57df7af058e9adb7be88677053c5ea6d9af6d18;hpb=414624cea784dc0c97bb99826bad98b3c95fda36;p=vlc diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index a57df7af05..d93d0a7dee 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -38,7 +38,7 @@ # include "config.h" #endif -#include +#include #include #ifdef HAVE_NCURSESW @@ -57,6 +57,8 @@ #include #include +#include + #ifdef HAVE_SYS_STAT_H # include #endif @@ -121,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 ); @@ -244,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; @@ -318,7 +322,7 @@ static int Open( vlc_object_t *p_this ) } 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 ); @@ -397,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 ) ) { @@ -428,7 +433,7 @@ static void Run( intf_thread_t *p_intf ) { FindIndex( p_intf ); } - + while( ( i_key = wgetch( p_sys->w ) ) != -1 ) { /* @@ -458,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 */ @@ -566,13 +572,13 @@ 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; \ } while(0) - + #define ReturnFalse \ do { \ vlc_object_release( p_playlist ); \ @@ -673,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 { @@ -705,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 ) @@ -716,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; @@ -795,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 ); @@ -927,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. * @@ -981,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 ) @@ -997,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 ); @@ -1246,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 ) @@ -1348,7 +1356,7 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) #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 ); @@ -1427,7 +1435,6 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) mvhline( y, x + i_width, ' ', w - i_width ); } - free( p_buf ); #else if( i_len > w ) { @@ -1458,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, ... ) { @@ -1491,14 +1499,13 @@ static void DumpObject( intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int p_obj->psz_object_type, p_obj->i_object_id ); vlc_list_t *list = vlc_list_children( p_obj ); - vlc_object_release( p_obj ); for( int i = 0; i < list->i_count ; i++ ) { - MainBoxWrite( p_intf, *l, 1 + 2 * i_level, + MainBoxWrite( p_intf, *l, 1 + 2 * i_level, i == list->i_count - 1 ? "`-" : "|-" ); DumpObject( p_intf, l, list->p_values[i].p_object, i_level + 1 ); } - + vlc_list_release( list ); } static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) @@ -1510,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 ); @@ -1557,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 ); @@ -1908,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", @@ -1984,7 +1993,6 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { int l = 0; DrawBox( p_sys->w, y++, 0, h, COLS, _(" Objects "), p_sys->b_color ); - vlc_object_yield( p_intf->p_libvlc ); DumpObject( p_intf, &l, VLC_OBJECT( p_intf->p_libvlc ), 0 ); p_sys->i_box_lines_total = l; @@ -2276,7 +2284,7 @@ static void PlaylistRebuild( intf_thread_t *p_intf ) p_sys->b_need_update = false; PL_UNLOCK; - + vlc_object_release( p_playlist ); } @@ -2324,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 );