/*****************************************************************************
* Preamble
*****************************************************************************/
+#include <vlc/vlc.h>
+
#include <errno.h> /* ENOMEM */
-#include <stdio.h>
#include <time.h>
-#include <curses.h>
+#ifdef HAVE_NCURSESW
+# define _XOPEN_SOURCE_EXTENDED 1
+#endif
+
+#include <ncurses.h>
-#include <vlc/vlc.h>
#include <vlc_interface.h>
#include <vlc_vout.h>
#include <vlc_aout.h>
#ifdef HAVE_VCDX
#define VCD_MRL "vcdx://"
#else
-#define VCD_MRL "vcdx://"
+#define VCD_MRL "vcd://"
#endif
#define SEARCH_CHAIN_SIZE 20
int i_box_plidx; /* Playlist index */
int b_box_plidx_follow;
- playlist_item_t *p_plnode; /* Playlist node */
int i_box_bidx; /* browser index */
int b_box_cleared;
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 );
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 );
memset( p_sys->psz_partial_keys, 0, sizeof( p_sys->psz_partial_keys ) );
/* 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 );
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 );
}
}
/* following functions are local */
-
static char *KeyToUTF8( int i_key, char *psz_part )
{
- char *psz_utf8, *psz;
+ char *psz_utf8;
int len = strlen( psz_part );
if( len == 6 )
{
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
* (in case of non-UTF8 multibyte local encoding) */
+ char *psz;
for( psz = psz_utf8; *psz; psz++ )
if( ( *psz == '?' ) && ( *psz_utf8 != '?' ) )
{
free( psz_utf8 );
return NULL;
}
+#endif
memset( psz_part, 0, 6 );
return psz_utf8;
case KEY_ENTER:
case 0x0d:
+ if( !p_sys->pp_plist || !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_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_sys->p_playlist->p_root_onelevel;
+ while( p_parent->p_parent )
+ p_parent = p_parent->p_parent;
playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY,
- VLC_TRUE, NULL,
- p_sys->pp_plist[p_sys->i_box_plidx]->p_item );
+ VLC_TRUE, p_parent, p_item );
}
else
{
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 );
- */
+
+ playlist_item_t *p_parent = p_sys->p_playlist->status.p_node;
+ if( !p_parent )
+ p_parent = p_sys->p_playlist->p_root_onelevel;
+
+ while( p_parent->p_parent )
+ p_parent = p_parent->p_parent;
+
+ playlist_Add( p_sys->p_playlist, psz_uri, NULL,
+ PLAYLIST_APPEND, PLAYLIST_END,
+ p_parent == p_sys->p_playlist->p_root_onelevel
+ , VLC_FALSE );
p_sys->i_box_type = BOX_PLAYLIST;
free( psz_uri );
}
case 0x0d:
if( p_playlist && 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_playlist->status.p_node;
+ if( !p_parent )
+ p_parent = p_sys->p_playlist->p_root_onelevel;
+
+ while( 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_sys->p_playlist->p_root_onelevel
+ , VLC_FALSE );
p_sys->b_box_plidx_follow = VLC_TRUE;
}
p_sys->i_box_type = BOX_PLAYLIST;
va_list vl_args;
char *p_buf = NULL;
int i_len;
+#ifdef HAVE_NCURSESW
+ size_t i_char_len; /* UCS character length */
+ size_t i_width; /* Display width */
+ wchar_t *psz_wide; /* wchar_t representation of p_buf */
+#endif
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 )
+
+ i_len = strlen( p_buf );
+#ifdef HAVE_NCURSESW
+ psz_wide = (wchar_t *) malloc( sizeof( wchar_t ) * ( i_len + 1 ) );
+
+ i_char_len = mbstowcs( psz_wide, p_buf, i_len );
+
+ if( i_char_len == (size_t)-1 ) /* an invalid character was encountered */
+ i_width = i_len;
+ else
{
- 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;
+ i_width = wcswidth( psz_wide, i_char_len );
+ if( i_width == (size_t)-1 ) /* a non printable character was encountered */
+ i_width = i_len;
+ }
+ if( i_width > (size_t)w )
+#else
+ if( i_len > w )
+#endif
+ { /* FIXME: ncursesw: ellipsize psz_wide while keeping the width in mind */
+ int i_cut = i_len - w;
+ int x1 = i_len/2 - i_cut/2;
+ int x2 = x1 + i_cut;
- if( i_len > x2 )
- {
- memmove( &p_buf[x1], &p_buf[x2], i_len - x2 );
- }
- p_buf[w] = '\0';
- if( w > 7 )
- {
- p_buf[w/2-1] = '.';
- p_buf[w/2 ] = '.';
- p_buf[w/2+1] = '.';
- }
- psz_local = ToLocale( p_buf );
- mvprintw( y, x, "%s", psz_local );
- LocaleFree( p_buf );
+ if( i_len > x2 )
+ {
+ memmove( &p_buf[x1], &p_buf[x2], i_len - x2 );
}
- else
+ p_buf[w] = '\0';
+ if( w > 7 )
{
- char *psz_local = ToLocale( p_buf );
- mvprintw( y, x, "%s", psz_local );
- LocaleFree( p_buf );
- mvhline( y, x + i_len, ' ', w - i_len );
+ p_buf[w/2-1] = '.';
+ p_buf[w/2 ] = '.';
+ p_buf[w/2+1] = '.';
}
+#ifdef HAVE_NCURSESW
+ mvprintw( y, x, "%s", p_buf );
+#else
+ char *psz_local = ToLocale( p_buf );
+ mvprintw( y, x, "%s", psz_local );
+ LocaleFree( p_buf );
+#endif
+ }
+ else
+ {
+#ifdef HAVE_NCURSESW
+ mvprintw( y, x, "%s", p_buf );
+ mvhline( y, x + i_width, ' ', w - i_width );
+#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, ... )
}
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 )
vlc_value_t val_list;
/* Source */
- mvnprintw( y++, 0, COLS, " Source : %s",
- input_GetItem(p_input)->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" );
}
else if( val.i_int == OPENING_S )
{
- mvnprintw( y++, 0, COLS, " State : Openning/Connecting" );
+ mvnprintw( y, 0, COLS, " State : Opening/Connecting" );
}
else if( val.i_int == BUFFERING_S )
{
- mvnprintw( y++, 0, COLS, " State : Buffering" );
+ mvnprintw( y, 0, COLS, " State : Buffering" );
}
else if( val.i_int == PAUSE_S )
{
- mvnprintw( y++, 0, COLS, " State : Paused" );
- }
- else
- {
- y++;
+ mvnprintw( y, 0, COLS, " State : Paused" );
}
+ char *psz_playlist_state = malloc( 25 );
+ /* strlen( "[Repeat] [Random] [Loop] ) == 24, + '\0' */
+ psz_playlist_state[0] = '\0';
+ if( var_GetBool( p_sys->p_playlist, "repeat" ) )
+ strcat( psz_playlist_state, "[Repeat] " );
+ if( var_GetBool( p_sys->p_playlist, "random" ) )
+ strcat( psz_playlist_state, "[Random] " );
+ if( var_GetBool( p_sys->p_playlist, "loop" ) )
+ strcat( psz_playlist_state, "[Loop]" );
+ mvnprintw( y++, 32, COLS, psz_playlist_state );
+ free( psz_playlist_state );
+
if( val.i_int != INIT_S && val.i_int != END_S )
{
audio_volume_t i_volume;
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;
}
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;
strcmp( psz_entry, ".." ) )
{
free( psz_entry );
- psz_entry = utf8_readdir( p_current_dir );
continue;
}
if( !( p_dir_entry = malloc( sizeof( struct dir_entry_t) ) ) )
{
- free( psz_uri);
- return;
+ free( psz_uri );
+ free( psz_entry );
+ continue;
}
#if defined( S_ISDIR )
- 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
free( psz_uri );
free( psz_entry );
- /* Read next entry */
- psz_entry = utf8_readdir( p_current_dir );
}
/* Sort */
projects / vlc / blobdiff