X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=b920f5b5c65328c3b720e0aa8d8b73051cadcce7;hb=60b06277e945528c7852e4e634998540c30d264b;hp=7087fc588329a2b9e8e4448556f672d95fb759fc;hpb=2c14f59841c493564d6b9900be99f7570c8699b7;p=vlc diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index 7087fc5883..b920f5b5c6 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -25,11 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -/* - * Note that when we use wide characters (and link with libncursesw), - * we assume that an UTF8 locale is used (or compatible, such as ASCII). - * Other characters encodings are not supported. - */ +/* UTF8 locale is required */ /***************************************************************************** * Preamble @@ -55,6 +51,7 @@ #include #include #include +#include #include @@ -96,7 +93,7 @@ enum BOX_NONE, BOX_HELP, BOX_INFO, -// BOX_LOG, + BOX_LOG, BOX_PLAYLIST, BOX_SEARCH, BOX_OPEN, @@ -106,6 +103,20 @@ enum BOX_STATS }; +static const char *box_title[] = { + [BOX_NONE] = "", + [BOX_HELP] = " Help ", + [BOX_INFO] = " Information ", + [BOX_LOG] = " Messages ", + [BOX_PLAYLIST] = " Playlist ", + [BOX_SEARCH] = " Playlist ", + [BOX_OPEN] = " Playlist ", + [BOX_BROWSE] = " Browse ", + [BOX_META] = " Meta-information ", + [BOX_OBJECTS] = " Objects ", + [BOX_STATS] = " Stats ", +}; + enum { C_DEFAULT = 0, @@ -115,12 +126,10 @@ enum C_PLAYLIST_3, C_BOX, C_STATUS, -#if 0 C_INFO, C_ERROR, C_WARNING, C_DEBUG, -#endif C_CATEGORY, C_FOLDER, /* XXX: new elements here ! */ @@ -144,13 +153,12 @@ static const struct { short f; short b; } color_pairs[] = /* 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) */ @@ -174,38 +182,46 @@ struct intf_sys_t input_thread_t *p_input; bool b_color; - - WINDOW *w; + bool b_exit; int i_box_type; - int i_box_y; - int i_box_lines; - int i_box_lines_total; - int i_box_start; - - int i_box_plidx; /* Playlist index */ - int b_box_plidx_follow; - int i_box_bidx; /* browser index */ - - playlist_item_t *p_node; /* current node */ - -// msg_subscription_t* p_sub; /* message bank subscription */ - + int i_box_y; // start of box content + int i_box_height; + int i_box_lines_total; // number of lines in the box + int i_box_start; // first line of box displayed + int i_box_idx; // selected line + + msg_subscription_t *p_sub; // message bank subscription + msg_item_t *msgs[50]; // ring buffer + int i_msgs; + vlc_mutex_t msg_lock; + + /* Search Box context */ char psz_search_chain[20]; char *psz_old_search; int i_before_search; + /* Open Box Context */ char psz_open_chain[50]; + /* File Browser context */ char *psz_current_dir; int i_dir_entries; struct dir_entry_t **pp_dir_entries; bool b_show_hidden_files; - bool category_view; + /* Playlist context */ struct pl_item_t **pp_plist; int i_plist_entries; - bool b_need_update; /* for playlist view */ + bool b_need_update; + bool b_plidx_follow; + playlist_item_t *p_node; /* current node */ + +}; + +struct msg_cb_data_t +{ + intf_sys_t *p_sys; }; /***************************************************************************** @@ -243,7 +259,7 @@ static bool IsFile(const char *current_dir, const char *entry) char *uri; struct stat st; - if (asprintf(&uri, "%s/%s", current_dir, entry) != -1) + if (asprintf(&uri, "%s" DIR_SEP "%s", current_dir, entry) != -1) { ret = vlc_stat(uri, &st) || !S_ISDIR(st.st_mode); free(uri); @@ -292,9 +308,10 @@ static void ReadDir(intf_thread_t *p_intf) goto next; p_dir_entry->b_file = IsFile(p_sys->psz_current_dir, psz_entry); - p_dir_entry->psz_path = strdup(psz_entry); + p_dir_entry->psz_path = psz_entry; INSERT_ELEM(p_sys->pp_dir_entries, p_sys->i_dir_entries, p_sys->i_dir_entries, p_dir_entry); + continue; next: free(psz_entry); @@ -308,9 +325,44 @@ next: } /***************************************************************************** - * Playlist + * Adjust index position after a change (list navigation or item switching) *****************************************************************************/ +static void CheckIdx(intf_sys_t *p_sys) +{ + int lines = p_sys->i_box_lines_total; + int height = LINES - p_sys->i_box_y - 2; + if (height > lines - 1) + height = lines - 1; + + /* make sure the new index is within the box */ + if (p_sys->i_box_idx <= 0) + { + p_sys->i_box_idx = 0; + p_sys->i_box_start = 0; + } + else if (p_sys->i_box_idx >= lines - 1 && lines > 0) + { + p_sys->i_box_idx = lines - 1; + p_sys->i_box_start = p_sys->i_box_idx - height; + } + + /* Fix box start (1st line of the box displayed) */ + if (p_sys->i_box_idx < p_sys->i_box_start || + p_sys->i_box_idx > height + p_sys->i_box_start + 1) + { + p_sys->i_box_start = p_sys->i_box_idx - height/2; + if (p_sys->i_box_start < 0) + p_sys->i_box_start = 0; + } + else if (p_sys->i_box_idx == p_sys->i_box_start - 1) + p_sys->i_box_start--; + else if (p_sys->i_box_idx == height + p_sys->i_box_start + 1) + p_sys->i_box_start++; +} +/***************************************************************************** + * Playlist + *****************************************************************************/ static void PlaylistDestroy(intf_sys_t *p_sys) { while (p_sys->i_plist_entries) @@ -323,14 +375,6 @@ static void PlaylistDestroy(intf_sys_t *p_sys) 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; -} - static bool PlaylistAddChild(intf_sys_t *p_sys, playlist_item_t *p_child, const char *c, const char d) { @@ -398,11 +442,8 @@ static void PlaylistRebuild(intf_thread_t *p_intf) playlist_t *p_playlist = pl_Get(p_intf); PL_LOCK; - PlaylistDestroy(p_sys); - PlaylistAddNode(p_sys, PlaylistGetRoot(p_intf), ""); - p_sys->b_need_update = false; - + PlaylistAddNode(p_sys, p_playlist->p_root_onelevel, ""); PL_UNLOCK; } @@ -423,16 +464,6 @@ static int PlaylistChanged(vlc_object_t *p_this, const char *psz_variable, } /* 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) { @@ -452,7 +483,7 @@ static void SearchPlaylist(intf_sys_t *p_sys, char *psz_searchstring) if (!psz_searchstring || !*psz_searchstring) { - p_sys->i_box_plidx = p_sys->i_before_search; + p_sys->i_box_idx = p_sys->i_before_search; return; } @@ -462,35 +493,48 @@ static void SearchPlaylist(intf_sys_t *p_sys, char *psz_searchstring) i_item = SubSearchPlaylist(p_sys, psz_searchstring, 0, i_first); if (i_item > 0) - p_sys->i_box_plidx = i_item; + { + p_sys->i_box_idx = i_item; + CheckIdx(p_sys); + } } 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); + playlist_item_t *p_played_item; + + PL_ASSERT_LOCKED; + + if (p_item->i_children == 0 && p_item == p_sys->p_node) + return true; + + p_played_item = playlist_CurrentPlayingItem(p_playlist); + if (p_played_item && p_item->p_input && p_played_item->p_input) + return p_item->p_input->i_id == p_played_item->p_input->i_id; + + return false; } -static void FindIndex(intf_sys_t *p_sys, playlist_t *p_playlist, bool locked) +static void FindIndex(intf_sys_t *p_sys, playlist_t *p_playlist) { - int plidx = p_sys->i_box_plidx; - if (!locked) - PL_LOCK; + int plidx = p_sys->i_box_idx; + int max = p_sys->i_plist_entries; - 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++) + PL_LOCK; + + if (!IsIndex(p_sys, p_playlist, plidx)) + for(int i = 0; i < max; i++) if (IsIndex(p_sys, p_playlist, i)) { - p_sys->i_box_plidx = i; + p_sys->i_box_idx = i; + CheckIdx(p_sys); break; } - } - if (!locked) - PL_UNLOCK; + PL_UNLOCK; + + p_sys->b_plidx_follow = true; } /**************************************************************************** @@ -515,53 +559,53 @@ static void start_color_and_pairs(intf_thread_t *p_intf) init_color(COLOR_YELLOW, 960, 500, 0); /* YELLOW -> ORANGE */ } -static void DrawBox(WINDOW *win, int y, int x, int h, int w, const char *title, bool b_color) +static void DrawBox(int y, int h, bool b_color, const char *title) { int i_len; + int w = COLS; - if (w <= 3 || h <= 2) + if (w <= 3 || h <= 0) return; - if (b_color) - wcolor_set(win, C_BOX, NULL); + if (b_color) color_set(C_BOX, NULL); + if (!title) title = ""; i_len = strlen(title); if (i_len > w - 2) i_len = w - 2; - 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); + mvaddch(y, 0, ACS_ULCORNER); + mvhline(y, 1, ACS_HLINE, (w-i_len-2)/2); + mvprintw(y, 1+(w-i_len-2)/2, "%s", title); + mvhline(y, (w-i_len)/2+i_len, ACS_HLINE, w - 1 - ((w-i_len)/2+i_len)); + mvaddch(y, w-1,ACS_URCORNER); - for(int i = 0; i < h-2; i++) + for(int i = 0; i < h; i++) { - mvwaddch(win, y+i+1, x, ACS_VLINE); - mvwaddch(win, y+i+1, x+w-1, ACS_VLINE); + mvaddch(++y, 0, ACS_VLINE); + mvaddch(y, w-1, ACS_VLINE); } - 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); + mvaddch(++y, 0, ACS_LLCORNER); + mvhline(y, 1, ACS_HLINE, w - 2); + mvaddch(y, w-1, ACS_LRCORNER); + if (b_color) color_set(C_DEFAULT, NULL); } -static void DrawEmptyLine(WINDOW *win, int y, int x, int w) +static void DrawEmptyLine(int y, int x, int w) { if (w <= 0) return; - mvwhline(win, y, x, ' ', w); + mvhline(y, x, ' ', w); } -static void DrawLine(WINDOW *win, int y, int x, int w) +static void DrawLine(int y, int x, int w) { if (w <= 0) return; attrset(A_REVERSE); - mvwhline(win, y, x, ' ', w); + mvhline(y, x, ' ', w); attroff(A_REVERSE); } @@ -660,13 +704,13 @@ static void mvnprintw(int y, int x, int w, const char *p_fmt, ...) free(p_buf); } -static void MainBoxWrite(intf_thread_t *p_intf, int l, int x, const char *p_fmt, ...) +static void MainBoxWrite(intf_sys_t *p_sys, int l, const char *p_fmt, ...) { - intf_sys_t *p_sys = p_intf->p_sys; - va_list vl_args; + va_list vl_args; char *p_buf; + bool b_selected = l == p_sys->i_box_idx; - 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_height) return; va_start(vl_args, p_fmt); @@ -674,109 +718,424 @@ static void MainBoxWrite(intf_thread_t *p_intf, int l, int x, const char *p_fmt, return; va_end(vl_args); - mvnprintw(p_sys->i_box_y + l - p_sys->i_box_start, x, COLS - x - 1, "%s", p_buf); + if (b_selected) attron(A_REVERSE); + mvnprintw(p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2, "%s", p_buf); + if (b_selected) attroff(A_REVERSE); + free(p_buf); } -static void DumpObject(intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int i_level) +static int SubDrawObject(intf_sys_t *p_sys, int l, vlc_object_t *p_obj, int i_level, const char *prefix) { + int x = 2 * i_level++; char *psz_name = vlc_object_get_name(p_obj); + vlc_list_t *list; + char space[x+3]; + memset(space, ' ', x); + space[x] = '\0'; + if (psz_name) { - MainBoxWrite(p_intf, (*l)++, 1 + 2 * i_level, "%s \"%s\" (%p)", - p_obj->psz_object_type, psz_name, p_obj); + MainBoxWrite(p_sys, l++, "%s%s%s \"%s\" (%p)", space, prefix, + 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_sys, l++, "%s%s%s (%p)", space, prefix, + p_obj->psz_object_type, p_obj); - vlc_list_t *list = vlc_list_children(p_obj); + 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); + l = SubDrawObject(p_sys, l, list->p_values[i].p_object, i_level, + (i == list->i_count - 1) ? "`-" : "|-" ); } vlc_list_release(list); + return l; +} + +static int DrawObjects(intf_thread_t *p_intf) +{ + return SubDrawObject(p_intf->p_sys, 0, VLC_OBJECT(p_intf->p_libvlc), 0, ""); +} + +static int DrawMeta(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + input_thread_t *p_input = p_sys->p_input; + input_item_t *p_item; + int l = 0; + + if (!p_input) + return 0; + + 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) color_set(C_CATEGORY, NULL); + MainBoxWrite(p_sys, l++, " [%s]", + vlc_meta_TypeToLocalizedString(i)); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + MainBoxWrite(p_sys, l++, " %s", psz_meta); + } + vlc_mutex_unlock(&p_item->lock); + + return l; +} + +static int DrawInfo(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + input_thread_t *p_input = p_sys->p_input; + input_item_t *p_item; + int l = 0; + + if (!p_input) + return 0; + + p_item = input_GetItem(p_input); + vlc_mutex_lock(&p_item->lock); + for(int i = 0; i < p_item->i_categories; i++) + { + info_category_t *p_category = p_item->pp_categories[i]; + if (p_sys->b_color) color_set(C_CATEGORY, NULL); + MainBoxWrite(p_sys, l++, _(" [%s]"), p_category->psz_name); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + for(int j = 0; j < p_category->i_infos; j++) + { + info_t *p_info = p_category->pp_infos[j]; + MainBoxWrite(p_sys, l++, _(" %s: %s"), + p_info->psz_name, p_info->psz_value); + } + } + vlc_mutex_unlock(&p_item->lock); + + return l; +} + +static int DrawStats(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + input_thread_t *p_input = p_sys->p_input; + input_item_t *p_item; + input_stats_t *p_stats; + int l = 0, i_audio = 0, i_video = 0; + + if (!p_input) + return 0; + + p_item = input_GetItem(p_input); + assert(p_item); + + vlc_mutex_lock(&p_item->lock); + p_stats = p_item->p_stats; + vlc_mutex_lock(&p_stats->lock); + + for(int 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); + } + + /* Input */ + if (p_sys->b_color) color_set(C_CATEGORY, NULL); + MainBoxWrite(p_sys, l++, _(" [Incoming]")); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + MainBoxWrite(p_sys, l++, _(" input bytes read : %8.0f KiB"), + (float)(p_stats->i_read_bytes)/1024); + MainBoxWrite(p_sys, l++, _(" input bitrate : %6.0f kb/s"), + p_stats->f_input_bitrate*8000); + MainBoxWrite(p_sys, l++, _(" demux bytes read : %8.0f KiB"), + (float)(p_stats->i_demux_read_bytes)/1024); + MainBoxWrite(p_sys, l++, _(" demux bitrate : %6.0f kb/s"), + p_stats->f_demux_bitrate*8000); + + /* Video */ + if (i_video) + { + if (p_sys->b_color) color_set(C_CATEGORY, NULL); + MainBoxWrite(p_sys, l++, _(" [Video Decoding]")); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + MainBoxWrite(p_sys, l++, _(" video decoded : %"PRId64), + p_stats->i_decoded_video); + MainBoxWrite(p_sys, l++, _(" frames displayed : %"PRId64), + p_stats->i_displayed_pictures); + MainBoxWrite(p_sys, l++, _(" frames lost : %"PRId64), + p_stats->i_lost_pictures); + } + /* Audio*/ + if (i_audio) + { + if (p_sys->b_color) color_set(C_CATEGORY, NULL); + MainBoxWrite(p_sys, l++, _(" [Audio Decoding]")); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + MainBoxWrite(p_sys, l++, _(" audio decoded : %"PRId64), + p_stats->i_decoded_audio); + MainBoxWrite(p_sys, l++, _(" buffers played : %"PRId64), + p_stats->i_played_abuffers); + MainBoxWrite(p_sys, l++, _(" buffers lost : %"PRId64), + p_stats->i_lost_abuffers); + } + /* Sout */ + if (p_sys->b_color) color_set(C_CATEGORY, NULL); + MainBoxWrite(p_sys, l++, _(" [Streaming]")); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + MainBoxWrite(p_sys, l++, _(" packets sent : %5i"), p_stats->i_sent_packets); + MainBoxWrite(p_sys, l++, _(" bytes sent : %8.0f KiB"), + (float)(p_stats->i_sent_bytes)/1025); + MainBoxWrite(p_sys, l++, _(" sending bitrate : %6.0f kb/s"), + p_stats->f_send_bitrate*8000); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + + vlc_mutex_unlock(&p_stats->lock); + vlc_mutex_unlock(&p_item->lock); + + return l; +} + +static int DrawHelp(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + int l = 0; + +#define H(a) MainBoxWrite(p_sys, l++, a) + + if (p_sys->b_color) color_set(C_CATEGORY, NULL); + H(_("[Display]")); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + H(_(" h,H Show/Hide help box")); + H(_(" i Show/Hide info box")); + H(_(" m Show/Hide metadata box")); + H(_(" L Show/Hide messages box")); + H(_(" P Show/Hide playlist box")); + H(_(" B Show/Hide filebrowser")); + H(_(" x Show/Hide objects box")); + H(_(" S Show/Hide statistics box")); + H(_(" Esc Close Add/Search entry")); + H(_(" Ctrl-l Refresh the screen")); + H(""); + + if (p_sys->b_color) color_set(C_CATEGORY, NULL); + H(_("[Global]")); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + H(_(" q, Q, Esc Quit")); + H(_(" s Stop")); + H(_(" Pause/Play")); + H(_(" f Toggle Fullscreen")); + H(_(" n, p Next/Previous playlist item")); + H(_(" [, ] Next/Previous title")); + H(_(" <, > Next/Previous chapter")); + /* xgettext: You can use ← and → characters */ + H(_(" , Seek -/+ 1%%")); + H(_(" a, z Volume Up/Down")); + /* xgettext: You can use ↑ and ↓ characters */ + H(_(" , Navigate through the box line by line")); + /* xgettext: You can use ⇞ and ⇟ characters */ + H(_(" , Navigate through the box page by page")); + /* xgettext: You can use ↖ and ↘ characters */ + H(_(" , Navigate to start/end of box")); + H(""); + + if (p_sys->b_color) color_set(C_CATEGORY, NULL); + H(_("[Playlist]")); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + H(_(" r Toggle Random playing")); + H(_(" l Toggle Loop Playlist")); + H(_(" R Toggle Repeat item")); + H(_(" o Order Playlist by title")); + H(_(" O Reverse order Playlist by title")); + H(_(" g Go to the current playing item")); + H(_(" / Look for an item")); + H(_(" A Add an entry")); + /* xgettext: You can use ⌫ character to translate */ + H(_(" D, , Delete an entry")); + H(_(" e Eject (if stopped)")); + H(""); + + if (p_sys->b_color) color_set(C_CATEGORY, NULL); + H(_("[Filebrowser]")); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + H(_(" Add the selected file to the playlist")); + H(_(" Add the selected directory to the playlist")); + H(_(" . Show/Hide hidden files")); + H(""); + + if (p_sys->b_color) color_set(C_CATEGORY, NULL); + H(_("[Player]")); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + /* xgettext: You can use ↑ and ↓ characters */ + H(_(" , Seek +/-5%%")); + +#undef H + return l; +} + +static int DrawBrowse(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + + for(int i = 0; i < p_sys->i_dir_entries; i++) + { + struct dir_entry_t *p_dir_entry = p_sys->pp_dir_entries[i]; + char type = p_dir_entry->b_file ? ' ' : '+'; + + if (p_sys->b_color) + color_set(p_dir_entry->b_file ? C_DEFAULT : C_FOLDER, NULL); + MainBoxWrite(p_sys, i, " %c %s", type, p_dir_entry->psz_path); + } + + return p_sys->i_dir_entries; +} + +static int DrawPlaylist(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + playlist_t *p_playlist = pl_Get(p_intf); + + if (p_sys->b_need_update) + { + PlaylistRebuild(p_intf); + p_sys->b_need_update = false; + } + + if (p_sys->b_plidx_follow) + FindIndex(p_sys, p_playlist); + + for(int i = 0; i < p_sys->i_plist_entries; i++) + { + char c; + playlist_item_t *p_current_item; + playlist_item_t *p_item = p_sys->pp_plist[i]->p_item; + playlist_item_t *p_node = p_sys->p_node; + + PL_LOCK; + assert(p_item); + p_current_item = playlist_CurrentPlayingItem(p_playlist); + if ((p_node && p_item->p_input == p_node->p_input) || + (!p_node && p_current_item && p_item->p_input == p_current_item->p_input)) + c = '*'; + else if (p_item == p_node || p_current_item == p_item) + c = '>'; + else + c = ' '; + PL_UNLOCK; + + if (p_sys->b_color) color_set(i%3 + C_PLAYLIST_1, NULL); + MainBoxWrite(p_sys, i, "%c%s", c, p_sys->pp_plist[i]->psz_display); + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + } + + return p_sys->i_plist_entries; +} + +static int DrawMessages(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + int l = 0; + int i; + + vlc_mutex_lock(&p_sys->msg_lock); + i = p_sys->i_msgs; + for(;;) + { + msg_item_t *msg = p_sys->msgs[i]; + if (msg) + { + if (p_sys->b_color) + color_set(msg->i_type + C_INFO, NULL); + MainBoxWrite(p_sys, l++, "[%s] %s", msg->psz_module, msg->psz_msg); + } + + if (++i == sizeof p_sys->msgs / sizeof *p_sys->msgs) + i = 0; + + if (i == p_sys->i_msgs) /* did we loop around the ring buffer ? */ + break; + } + + vlc_mutex_unlock(&p_sys->msg_lock); + if (p_sys->b_color) + color_set(C_DEFAULT, NULL); + return l; } -static void Redraw(intf_thread_t *p_intf, time_t *t_last_refresh) +static int DrawStatus(intf_thread_t *p_intf) { intf_sys_t *p_sys = p_intf->p_sys; input_thread_t *p_input = p_sys->p_input; playlist_t *p_playlist = pl_Get(p_intf); + static const char name[] = "VLC media player "PACKAGE_VERSION; + const size_t name_len = sizeof name - 1; /* without \0 termination */ int y = 0; - int h; - int y_end; + const char *repeat, *loop, *random; + /* Title */ + int padding = COLS - name_len; /* center title */ + if (padding < 0) + padding = 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; - char psz_title[i_size]; - 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); + if (p_sys->b_color) color_set(C_TITLE, NULL); + DrawEmptyLine(y, 0, COLS); + mvnprintw(y++, padding / 2, COLS, "%s", name); + if (p_sys->b_color) color_set(C_STATUS, NULL); attroff(A_REVERSE); - y += 2; - if (p_sys->b_color) - wcolor_set(p_sys->w, C_STATUS, NULL); + y++; /* leave a blank line */ - /* Infos */ - char *psz_state; - if (asprintf(&psz_state, "%s%s%s", - var_GetBool(p_playlist, "repeat") ? _("[Repeat] ") : "", - var_GetBool(p_playlist, "random") ? _("[Random] ") : "", - var_GetBool(p_playlist, "loop") ? _("[Loop]") : "") == -1) - psz_state = NULL; + repeat = var_GetBool(p_playlist, "repeat") ? _("[Repeat] ") : ""; + random = var_GetBool(p_playlist, "random") ? _("[Random] ") : ""; + loop = var_GetBool(p_playlist, "loop") ? _("[Loop]") : ""; 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); - /* 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) - y += 2; - else + switch(val.i_int) { + static const char *input_state[] = { + [PLAYING_S] = " State : Playing %s%s%s", + [OPENING_S] = " State : Opening/Connecting %s%s%s", + [PAUSE_S] = " State : Paused %s%s%s", + }; + char buf1[MSTRTIME_MAX_SIZE]; + char buf2[MSTRTIME_MAX_SIZE]; audio_volume_t i_volume; - /* Position */ + case INIT_S: + case END_S: + y += 2; + break; + + case PLAYING_S: + case OPENING_S: + case PAUSE_S: + mvnprintw(y++, 0, COLS, _(input_state[val.i_int]), + repeat, random, loop); + + default: var_Get(p_input, "time", &val); secstotimestr(buf1, val.i_time / CLOCK_FREQ); - var_Get(p_input, "length", &val); secstotimestr(buf2, val.i_time / CLOCK_FREQ); mvnprintw(y++, 0, COLS, _(" Position : %s/%s"), buf1, buf2); - /* Volume */ - aout_VolumeGet(p_playlist, &i_volume); - mvnprintw(y++, 0, COLS, _(" Volume : %i%%"), i_volume*200/AOUT_VOLUME_MAX); + i_volume = aout_VolumeGet(p_playlist); + mvnprintw(y++, 0, COLS, _(" Volume : %i%%"), + i_volume*200/AOUT_VOLUME_MAX); - /* Title */ if (!var_Get(p_input, "title", &val)) { int i_title_count = var_CountChoices(p_input, "title"); @@ -785,7 +1144,6 @@ static void Redraw(intf_thread_t *p_intf, time_t *t_last_refresh) val.i_int, i_title_count); } - /* Chapter */ if (!var_Get(p_input, "chapter", &val)) { int i_chapter_count = var_CountChoices(p_input, "chapter"); @@ -797,577 +1155,117 @@ static void Redraw(intf_thread_t *p_intf, time_t *t_last_refresh) } else { - mvnprintw(y++, 0, COLS, _(" Source: %s"), psz_state); - DrawEmptyLine(p_sys->w, y++, 0, COLS); + mvnprintw(y++, 0, COLS, _(" Source: ")); + mvnprintw(y++, 0, COLS, " %s%s%s", repeat, random, loop); mvnprintw(y++, 0, COLS, _(" [ h for help ]")); - DrawEmptyLine(p_sys->w, y++, 0, COLS); - } - free(psz_state); - if (p_sys->b_color) - wcolor_set(p_sys->w, C_DEFAULT, NULL); - - DrawBox(p_sys->w, y, 0, 3, COLS, "", p_sys->b_color); - DrawEmptyLine(p_sys->w, y+1, 1, COLS-2); - - if (p_input && var_GetInteger(p_input, "state") == PLAYING_S) - { - float pos = var_GetFloat(p_input, "position"); - DrawLine(p_sys->w, y+1, 1, (int)(pos * (COLS-2))); + DrawEmptyLine(y++, 0, COLS); } - y += 3; - - p_sys->i_box_y = y + 1; - p_sys->i_box_lines = LINES - y - 2; - - h = LINES - y; - y_end = y + h - 1; + if (p_sys->b_color) color_set(C_DEFAULT, NULL); + DrawBox(y++, 1, p_sys->b_color, ""); /* position slider */ + DrawEmptyLine(y, 1, COLS-2); + if (p_input) + DrawLine(y, 1, (int)((COLS-2) * var_GetFloat(p_input, "position"))); - 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); + y += 2; /* skip slider and box */ - 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, _(" Esc Close Add/Search entry")); - MainBoxWrite(p_intf, l++, 1, ""); + return y; +} - 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, ""); +static void FillTextBox(intf_sys_t *p_sys) +{ + int width = COLS - 2; + const char *title = p_sys->i_box_type == BOX_OPEN ? "Open: %s" : "Find: %s"; + char *chain = p_sys->i_box_type == BOX_OPEN ? p_sys->psz_open_chain : + p_sys->psz_old_search ? p_sys->psz_old_search : + p_sys->psz_search_chain; + + DrawEmptyLine(7, 1, width); + mvnprintw(7, 1, width, _(title), chain); +} - 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, ""); +static void FillBox(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + static int (* const draw[]) (intf_thread_t *) = { + [BOX_HELP] = DrawHelp, + [BOX_INFO] = DrawInfo, + [BOX_META] = DrawMeta, + [BOX_OBJECTS] = DrawObjects, + [BOX_STATS] = DrawStats, + [BOX_BROWSE] = DrawBrowse, + [BOX_PLAYLIST] = DrawPlaylist, + [BOX_SEARCH] = DrawPlaylist, + [BOX_OPEN] = DrawPlaylist, + [BOX_LOG] = DrawMessages, + }; - 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, ""); + p_sys->i_box_lines_total = draw[p_sys->i_box_type](p_intf); - 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->i_box_type == BOX_SEARCH || p_sys->i_box_type == BOX_OPEN) + FillTextBox(p_sys); +} - 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, ""); +static void Redraw(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + int box = p_sys->i_box_type; + int y = DrawStatus(p_intf); - 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_height = LINES - y - 2; + DrawBox(y++, p_sys->i_box_height, p_sys->b_color, _(box_title[box])); - 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; + p_sys->i_box_y = y; - 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) + if (box != BOX_NONE) { - /* Info box */ - int l = 0; - DrawBox(p_sys->w, y++, 0, h, COLS, _(" Information "), p_sys->b_color); - - 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++) - { - 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++) - { - 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); - } - } - vlc_mutex_unlock(&input_GetItem(p_input)->lock); - } - else - MainBoxWrite(p_intf, l++, 1, _("No item currently playing")); + FillBox(p_intf); - 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 - 1) 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; + y += __MIN(p_sys->i_box_lines_total - p_sys->i_box_start, + p_sys->i_box_height); } - 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); + while (y < LINES - 1) + DrawEmptyLine(y++, 1, COLS - 2); - if (p_input) - { - 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) - p_sys->i_box_start = p_sys->i_box_lines_total - 1; + refresh(); +} - 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; +static void ChangePosition(intf_thread_t *p_intf, float increment) +{ + intf_sys_t *p_sys = p_intf->p_sys; + input_thread_t *p_input = p_sys->p_input; + float pos; - DrawBox(p_sys->w, y++, 0, h, COLS, _(" Logs "), p_sys->b_color); + if (!p_input || var_GetInteger(p_input, "state") != PLAYING_S) + return; + pos = var_GetFloat(p_input, "position") + increment; - i_start = p_intf->p_sys->p_sub->i_start; + if (pos > 0.99) pos = 0.99; + if (pos < 0.0) pos = 0.0; - 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); + var_SetFloat(p_input, "position", pos); +} - 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); - } +static inline void RemoveLastUTF8Entity(char *psz, int len) +{ + while (len && ((psz[--len] & 0xc0) == 0x80)) /* UTF8 continuation byte */ + ; + psz[len] = '\0'; +} - 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) +static char *GetDiscDevice(intf_thread_t *p_intf, const char *name) +{ + static const struct { const char *s; size_t n; const char *v; } devs[] = { - /* 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) - { - 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; - - 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_OBJECTS) - { - int l = 0; - DrawBox(p_sys->w, y++, 0, h, COLS, _(" Objects "), p_sys->b_color); - DumpObject(p_intf, &l, VLC_OBJECT(p_intf->p_libvlc), 0); - - p_sys->i_box_lines_total = l; - if (p_sys->i_box_start >= p_sys->i_box_lines_total) - p_sys->i_box_start = p_sys->i_box_lines_total - 1; - - if (l - p_sys->i_box_start < p_sys->i_box_lines) - y += l - p_sys->i_box_start; - else - y += p_sys->i_box_lines; - } - else if (p_sys->i_box_type == BOX_STATS) - { - DrawBox(p_sys->w, y++, 0, h, COLS, _(" Stats "), p_sys->b_color); - - if (p_input) - { - input_item_t *p_item = input_GetItem(p_input); - assert(p_item); - vlc_mutex_lock(&p_item->lock); - vlc_mutex_lock(&p_item->p_stats->lock); - - int i_audio = 0; - int i_video = 0; - int i; - - if (!p_item->i_es) - i_video = i_audio = 1; - else - for(i = 0; i < p_item->i_es ; i++) - { - i_audio += (p_item->es[i]->i_cat == AUDIO_ES); - i_video += (p_item->es[i]->i_cat == VIDEO_ES); - } - - int l = 0; - -#define SHOW_ACS(x,c) \ - if (l >= p_sys->i_box_start && l - p_sys->i_box_start < p_sys->i_box_lines) \ - mvaddch(p_sys->i_box_y - p_sys->i_box_start + l, x, c) - - /* Input */ - if (p_sys->b_color) wcolor_set(p_sys->w, C_CATEGORY, NULL); - MainBoxWrite(p_intf, l, 1, _("+-[Incoming]")); - SHOW_ACS(1, ACS_ULCORNER); SHOW_ACS(2, ACS_HLINE); l++; - if (p_sys->b_color) wcolor_set(p_sys->w, C_DEFAULT, NULL); - MainBoxWrite(p_intf, l, 1, _("| input bytes read : %8.0f 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++; - } - /* 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 >= i_max) p_sys->i_box_plidx = i_max - 1; - - 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); - } - if (i_start < 0) - i_start = 0; - if (i_stop > i_max) - i_stop = i_max; - - for(i_item = i_start; i_item < i_stop; i_item++) - { - 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 - y++; - - if (p_sys->i_box_type == BOX_SEARCH) - { - DrawEmptyLine(p_sys->w, 7, 1, COLS-2); - mvnprintw(7, 1, COLS-2, _("Find: %s"), *p_sys->psz_search_chain ? - p_sys->psz_search_chain : p_sys->psz_old_search); - } - if (p_sys->i_box_type == BOX_OPEN) - { - 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 ChangePosition(intf_thread_t *p_intf, float increment) -{ - 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") + increment; - - if (pos > 0.99) pos = 0.99; - if (pos < 0.0) pos = 0.0; - - var_SetFloat(p_input, "position", pos); -} - -static inline int RemoveLastUTF8Entity(char *psz, int len) -{ - while (len && ((psz[--len] & 0xc0) == 0x80)); - /* UTF8 continuation byte */ - - psz[len] = '\0'; - return len; -} - -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; + { "cdda://", 7, "cd-audio", }, + { "dvd://", 6, "dvd", }, + { "vcd://", 6, "vcd", }, + }; + char *device; for (unsigned i = 0; i < sizeof devs / sizeof *devs; i++) { @@ -1410,9 +1308,7 @@ static void Eject(intf_thread_t *p_intf) } psz_name = playlist_CurrentPlayingItem(p_playlist)->p_input->psz_name; - - if (psz_name) - psz_device = GetDiscDevice(p_intf, psz_name); + psz_device = psz_name ? GetDiscDevice(p_intf, psz_name) : NULL; PL_UNLOCK; @@ -1440,487 +1336,329 @@ static void PlayPause(intf_thread_t *p_intf) static inline void BoxSwitch(intf_sys_t *p_sys, int box) { p_sys->i_box_type = (p_sys->i_box_type == box) ? BOX_NONE : box; + p_sys->i_box_start = 0; + p_sys->i_box_idx = 0; } -static int HandleKey(intf_thread_t *p_intf) +static bool HandlePlaylistKey(intf_thread_t *p_intf, int key) { intf_sys_t *p_sys = p_intf->p_sys; playlist_t *p_playlist = pl_Get(p_intf); - int i_key = wgetch(p_sys->w); + struct pl_item_t *p_pl_item; - if (i_key == -1) - return 0; - - if (p_sys->i_box_type == BOX_PLAYLIST) + switch(key) { - int b_ret = true; - bool b_box_plidx_follow = false; + /* Playlist Settings */ + case 'r': var_ToggleBool(p_playlist, "random"); return true; + case 'l': var_ToggleBool(p_playlist, "loop"); return true; + case 'R': var_ToggleBool(p_playlist, "repeat"); return true; + + /* Playlist sort */ + case 'o': + case 'O': + playlist_RecursiveNodeSort(p_playlist, p_playlist->p_root_onelevel, + SORT_TITLE_NODES_FIRST, + (key == 'o')? ORDER_NORMAL : ORDER_REVERSE); + p_sys->b_need_update = true; + return true; + + case 'g': + FindIndex(p_sys, p_playlist); + return true; + + /* Deletion */ + case 'D': + case KEY_BACKSPACE: + case 0x7f: + case KEY_DC: + { + playlist_item_t *p_item; - 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; - - /* 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; - - /* Playlist view */ - case 'v': - p_sys->category_view = !p_sys->category_view; - PlaylistRebuild(p_intf); - return 1; - - /* 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: - { - playlist_item_t *p_item; + PL_LOCK; + p_item = p_sys->pp_plist[p_sys->i_box_idx]->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; + p_sys->b_need_update = true; + return true; + } - 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_pl_item = p_sys->pp_plist[p_sys->i_box_idx])) + return false; - 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) + if (p_pl_item->p_item->i_children) + { + playlist_item_t *p_item, *p_parent = p_pl_item->p_item; + if (p_parent->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; + p_item = p_parent; - 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) - { /* 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); + p_sys->p_node = p_parent; + 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; - return 1; + playlist_Control(p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, + p_parent, p_item); + } + else + { /* We only want to set the current node */ + playlist_Stop(p_playlist); + p_sys->p_node = p_pl_item->p_item; } + + p_sys->b_plidx_follow = true; + return true; } - else 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; - 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) - { - playlist_item_t *p_item; - PL_LOCK; - p_item = playlist_CurrentPlayingItem(p_playlist); - p_parent = p_item ? p_item->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; + return false; +} - playlist_Add(p_playlist, psz_uri, NULL, PLAYLIST_APPEND, - PLAYLIST_END, - p_parent->p_input == - p_playlist->p_local_onelevel->p_input - , false); +static bool HandleBrowseKey(intf_thread_t *p_intf, int key) +{ + intf_sys_t *p_sys = p_intf->p_sys; + struct dir_entry_t *dir_entry; - 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; - return 1; - } - } - 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(key) { - switch(i_key) + case '.': + p_sys->b_show_hidden_files = !p_sys->b_show_hidden_files; + ReadDir(p_intf); + return true; + + case KEY_ENTER: + case '\r': + case '\n': + case ' ': + dir_entry = p_sys->pp_dir_entries[p_sys->i_box_idx]; + char *psz_path; + if (asprintf(&psz_path, "%s" DIR_SEP "%s", p_sys->psz_current_dir, + dir_entry->psz_path) == -1) + return true; + + if (!dir_entry->b_file && key != ' ') { - case KEY_HOME: + free(p_sys->psz_current_dir); + p_sys->psz_current_dir = psz_path; + ReadDir(p_intf); + 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; + p_sys->i_box_idx = 0; + return true; } - } - else if (p_sys->i_box_type == BOX_NONE) - { - switch(i_key) - { - case KEY_HOME: - ChangePosition(p_intf, -1.0); - return 1; -#ifdef __FreeBSD__ - case KEY_SELECT: -#endif - case KEY_END: - ChangePosition(p_intf, .99); - return 1; - case KEY_UP: - ChangePosition(p_intf, 0.05); - return 1; - case KEY_DOWN: - ChangePosition(p_intf, -0.05); - return 1; - default: - break; + char *psz_uri = make_URI(psz_path, dir_entry->b_file ? "file" + : "directory"); + free(psz_path); + if (psz_uri == NULL) + return true; + + playlist_t *p_playlist = pl_Get(p_intf); + playlist_item_t *p_parent = p_sys->p_node; + if (!p_parent) + { + playlist_item_t *p_item; + PL_LOCK; + p_item = playlist_CurrentPlayingItem(p_playlist); + p_parent = p_item ? p_item->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; + + input_item_t *p_input = p_playlist->p_local_onelevel->p_input; + playlist_Add(p_playlist, psz_uri, NULL, PLAYLIST_APPEND, + PLAYLIST_END, p_parent->p_input == p_input, false); + + BoxSwitch(p_sys, BOX_PLAYLIST); + free(psz_uri); + return true; } - else if (p_sys->i_box_type == BOX_SEARCH) + + return false; +} + +static void HandleEditBoxKey(intf_thread_t *p_intf, int key, int box) +{ + intf_sys_t *p_sys = p_intf->p_sys; + bool search = box == BOX_SEARCH; + char *str = search ? p_sys->psz_search_chain: p_sys->psz_open_chain; + size_t len = strlen(str); + + assert(box == BOX_SEARCH || box == BOX_OPEN); + + switch(key) { - size_t i_chain_len = strlen(p_sys->psz_search_chain); - switch(i_key) + case 0x0c: /* ^l */ + case KEY_CLEAR: clear(); return; + + case KEY_ENTER: + case '\r': + case '\n': + if (search) { - case KEY_CLEAR: - case 0x0c: /* ^l */ - clear(); - return 1; - case KEY_ENTER: - case '\r': - case '\n': - if (i_chain_len) + if (len) 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: - if (i_chain_len + 1 < sizeof p_sys->psz_search_chain) - { - p_sys->psz_search_chain[i_chain_len] = (char) i_key; - p_sys->psz_search_chain[i_chain_len + 1] = '\0'; - } } - free(p_sys->psz_old_search); - p_sys->psz_old_search = NULL; - SearchPlaylist(p_sys, p_sys->psz_search_chain); - return 1; - } - else if (p_sys->i_box_type == BOX_OPEN) - { - size_t i_chain_len = strlen(p_sys->psz_open_chain); - - switch(i_key) + else if (len) { - case KEY_CLEAR: - case 0x0c: /* ^l */ - clear(); - return 1; - case KEY_ENTER: - case '\r': - case '\n': - if (i_chain_len) + char *psz_uri = make_URI(p_sys->psz_open_chain, NULL); + if (psz_uri == NULL) { - playlist_item_t *p_parent = p_sys->p_node; + p_sys->i_box_type = BOX_PLAYLIST; + return; + } - PL_LOCK; - if (!p_parent) - p_parent = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL; + playlist_t *p_playlist = pl_Get(p_intf); + playlist_item_t *p_parent = p_sys->p_node, *p_current; + + PL_LOCK; + if (!p_parent) + { + p_current = playlist_CurrentPlayingItem(p_playlist); + p_parent = p_current ? p_current->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; + 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); + playlist_Add(p_playlist, psz_uri, 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; - 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: - if (i_chain_len + 1 < sizeof p_sys->psz_open_chain) - { - p_sys->psz_open_chain[i_chain_len] = (char) i_key; - p_sys->psz_open_chain[i_chain_len + 1] = '\0'; - } + free(psz_uri); + p_sys->b_plidx_follow = true; + } + p_sys->i_box_type = BOX_PLAYLIST; + return; + + 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 getch() 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 (getch() != ERR) + return; + + if (search) p_sys->i_box_idx = p_sys->i_before_search; + p_sys->i_box_type = BOX_PLAYLIST; + return; + + case KEY_BACKSPACE: + case 0x7f: + RemoveLastUTF8Entity(str, len); + break; + + default: + if (len + 1 < (search ? sizeof p_sys->psz_search_chain + : sizeof p_sys->psz_open_chain)) + { + str[len + 0] = (char) key; + str[len + 1] = '\0'; } - return 1; } + if (search) + { + free(p_sys->psz_old_search); + p_sys->psz_old_search = NULL; + SearchPlaylist(p_sys, str); + } +} - /* Common keys */ - switch(i_key) +static void InputNavigate(input_thread_t* p_input, const char *var) +{ + if (p_input) + var_TriggerCallback(p_input, var); +} + +static void HandleCommonKey(intf_thread_t *p_intf, int key) +{ + intf_sys_t *p_sys = p_intf->p_sys; + playlist_t *p_playlist = pl_Get(p_intf); + switch(key) { case 0x1b: /* ESC */ - if (wgetch(p_sys->w) != ERR) - return 0; + if (getch() != ERR) + return; case 'q': case 'Q': case KEY_EXIT: libvlc_Quit(p_intf->p_libvlc); - return 0; + p_sys->b_exit = true; // terminate the main loop + return; - /* Box switching */ - case 'i': - BoxSwitch(p_sys, BOX_INFO); - p_sys->i_box_lines_total = 0; - break; - case 'm': - BoxSwitch(p_sys, BOX_META); - p_sys->i_box_lines_total = 0; - break; -#if 0 - case 'L': - BoxSwitch(p_sys, BOX_LOG) - break; -#endif - case 'P': - BoxSwitch(p_sys, BOX_PLAYLIST); - break; - case 'B': - BoxSwitch(p_sys, BOX_BROWSE); - break; - case 'x': - BoxSwitch(p_sys, BOX_OBJECTS); - break; - case 'S': - BoxSwitch(p_sys, BOX_STATS); - break; case 'h': - case 'H': - BoxSwitch(p_sys, BOX_HELP); - p_sys->i_box_lines_total = 0; - break; - case '/': - if (p_sys->i_box_type != BOX_SEARCH && p_sys->psz_search_chain) + case 'H': BoxSwitch(p_sys, BOX_HELP); return; + case 'i': BoxSwitch(p_sys, BOX_INFO); return; + case 'm': BoxSwitch(p_sys, BOX_META); return; + case 'L': BoxSwitch(p_sys, BOX_LOG); return; + case 'P': BoxSwitch(p_sys, BOX_PLAYLIST); return; + case 'B': BoxSwitch(p_sys, BOX_BROWSE); return; + case 'x': BoxSwitch(p_sys, BOX_OBJECTS); return; + case 'S': BoxSwitch(p_sys, BOX_STATS); return; + + case '/': /* Search */ + p_sys->psz_search_chain[0] = '\0'; + p_sys->b_plidx_follow = false; + if (p_sys->i_box_type == BOX_PLAYLIST) { - 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_before_search = p_sys->i_box_idx; p_sys->i_box_type = BOX_SEARCH; } - break; - case 'A': /* Open */ - if (p_sys->i_box_type != BOX_OPEN) + else { - p_sys->psz_open_chain[0] = '\0'; - p_sys->i_box_type = BOX_OPEN; + p_sys->i_before_search = 0; + BoxSwitch(p_sys, BOX_SEARCH); } - break; + return; - /* Navigation */ - case KEY_RIGHT: - ChangePosition(p_intf, 0.01); - break; + case 'A': /* Open */ + p_sys->psz_open_chain[0] = '\0'; + if (p_sys->i_box_type == BOX_PLAYLIST) + p_sys->i_box_type = BOX_OPEN; + else + BoxSwitch(p_sys, BOX_OPEN); + return; - case KEY_LEFT: - ChangePosition(p_intf, -0.01); - break; + /* Navigation */ + case KEY_RIGHT: ChangePosition(p_intf, +0.01); return; + case KEY_LEFT: ChangePosition(p_intf, -0.01); return; /* Common control */ case 'f': - if (p_intf->p_sys->p_input) + if (p_sys->p_input) { - vout_thread_t *p_vout = input_GetVout(p_intf->p_sys->p_input); + vout_thread_t *p_vout = input_GetVout(p_sys->p_input); if (p_vout) { bool fs = var_ToggleBool(p_playlist, "fullscreen"); @@ -1928,73 +1666,143 @@ static int HandleKey(intf_thread_t *p_intf) vlc_object_release(p_vout); } } - return 0; + return; - case ' ': - PlayPause(p_intf); - break; + case ' ': PlayPause(p_intf); return; + case 's': playlist_Stop(p_playlist); return; + case 'e': Eject(p_intf); return; - case 's': - playlist_Stop(p_playlist); - break; + case '[': InputNavigate(p_sys->p_input, "prev-title"); return; + case ']': InputNavigate(p_sys->p_input, "next-title"); return; + case '<': InputNavigate(p_sys->p_input, "prev-chapter"); return; + case '>': InputNavigate(p_sys->p_input, "next-chapter"); return; - case 'e': - Eject(p_intf); - break; + case 'p': playlist_Prev(p_playlist); break; + case 'n': playlist_Next(p_playlist); break; + case 'a': aout_VolumeUp(p_playlist, 1, NULL); break; + case 'z': aout_VolumeDown(p_playlist, 1, NULL); break; - case '[': - if (p_sys->p_input) - var_TriggerCallback(p_sys->p_input, "prev-title"); + case 0x0c: /* ^l */ + case KEY_CLEAR: break; - case ']': - if (p_sys->p_input) - var_TriggerCallback(p_sys->p_input, "next-title"); - break; + default: + return; + } - case '<': - if (p_sys->p_input) - var_TriggerCallback(p_sys->p_input, "prev-chapter"); - break; + clear(); + return; +} - case '>': - if (p_sys->p_input) - var_TriggerCallback(p_sys->p_input, "next-chapter"); - break; +static bool HandleListKey(intf_thread_t *p_intf, int key) +{ + intf_sys_t *p_sys = p_intf->p_sys; + playlist_t *p_playlist = pl_Get(p_intf); - case 'p': - playlist_Prev(p_playlist); - clear(); - break; + switch(key) + { +#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_idx = p_sys->i_box_lines_total - 1; break; + case KEY_HOME: p_sys->i_box_idx = 0; break; + case KEY_UP: p_sys->i_box_idx--; break; + case KEY_DOWN: p_sys->i_box_idx++; break; + case KEY_PPAGE:p_sys->i_box_idx -= p_sys->i_box_height; break; + case KEY_NPAGE:p_sys->i_box_idx += p_sys->i_box_height; break; + default: + return false; + } - case 'n': - playlist_Next(p_playlist); - clear(); - break; + CheckIdx(p_sys); - case 'a': - aout_VolumeUp(p_playlist, 1, NULL); - clear(); - break; + if (p_sys->i_box_type == BOX_PLAYLIST) + { + PL_LOCK; + p_sys->b_plidx_follow = IsIndex(p_sys, p_playlist, p_sys->i_box_idx); + PL_UNLOCK; + } - case 'z': - aout_VolumeDown(p_playlist, 1, NULL); - clear(); - break; + return true; +} - /* - * ^l should clear and redraw the screen - */ - case KEY_CLEAR: - case 0x0c: /* ^l */ - clear(); - break; +static void HandleKey(intf_thread_t *p_intf) +{ + intf_sys_t *p_sys = p_intf->p_sys; + int key = getch(); + int box = p_sys->i_box_type; - default: - return 0; + if (key == -1) + return; + + if (box == BOX_SEARCH || box == BOX_OPEN) + { + HandleEditBoxKey(p_intf, key, p_sys->i_box_type); + return; } - return 1; + if (box == BOX_NONE) + switch(key) + { +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif + case KEY_END: ChangePosition(p_intf, +.99); return; + case KEY_HOME: ChangePosition(p_intf, -1.0); return; + case KEY_UP: ChangePosition(p_intf, +0.05); return; + case KEY_DOWN: ChangePosition(p_intf, -0.05); return; + default: HandleCommonKey(p_intf, key); return; + } + + if (box == BOX_BROWSE && HandleBrowseKey(p_intf, key)) + return; + + if (box == BOX_PLAYLIST && HandlePlaylistKey(p_intf, key)) + return; + + if (HandleListKey(p_intf, key)) + return; + + HandleCommonKey(p_intf, key); +} + +/* + * + */ + +static void MsgCallback(msg_cb_data_t *data, msg_item_t *msg, unsigned i) +{ + intf_sys_t *p_sys = data->p_sys; + (void)i; // what is this? + int canc = vlc_savecancel(); + + vlc_mutex_lock(&p_sys->msg_lock); + + if (p_sys->msgs[p_sys->i_msgs]) + msg_Release(p_sys->msgs[p_sys->i_msgs]); + p_sys->msgs[p_sys->i_msgs++] = msg_Hold(msg); + + if (p_sys->i_msgs == (sizeof p_sys->msgs / sizeof *p_sys->msgs)) + p_sys->i_msgs = 0; + + vlc_mutex_unlock(&p_sys->msg_lock); + + vlc_restorecancel(canc); +} + +static inline void UpdateInput(intf_sys_t *p_sys, playlist_t *p_playlist) +{ + if (!p_sys->p_input) + { + 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; + } } /***************************************************************************** @@ -2004,52 +1812,19 @@ static void Run(intf_thread_t *p_intf) { intf_sys_t *p_sys = p_intf->p_sys; playlist_t *p_playlist = pl_Get(p_intf); - bool force_redraw = false; - time_t t_last_refresh; int canc = vlc_savecancel(); - PlaylistRebuild(p_intf); - Redraw(p_intf, &t_last_refresh); - 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)) + while (vlc_object_alive(p_intf) && !p_sys->b_exit) { - msleep(INTF_IDLE_SLEEP); - - /* Update the input */ - if (!p_sys->p_input) - { - p_sys->p_input = playlist_CurrentInput(p_playlist); - force_redraw = true; - } - else if (p_sys->p_input->b_dead) - { - vlc_object_release(p_sys->p_input); - p_sys->p_input = NULL; - } - - PL_LOCK; - if (p_sys->b_box_plidx_follow && playlist_CurrentPlayingItem(p_playlist)) - FindIndex(p_sys, p_playlist, true); - - PL_UNLOCK; - - while (HandleKey(p_intf)) - Redraw(p_intf, &t_last_refresh); - - if (force_redraw) - { - clear(); - Redraw(p_intf, &t_last_refresh); - force_redraw = false; - } - - if ((time(0) - t_last_refresh) >= 1) - Redraw(p_intf, &t_last_refresh); + UpdateInput(p_sys, p_playlist); + Redraw(p_intf); + HandleKey(p_intf); } + var_DelCallback(p_playlist, "intf-change", PlaylistChanged, p_intf); var_DelCallback(p_playlist, "playlist-item-append", PlaylistChanged, p_intf); vlc_restorecancel(canc); @@ -2062,16 +1837,30 @@ 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)); + struct msg_cb_data_t *msg_cb_data; + if (!p_sys) return VLC_ENOMEM; + msg_cb_data = malloc(sizeof *msg_cb_data); + if (!msg_cb_data) + { + free(p_sys); + return VLC_ENOMEM; + } + + msg_cb_data->p_sys = p_sys; + vlc_mutex_init(&p_sys->msg_lock); + p_sys->i_msgs = 0; + memset(p_sys->msgs, 0, sizeof p_sys->msgs); + p_sys->p_sub = msg_Subscribe(p_intf->p_libvlc, MsgCallback, msg_cb_data); + msg_SubscriptionSetVerbosity(p_sys->p_sub, + var_GetInteger(p_intf->p_libvlc, "verbose")); + 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_plidx_follow = true; p_sys->b_color = var_CreateGetBool(p_intf, "color"); - p_sys->category_view = true; //FIXME: switching back & forth is broken - p_sys->psz_current_dir = var_CreateGetString(p_intf, "browse-dir"); if (!p_sys->psz_current_dir || !*p_sys->psz_current_dir) { @@ -2079,23 +1868,25 @@ static int Open(vlc_object_t *p_this) p_sys->psz_current_dir = config_GetUserDir(VLC_HOME_DIR); } - p_sys->w = initscr(); /* Initialize the curses library */ + initscr(); /* Initialize the curses library */ if (p_sys->b_color) start_color_and_pairs(p_intf); - keypad(p_sys->w, TRUE); /* Don't do NL -> CR/NL */ + keypad(stdscr, 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); + curs_set(0); /* Non blocking getch() */ + timeout(1000); clear(); /* Stop printing errors to the console */ - freopen("/dev/null", "wb", stderr); + if(!freopen("/dev/null", "wb", stderr)) + msg_Err(p_intf, "Couldn't close stderr (%m)"); ReadDir(p_intf); + PlaylistRebuild(p_intf), p_intf->pf_run = Run; return VLC_SUCCESS; @@ -2117,10 +1908,13 @@ static void Close(vlc_object_t *p_this) if (p_sys->p_input) vlc_object_release(p_sys->p_input); - /* Close the ncurses interface */ - endwin(); + endwin(); /* Close the ncurses interface */ -// msg_Unsubscribe(p_intf, p_sys->p_sub); + msg_Unsubscribe(p_sys->p_sub); + vlc_mutex_destroy(&p_sys->msg_lock); + for(unsigned i = 0; i < sizeof p_sys->msgs / sizeof *p_sys->msgs; i++) + if (p_sys->msgs[i]) + msg_Release(p_sys->msgs[i]); free(p_sys); }