X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=40a0ebd103d4ff1a6eb1ebd80d0aabc356c801bc;hb=8a72c657e913a8993e64d37eb310f495eca4c337;hp=d1cdba433d534e88754748975ea28147c14b7f6a;hpb=35192dd7729d4c3aae4c2ff28e8a823f95f02705;p=vlc diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index d1cdba433d..40a0ebd103 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -1,7 +1,7 @@ /***************************************************************************** * ncurses.c : NCurses interface for vlc ***************************************************************************** - * Copyright © 2001-2007 the VideoLAN team + * Copyright © 2001-2010 the VideoLAN team * $Id$ * * Authors: Sam Hocevar @@ -56,16 +56,13 @@ #include #include #include +#include #include #ifdef HAVE_SYS_STAT_H # include #endif -#if (!defined( WIN32 ) || defined(__MINGW32__)) -/* Mingw has its own version of dirent */ -# include -#endif #define SEARCH_CHAIN_SIZE 20 #define OPEN_CHAIN_SIZE 50 @@ -73,50 +70,27 @@ /***************************************************************************** * Local prototypes. *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); - -static void Run ( intf_thread_t * ); -static void PlayPause ( intf_thread_t * ); -static void Eject ( intf_thread_t * ); - -static int HandleKey ( intf_thread_t *, int ); -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, const char *); -static void PlaylistDestroy( intf_thread_t * ); -static int PlaylistChanged( vlc_object_t *, const char *, vlc_value_t, - vlc_value_t, void * ); -static inline bool PlaylistIsPlaying( playlist_t *, playlist_item_t * ); -static void FindIndex ( intf_thread_t *, playlist_t * ); -static void SearchPlaylist ( intf_thread_t *, char * ); -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 * ); +static int Open (vlc_object_t *); +static void Close (vlc_object_t *); /***************************************************************************** * Module descriptor *****************************************************************************/ #define BROWSE_TEXT N_("Filebrowser starting point") -#define BROWSE_LONGTEXT N_( \ +#define BROWSE_LONGTEXT N_(\ "This option allows you to specify the directory the ncurses filebrowser " \ "will show you initially.") vlc_module_begin () - set_shortname( "Ncurses" ) - set_description( N_("Ncurses interface") ) - set_capability( "interface", 10 ) - set_category( CAT_INTERFACE ) - set_subcategory( SUBCAT_INTERFACE_MAIN ) - set_callbacks( Open, Close ) - add_shortcut( "curses" ) - add_directory( "browse-dir", NULL, NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false ) + set_shortname("Ncurses") + set_description(N_("Ncurses interface")) + set_capability("interface", 10) + set_category(CAT_INTERFACE) + set_subcategory(SUBCAT_INTERFACE_MAIN) + set_callbacks(Open, Close) + add_shortcut("curses") + add_directory("browse-dir", NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false) vlc_module_end () /***************************************************************************** @@ -127,7 +101,7 @@ enum BOX_NONE, BOX_HELP, BOX_INFO, - BOX_LOG, +// BOX_LOG, BOX_PLAYLIST, BOX_SEARCH, BOX_OPEN, @@ -136,6 +110,7 @@ enum BOX_OBJECTS, BOX_STATS }; + enum { C_DEFAULT = 0, @@ -145,35 +120,66 @@ enum C_PLAYLIST_3, C_BOX, C_STATUS, +#if 0 C_INFO, C_ERROR, C_WARNING, C_DEBUG, +#endif C_CATEGORY, - C_FOLDER + C_FOLDER, + /* XXX: new elements here ! */ + + C_MAX }; -enum + +/* Available colors: BLACK RED GREEN YELLOW BLUE MAGENTA CYAN WHITE */ +static const struct { short f; short b; } color_pairs[] = { - VIEW_CATEGORY, - VIEW_ONELEVEL + /* element */ /* foreground*/ /* background*/ + [C_TITLE] = { COLOR_YELLOW, COLOR_BLACK }, + + /* jamaican playlist, for rastafari sisters & brothers! */ + [C_PLAYLIST_1] = { COLOR_GREEN, COLOR_BLACK }, + [C_PLAYLIST_2] = { COLOR_YELLOW, COLOR_BLACK }, + [C_PLAYLIST_3] = { COLOR_RED, COLOR_BLACK }, + + /* used in DrawBox() */ + [C_BOX] = { COLOR_CYAN, COLOR_BLACK }, + /* Source: State, Position, Volume, Chapters, etc...*/ + [C_STATUS] = { COLOR_BLUE, COLOR_BLACK }, + +#if 0 + /* VLC messages, keep the order from highest priority to lowest */ + [C_INFO] = { COLOR_BLACK, COLOR_WHITE }, + [C_ERROR] = { COLOR_RED, COLOR_BLACK }, + [C_WARNING] = { COLOR_YELLOW, COLOR_BLACK }, + [C_DEBUG] = { COLOR_WHITE, COLOR_BLACK }, +#endif + /* Category title: help, info, metadata */ + [C_CATEGORY] = { COLOR_MAGENTA, COLOR_BLACK }, + /* Folder (BOX_BROWSE) */ + [C_FOLDER] = { COLOR_RED, COLOR_BLACK }, }; + struct dir_entry_t { - bool b_file; + bool b_file; char *psz_path; }; + struct pl_item_t { playlist_item_t *p_item; char *psz_display; }; + struct intf_sys_t { input_thread_t *p_input; - playlist_t *p_playlist; - bool b_color; - bool b_color_started; + bool b_color; + bool b_color_started; float f_slider; float f_slider_old; @@ -194,7 +200,7 @@ struct intf_sys_t int b_box_cleared; - msg_subscription_t* p_sub; /* message bank subscription */ +// msg_subscription_t* p_sub; /* message bank subscription */ char *psz_search_chain; /* for playlist searching */ char *psz_old_search; /* for searching next */ @@ -208,1374 +214,652 @@ struct intf_sys_t char *psz_current_dir; int i_dir_entries; struct dir_entry_t **pp_dir_entries; - bool b_show_hidden_files; + bool b_show_hidden_files; - int i_current_view; /* playlist view */ + bool category_view; struct pl_item_t **pp_plist; int i_plist_entries; - bool b_need_update; /* for playlist view */ + bool b_need_update; /* for playlist view */ }; -static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title, bool b_color ); -static void DrawLine( WINDOW *win, int y, int x, int w ); -static void DrawEmptyLine( WINDOW *win, int y, int x, int w ); - /***************************************************************************** - * Open: initialize and create window + * Directories *****************************************************************************/ -static int Open( vlc_object_t *p_this ) + +static void DirsDestroy(intf_sys_t *p_sys) { - intf_thread_t *p_intf = (intf_thread_t *)p_this; - intf_sys_t *p_sys; + while (p_sys->i_dir_entries) + { + struct dir_entry_t *p_dir_entry; + p_dir_entry = p_sys->pp_dir_entries[--p_sys->i_dir_entries]; + free(p_dir_entry->psz_path); + free(p_dir_entry); + } + free(p_sys->pp_dir_entries); + p_sys->pp_dir_entries = NULL; +} - /* 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; - p_sys->f_slider_old = 0.0; - p_sys->i_box_type = BOX_PLAYLIST; - p_sys->i_box_lines = 0; - p_sys->i_box_start= 0; - p_sys->i_box_lines_total = 0; - p_sys->b_box_plidx_follow = true; - p_sys->b_box_cleared = false; - p_sys->i_box_plidx = 0; - p_sys->i_box_bidx = 0; -// FIXME p_sys->p_sub = msg_Subscribe( p_intf ); - p_sys->b_color = var_CreateGetBool( p_intf, "color" ); - p_sys->b_color_started = false; +static int comp_dir_entries(const void *pp_dir_entry1, const void *pp_dir_entry2) +{ + struct dir_entry_t *p_dir_entry1 = *(struct dir_entry_t**)pp_dir_entry1; + struct dir_entry_t *p_dir_entry2 = *(struct dir_entry_t**)pp_dir_entry2; -#ifndef HAVE_NCURSESW - memset( p_sys->psz_partial_keys, 0, sizeof( p_sys->psz_partial_keys ) ); -#endif + if (p_dir_entry1->b_file == p_dir_entry2->b_file) + return strcasecmp(p_dir_entry1->psz_path, p_dir_entry2->psz_path); + + return p_dir_entry1->b_file ? 1 : -1; +} + +static void ReadDir(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + DIR *p_current_dir; - /* Initialize the curses library */ - p_sys->w = initscr(); + if (!p_sys->psz_current_dir || !*p_sys->psz_current_dir) + { + msg_Dbg(p_intf, "no current dir set"); + return; + } - if( p_sys->b_color ) - start_color_and_pairs( p_intf ); + char *psz_entry; - keypad( p_sys->w, TRUE ); - /* Don't do NL -> CR/NL */ - nonl(); - /* Take input chars one at a time */ - cbreak(); - /* Don't echo */ - noecho(); - /* Invisible cursor */ - curs_set( 0 ); - /* Non blocking wgetch() */ - wtimeout( p_sys->w, 0 ); + /* Open the dir */ + p_current_dir = vlc_opendir(p_sys->psz_current_dir); - clear(); + if (!p_current_dir) + { + /* something went bad, get out of here ! */ + msg_Warn(p_intf, "cannot open directory `%s' (%m)", + p_sys->psz_current_dir); + return; + } - /* exported function */ - p_intf->pf_run = Run; + /* Clean the old shit */ + DirsDestroy(p_sys); - /* Stop printing errors to the console */ - freopen( "/dev/null", "wb", stderr ); + /* while we still have entries in the directory */ + while ((psz_entry = vlc_readdir(p_current_dir))) + { +#if defined(S_ISDIR) + struct stat stat_data; +#endif + struct dir_entry_t *p_dir_entry; + char *psz_uri = NULL; - /* Set defaul playlist view */ - p_sys->i_current_view = VIEW_CATEGORY; - p_sys->pp_plist = NULL; - p_sys->i_plist_entries = 0; - p_sys->b_need_update = false; + if (!p_sys->b_show_hidden_files) + if (*psz_entry == '.' && strcmp(psz_entry, "..")) + goto next; - /* Initialize search chain */ - p_sys->psz_search_chain = malloc( SEARCH_CHAIN_SIZE + 1 ); - p_sys->psz_old_search = NULL; - p_sys->i_before_search = 0; + if (asprintf(&psz_uri, "%s/%s", p_sys->psz_current_dir, psz_entry) == -1) + { + psz_uri = NULL; + goto next; + } - /* Initialize open chain */ - p_sys->psz_open_chain = malloc( OPEN_CHAIN_SIZE + 1 ); + if (!(p_dir_entry = malloc(sizeof *p_dir_entry))) + goto next; - /* Initialize browser options */ - char* psz_tmp = var_CreateGetString( p_intf, "browse-dir" ); - if( psz_tmp && *psz_tmp ) - p_sys->psz_current_dir = psz_tmp; - else - { - p_sys->psz_current_dir = config_GetUserDir( VLC_HOME_DIR ); - free( psz_tmp ); + p_dir_entry->b_file = +#if defined(S_ISDIR) + vlc_stat(psz_uri, &stat_data) || !S_ISDIR(stat_data.st_mode) +/*#elif defined(DT_DIR) + !(p_dir_content->d_type & DT_DIR)*/ +#else + false +#endif + ; + + p_dir_entry->psz_path = strdup(psz_entry); + INSERT_ELEM(p_sys->pp_dir_entries, p_sys->i_dir_entries, + p_sys->i_dir_entries, p_dir_entry); + +next: + free(psz_uri); + free(psz_entry); } - p_sys->i_dir_entries = 0; - p_sys->pp_dir_entries = NULL; - p_sys->b_show_hidden_files = false; - ReadDir( p_intf ); + /* Sort */ + qsort(p_sys->pp_dir_entries, p_sys->i_dir_entries, + sizeof(struct dir_entry_t*), &comp_dir_entries); - return VLC_SUCCESS; + closedir(p_current_dir); } /***************************************************************************** - * Close: destroy interface window + * Playlist *****************************************************************************/ -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; - PlaylistDestroy( p_intf ); - - while( p_sys->i_dir_entries ) +static void PlaylistDestroy(intf_sys_t *p_sys) +{ + while (p_sys->i_plist_entries) { - 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, 0 ); - free( p_dir_entry ); + struct pl_item_t *p_pl_item = p_sys->pp_plist[--p_sys->i_plist_entries]; + free(p_pl_item->psz_display); + free(p_pl_item); } - p_sys->pp_dir_entries = NULL; + free(p_sys->pp_plist); + p_sys->pp_plist = NULL; +} + +static inline playlist_item_t *PlaylistGetRoot(intf_thread_t *p_intf) +{ + playlist_t *p_playlist = pl_Get(p_intf); + return p_intf->p_sys->category_view ? + p_playlist->p_root_category : + p_playlist->p_root_onelevel; +} - free( p_sys->psz_current_dir ); - free( p_sys->psz_search_chain ); - free( p_sys->psz_old_search ); - free( p_sys->psz_open_chain ); +static bool PlaylistAddChild(intf_sys_t *p_sys, playlist_item_t *p_child, + const char *c, const char d) +{ + int ret; + char *psz_name = input_item_GetTitleFbName(p_child->p_input); + struct pl_item_t *p_pl_item = malloc(sizeof *p_pl_item); - if( p_sys->p_input ) - { - vlc_object_release( p_sys->p_input ); - } - pl_Release( p_intf ); + if (!psz_name || !p_pl_item) + goto error; - /* Close the ncurses interface */ - endwin(); + p_pl_item->p_item = p_child; -// FIXME msg_Unsubscribe( p_intf, p_sys->p_sub ); + if (c && *c) + ret = asprintf(&p_pl_item->psz_display, "%s%c-%s", c, d, psz_name); + else + ret = asprintf(&p_pl_item->psz_display, " %s", psz_name); - /* Destroy structure */ - free( p_sys ); -} + free(psz_name); + psz_name = NULL; -/***************************************************************************** - * Run: ncurses thread - *****************************************************************************/ -static void Run( intf_thread_t *p_intf ) -{ - intf_sys_t *p_sys = p_intf->p_sys; - playlist_t *p_playlist = pl_Hold( p_intf ); - p_sys->p_playlist = p_playlist; + if (ret == -1) + goto error; - int i_key; - time_t t_last_refresh; - int canc = vlc_savecancel(); + INSERT_ELEM(p_sys->pp_plist, p_sys->i_plist_entries, + p_sys->i_plist_entries, p_pl_item); - /* - * force drawing the interface for the first time - */ - t_last_refresh = ( time( 0 ) - 1); - /* - * force building of the playlist array - */ - PlaylistRebuild( p_intf ); - var_AddCallback( p_playlist, "intf-change", PlaylistChanged, p_intf ); - var_AddCallback( p_playlist, "playlist-item-append", PlaylistChanged, p_intf ); - - while( vlc_object_alive( p_intf ) ) + return true; + +error: + free(psz_name); + free(p_pl_item); + return false; +} + +static void PlaylistAddNode(intf_sys_t *p_sys, playlist_item_t *p_node, + const char *c) +{ + for(int k = 0; k < p_node->i_children; k++) { - msleep( INTF_IDLE_SLEEP ); + playlist_item_t *p_child = p_node->pp_children[k]; + char d = k == p_node->i_children - 1 ? '`' : '|'; + if(!PlaylistAddChild(p_sys, p_child, c, d)) + return; - /* Update the input */ - if( p_sys->p_input == NULL ) - { - p_sys->p_input = playlist_CurrentInput( p_playlist ); - } - 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 = false; - } + if (p_child->i_children <= 0) + continue; - PL_LOCK; - if( p_sys->b_box_plidx_follow && playlist_CurrentPlayingItem(p_playlist) ) + if (*c) { - PL_UNLOCK; - FindIndex( p_intf, p_playlist ); + char *psz_tmp; + if (asprintf(&psz_tmp, "%s%c ", c, + k == p_node->i_children - 1 ? ' ' : '|') == -1) + return; + PlaylistAddNode(p_sys, p_child, psz_tmp); + free(psz_tmp); } else - PL_UNLOCK; + PlaylistAddNode(p_sys, p_child, " "); + } +} - while( ( i_key = wgetch( p_sys->w ) ) != -1 ) - { - /* - * HandleKey returns 1 if the screen needs to be redrawn - */ - if( HandleKey( p_intf, i_key ) ) - { - Redraw( p_intf, &t_last_refresh ); - } - } - /* Hack */ - if( p_sys->f_slider > 0.0001 && !p_sys->b_box_cleared ) - { - clear(); - Redraw( p_intf, &t_last_refresh ); - p_sys->b_box_cleared = true; - } +static void PlaylistRebuild(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + playlist_t *p_playlist = pl_Get(p_intf); - /* - * redraw the screen every second - */ - if( (time(0) - t_last_refresh) >= 1 ) - { - ManageSlider( p_intf ); - Redraw( p_intf, &t_last_refresh ); - } - } - var_DelCallback( p_playlist, "intf-change", PlaylistChanged, p_intf ); - var_DelCallback( p_playlist, "playlist-item-append", PlaylistChanged, p_intf ); - vlc_restorecancel( canc ); + PL_LOCK; + + PlaylistDestroy(p_sys); + PlaylistAddNode(p_sys, PlaylistGetRoot(p_intf), ""); + p_sys->b_need_update = false; + + PL_UNLOCK; +} + +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; + intf_sys_t *p_sys = p_intf->p_sys; + playlist_item_t *p_node = playlist_CurrentPlayingItem(pl_Get(p_intf)); + + p_sys->b_need_update = true; + p_sys->p_node = p_node ? p_node->p_parent : NULL; + + return VLC_SUCCESS; +} + +/* Playlist suxx */ +/* This function have to be called with the playlist locked */ +static inline bool PlaylistIsPlaying(playlist_t *p_playlist, + playlist_item_t *p_item) +{ + playlist_item_t *p_played_item = playlist_CurrentPlayingItem(p_playlist); + return p_item && p_played_item + && p_item->p_input && p_played_item->p_input + && p_item->p_input->i_id == p_played_item->p_input->i_id; +} + +static int SubSearchPlaylist(intf_sys_t *p_sys, char *psz_searchstring, + int i_start, int i_stop) +{ + for(int i = i_start + 1; i < i_stop; i++) + if (strcasestr(p_sys->pp_plist[i]->psz_display, psz_searchstring)) + return i; + + return -1; } -/* following functions are local */ -static void start_color_and_pairs( intf_thread_t *p_intf ) +static void SearchPlaylist(intf_sys_t *p_sys, char *psz_searchstring) { - assert( p_intf->p_sys->b_color && !p_intf->p_sys->b_color_started ); + int i_item, i_first = p_sys->i_before_search; + + if (i_first < 0) + i_first = 0; - if( !has_colors() ) + if (!psz_searchstring || !*psz_searchstring) { - p_intf->p_sys->b_color = false; - msg_Warn( p_intf, "Terminal doesn't support colors" ); + p_sys->i_box_plidx = p_sys->i_before_search; return; } - start_color(); + i_item = SubSearchPlaylist(p_sys, psz_searchstring, i_first + 1, + p_sys->i_plist_entries); + if (i_item < 0) + i_item = SubSearchPlaylist(p_sys, psz_searchstring, 0, i_first); + + if (i_item > 0) + p_sys->i_box_plidx = i_item; +} - /* Available colors: BLACK RED GREEN YELLOW BLUE MAGENTA CYAN WHITE */ +static inline bool IsIndex(intf_sys_t *p_sys, playlist_t *p_playlist, int i) +{ + playlist_item_t *p_item = p_sys->pp_plist[i]->p_item; + return (p_item->i_children == 0 && p_item == p_sys->p_node) || + PlaylistIsPlaying(p_playlist, p_item); +} - /* untested, in all my terminals, !can_change_color() --funman */ - if( can_change_color() ) - init_color( COLOR_YELLOW, 960, 500, 0 ); /* YELLOW -> ORANGE */ +static void FindIndex(intf_sys_t *p_sys, playlist_t *p_playlist, bool locked) +{ + int plidx = p_sys->i_box_plidx; + if (!locked) + PL_LOCK; - /* title */ - init_pair( C_TITLE, COLOR_YELLOW, COLOR_BLACK ); + if (plidx < 0 || plidx >= p_sys->i_plist_entries || + !IsIndex(p_sys, p_playlist, plidx)) + { + for(int i = 0; i < p_sys->i_plist_entries; i++) + if (IsIndex(p_sys, p_playlist, i)) + { + p_sys->i_box_plidx = i; + break; + } + } - /* 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 ); + if (!locked) + PL_UNLOCK; +} - /* 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 ); +/**************************************************************************** + * Drawing + ****************************************************************************/ - /* VLC messages, keep the order from highest priority to lowest */ +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); - /* 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 ); + if (!has_colors()) + { + p_intf->p_sys->b_color = false; + msg_Warn(p_intf, "Terminal doesn't support colors"); + return; + } - /* Category title (help, info, metadata) */ - init_pair( C_CATEGORY, COLOR_MAGENTA, COLOR_BLACK ); + start_color(); + for(int i = C_DEFAULT + 1; i < C_MAX; i++) + init_pair(i, color_pairs[i].f, color_pairs[i].b); - /* Folder (BOX_BROWSE) */ - init_pair( C_FOLDER, COLOR_RED, COLOR_BLACK ); + /* untested, in all my terminals, !can_change_color() --funman */ + if (can_change_color()) + init_color(COLOR_YELLOW, 960, 500, 0); /* YELLOW -> ORANGE */ p_intf->p_sys->b_color_started = true; } -#ifndef HAVE_NCURSESW -static char *KeyToUTF8( int i_key, char *psz_part ) +static void DrawBox(WINDOW *win, int y, int x, int h, int w, const char *title, bool b_color) { - char *psz_utf8; - int len = strlen( psz_part ); - if( len == 6 ) - { - /* overflow error - should not happen */ - memset( psz_part, 0, 6 ); - return NULL; - } + int i_len; - psz_part[len] = (char)i_key; + if (w <= 3 || h <= 2) + return; - psz_utf8 = FromLocaleDup( psz_part ); + if (b_color) + wcolor_set(win, C_BOX, NULL); + if (!title) title = ""; + i_len = strlen(title); - /* 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 != '?' ) ) - { - /* incomplete bytes sequence detected - * (VLC core inserted dummy question marks) */ - free( psz_utf8 ); - return NULL; - } + if (i_len > w - 2) + i_len = w - 2; - /* Check for incomplete UTF8 bytes sequence */ - if( EnsureUTF8( psz_utf8 ) == NULL ) + mvwaddch(win, y, x, ACS_ULCORNER); + mvwhline(win, y, x+1, ACS_HLINE, (w-i_len-2)/2); + mvwprintw(win,y, x+1+(w-i_len-2)/2, "%s", title); + mvwhline(win, y, x+(w-i_len)/2+i_len, ACS_HLINE, w - 1 - ((w-i_len)/2+i_len)); + mvwaddch(win, y, x+w-1,ACS_URCORNER); + + for(int i = 0; i < h-2; i++) { - free( psz_utf8 ); - return NULL; + mvwaddch(win, y+i+1, x, ACS_VLINE); + mvwaddch(win, y+i+1, x+w-1, ACS_VLINE); } - memset( psz_part, 0, 6 ); - return psz_utf8; + 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); } -#endif -static inline int RemoveLastUTF8Entity( char *psz, int len ) +static void DrawEmptyLine(WINDOW *win, int y, int x, int w) { - while( len && ( (psz[--len] & 0xc0) == 0x80 ) ); - /* UTF8 continuation byte */ + if (w <= 0) return; - psz[len] = '\0'; - return len; + mvwhline(win, y, x, ' ', w); } -static int HandleKey( intf_thread_t *p_intf, int i_key ) +static void DrawLine(WINDOW *win, int y, int x, int w) { - intf_sys_t *p_sys = p_intf->p_sys; - int i_ret = 1; + if (w <= 0) return; + + attrset(A_REVERSE); + mvwhline(win, y, x, ' ', w); + attroff(A_REVERSE); +} + +static void mvnprintw(int y, int x, int w, const char *p_fmt, ...) +{ + va_list vl_args; + char *p_buf; + 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); + + 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); - playlist_t *p_playlist = pl_Hold( p_intf ); + size_t i_width; /* number of columns */ - if( p_sys->i_box_type == BOX_PLAYLIST ) + if (i_char_len == (size_t)-1) /* an invalid character was encountered */ { - int b_ret = true; - bool b_box_plidx_follow = false; + free(p_buf); + return; + } - switch( i_key ) + i_width = wcswidth(psz_wide, i_char_len); + if (i_width == (size_t)-1) + { + /* a non printable character was encountered */ + i_width = 0; + for(unsigned i = 0 ; i < i_char_len ; i++) { - /* Playlist Settings */ - case 'r': - var_ToggleBool( p_playlist, "random" ); - goto end; - case 'l': - var_ToggleBool( p_playlist, "loop" ); - goto end; - case 'R': - var_ToggleBool( p_playlist, "repeat" ); - goto end; + int i_cwidth = wcwidth(psz_wide[i]); + if (i_cwidth != -1) + i_width += i_cwidth; + } + } - /* Playlist sort */ - case 'o': - playlist_RecursiveNodeSort( p_playlist, - PlaylistGetRoot( p_intf ), - SORT_TITLE_NODES_FIRST, ORDER_NORMAL ); - p_sys->b_need_update = true; - goto end; - case 'O': - playlist_RecursiveNodeSort( p_playlist, - PlaylistGetRoot( p_intf ), - SORT_TITLE_NODES_FIRST, ORDER_REVERSE ); - p_sys->b_need_update = true; - goto end; + if (i_width <= (size_t)w) + { + mvprintw(y, x, "%s", p_buf); + mvhline(y, x + i_width, ' ', w - i_width); + free(p_buf); + return; + } - /* Playlist view */ - case 'v': - switch( p_sys->i_current_view ) - { - case VIEW_CATEGORY: - p_sys->i_current_view = VIEW_ONELEVEL; - break; - default: - p_sys->i_current_view = VIEW_CATEGORY; - } - //p_sys->b_need_update = true; - PlaylistRebuild( p_intf ); - goto end; + 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) + { + 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; + } - /* Playlist navigation */ - case 'g': - FindIndex( p_intf, p_playlist ); - 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_playlist->items.i_size - 1; - break; - case KEY_UP: - p_sys->i_box_plidx--; - break; - case KEY_DOWN: - p_sys->i_box_plidx++; - break; - case KEY_PPAGE: - p_sys->i_box_plidx -= p_sys->i_box_lines; - break; - case KEY_NPAGE: - p_sys->i_box_plidx += p_sys->i_box_lines; - break; - case 'D': - case KEY_BACKSPACE: - case 0x7f: - case KEY_DC: - { - playlist_item_t *p_item; - - 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, pl_Locked ); - } - else - { - playlist_NodeDelete( p_playlist, p_item, - true , false ); - } - PL_UNLOCK; - PlaylistRebuild( p_intf ); - break; - } - - case KEY_ENTER: - case '\r': - case '\n': - if( !p_sys->pp_plist[p_sys->i_box_plidx] ) - { - b_ret = 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_playlist->p_root_onelevel; - while( p_parent->p_parent ) - p_parent = p_parent->p_parent; - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, - pl_Unlocked, 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 - { - p_sys->p_node = p_sys->pp_plist[p_sys->i_box_plidx]->p_item; - 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; - break; - default: - b_ret = false; - break; - } - - if( b_ret ) - { - int i_max = p_sys->i_plist_entries; - if( p_sys->i_box_plidx >= i_max ) p_sys->i_box_plidx = i_max - 1; - if( p_sys->i_box_plidx < 0 ) p_sys->i_box_plidx = 0; - - PL_LOCK; - if( PlaylistIsPlaying( p_playlist, - p_sys->pp_plist[p_sys->i_box_plidx]->p_item ) ) - b_box_plidx_follow = true; - PL_UNLOCK; - p_sys->b_box_plidx_follow = b_box_plidx_follow; - goto end; - } - } - if( p_sys->i_box_type == BOX_BROWSE ) - { - bool b_ret = true; - /* Browser navigation */ - switch( 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; - case KEY_UP: - p_sys->i_box_bidx--; - break; - case KEY_DOWN: - p_sys->i_box_bidx++; - break; - case KEY_PPAGE: - p_sys->i_box_bidx -= p_sys->i_box_lines; - break; - case KEY_NPAGE: - p_sys->i_box_bidx += p_sys->i_box_lines; - break; - case '.': /* Toggle show hidden files */ - p_sys->b_show_hidden_files = ( p_sys->b_show_hidden_files == - true ? false : true ); - ReadDir( p_intf ); - break; - - case KEY_ENTER: - case '\r': - case '\n': - case ' ': - if( p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file || i_key == ' ' ) - { - char* psz_uri; - if( asprintf( &psz_uri, "%s://%s/%s", - p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file ? - "file" : "directory", - p_sys->psz_current_dir, - p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path - ) == -1 ) - { - psz_uri = NULL; - } - - playlist_item_t *p_parent = p_sys->p_node; - if( !p_parent ) - { - PL_LOCK; - p_parent = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL; - PL_UNLOCK; - 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 - , false ); - - p_sys->i_box_type = BOX_PLAYLIST; - free( psz_uri ); - } - else - { - if( asprintf( &(p_sys->psz_current_dir), "%s/%s", p_sys->psz_current_dir, - p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) != -1 ) - ReadDir( p_intf ); - } - break; - default: - b_ret = false; - break; - } - if( b_ret ) - { - if( p_sys->i_box_bidx >= p_sys->i_dir_entries ) p_sys->i_box_bidx = p_sys->i_dir_entries - 1; - if( p_sys->i_box_bidx < 0 ) p_sys->i_box_bidx = 0; - goto end; - } - } - 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_STATS || - p_sys->i_box_type == BOX_OBJECTS ) - { - switch( i_key ) - { - case KEY_HOME: - p_sys->i_box_start = 0; - goto end; -#ifdef __FreeBSD__ - case KEY_SELECT: -#endif - case KEY_END: - p_sys->i_box_start = p_sys->i_box_lines_total - 1; - goto end; - case KEY_UP: - if( p_sys->i_box_start > 0 ) p_sys->i_box_start--; - goto end; - case KEY_DOWN: - if( p_sys->i_box_start < p_sys->i_box_lines_total - 1 ) - { - p_sys->i_box_start++; - } - goto end; - case KEY_PPAGE: - p_sys->i_box_start -= p_sys->i_box_lines; - if( p_sys->i_box_start < 0 ) p_sys->i_box_start = 0; - goto end; - case KEY_NPAGE: - p_sys->i_box_start += p_sys->i_box_lines; - if( p_sys->i_box_start >= p_sys->i_box_lines_total ) - { - p_sys->i_box_start = p_sys->i_box_lines_total - 1; - } - goto end; - default: - break; - } - } - else if( p_sys->i_box_type == BOX_NONE ) - { - switch( i_key ) - { - case KEY_HOME: - p_sys->f_slider = 0; - ManageSlider( p_intf ); - goto end; -#ifdef __FreeBSD__ - case KEY_SELECT: -#endif - case KEY_END: - p_sys->f_slider = 99.9; - ManageSlider( p_intf ); - goto end; - case KEY_UP: - p_sys->f_slider += 5.0; - if( p_sys->f_slider >= 99.0 ) p_sys->f_slider = 99.0; - ManageSlider( p_intf ); - goto end; - case KEY_DOWN: - p_sys->f_slider -= 5.0; - if( p_sys->f_slider < 0.0 ) p_sys->f_slider = 0.0; - ManageSlider( p_intf ); - goto end; - - default: - break; - } - } - else if( p_sys->i_box_type == BOX_SEARCH && 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(); - goto end; - case KEY_ENTER: - case '\r': - case '\n': - if( i_chain_len > 0 ) - { - p_sys->psz_old_search = strdup( p_sys->psz_search_chain ); - } - else if( p_sys->psz_old_search ) - { - SearchPlaylist( p_intf, p_sys->psz_old_search ); - } - p_sys->i_box_type = BOX_PLAYLIST; - goto end; - 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 ) - { - i_ret = 0; - goto end; - } - p_sys->i_box_plidx = p_sys->i_before_search; - p_sys->i_box_type = BOX_PLAYLIST; - goto end; - 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 ) - { - if( i_chain_len + strlen( psz_utf8 ) < SEARCH_CHAIN_SIZE ) - { - strcpy( p_sys->psz_search_chain + i_chain_len, - psz_utf8 ); - } - free( psz_utf8 ); - } -#endif - break; - } - } - free( p_sys->psz_old_search ); - p_sys->psz_old_search = NULL; - SearchPlaylist( p_intf, p_sys->psz_search_chain ); - goto end; - } - else if( p_sys->i_box_type == BOX_OPEN && p_sys->psz_open_chain ) - { - int i_chain_len = strlen( p_sys->psz_open_chain ); - - switch( i_key ) - { - case KEY_CLEAR: - case 0x0c: /* ^l */ - clear(); - break; - case KEY_ENTER: - case '\r': - case '\n': - if( i_chain_len > 0 ) - { - playlist_item_t *p_parent = p_sys->p_node; - - PL_LOCK; - if( !p_parent ) - p_parent = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL; - 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; - PL_UNLOCK; - - 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 - , false ); - - p_sys->b_box_plidx_follow = true; - } - p_sys->i_box_type = BOX_PLAYLIST; - break; - case 0x1b: /* ESC */ - if( wgetch( p_sys->w ) != ERR ) - { - i_ret = 0; - break; - } - p_sys->i_box_type = BOX_PLAYLIST; - break; - 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 ) - { - if( i_chain_len + strlen( psz_utf8 ) < OPEN_CHAIN_SIZE ) - { - strcpy( p_sys->psz_open_chain + i_chain_len, - psz_utf8 ); - } - free( psz_utf8 ); - } -#endif - } - } - goto end; - } - - - /* Common keys */ - switch( i_key ) - { - case 0x1b: /* ESC */ - if( wgetch( p_sys->w ) != ERR ) - { - i_ret = 0; - break; - } - case 'q': - case 'Q': - case KEY_EXIT: - libvlc_Quit( p_intf->p_libvlc ); - i_ret = 0; - break; - - /* Box switching */ - case 'i': - if( p_sys->i_box_type == BOX_INFO ) - p_sys->i_box_type = BOX_NONE; - else - p_sys->i_box_type = BOX_INFO; - p_sys->i_box_lines_total = 0; - break; - 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; - break; - case 'L': - if( p_sys->i_box_type == BOX_LOG ) - p_sys->i_box_type = BOX_NONE; - else - p_sys->i_box_type = BOX_LOG; - break; - case 'P': - if( p_sys->i_box_type == BOX_PLAYLIST ) - p_sys->i_box_type = BOX_NONE; - else - p_sys->i_box_type = BOX_PLAYLIST; - break; - case 'B': - if( p_sys->i_box_type == BOX_BROWSE ) - p_sys->i_box_type = BOX_NONE; - else - p_sys->i_box_type = BOX_BROWSE; - break; - 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; - break; - 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; - break; - 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 ); - break; - case 'h': - case 'H': - if( p_sys->i_box_type == BOX_HELP ) - p_sys->i_box_type = BOX_NONE; - else - p_sys->i_box_type = BOX_HELP; - p_sys->i_box_lines_total = 0; - break; - case '/': - if( p_sys->i_box_type != BOX_SEARCH ) - { - if( p_sys->psz_search_chain ) - { - p_sys->psz_search_chain[0] = '\0'; - p_sys->b_box_plidx_follow = false; - p_sys->i_before_search = p_sys->i_box_plidx; - p_sys->i_box_type = BOX_SEARCH; - } - } - break; - case 'A': /* Open */ - if( p_sys->i_box_type != BOX_OPEN ) - { - if( p_sys->psz_open_chain ) - { - p_sys->psz_open_chain[0] = '\0'; - p_sys->i_box_type = BOX_OPEN; - } - } - break; - - /* Navigation */ - case KEY_RIGHT: - p_sys->f_slider += 1.0; - if( p_sys->f_slider > 99.9 ) p_sys->f_slider = 99.9; - ManageSlider( p_intf ); - break; - - case KEY_LEFT: - p_sys->f_slider -= 1.0; - if( p_sys->f_slider < 0.0 ) p_sys->f_slider = 0.0; - ManageSlider( p_intf ); - break; - - /* Common control */ - case 'f': - { - if( p_intf->p_sys->p_input ) - { - vout_thread_t *p_vout; - p_vout = vlc_object_find( p_intf->p_sys->p_input, - VLC_OBJECT_VOUT, FIND_CHILD ); - if( p_vout ) - { - var_ToggleBool( p_vout, "fullscreen" ); - vlc_object_release( p_vout ); - } - else - { - var_ToggleBool( p_playlist, "fullscreen" ); - } - } - i_ret = 0; - break; - } - - case ' ': - PlayPause( p_intf ); - break; - - case 's': - playlist_Stop( p_playlist ); - break; - - case 'e': - Eject( p_intf ); - break; - - case '[': - if( p_sys->p_input ) - var_TriggerCallback( p_sys->p_input, "prev-title" ); - break; - - case ']': - if( p_sys->p_input ) - var_TriggerCallback( p_sys->p_input, "next-title" ); - break; - - case '<': - if( p_sys->p_input ) - var_TriggerCallback( p_sys->p_input, "prev-chapter" ); - break; - - case '>': - if( p_sys->p_input ) - var_TriggerCallback( p_sys->p_input, "next-chapter" ); - break; - - case 'p': - playlist_Prev( p_playlist ); - clear(); - break; - - case 'n': - playlist_Next( p_playlist ); - clear(); - break; - - case 'a': - aout_VolumeUp( p_playlist, 1, NULL ); - clear(); - break; - - case 'z': - aout_VolumeDown( p_playlist, 1, NULL ); - clear(); - break; - - /* - * ^l should clear and redraw the screen - */ - case KEY_CLEAR: - case 0x0c: /* ^l */ - clear(); - break; - - default: - i_ret = 0; - } - -end: - pl_Release( p_intf ); - return i_ret; -} - -static void ManageSlider( intf_thread_t *p_intf ) -{ - intf_sys_t *p_sys = p_intf->p_sys; - input_thread_t *p_input = p_sys->p_input; - vlc_value_t val; - - if( p_input == NULL ) - { - return; - } - var_Get( p_input, "state", &val ); - if( val.i_int != PLAYING_S ) - { - return; - } - - var_Get( p_input, "position", &val ); - if( p_sys->f_slider == p_sys->f_slider_old ) - { - p_sys->f_slider = - p_sys->f_slider_old = 100 * val.f_float; - } - else - { - p_sys->f_slider_old = p_sys->f_slider; - - val.f_float = p_sys->f_slider / 100.0; - var_Set( p_input, "position", val ); - } -} - -static void SearchPlaylist( intf_thread_t *p_intf, char *psz_searchstring ) -{ - int i_max; - int i_first = 0 ; - int i_item = -1; - intf_sys_t *p_sys = p_intf->p_sys; - - if( p_sys->i_before_search >= 0 ) - { - i_first = p_sys->i_before_search; - } - - if( ( ! psz_searchstring ) || strlen( psz_searchstring ) <= 0 ) - { - p_sys->i_box_plidx = p_sys->i_before_search; - return; - } - - i_max = p_sys->i_plist_entries; - - i_item = SubSearchPlaylist( p_intf, psz_searchstring, i_first + 1, i_max ); - if( i_item < 0 ) - { - i_item = SubSearchPlaylist( p_intf, psz_searchstring, 0, i_first ); - } - - if( i_item < 0 || i_item >= i_max ) return; - - p_sys->i_box_plidx = i_item; -} - -static int SubSearchPlaylist( intf_thread_t *p_intf, char *psz_searchstring, - int i_start, int i_stop ) -{ - intf_sys_t *p_sys = p_intf->p_sys; - int i, i_item = -1; - - for( i = i_start + 1; i < i_stop; i++ ) - { - if( strcasestr( p_sys->pp_plist[i]->psz_display, - psz_searchstring ) != NULL ) - { - i_item = i; - break; - } - } - - return i_item; -} - - -static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) -{ - va_list vl_args; - 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 ); - - 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 */ - { - free( p_buf ); - 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++ ) - { - i_cwidth = wcwidth( psz_wide[i] ); - if( i_cwidth != -1 ) - i_width += i_cwidth; - } - } - } - 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 ) - { - 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]); - /* 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++; - /* 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; - } - i++; + 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; } - 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 ); + i++; } + 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 - if( i_len > w ) + 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 ) - { - memmove( &p_buf[x1], &p_buf[x2], i_len - x2 ); - } + if (i_len > x2) + memmove(&p_buf[x1], &p_buf[x2], i_len - x2); + p_buf[w] = '\0'; - if( w > 7 ) + 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 ); } + + char *psz_local = ToLocale(p_buf); + mvprintw(y, x, "%s", psz_local); + + if (i_len > w) + mvhline(y, x + i_len, ' ', w - i_len); + + LocaleFree(psz_local); #endif - free( p_buf ); + + free(p_buf); } -static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt, ... ) -{ - intf_sys_t *p_sys = p_intf->p_sys; - va_list vl_args; - char *p_buf = NULL; +static void MainBoxWrite(intf_thread_t *p_intf, int l, int x, const char *p_fmt, ...) +{ + intf_sys_t *p_sys = p_intf->p_sys; + va_list vl_args; + char *p_buf; - if( l < p_sys->i_box_start || l - p_sys->i_box_start >= p_sys->i_box_lines ) - { + if (l < p_sys->i_box_start || l - p_sys->i_box_start >= p_sys->i_box_lines) return; - } - va_start( vl_args, p_fmt ); - if( vasprintf( &p_buf, p_fmt, vl_args ) == -1 ) + va_start(vl_args, p_fmt); + if (vasprintf(&p_buf, p_fmt, vl_args) == -1) return; - va_end( vl_args ); + va_end(vl_args); - mvnprintw( p_sys->i_box_y + l - p_sys->i_box_start, x, COLS - x - 1, "%s", p_buf ); - free( p_buf ); + 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 ) +static void DumpObject(intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int i_level) { - char *psz_name = vlc_object_get_name( p_obj ); - if( psz_name ) + char *psz_name = vlc_object_get_name(p_obj); + if (psz_name) { - MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s \"%s\" (%p)", - p_obj->psz_object_type, psz_name, p_obj ); - free( psz_name ); + MainBoxWrite(p_intf, (*l)++, 1 + 2 * i_level, "%s \"%s\" (%p)", + p_obj->psz_object_type, psz_name, p_obj); + free(psz_name); } else - MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s (%o)", - p_obj->psz_object_type, p_obj ); + MainBoxWrite(p_intf, (*l)++, 1 + 2 * i_level, "%s (%o)", + p_obj->psz_object_type, p_obj); - vlc_list_t *list = vlc_list_children( p_obj ); - for( int i = 0; i < list->i_count ; 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 == list->i_count - 1 ? "`-" : "|-" ); - DumpObject( p_intf, l, list->p_values[i].p_object, 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_list_release( list ); + vlc_list_release(list); } -static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) +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_Hold( p_intf ); + playlist_t *p_playlist = pl_Get(p_intf); int y = 0; int h; int y_end; /* Title */ - attrset( A_REVERSE ); - int i_len = strlen( "VLC media player "PACKAGE_VERSION ); - int mid = ( COLS - i_len ) / 2; - if( mid < 0 ) + attrset(A_REVERSE); + int i_len = sizeof "VLC media player "PACKAGE_VERSION - 1; + int mid = (COLS - i_len) / 2; + if (mid < 0) mid = 0; - int i_size = ( COLS > i_len + 1 ) ? COLS : i_len + 1; + 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 ); + memset(psz_title, ' ', mid); + if (p_sys->b_color) + wcolor_set(p_sys->w, C_TITLE, NULL); + strlcpy(&psz_title[mid], "VLC media player "PACKAGE_VERSION, i_size); + 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 ); + 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 ) + 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 ) + if (p_input && !p_input->b_dead) { char buf1[MSTRTIME_MAX_SIZE]; char buf2[MSTRTIME_MAX_SIZE]; vlc_value_t val; /* Source */ - char *psz_uri = input_item_GetURI( input_GetItem( p_input ) ); - mvnprintw( y++, 0, COLS, _(" Source : %s"), psz_uri ); - free( 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 %s"), psz_state ); - } - else if( val.i_int == OPENING_S ) - { - mvnprintw( y++, 0, COLS, _(" State : Opening/Connecting %s"), psz_state ); - } - else if( val.i_int == PAUSE_S ) - { - mvnprintw( y++, 0, COLS, _(" State : Paused %s"), psz_state ); - } - - if( val.i_int != INIT_S && val.i_int != END_S ) + var_Get(p_input, "state", &val); + if (val.i_int == PLAYING_S) + 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); + else if (val.i_int == PAUSE_S) + mvnprintw(y++, 0, COLS, _(" State : Paused %s"), psz_state); + + if (val.i_int == INIT_S || val.i_int == END_S) + y += 2; + else { audio_volume_t i_volume; /* Position */ - var_Get( p_input, "time", &val ); - msecstotimestr( buf1, val.i_time / 1000 ); + var_Get(p_input, "time", &val); + secstotimestr(buf1, val.i_time / CLOCK_FREQ); - var_Get( p_input, "length", &val ); - msecstotimestr( buf2, val.i_time / 1000 ); + var_Get(p_input, "length", &val); + secstotimestr(buf2, val.i_time / CLOCK_FREQ); - 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_playlist, &i_volume ); - mvnprintw( y++, 0, COLS, _(" Volume : %i%%"), i_volume*200/AOUT_VOLUME_MAX ); + aout_VolumeGet(p_playlist, &i_volume); + mvnprintw(y++, 0, COLS, _(" Volume : %i%%"), i_volume*200/AOUT_VOLUME_MAX); /* Title */ - if( !var_Get( p_input, "title", &val ) ) + if (!var_Get(p_input, "title", &val)) { - int i_title_count = var_CountChoices( p_input, "title" ); - if( i_title_count > 0 ) - mvnprintw( y++, 0, COLS, _(" Title : %d/%d"), val.i_int, i_title_count ); + int i_title_count = var_CountChoices(p_input, "title"); + if (i_title_count > 0) + mvnprintw(y++, 0, COLS, _(" Title : %"PRId64"/%d"), + val.i_int, i_title_count); } /* Chapter */ - if( !var_Get( p_input, "chapter", &val ) ) + if (!var_Get(p_input, "chapter", &val)) { - int i_chapter_count = var_CountChoices( p_input, "chapter" ); - if( i_chapter_count > 0 ) - mvnprintw( y++, 0, COLS, _(" Chapter : %d/%d"), val.i_int, i_chapter_count ); + int i_chapter_count = var_CountChoices(p_input, "chapter"); + if (i_chapter_count > 0) + mvnprintw(y++, 0, COLS, _(" Chapter : %"PRId64"/%d"), + val.i_int, i_chapter_count); } } - else - { - y += 2; - } } else { - 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 ); + 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 ); + free(psz_state); + if (p_sys->b_color) + wcolor_set(p_sys->w, C_DEFAULT, NULL); - 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)) ); + 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; p_sys->i_box_y = y + 1; @@ -1584,1079 +868,1429 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) h = LINES - y; y_end = y + h - 1; - if( p_sys->i_box_type == BOX_HELP ) + if (p_sys->i_box_type == BOX_HELP) { /* Help box */ int l = 0; - 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, "" ); - - 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, "" ); - - 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, "" ); - - 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, "" ); - - 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, "" ); - - 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, "" ); - - 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") ); + 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, ""); + + 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, ""); + + 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, ""); + + 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, ""); + + 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, ""); + + 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, ""); + + 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 ) - { + 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 ) - { + 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_INFO ) + else if (p_sys->i_box_type == BOX_INFO) { /* Info box */ int l = 0; - DrawBox( p_sys->w, y++, 0, h, COLS, _(" Information "), p_sys->b_color ); + DrawBox(p_sys->w, y++, 0, h, COLS, _(" Information "), p_sys->b_color); - if( p_input ) + if (p_input) { int i,j; - vlc_mutex_lock( &input_GetItem(p_input)->lock ); - for( i = 0; i < input_GetItem(p_input)->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 = input_GetItem(p_input)->pp_categories[i]; - if( y >= y_end ) break; - 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++ ) + if (y >= y_end) break; + 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 ); + if (y >= y_end) break; + MainBoxWrite(p_intf, l++, 1, _(" %s: %s"), p_info->psz_name, p_info->psz_value); } } - vlc_mutex_unlock( &input_GetItem(p_input)->lock ); + vlc_mutex_unlock(&input_GetItem(p_input)->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) + 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; + + DrawBox(p_sys->w, y++, 0, h, COLS, _("Meta-information"), + p_sys->b_color); + + if (p_input) { - MainBoxWrite( p_intf, l++, 1, _("No item currently playing") ); + input_item_t *p_item = input_GetItem(p_input); + vlc_mutex_lock(&p_item->lock); + for(int i=0; ip_meta, i); + if (!psz_meta || !*psz_meta) + continue; + + if (p_sys->b_color) wcolor_set(p_sys->w, C_CATEGORY, NULL); + MainBoxWrite(p_intf, l++, 1, " [%s]", + vlc_meta_TypeToLocalizedString(i)); + 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 ) - { + if (p_sys->i_box_start >= p_sys->i_box_lines_total) p_sys->i_box_start = p_sys->i_box_lines_total - 1; + + y += __MIN(l - p_sys->i_box_start, p_sys->i_box_lines); + } +#if 0 /* Deprecated API */ + else if (p_sys->i_box_type == BOX_LOG) + { + int i_line = 0; + int i_stop; + int i_start; + + DrawBox(p_sys->w, y++, 0, h, COLS, _(" Logs "), p_sys->b_color); + + + i_start = p_intf->p_sys->p_sub->i_start; + + vlc_mutex_lock(p_intf->p_sys->p_sub->p_lock); + i_stop = *p_intf->p_sys->p_sub->pi_stop; + vlc_mutex_unlock(p_intf->p_sys->p_sub->p_lock); + + for(;;) + { + static const char *ppsz_type[4] = { "", "error", "warning", "debug" }; + if (i_line >= h - 2) + { + break; + } + i_stop--; + i_line++; + if (i_stop < 0) i_stop += VLC_MSG_QSIZE; + if (i_stop == i_start) + { + 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); } - if( l - p_sys->i_box_start < p_sys->i_box_lines ) + vlc_mutex_lock(p_intf->p_sys->p_sub->p_lock); + p_intf->p_sys->p_sub->i_start = i_stop; + vlc_mutex_unlock(p_intf->p_sys->p_sub->p_lock); + y = y_end; + } +#endif + else if (p_sys->i_box_type == BOX_BROWSE) + { + /* Filebrowser box */ + int i_start, i_stop; + int i_item; + 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; + + if (p_sys->i_box_bidx < (h - 2)/2) { - y += l - p_sys->i_box_start; + i_start = 0; + i_stop = h - 2; + } + else if (p_sys->i_dir_entries - p_sys->i_box_bidx > (h - 2)/2) + { + i_start = p_sys->i_box_bidx - (h - 2)/2; + i_stop = i_start + h - 2; } else { - y += p_sys->i_box_lines; + i_stop = p_sys->i_dir_entries; + i_start = p_sys->i_dir_entries - (h - 2); + } + if (i_start < 0) + i_start = 0; + if (i_stop > p_sys->i_dir_entries) + i_stop = p_sys->i_dir_entries; + + for(i_item = i_start; i_item < i_stop; i_item++) + { + bool b_selected = (p_sys->i_box_bidx == i_item); + + if (y >= y_end) break; + if (b_selected) + 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 == 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); } + } - else if( p_sys->i_box_type == BOX_META ) + else if (p_sys->i_box_type == BOX_OBJECTS) { - /* Meta data box */ 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; - DrawBox( p_sys->w, y++, 0, h, COLS, _("Meta-information"), - p_sys->b_color ); + 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 ) + 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; - 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 = vlc_meta_Get( p_item->p_meta, i ); - if( psz_meta && *psz_meta ) + + if (!p_item->i_es) + i_video = i_audio = 1; + else + for(i = 0; i < p_item->i_es ; i++) { - 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_ALBUM; break; - case 5: - psz_meta_title = VLC_META_TRACK_NUMBER; 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 ); + 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 KiB"), + (float)(p_item->p_stats->i_read_bytes)/1024); + 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 KiB"), + (float)(p_item->p_stats->i_demux_read_bytes)/1024); + 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++; + DrawEmptyLine(p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2); + 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 : %"PRId64), + p_item->p_stats->i_decoded_video); + SHOW_ACS(1, ACS_VLINE); l++; + MainBoxWrite(p_intf, l, 1, _("| frames displayed : %"PRId64), + p_item->p_stats->i_displayed_pictures); + SHOW_ACS(1, ACS_VLINE); l++; + MainBoxWrite(p_intf, l, 1, _("| frames lost : %"PRId64), + p_item->p_stats->i_lost_pictures); + SHOW_ACS(1, ACS_VLINE); l++; + DrawEmptyLine(p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2); + 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 : %"PRId64), + p_item->p_stats->i_decoded_audio); + SHOW_ACS(1, ACS_VLINE); l++; + MainBoxWrite(p_intf, l, 1, _("| buffers played : %"PRId64), + p_item->p_stats->i_played_abuffers); + SHOW_ACS(1, ACS_VLINE); l++; + MainBoxWrite(p_intf, l, 1, _("| buffers lost : %"PRId64), + p_item->p_stats->i_lost_abuffers); + SHOW_ACS(1, ACS_VLINE); l++; + DrawEmptyLine(p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2); + SHOW_ACS(1, ACS_VLINE); l++; } - vlc_mutex_unlock( &p_item->lock ); + /* 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 KiB"), + (float)(p_item->p_stats->i_sent_bytes)/1024); + 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 ) + { + /* Playlist box */ + int i_start, i_stop, i_max = p_sys->i_plist_entries; + int i_item; + char *psz_title; + + if (p_sys->category_view) + psz_title = strdup(_(" Playlist (By category) ")); else + psz_title = strdup(_(" Playlist (All, one level) ")); + + 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) + PlaylistRebuild(p_intf); + if (p_sys->b_box_plidx_follow) + FindIndex(p_sys, p_playlist, false); + + if (p_sys->i_box_plidx < 0) p_sys->i_box_plidx = 0; + if (p_sys->i_box_plidx < 0) p_sys->i_box_plidx = 0; + if (p_sys->i_box_plidx >= i_max) p_sys->i_box_plidx = i_max - 1; + + if (p_sys->i_box_plidx < (h - 2)/2) { - MainBoxWrite( p_intf, l++, 1, _("No item currently playing") ); + i_start = 0; + i_stop = h - 2; } - p_sys->i_box_lines_total = l; - if( p_sys->i_box_start >= p_sys->i_box_lines_total ) + else if (i_max - p_sys->i_box_plidx > (h - 2)/2) { - p_sys->i_box_start = p_sys->i_box_lines_total - 1; + i_start = p_sys->i_box_plidx - (h - 2)/2; + i_stop = i_start + h - 2; + } + else + { + i_stop = i_max; + i_start = i_max - (h - 2); } + if (i_start < 0) + i_start = 0; + if (i_stop > i_max) + i_stop = i_max; - if( l - p_sys->i_box_start < p_sys->i_box_lines ) + for(i_item = i_start; i_item < i_stop; i_item++) { - y += l - p_sys->i_box_start; + bool b_selected = (p_sys->i_box_plidx == i_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 = ' '; + input_thread_t *p_input2 = playlist_CurrentInput(p_playlist); + + PL_LOCK; + assert(p_item); + playlist_item_t *p_current_playing_item = playlist_CurrentPlayingItem(p_playlist); + if ((p_node && p_item->p_input == p_node->p_input) || + (!p_node && p_input2 && p_current_playing_item && + p_item->p_input == p_current_playing_item->p_input)) + c = '*'; + else if (p_item == p_node || (p_item != p_node && + PlaylistIsPlaying(p_playlist, p_item))) + c = '>'; + PL_UNLOCK; + + if (p_input2) + vlc_object_release(p_input2); + + 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); } - else + + } + else + y++; + + if (p_sys->i_box_type == BOX_SEARCH) + { + DrawEmptyLine(p_sys->w, 7, 1, COLS-2); + if (p_sys->psz_search_chain) + { + if (!*p_sys->psz_search_chain && p_sys->psz_old_search) + /* Searching next entry */ + 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); + } + } + if (p_sys->i_box_type == BOX_OPEN && 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); + } + + while (y < y_end) + DrawEmptyLine(p_sys->w, y++, 1, COLS - 2); + + refresh(); + + *t_last_refresh = time(0); +} + +static void ManageSlider(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + input_thread_t *p_input = p_sys->p_input; + float pos; + + if (!p_input || var_GetInteger(p_input, "state") != PLAYING_S) + return; + + pos = var_GetFloat(p_input, "position"); + if (p_sys->f_slider == p_sys->f_slider_old) + p_sys->f_slider = p_sys->f_slider_old = 100. * pos; + else + { + p_sys->f_slider_old = p_sys->f_slider; + + pos = p_sys->f_slider / 100.; + var_SetFloat(p_input, "position", pos); + } +} + +#ifndef HAVE_NCURSESW +static char *KeyToUTF8(int i_key, char *psz_part) +{ + char *psz_utf8; + int len = strlen(psz_part); + if (len == 6) + { + /* overflow error - should not happen */ + memset(psz_part, 0, 6); + return NULL; + } + + psz_part[len] = (char)i_key; + + 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 != '?')) { - y += p_sys->i_box_lines; + /* incomplete bytes sequence detected + * (VLC core inserted dummy question marks) */ + free(psz_utf8); + return NULL; } - } - else if( p_sys->i_box_type == BOX_LOG ) + + /* Check for incomplete UTF8 bytes sequence */ + if (!EnsureUTF8(psz_utf8)) { -#warning Deprecated API -#if 0 - int i_line = 0; - int i_stop; - int i_start; + free(psz_utf8); + return NULL; + } - DrawBox( p_sys->w, y++, 0, h, COLS, _(" Logs "), p_sys->b_color ); + memset(psz_part, 0, 6); + return psz_utf8; +} +#endif +static inline int RemoveLastUTF8Entity(char *psz, int len) +{ + while (len && ((psz[--len] & 0xc0) == 0x80)); + /* UTF8 continuation byte */ - i_start = p_intf->p_sys->p_sub->i_start; + psz[len] = '\0'; + return len; +} - vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); - i_stop = *p_intf->p_sys->p_sub->pi_stop; - vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock ); +static char *GetDiscDevice(intf_thread_t *p_intf, const char *name) +{ + static const struct { const char *s; size_t n; const char *v; } devs[] = + { + { "cdda://", 7, "cd-audio", }, + { "dvd://", 6, "dvd", }, + { "vcd://", 6, "vcd", }, + }; + char *device; - for( ;; ) - { - static const char *ppsz_type[4] = { "", "error", "warning", "debug" }; - if( i_line >= h - 2 ) - { - break; - } - i_stop--; - i_line++; - if( i_stop < 0 ) i_stop += VLC_MSG_QSIZE; - if( i_stop == i_start ) + for (unsigned i = 0; i < sizeof devs / sizeof *devs; i++) + { + size_t n = devs[i].n; + if (!strncmp(name, devs[i].s, n)) + switch(name[n]) { - break; + case '\0': + case '@': + return config_GetPsz(p_intf, devs[i].v); + default: + /* Omit the beginning MRL-selector characters */ + return strdup(name + n); } - 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 ); - p_intf->p_sys->p_sub->i_start = i_stop; - vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock ); - y = y_end; -#endif } - else if( p_sys->i_box_type == BOX_BROWSE ) - { - /* Filebrowser box */ - int i_start, i_stop; - int i_item; - 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; + device = strdup(name); - if( p_sys->i_box_bidx < (h - 2)/2 ) - { - i_start = 0; - i_stop = h - 2; - } - else if( p_sys->i_dir_entries - p_sys->i_box_bidx > (h - 2)/2 ) - { - i_start = p_sys->i_box_bidx - (h - 2)/2; - i_stop = i_start + h - 2; - } - else - { - i_stop = p_sys->i_dir_entries; - i_start = p_sys->i_dir_entries - (h - 2); - } - if( i_start < 0 ) - { - i_start = 0; - } - if( i_stop > p_sys->i_dir_entries ) - { - i_stop = p_sys->i_dir_entries; - } + if (device) /* Remove what we have after @ */ + device[strcspn(device, "@")] = '\0'; - for( i_item = i_start; i_item < i_stop; i_item++ ) - { - bool b_selected = ( p_sys->i_box_bidx == i_item ); + return device; +} - if( y >= y_end ) break; - if( b_selected ) - { - 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 == 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 ); - } - } +static void Eject(intf_thread_t *p_intf) +{ + char *psz_device, *psz_name; + playlist_t * p_playlist = pl_Get(p_intf); - } - else if( p_sys->i_box_type == BOX_OBJECTS ) + /* If there's a stream playing, we aren't allowed to eject ! */ + if (p_intf->p_sys->p_input) + return; + + PL_LOCK; + + if (!playlist_CurrentPlayingItem(p_playlist)) { - 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 ); + PL_UNLOCK; + return; + } - 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; + psz_name = playlist_CurrentPlayingItem(p_playlist)->p_input->psz_name; - 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; + if (psz_name) + psz_device = GetDiscDevice(p_intf, psz_name); + + PL_UNLOCK; + + if (psz_device) + { + intf_Eject(p_intf, psz_device); + free(psz_device); } - else if( p_sys->i_box_type == BOX_STATS ) +} + +static void PlayPause(intf_thread_t *p_intf) +{ + input_thread_t *p_input = p_intf->p_sys->p_input; + + if (p_input) { - DrawBox( p_sys->w, y++, 0, h, COLS, _(" Stats "), p_sys->b_color ); + int64_t state = var_GetInteger( p_input, "state" ); + state = (state != PLAYING_S) ? PLAYING_S : PAUSE_S; + var_SetInteger( p_input, "state", state ); + } + else + playlist_Play(pl_Get(p_intf)); +} - 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 ); +static int HandleKey(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + playlist_t *p_playlist = pl_Get(p_intf); + int i_key = wgetch(p_sys->w); - int i_audio = 0; - int i_video = 0; - int i; + if (i_key == -1) + return 0; - 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 ); - } + if (p_sys->i_box_type == BOX_PLAYLIST) + { + int b_ret = true; + bool b_box_plidx_follow = false; - int l = 0; + switch(i_key) + { + /* Playlist Settings */ + case 'r': + var_ToggleBool(p_playlist, "random"); + return 1; + case 'l': + var_ToggleBool(p_playlist, "loop"); + return 1; + case 'R': + var_ToggleBool(p_playlist, "repeat"); + return 1; -#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 ) + /* Playlist sort */ + case 'o': + playlist_RecursiveNodeSort(p_playlist, + PlaylistGetRoot(p_intf), + SORT_TITLE_NODES_FIRST, ORDER_NORMAL); + p_sys->b_need_update = true; + return 1; + case 'O': + playlist_RecursiveNodeSort(p_playlist, + PlaylistGetRoot(p_intf), + SORT_TITLE_NODES_FIRST, ORDER_REVERSE); + p_sys->b_need_update = true; + return 1; - /* 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++; - DrawEmptyLine( p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2 ); - SHOW_ACS( 1, ACS_VLINE ); l++; + /* Playlist view */ + case 'v': + p_sys->category_view = !p_sys->category_view; + PlaylistRebuild(p_intf); + return 1; - /* 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++; - DrawEmptyLine( p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2 ); - SHOW_ACS( 1, ACS_VLINE ); l++; - } - /* Audio*/ - if( i_audio ) + /* Playlist navigation */ + case 'g': + FindIndex(p_sys, p_playlist, false); + 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_playlist->items.i_size - 1; + break; + case KEY_UP: + p_sys->i_box_plidx--; + break; + case KEY_DOWN: + p_sys->i_box_plidx++; + break; + case KEY_PPAGE: + p_sys->i_box_plidx -= p_sys->i_box_lines; + break; + case KEY_NPAGE: + p_sys->i_box_plidx += p_sys->i_box_lines; + break; + case 'D': + case KEY_BACKSPACE: + case 0x7f: + case KEY_DC: { - 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++; - DrawEmptyLine( p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2 ); - 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 ); + playlist_item_t *p_item; -#undef SHOW_ACS + 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, pl_Locked); + else + playlist_NodeDelete(p_playlist, p_item, true , false); + PL_UNLOCK; + PlaylistRebuild(p_intf); + break; + } - 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; + case KEY_ENTER: + case '\r': + case '\n': + if (!p_sys->pp_plist[p_sys->i_box_plidx]) + { + b_ret = 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( 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; + 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, + pl_Unlocked, 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 + { + p_sys->p_node = p_sys->pp_plist[p_sys->i_box_plidx]->p_item; + 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; + break; + default: + b_ret = false; + break; + } - vlc_mutex_unlock( &p_item->p_stats->lock ); - vlc_mutex_unlock( &p_item->lock ); + if (b_ret) + { + int i_max = p_sys->i_plist_entries; + if (p_sys->i_box_plidx >= i_max) p_sys->i_box_plidx = i_max - 1; + if (p_sys->i_box_plidx < 0) p_sys->i_box_plidx = 0; + PL_LOCK; + if (PlaylistIsPlaying(p_playlist, + p_sys->pp_plist[p_sys->i_box_plidx]->p_item)) + b_box_plidx_follow = true; + PL_UNLOCK; + p_sys->b_box_plidx_follow = b_box_plidx_follow; + return 1; } } - else if( p_sys->i_box_type == BOX_PLAYLIST || - p_sys->i_box_type == BOX_SEARCH || - p_sys->i_box_type == BOX_OPEN ) + else if (p_sys->i_box_type == BOX_BROWSE) { - /* Playlist box */ - int i_start, i_stop, i_max = p_sys->i_plist_entries; - int i_item; - char *psz_title; - - switch( p_sys->i_current_view ) + bool b_ret = true; + /* Browser navigation */ + switch(i_key) { - case VIEW_ONELEVEL: - psz_title = strdup( _(" Playlist (All, one level) ") ); + case KEY_HOME: + p_sys->i_box_bidx = 0; break; - case VIEW_CATEGORY: - psz_title = strdup( _(" Playlist (By category) ") ); +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif + case KEY_END: + p_sys->i_box_bidx = p_sys->i_dir_entries - 1; break; - default: - psz_title = strdup( _(" Playlist (Manually added) ") ); - } + case KEY_UP: + p_sys->i_box_bidx--; + break; + case KEY_DOWN: + p_sys->i_box_bidx++; + break; + case KEY_PPAGE: + p_sys->i_box_bidx -= p_sys->i_box_lines; + break; + case KEY_NPAGE: + p_sys->i_box_bidx += p_sys->i_box_lines; + break; + case '.': /* Toggle show hidden files */ + p_sys->b_show_hidden_files = (p_sys->b_show_hidden_files == + true ? false : true); + ReadDir(p_intf); + break; + + case KEY_ENTER: + case '\r': + case '\n': + case ' ': + if (p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file || i_key == ' ') + { + char* psz_uri; + if (asprintf(&psz_uri, "%s://%s/%s", + p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file ? + "file" : "directory", + p_sys->psz_current_dir, + p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path + ) == -1) + { + psz_uri = NULL; + } - DrawBox( p_sys->w, y++, 0, h, COLS, psz_title, p_sys->b_color ); - free( psz_title ); + playlist_item_t *p_parent = p_sys->p_node; + if (!p_parent) + { + PL_LOCK; + p_parent = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL; + PL_UNLOCK; + if (!p_parent) + p_parent = p_playlist->p_local_onelevel; + } - if( p_sys->b_need_update || p_sys->pp_plist == NULL ) - { - PlaylistRebuild( p_intf ); - } - if( p_sys->b_box_plidx_follow ) - { - FindIndex( p_intf, p_playlist ); - } + while (p_parent->p_parent && p_parent->p_parent->p_parent) + p_parent = p_parent->p_parent; - if( p_sys->i_box_plidx < 0 ) p_sys->i_box_plidx = 0; - if( p_sys->i_box_plidx < 0 ) p_sys->i_box_plidx = 0; - if( p_sys->i_box_plidx >= i_max ) p_sys->i_box_plidx = i_max - 1; + playlist_Add(p_playlist, psz_uri, NULL, PLAYLIST_APPEND, + PLAYLIST_END, + p_parent->p_input == + p_playlist->p_local_onelevel->p_input + , false); - if( p_sys->i_box_plidx < (h - 2)/2 ) - { - i_start = 0; - i_stop = h - 2; - } - else if( i_max - p_sys->i_box_plidx > (h - 2)/2 ) - { - i_start = p_sys->i_box_plidx - (h - 2)/2; - i_stop = i_start + h - 2; - } - else - { - i_stop = i_max; - i_start = i_max - (h - 2); + p_sys->i_box_type = BOX_PLAYLIST; + free(psz_uri); + } + else + { + if (asprintf(&(p_sys->psz_current_dir), "%s/%s", p_sys->psz_current_dir, + p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path) != -1) + ReadDir(p_intf); + } + break; + default: + b_ret = false; + break; } - if( i_start < 0 ) + if (b_ret) { - i_start = 0; + if (p_sys->i_box_bidx >= p_sys->i_dir_entries) p_sys->i_box_bidx = p_sys->i_dir_entries - 1; + if (p_sys->i_box_bidx < 0) p_sys->i_box_bidx = 0; + return 1; } - if( i_stop > i_max ) + } + 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_STATS || + p_sys->i_box_type == BOX_OBJECTS) + { + switch(i_key) { - i_stop = i_max; + 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; + case KEY_UP: + if (p_sys->i_box_start > 0) p_sys->i_box_start--; + return 1; + case KEY_DOWN: + if (p_sys->i_box_start < p_sys->i_box_lines_total - 1) + p_sys->i_box_start++; + return 1; + case KEY_PPAGE: + p_sys->i_box_start -= p_sys->i_box_lines; + if (p_sys->i_box_start < 0) p_sys->i_box_start = 0; + return 1; + case KEY_NPAGE: + p_sys->i_box_start += p_sys->i_box_lines; + if (p_sys->i_box_start >= p_sys->i_box_lines_total) + p_sys->i_box_start = p_sys->i_box_lines_total - 1; + return 1; + default: + break; } - - for( i_item = i_start; i_item < i_stop; i_item++ ) + } + else if (p_sys->i_box_type == BOX_NONE) + { + switch(i_key) { - bool b_selected = ( p_sys->i_box_plidx == i_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 = ' '; - input_thread_t *p_input2 = playlist_CurrentInput( p_playlist ); - - PL_LOCK; - assert( p_item ); - playlist_item_t *p_current_playing_item = playlist_CurrentPlayingItem(p_playlist); - if( ( p_node && p_item->p_input == p_node->p_input ) || - ( !p_node && p_input2 && p_current_playing_item && - p_item->p_input == p_current_playing_item->p_input ) ) - c = '*'; - else if( p_item == p_node || ( p_item != p_node && - PlaylistIsPlaying( p_playlist, p_item ) ) ) - c = '>'; - PL_UNLOCK; - - if( p_input2 ) - vlc_object_release( p_input2 ); + case KEY_HOME: + 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); + return 1; + case KEY_UP: + p_sys->f_slider += 5.0; + if (p_sys->f_slider >= 99.0) p_sys->f_slider = 99.0; + ManageSlider(p_intf); + return 1; + case KEY_DOWN: + p_sys->f_slider -= 5.0; + if (p_sys->f_slider < 0.0) p_sys->f_slider = 0.0; + ManageSlider(p_intf); + return 1; - 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 ); - } + default: + break; } - - } - else - { - y++; } - if( p_sys->i_box_type == BOX_SEARCH ) + else if (p_sys->i_box_type == BOX_SEARCH && p_sys->psz_search_chain) { - DrawEmptyLine( p_sys->w, 7, 1, COLS-2 ); - if( p_sys->psz_search_chain ) + int i_chain_len = strlen(p_sys->psz_search_chain); + switch(i_key) { - if( strlen( p_sys->psz_search_chain ) == 0 && - p_sys->psz_old_search != NULL ) - { - /* Searching next entry */ - mvnprintw( 7, 1, COLS-2, _("Find: %s"), p_sys->psz_old_search ); - } - else + case KEY_CLEAR: + case 0x0c: /* ^l */ + clear(); + return 1; + case KEY_ENTER: + case '\r': + case '\n': + if (i_chain_len > 0) + p_sys->psz_old_search = strdup(p_sys->psz_search_chain); + else if (p_sys->psz_old_search) + SearchPlaylist(p_sys, p_sys->psz_old_search); + p_sys->i_box_type = BOX_PLAYLIST; + return 1; + 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: { - mvnprintw( 7, 1, COLS-2, _("Find: %s"), p_sys->psz_search_chain ); +#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) + { + if (i_chain_len + strlen(psz_utf8) < SEARCH_CHAIN_SIZE) + strcpy(p_sys->psz_search_chain + i_chain_len, psz_utf8); + free(psz_utf8); + } +#endif + break; } } + free(p_sys->psz_old_search); + p_sys->psz_old_search = NULL; + SearchPlaylist(p_sys, p_sys->psz_search_chain); + return 1; } - if( p_sys->i_box_type == BOX_OPEN ) + else if (p_sys->i_box_type == BOX_OPEN && p_sys->psz_open_chain) { - if( p_sys->psz_open_chain ) + int i_chain_len = strlen(p_sys->psz_open_chain); + + switch(i_key) { - DrawEmptyLine( p_sys->w, 7, 1, COLS-2 ); - mvnprintw( 7, 1, COLS-2, _("Open: %s"), p_sys->psz_open_chain ); - } - } + case KEY_CLEAR: + case 0x0c: /* ^l */ + clear(); + return 1; + case KEY_ENTER: + case '\r': + case '\n': + if (i_chain_len > 0) + { + playlist_item_t *p_parent = p_sys->p_node; - while( y < y_end ) - { - DrawEmptyLine( p_sys->w, y++, 1, COLS - 2 ); - } + PL_LOCK; + if (!p_parent) + p_parent = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL; + if (!p_parent) + p_parent = p_playlist->p_local_onelevel; - refresh(); + while (p_parent->p_parent && p_parent->p_parent->p_parent) + p_parent = p_parent->p_parent; + PL_UNLOCK; - *t_last_refresh = time( 0 ); - pl_Release( p_intf ); -} + 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 + , false); -static playlist_item_t *PlaylistGetRoot( intf_thread_t *p_intf ) -{ - intf_sys_t *p_sys = p_intf->p_sys; - playlist_t *p_playlist = pl_Hold( p_intf ); - playlist_item_t *p_item; + p_sys->b_box_plidx_follow = true; + } + p_sys->i_box_type = BOX_PLAYLIST; + return 1; + 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); + return 1; + 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); - switch( p_sys->i_current_view ) - { - case VIEW_CATEGORY: - p_item = p_playlist->p_root_category; - break; - default: - p_item = p_playlist->p_root_onelevel; + if (psz_utf8) + { + if (i_chain_len + strlen(psz_utf8) < OPEN_CHAIN_SIZE) + strcpy(p_sys->psz_open_chain + i_chain_len, psz_utf8); + free(psz_utf8); + } +#endif + } + } + return 1; } - pl_Release( p_intf ); - return p_item; -} -static void PlaylistRebuild( intf_thread_t *p_intf ) -{ - intf_sys_t *p_sys = p_intf->p_sys; - playlist_t *p_playlist = pl_Hold( p_intf ); - PL_LOCK; + /* Common keys */ + switch(i_key) + { + case 0x1b: /* ESC */ + if (wgetch(p_sys->w) != ERR) + return 0; + case 'q': + case 'Q': + case KEY_EXIT: + libvlc_Quit(p_intf->p_libvlc); + return 0; + + /* Box switching */ + case 'i': + if (p_sys->i_box_type == BOX_INFO) + p_sys->i_box_type = BOX_NONE; + else + p_sys->i_box_type = BOX_INFO; + p_sys->i_box_lines_total = 0; + break; + 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; + break; +#if 0 + case 'L': + if (p_sys->i_box_type == BOX_LOG) + p_sys->i_box_type = BOX_NONE; + else + p_sys->i_box_type = BOX_LOG; + break; +#endif + case 'P': + if (p_sys->i_box_type == BOX_PLAYLIST) + p_sys->i_box_type = BOX_NONE; + else + p_sys->i_box_type = BOX_PLAYLIST; + break; + case 'B': + if (p_sys->i_box_type == BOX_BROWSE) + p_sys->i_box_type = BOX_NONE; + else + p_sys->i_box_type = BOX_BROWSE; + break; + 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; + break; + 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; + break; + 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); + break; + case 'h': + case 'H': + if (p_sys->i_box_type == BOX_HELP) + p_sys->i_box_type = BOX_NONE; + else + p_sys->i_box_type = BOX_HELP; + p_sys->i_box_lines_total = 0; + break; + case '/': + if (p_sys->i_box_type != BOX_SEARCH && p_sys->psz_search_chain) + { + p_sys->psz_search_chain[0] = '\0'; + p_sys->b_box_plidx_follow = false; + p_sys->i_before_search = p_sys->i_box_plidx; + p_sys->i_box_type = BOX_SEARCH; + } + break; + case 'A': /* Open */ + if (p_sys->i_box_type != BOX_OPEN && p_sys->psz_open_chain) + { + p_sys->psz_open_chain[0] = '\0'; + p_sys->i_box_type = BOX_OPEN; + } + break; - /* First clear the old one */ - PlaylistDestroy( p_intf ); + /* Navigation */ + case KEY_RIGHT: + p_sys->f_slider += 1.0; + if (p_sys->f_slider > 99.9) p_sys->f_slider = 99.9; + ManageSlider(p_intf); + break; - /* Build the new one */ - PlaylistAddNode( p_intf, PlaylistGetRoot( p_intf ), 0, "" ); + case KEY_LEFT: + p_sys->f_slider -= 1.0; + if (p_sys->f_slider < 0.0) p_sys->f_slider = 0.0; + ManageSlider(p_intf); + break; - p_sys->b_need_update = false; + /* Common control */ + case 'f': + if (p_intf->p_sys->p_input) + { + vout_thread_t *p_vout = input_GetVout(p_intf->p_sys->p_input); + if (p_vout) + { + bool fs = var_ToggleBool(p_playlist, "fullscreen"); + var_SetBool(p_vout, "fullscreen", fs); + vlc_object_release(p_vout); + } + } + return 0; - PL_UNLOCK; + case ' ': + PlayPause(p_intf); + break; - pl_Release( p_intf ); -} + case 's': + playlist_Stop(p_playlist); + break; -static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node, - int i, const char *c ) -{ - intf_sys_t *p_sys = p_intf->p_sys; - playlist_item_t *p_child; - int k; + case 'e': + Eject(p_intf); + break; - for( k = 0; k < p_node->i_children; k++ ) - { - char *psz_display; - p_child = p_node->pp_children[k]; - char *psz_name = input_item_GetTitleFbName( p_child->p_input ); + case '[': + if (p_sys->p_input) + var_TriggerCallback(p_sys->p_input, "prev-title"); + break; - if( c && *c ) - { - if( asprintf( &psz_display, "%s%c-%s", c, - k == p_node->i_children - 1 ? '`' : '|', psz_name ) == -1 ) - return; - } - else - { - if( asprintf( &psz_display, " %s", psz_name ) == -1 ) - return; - } - 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 ); - i++; + case ']': + if (p_sys->p_input) + var_TriggerCallback(p_sys->p_input, "next-title"); + break; - if( p_child->i_children > 0 ) - { - 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 ); - } - } -} + case '<': + if (p_sys->p_input) + var_TriggerCallback(p_sys->p_input, "prev-chapter"); + break; -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_Hold( p_intf ); - p_intf->p_sys->b_need_update = true; - p_intf->p_sys->p_node = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL; - pl_Release( p_intf ); - return VLC_SUCCESS; -} + case '>': + if (p_sys->p_input) + var_TriggerCallback(p_sys->p_input, "next-chapter"); + break; -/* Playlist suxx */ -/* This function have to be called with the playlist locked */ -static inline bool PlaylistIsPlaying( playlist_t *p_playlist, - playlist_item_t *p_item ) -{ - playlist_item_t *p_played_item = playlist_CurrentPlayingItem( p_playlist ); - 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 ); -} + case 'p': + playlist_Prev(p_playlist); + clear(); + break; -static void FindIndex( intf_thread_t *p_intf, playlist_t *p_playlist ) -{ - intf_sys_t *p_sys = p_intf->p_sys; - int i; + case 'n': + playlist_Next(p_playlist); + clear(); + break; - if( p_sys->i_box_plidx < p_sys->i_plist_entries && p_sys->i_box_plidx >= 0 ) - { - playlist_item_t *p_item = p_sys->pp_plist[p_sys->i_box_plidx]->p_item; - PL_LOCK; - if( ( p_item->i_children == 0 && p_item == p_sys->p_node ) || - PlaylistIsPlaying( p_playlist, p_item ) ) - { - PL_UNLOCK; - return; - } - } + case 'a': + aout_VolumeUp(p_playlist, 1, NULL); + clear(); + break; - for( i = 0; i < p_sys->i_plist_entries; i++ ) - { - 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_playlist, p_sys->pp_plist[i]->p_item ) ) - { - p_sys->i_box_plidx = i; + case 'z': + aout_VolumeDown(p_playlist, 1, NULL); + clear(); break; - } - } - PL_UNLOCK; -} -static void PlaylistDestroy( intf_thread_t *p_intf ) -{ - intf_sys_t *p_sys = p_intf->p_sys; + /* + * ^l should clear and redraw the screen + */ + case KEY_CLEAR: + case 0x0c: /* ^l */ + clear(); + break; - while( p_sys->i_plist_entries ) - { - 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, 0 ); - free( p_pl_item ); + default: + return 0; } - p_sys->pp_plist = NULL; + + return 1; } -static void Eject( intf_thread_t *p_intf ) +/***************************************************************************** + * Run: ncurses thread + *****************************************************************************/ +static void Run(intf_thread_t *p_intf) { - char *psz_device = NULL, *psz_parser, *psz_name; - - /* - * Get the active input - * Determine whether we can eject a media, ie it's a DVD, VCD or CD-DA - * If it's neither of these, then return - */ - - playlist_t * p_playlist = pl_Hold( p_intf ); - PL_LOCK; - - if( playlist_CurrentPlayingItem(p_playlist) == NULL ) - { - PL_UNLOCK; - pl_Release( p_intf ); - return; - } + intf_sys_t *p_sys = p_intf->p_sys; + playlist_t *p_playlist = pl_Get(p_intf); - psz_name = playlist_CurrentPlayingItem(p_playlist)->p_input->psz_name; + time_t t_last_refresh; + int canc = vlc_savecancel(); - if( psz_name ) - { - if( !strncmp(psz_name, "dvd://", 6) ) - { - switch( psz_name[6] ) - { - case '\0': - case '@': - psz_device = config_GetPsz( p_intf, "dvd" ); - break; - default: - /* Omit the first MRL-selector characters */ - psz_device = strdup( psz_name + strlen("dvd://" ) ); - break; - } - } - else if( !strncmp(psz_name, "vcd://", 6) ) - { - switch( psz_name[6] ) - { - case '\0': - case '@': - psz_device = config_GetPsz( p_intf, "vcd" ); - break; - default: - /* Omit the beginning MRL-selector characters */ - psz_device = strdup( psz_name + 6 ); - break; - } - } - else if( !strncmp(psz_name, "cdda://", 7 ) ) - { - switch( psz_name[7] ) - { - case '\0': - case '@': - psz_device = config_GetPsz( p_intf, "cd-audio" ); - break; - default: - /* Omit the beginning MRL-selector characters */ - psz_device = strdup( psz_name + 7 ); - break; - } - } - else - { - psz_device = strdup( psz_name ); - } - } + PlaylistRebuild(p_intf); + Redraw(p_intf, &t_last_refresh); - PL_UNLOCK; + var_AddCallback(p_playlist, "intf-change", PlaylistChanged, p_intf); + var_AddCallback(p_playlist, "playlist-item-append", PlaylistChanged, p_intf); - if( psz_device == NULL ) + while (vlc_object_alive(p_intf)) { - pl_Release( p_intf ); - return; - } + msleep(INTF_IDLE_SLEEP); - /* Remove what we have after @ */ - for( psz_parser = psz_device ; *psz_parser ; psz_parser++ ) - { - if( *psz_parser == '@' ) + /* Update the input */ + if (!p_sys->p_input) + p_sys->p_input = playlist_CurrentInput(p_playlist); + else if (p_sys->p_input->b_dead) { - *psz_parser = '\0'; - break; + 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 = false; } - } - - /* If there's a stream playing, we aren't allowed to eject ! */ - if( p_intf->p_sys->p_input == NULL ) - { - msg_Dbg( p_intf, "ejecting %s", psz_device ); - - intf_Eject( p_intf, psz_device ); - } - - free( psz_device ); - pl_Release( p_intf ); - return; -} - -static int comp_dir_entries( const void *pp_dir_entry1, - const void *pp_dir_entry2 ) -{ - struct dir_entry_t *p_dir_entry1 = *(struct dir_entry_t**)pp_dir_entry1; - struct dir_entry_t *p_dir_entry2 = *(struct dir_entry_t**)pp_dir_entry2; - if ( p_dir_entry1->b_file == p_dir_entry2->b_file ) { - return strcasecmp( p_dir_entry1->psz_path, p_dir_entry2->psz_path ); - } - else - { - return ( p_dir_entry1->b_file ? 1 : -1 ); - } -} -static void ReadDir( intf_thread_t *p_intf ) -{ - intf_sys_t *p_sys = p_intf->p_sys; - DIR *p_current_dir; - int i; + PL_LOCK; + if (p_sys->b_box_plidx_follow && playlist_CurrentPlayingItem(p_playlist)) + FindIndex(p_sys, p_playlist, true); - if( p_sys->psz_current_dir && *p_sys->psz_current_dir ) - { - char *psz_entry; + PL_UNLOCK; - /* Open the dir */ - p_current_dir = utf8_opendir( p_sys->psz_current_dir ); + while (HandleKey(p_intf)) + Redraw(p_intf, &t_last_refresh); - if( p_current_dir == NULL ) + /* Hack */ + if (p_sys->f_slider > 0.0001 && !p_sys->b_box_cleared) { - /* something went bad, get out of here ! */ - msg_Warn( p_intf, "cannot open directory `%s' (%m)", - p_sys->psz_current_dir ); - return; + clear(); + Redraw(p_intf, &t_last_refresh); + p_sys->b_box_cleared = true; } - /* Clean the old shit */ - for( i = 0; i < p_sys->i_dir_entries; i++ ) + if ((time(0) - t_last_refresh) >= 1) { - struct dir_entry_t *p_dir_entry = p_sys->pp_dir_entries[i]; - free( p_dir_entry->psz_path ); - REMOVE_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, i ); - free( p_dir_entry ); + ManageSlider(p_intf); + Redraw(p_intf, &t_last_refresh); } - p_sys->pp_dir_entries = NULL; - p_sys->i_dir_entries = 0; - - /* while we still have entries in the directory */ - while( ( psz_entry = utf8_readdir( p_current_dir ) ) != NULL ) - { -#if defined( S_ISDIR ) - struct stat stat_data; -#endif - struct dir_entry_t *p_dir_entry; - char *psz_uri; + } + var_DelCallback(p_playlist, "intf-change", PlaylistChanged, p_intf); + var_DelCallback(p_playlist, "playlist-item-append", PlaylistChanged, p_intf); + vlc_restorecancel(canc); +} - if( p_sys->b_show_hidden_files == false && - ( strlen( psz_entry ) && psz_entry[0] == '.' ) && - strcmp( psz_entry, ".." ) ) - { - free( psz_entry ); - continue; - } +/***************************************************************************** + * Open: initialize and create window + *****************************************************************************/ +static int Open(vlc_object_t *p_this) +{ + intf_thread_t *p_intf = (intf_thread_t *)p_this; + intf_sys_t *p_sys = p_intf->p_sys = calloc(1, sizeof(intf_sys_t)); + if (!p_sys) + return VLC_ENOMEM; - if( asprintf( &psz_uri, "%s/%s", p_sys->psz_current_dir, - psz_entry ) == -1) - { - free( psz_entry ); - continue; - } + p_sys->f_slider = 0.0; + p_sys->f_slider_old = 0.0; + p_sys->i_box_type = BOX_PLAYLIST; + p_sys->b_box_plidx_follow = true; +// p_sys->p_sub = msg_Subscribe(p_intf); + p_sys->b_color = var_CreateGetBool(p_intf, "color"); - if( !( p_dir_entry = malloc( sizeof( struct dir_entry_t) ) ) ) - { - free( psz_uri ); - free( psz_entry ); - continue; - } + p_sys->category_view = true; //FIXME: switching back & forth is broken + p_sys->psz_search_chain = malloc(SEARCH_CHAIN_SIZE + 1); + p_sys->psz_open_chain = malloc(OPEN_CHAIN_SIZE + 1); -#if defined( S_ISDIR ) - 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 - if( 0 ) -#endif - { - p_dir_entry->psz_path = strdup( psz_entry ); - p_dir_entry->b_file = false; - INSERT_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, - p_sys->i_dir_entries, p_dir_entry ); - } - else - { - p_dir_entry->psz_path = strdup( psz_entry ); - p_dir_entry->b_file = true; - INSERT_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, - p_sys->i_dir_entries, p_dir_entry ); - } + p_sys->psz_current_dir = var_CreateGetString(p_intf, "browse-dir"); + if (!p_sys->psz_current_dir || !*p_sys->psz_current_dir) + { + free(p_sys->psz_current_dir); + p_sys->psz_current_dir = config_GetUserDir(VLC_HOME_DIR); + } - free( psz_uri ); - free( psz_entry ); - } + p_sys->w = initscr(); /* Initialize the curses library */ - /* Sort */ - qsort( p_sys->pp_dir_entries, p_sys->i_dir_entries, - sizeof(struct dir_entry_t*), &comp_dir_entries ); + if (p_sys->b_color) + start_color_and_pairs(p_intf); - closedir( p_current_dir ); - return; - } - else - { - msg_Dbg( p_intf, "no current dir set" ); - return; - } -} + keypad(p_sys->w, TRUE); /* Don't do NL -> CR/NL */ + nonl(); /* Take input chars one at a time */ + cbreak(); /* Don't echo */ + noecho(); /* Invisible cursor */ + curs_set(0); /* Non blocking wgetch() */ + wtimeout(p_sys->w, 0); + clear(); -static void PlayPause( intf_thread_t *p_intf ) -{ - input_thread_t *p_input = p_intf->p_sys->p_input; - playlist_t *p_playlist = pl_Hold( p_intf ); - vlc_value_t val; + /* Stop printing errors to the console */ + freopen("/dev/null", "wb", stderr); - if( p_input ) - { - var_Get( p_input, "state", &val ); - if( val.i_int != PAUSE_S ) - { - val.i_int = PAUSE_S; - } - else - { - val.i_int = PLAYING_S; - } - var_Set( p_input, "state", val ); - } - else - playlist_Play( p_playlist ); + ReadDir(p_intf); - pl_Release( p_intf ); + p_intf->pf_run = Run; + return VLC_SUCCESS; } -/**************************************************************************** - * - ****************************************************************************/ -static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title, bool b_color ) +/***************************************************************************** + * Close: destroy interface window + *****************************************************************************/ +static void Close(vlc_object_t *p_this) { - 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 ); + intf_sys_t *p_sys = ((intf_thread_t*)p_this)->p_sys; - if( i_len > w - 2 ) i_len = w - 2; + PlaylistDestroy(p_sys); + DirsDestroy(p_sys); - mvwaddch( win, y, x, ACS_ULCORNER ); - mvwhline( win, y, x+1, ACS_HLINE, ( w-i_len-2)/2 ); - mvwprintw( win,y, x+1+(w-i_len-2)/2, "%s", title ); - mvwhline( win, y, x+(w-i_len)/2+i_len, ACS_HLINE, w - 1 - ((w-i_len)/2+i_len) ); - mvwaddch( win, y, x+w-1,ACS_URCORNER ); + free(p_sys->psz_current_dir); + free(p_sys->psz_search_chain); + free(p_sys->psz_old_search); + free(p_sys->psz_open_chain); - for( i = 0; i < h-2; i++ ) - { - mvwaddch( win, y+i+1, x, ACS_VLINE ); - mvwaddch( win, y+i+1, x+w-1, ACS_VLINE ); - } + if (p_sys->p_input) + vlc_object_release(p_sys->p_input); - 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 ); - } -} + /* Close the ncurses interface */ + endwin(); -static void DrawEmptyLine( WINDOW *win, int y, int x, int w ) -{ - if( w > 0 ) - { - mvwhline( win, y, x, ' ', w ); - } -} +// msg_Unsubscribe(p_intf, p_sys->p_sub); -static void DrawLine( WINDOW *win, int y, int x, int w ) -{ - if( w > 0 ) - { - attrset( A_REVERSE ); - mvwhline( win, y, x, ' ', w ); - attroff( A_REVERSE ); - } + free(p_sys); }