X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=6de779b5f4690878ddd3e3beba837a14df7cd5de;hb=56220f86120b3d7b7d8c7b2957befede19f669b6;hp=66f88ebf713ca7f0fd1068098ec73af924999731;hpb=890ebe4a974cee5544bfa016ff1da6d7a07c5417;p=vlc diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index 66f88ebf71..6de779b5f4 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -1,7 +1,7 @@ /***************************************************************************** * ncurses.c : NCurses interface for vlc ***************************************************************************** - * Copyright © 2001-2010 the VideoLAN team + * Copyright © 2001-2011 the VideoLAN team * $Id$ * * Authors: Sam Hocevar @@ -34,29 +34,29 @@ # include "config.h" #endif -#include -#include - #define _XOPEN_SOURCE_EXTENDED 1 + +#include #include +#include +#include +#include + +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS +#include +#include #include #include #include -#include #include #include #include #include #include #include - -#include - -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include /***************************************************************************** * Local prototypes. @@ -84,6 +84,8 @@ vlc_module_begin () add_directory("browse-dir", NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false) vlc_module_end () +#include "eject.c" + /***************************************************************************** * intf_sys_t: description and status of ncurses interface *****************************************************************************/ @@ -92,7 +94,7 @@ enum BOX_NONE, BOX_HELP, BOX_INFO, -// BOX_LOG, + BOX_LOG, BOX_PLAYLIST, BOX_SEARCH, BOX_OPEN, @@ -102,6 +104,20 @@ enum BOX_STATS }; +static const char box_title[][19] = { + [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, @@ -111,12 +127,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 ! */ @@ -140,13 +154,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) */ @@ -155,81 +168,92 @@ static const struct { short f; short b; } color_pairs[] = struct dir_entry_t { - bool b_file; - char *psz_path; + bool file; + char *path; }; struct pl_item_t { - playlist_item_t *p_item; - char *psz_display; + playlist_item_t *item; + char *display; }; struct intf_sys_t { + vlc_thread_t thread; input_thread_t *p_input; - bool b_color; - - WINDOW *w; - - int i_box_type; - int i_box_y; - int i_box_lines; - int i_box_lines_total; - int i_box_start; + bool color; + bool exit; - int i_box_plidx; /* Playlist index */ - int b_box_plidx_follow; - int i_box_bidx; /* browser index */ + /* rgb values for the color yellow */ + short yellow_r; + short yellow_g; + short yellow_b; - playlist_item_t *p_node; /* current node */ + int box_type; + int box_y; // start of box content + int box_height; + int box_lines_total; // number of lines in the box + int box_start; // first line of box displayed + int box_idx; // selected line -// msg_subscription_t* p_sub; /* message bank subscription */ - - char psz_search_chain[20]; - char *psz_old_search; - int i_before_search; - - char psz_open_chain[50]; - - char *psz_current_dir; - int i_dir_entries; - struct dir_entry_t **pp_dir_entries; - bool b_show_hidden_files; + struct + { + int type; + vlc_log_t *item; + char *msg; + } msgs[50]; // ring buffer + int i_msgs; + int verbosity; + vlc_mutex_t msg_lock; + + /* Search Box context */ + char search_chain[20]; + + /* Open Box Context */ + char open_chain[50]; + + /* File Browser context */ + char *current_dir; + int n_dir_entries; + struct dir_entry_t **dir_entries; + bool show_hidden_files; + + /* Playlist context */ + struct pl_item_t **plist; + int plist_entries; + bool need_update; + vlc_mutex_t pl_lock; + bool plidx_follow; + playlist_item_t *node; /* current node */ - bool category_view; - struct pl_item_t **pp_plist; - int i_plist_entries; - bool b_need_update; /* for playlist view */ }; /***************************************************************************** * Directories *****************************************************************************/ -static void DirsDestroy(intf_sys_t *p_sys) +static void DirsDestroy(intf_sys_t *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); + while (sys->n_dir_entries) { + struct dir_entry_t *dir_entry = sys->dir_entries[--sys->n_dir_entries]; + free(dir_entry->path); + free(dir_entry); } - free(p_sys->pp_dir_entries); - p_sys->pp_dir_entries = NULL; + free(sys->dir_entries); + sys->dir_entries = NULL; } -static int comp_dir_entries(const void *pp_dir_entry1, const void *pp_dir_entry2) +static int comdir_entries(const void *a, const void *b) { - 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; + struct dir_entry_t *dir_entry1 = *(struct dir_entry_t**)a; + struct dir_entry_t *dir_entry2 = *(struct dir_entry_t**)b; - if (p_dir_entry1->b_file == p_dir_entry2->b_file) - return strcasecmp(p_dir_entry1->psz_path, p_dir_entry2->psz_path); + if (dir_entry1->file == dir_entry2->file) + return strcasecmp(dir_entry1->path, dir_entry2->path); - return p_dir_entry1->b_file ? 1 : -1; + return dir_entry1->file ? 1 : -1; } static bool IsFile(const char *current_dir, const char *entry) @@ -237,10 +261,8 @@ static bool IsFile(const char *current_dir, const char *entry) bool ret = true; #ifdef S_ISDIR 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) { + struct stat st; ret = vlc_stat(uri, &st) || !S_ISDIR(st.st_mode); free(uri); } @@ -248,316 +270,331 @@ static bool IsFile(const char *current_dir, const char *entry) return ret; } -static void ReadDir(intf_thread_t *p_intf) +static void ReadDir(intf_thread_t *intf) { - intf_sys_t *p_sys = p_intf->p_sys; - DIR *p_current_dir; + intf_sys_t *sys = intf->p_sys; - if (!p_sys->psz_current_dir || !*p_sys->psz_current_dir) - { - msg_Dbg(p_intf, "no current dir set"); + if (!sys->current_dir || !*sys->current_dir) { + msg_Dbg(intf, "no current dir set"); return; } - char *psz_entry; - - /* Open the dir */ - p_current_dir = vlc_opendir(p_sys->psz_current_dir); - - 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); + DIR *current_dir = vlc_opendir(sys->current_dir); + if (!current_dir) { + msg_Warn(intf, "cannot open directory `%s' (%s)", sys->current_dir, + vlc_strerror_c(errno)); return; } - /* Clean the old shit */ - DirsDestroy(p_sys); + DirsDestroy(sys); - /* while we still have entries in the directory */ - while ((psz_entry = vlc_readdir(p_current_dir))) - { - struct dir_entry_t *p_dir_entry; - - if (!p_sys->b_show_hidden_files) - if (*psz_entry == '.' && strcmp(psz_entry, "..")) - goto next; - - if (!(p_dir_entry = malloc(sizeof *p_dir_entry))) - goto next; + const char *entry; + while ((entry = vlc_readdir(current_dir))) { + if (!sys->show_hidden_files && *entry == '.' && strcmp(entry, "..")) + continue; - p_dir_entry->b_file = IsFile(p_sys->psz_current_dir, psz_entry); - 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); + struct dir_entry_t *dir_entry = malloc(sizeof *dir_entry); + if (unlikely(dir_entry == NULL)) + continue; -next: - free(psz_entry); + dir_entry->file = IsFile(sys->current_dir, entry); + dir_entry->path = xstrdup(entry); + INSERT_ELEM(sys->dir_entries, sys->n_dir_entries, + sys->n_dir_entries, dir_entry); + continue; } - /* Sort */ - qsort(p_sys->pp_dir_entries, p_sys->i_dir_entries, - sizeof(struct dir_entry_t*), &comp_dir_entries); + qsort(sys->dir_entries, sys->n_dir_entries, + sizeof(struct dir_entry_t*), &comdir_entries); - closedir(p_current_dir); + closedir(current_dir); } /***************************************************************************** - * Playlist + * Adjust index position after a change (list navigation or item switching) *****************************************************************************/ - -static void PlaylistDestroy(intf_sys_t *p_sys) +static void CheckIdx(intf_sys_t *sys) { - while (p_sys->i_plist_entries) - { - 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); + int lines = sys->box_lines_total; + int height = LINES - sys->box_y - 2; + if (height > lines - 1) + height = lines - 1; + + /* make sure the new index is within the box */ + if (sys->box_idx <= 0) { + sys->box_idx = 0; + sys->box_start = 0; + } else if (sys->box_idx >= lines - 1 && lines > 0) { + sys->box_idx = lines - 1; + sys->box_start = sys->box_idx - height; + } + + /* Fix box start (1st line of the box displayed) */ + if (sys->box_idx < sys->box_start || + sys->box_idx > height + sys->box_start + 1) { + sys->box_start = sys->box_idx - height/2; + if (sys->box_start < 0) + sys->box_start = 0; + } else if (sys->box_idx == sys->box_start - 1) { + sys->box_start--; + } else if (sys->box_idx == height + sys->box_start + 1) { + sys->box_start++; } - free(p_sys->pp_plist); - p_sys->pp_plist = NULL; } -static inline playlist_item_t *PlaylistGetRoot(intf_thread_t *p_intf) +/***************************************************************************** + * Playlist + *****************************************************************************/ +static void PlaylistDestroy(intf_sys_t *sys) { - 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; + while (sys->plist_entries) { + struct pl_item_t *p_pl_item = sys->plist[--sys->plist_entries]; + free(p_pl_item->display); + free(p_pl_item); + } + free(sys->plist); + sys->plist = NULL; } -static bool PlaylistAddChild(intf_sys_t *p_sys, playlist_item_t *p_child, +static bool PlaylistAddChild(intf_sys_t *sys, playlist_item_t *p_child, const char *c, const char d) { int ret; - char *psz_name = input_item_GetTitleFbName(p_child->p_input); + char *name = input_item_GetTitleFbName(p_child->p_input); struct pl_item_t *p_pl_item = malloc(sizeof *p_pl_item); - if (!psz_name || !p_pl_item) + if (!name || !p_pl_item) goto error; - p_pl_item->p_item = p_child; + p_pl_item->item = p_child; if (c && *c) - ret = asprintf(&p_pl_item->psz_display, "%s%c-%s", c, d, psz_name); + ret = asprintf(&p_pl_item->display, "%s%c-%s", c, d, name); else - ret = asprintf(&p_pl_item->psz_display, " %s", psz_name); + ret = asprintf(&p_pl_item->display, " %s", name); - free(psz_name); - psz_name = NULL; + free(name); + name = NULL; if (ret == -1) goto error; - INSERT_ELEM(p_sys->pp_plist, p_sys->i_plist_entries, - p_sys->i_plist_entries, p_pl_item); + INSERT_ELEM(sys->plist, sys->plist_entries, + sys->plist_entries, p_pl_item); return true; error: - free(psz_name); + free(name); free(p_pl_item); return false; } -static void PlaylistAddNode(intf_sys_t *p_sys, playlist_item_t *p_node, +static void PlaylistAddNode(intf_sys_t *sys, playlist_item_t *node, const char *c) { - for(int k = 0; k < p_node->i_children; k++) - { - 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)) + for (int k = 0; k < node->i_children; k++) { + bool last = k == node->i_children - 1; + playlist_item_t *p_child = node->pp_children[k]; + if (!PlaylistAddChild(sys, p_child, c, last ? '`' : '|')) return; if (p_child->i_children <= 0) continue; - if (*c) - { - char *psz_tmp; - if (asprintf(&psz_tmp, "%s%c ", c, - k == p_node->i_children - 1 ? ' ' : '|') == -1) + if (*c) { + char *tmp; + if (asprintf(&tmp, "%s%c ", c, last ? ' ' : '|') == -1) return; - PlaylistAddNode(p_sys, p_child, psz_tmp); - free(psz_tmp); + PlaylistAddNode(sys, p_child, tmp); + free(tmp); + } else { + PlaylistAddNode(sys, p_child, " "); } - else - PlaylistAddNode(p_sys, p_child, " "); } } -static void PlaylistRebuild(intf_thread_t *p_intf) +static void PlaylistRebuild(intf_thread_t *intf) { - intf_sys_t *p_sys = p_intf->p_sys; - playlist_t *p_playlist = pl_Get(p_intf); + intf_sys_t *sys = intf->p_sys; + playlist_t *p_playlist = pl_Get(intf); - PL_LOCK; - - PlaylistDestroy(p_sys); - PlaylistAddNode(p_sys, PlaylistGetRoot(p_intf), ""); - p_sys->b_need_update = false; - - PL_UNLOCK; + PlaylistDestroy(sys); + PlaylistAddNode(sys, p_playlist->p_root_onelevel, ""); } -static int PlaylistChanged(vlc_object_t *p_this, const char *psz_variable, +static int ItemChanged(vlc_object_t *p_this, const char *variable, vlc_value_t oval, vlc_value_t nval, void *param) { - VLC_UNUSED(p_this); VLC_UNUSED(psz_variable); + VLC_UNUSED(p_this); VLC_UNUSED(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)); + intf_sys_t *sys = ((intf_thread_t *)param)->p_sys; - p_sys->b_need_update = true; - p_sys->p_node = p_node ? p_node->p_parent : NULL; + vlc_mutex_lock(&sys->pl_lock); + sys->need_update = true; + vlc_mutex_unlock(&sys->pl_lock); 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) +static int PlaylistChanged(vlc_object_t *p_this, const char *variable, + vlc_value_t oval, vlc_value_t nval, void *param) { - 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; + VLC_UNUSED(p_this); VLC_UNUSED(variable); + VLC_UNUSED(oval); VLC_UNUSED(nval); + intf_thread_t *intf = (intf_thread_t *)param; + intf_sys_t *sys = intf->p_sys; + playlist_item_t *node = playlist_CurrentPlayingItem(pl_Get(intf)); + + vlc_mutex_lock(&sys->pl_lock); + sys->need_update = true; + sys->node = node ? node->p_parent : NULL; + vlc_mutex_unlock(&sys->pl_lock); + + return VLC_SUCCESS; } -static int SubSearchPlaylist(intf_sys_t *p_sys, char *psz_searchstring, +/* Playlist suxx */ +static int SubSearchPlaylist(intf_sys_t *sys, char *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)) + for (int i = i_start + 1; i < i_stop; i++) + if (strcasestr(sys->plist[i]->display, searchstring)) return i; return -1; } -static void SearchPlaylist(intf_sys_t *p_sys, char *psz_searchstring) +static void SearchPlaylist(intf_sys_t *sys) { - int i_item, i_first = p_sys->i_before_search; - + char *str = sys->search_chain; + int i_first = sys->box_idx; if (i_first < 0) i_first = 0; - if (!psz_searchstring || !*psz_searchstring) - { - p_sys->i_box_plidx = p_sys->i_before_search; + if (!str || !*str) return; - } - i_item = SubSearchPlaylist(p_sys, psz_searchstring, i_first + 1, - p_sys->i_plist_entries); + int i_item = SubSearchPlaylist(sys, str, i_first + 1, sys->plist_entries); if (i_item < 0) - i_item = SubSearchPlaylist(p_sys, psz_searchstring, 0, i_first); + i_item = SubSearchPlaylist(sys, str, 0, i_first); - if (i_item > 0) - p_sys->i_box_plidx = i_item; + if (i_item > 0) { + sys->box_idx = i_item; + CheckIdx(sys); + } } -static inline bool IsIndex(intf_sys_t *p_sys, playlist_t *p_playlist, int i) +static inline bool IsIndex(intf_sys_t *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 *item = sys->plist[i]->item; + + PL_ASSERT_LOCKED; + + vlc_mutex_lock(&sys->pl_lock); + if (item->i_children == 0 && item == sys->node) { + vlc_mutex_unlock(&sys->pl_lock); + return true; + } + vlc_mutex_unlock(&sys->pl_lock); + + playlist_item_t *p_played_item = playlist_CurrentPlayingItem(p_playlist); + if (p_played_item && item->p_input && p_played_item->p_input) + return 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 *sys, playlist_t *p_playlist) { - int plidx = p_sys->i_box_plidx; - if (!locked) - PL_LOCK; + int plidx = sys->box_idx; + int max = sys->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++) - if (IsIndex(p_sys, p_playlist, i)) - { - p_sys->i_box_plidx = i; + PL_LOCK; + + if (!IsIndex(sys, p_playlist, plidx)) + for (int i = 0; i < max; i++) + if (IsIndex(sys, p_playlist, i)) { + sys->box_idx = i; + CheckIdx(sys); break; } - } - if (!locked) - PL_UNLOCK; + PL_UNLOCK; + + sys->plidx_follow = true; } /**************************************************************************** * Drawing ****************************************************************************/ -static void start_color_and_pairs(intf_thread_t *p_intf) +static void start_color_and_pairs(intf_thread_t *intf) { - if (!has_colors()) - { - p_intf->p_sys->b_color = false; - msg_Warn(p_intf, "Terminal doesn't support colors"); + intf_sys_t *sys = intf->p_sys; + + if (!has_colors()) { + sys->color = false; + msg_Warn(intf, "Terminal doesn't support colors"); return; } start_color(); - for(int i = C_DEFAULT + 1; i < C_MAX; i++) + for (int i = C_DEFAULT + 1; i < C_MAX; i++) init_pair(i, color_pairs[i].f, color_pairs[i].b); /* untested, in all my terminals, !can_change_color() --funman */ - if (can_change_color()) + if (can_change_color()) { + color_content(COLOR_YELLOW, &sys->yellow_r, &sys->yellow_g, &sys->yellow_b); 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 color, const char *title) { - int i_len; - - if (w <= 3 || h <= 2) + int w = COLS; + if (w <= 3 || h <= 0) return; - if (b_color) - wcolor_set(win, C_BOX, NULL); + if (color) color_set(C_BOX, NULL); + if (!title) title = ""; - i_len = strlen(title); + int len = strlen(title); - if (i_len > w - 2) - i_len = w - 2; + if (len > w - 2) + 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-len-2)/2); + mvprintw(y, 1+(w-len-2)/2, "%s", title); + mvhline(y, (w-len)/2+len, ACS_HLINE, w - 1 - ((w-len)/2+len)); + mvaddch(y, w-1,ACS_URCORNER); - for(int i = 0; i < h-2; i++) - { - mvwaddch(win, y+i+1, x, ACS_VLINE); - mvwaddch(win, y+i+1, x+w-1, ACS_VLINE); + for (int i = 0; i < h; i++) { + 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 (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); } @@ -565,46 +602,44 @@ static void mvnprintw(int y, int x, int w, const char *p_fmt, ...) { va_list vl_args; char *p_buf; - int i_len; + int len; if (w <= 0) return; va_start(vl_args, p_fmt); - if (vasprintf(&p_buf, p_fmt, vl_args) == -1) - return; + int i_ret = vasprintf(&p_buf, p_fmt, vl_args); va_end(vl_args); - i_len = strlen(p_buf); + if (i_ret == -1) + return; + + len = strlen(p_buf); - wchar_t psz_wide[i_len + 1]; + wchar_t wide[len + 1]; EnsureUTF8(p_buf); - size_t i_char_len = mbstowcs(psz_wide, p_buf, i_len); + size_t i_char_len = mbstowcs(wide, p_buf, len); size_t i_width; /* number of columns */ - if (i_char_len == (size_t)-1) /* an invalid character was encountered */ - { + if (i_char_len == (size_t)-1) /* an invalid character was encountered */ { free(p_buf); return; } - i_width = wcswidth(psz_wide, i_char_len); - if (i_width == (size_t)-1) - { + i_width = wcswidth(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++) - { - int i_cwidth = wcwidth(psz_wide[i]); + for (unsigned i = 0 ; i < i_char_len ; i++) { + int i_cwidth = wcwidth(wide[i]); if (i_cwidth != -1) i_width += i_cwidth; } } - if (i_width <= (size_t)w) - { + if (i_width <= (size_t)w) { mvprintw(y, x, "%s", p_buf); mvhline(y, x + i_width, ' ', w - i_width); free(p_buf); @@ -613,726 +648,566 @@ static void mvnprintw(int y, int x, int w, const char *p_fmt, ...) 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) - { + while (i_total_width < w) { + i_total_width += wcwidth(wide[i]); + if (w > 7 && i_total_width >= w/2) { + wide[i ] = '.'; + wide[i+1] = '.'; + i_total_width -= wcwidth(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; + wide[i-1] = '.'; + i_total_width -= wcwidth(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]); + for (j = i_char_len - 1; i_2nd_width < w - i_total_width; j--) + i_2nd_width += wcwidth(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++; - wmemmove(&psz_wide[i+2], &psz_wide[j+1], i_char_len - j - 1); - psz_wide[i + 2 + i_char_len - j - 1] = '\0'; + wmemmove(&wide[i+2], &wide[j+1], i_char_len - j - 1); + wide[i + 2 + i_char_len - j - 1] = '\0'; break; } i++; } if (w <= 7) /* we don't add the '...' else we lose too much chars */ - psz_wide[i] = '\0'; + 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); + size_t i_wlen = wcslen(wide) * 6 + 1; /* worst case */ + char ellipsized[i_wlen]; + wcstombs(ellipsized, wide, i_wlen); + mvprintw(y, x, "%s", ellipsized); 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 *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 == sys->box_idx; - if (l < p_sys->i_box_start || l - p_sys->i_box_start >= p_sys->i_box_lines) + if (l < sys->box_start || l - sys->box_start >= sys->box_height) return; va_start(vl_args, p_fmt); - if (vasprintf(&p_buf, p_fmt, vl_args) == -1) - return; + int i_ret = vasprintf(&p_buf, p_fmt, vl_args); va_end(vl_args); + if (i_ret == -1) + return; + + if (b_selected) attron(A_REVERSE); + mvnprintw(sys->box_y + l - sys->box_start, 1, COLS - 2, "%s", p_buf); + if (b_selected) attroff(A_REVERSE); - 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 int SubDrawObject(intf_sys_t *sys, int l, vlc_object_t *p_obj, int i_level, const char *prefix) { - 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); - } - else - MainBoxWrite(p_intf, (*l)++, 1 + 2 * i_level, "%s (%o)", - p_obj->psz_object_type, p_obj); + char *name = vlc_object_get_name(p_obj); + MainBoxWrite(sys, l++, "%*s%s%s \"%s\" (%p)", 2 * i_level++, "", prefix, + p_obj->psz_object_type, name ? name : "", p_obj); + free(name); 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); + for (int i = 0; i < list->i_count ; i++) { + l = SubDrawObject(sys, l, list->p_values[i].p_address, i_level, + (i == list->i_count - 1) ? "`-" : "|-" ); } vlc_list_release(list); + return l; } -static void Redraw(intf_thread_t *p_intf, time_t *t_last_refresh) +static int DrawObjects(intf_thread_t *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); - int y = 0; - int h; - int y_end; + return SubDrawObject(intf->p_sys, 0, VLC_OBJECT(intf->p_libvlc), 0, ""); +} - /* Title */ - 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); - attroff(A_REVERSE); - y += 2; +static int DrawMeta(intf_thread_t *intf) +{ + intf_sys_t *sys = intf->p_sys; + input_thread_t *p_input = sys->p_input; + input_item_t *item; + int l = 0; - if (p_sys->b_color) - wcolor_set(p_sys->w, C_STATUS, NULL); + if (!p_input) + return 0; - /* 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; + item = input_GetItem(p_input); + vlc_mutex_lock(&item->lock); + for (int i=0; ip_meta, i); + if (!meta || !*meta) + continue; - if (p_input && !p_input->b_dead) - { - char buf1[MSTRTIME_MAX_SIZE]; - char buf2[MSTRTIME_MAX_SIZE]; - vlc_value_t val; + if (sys->color) color_set(C_CATEGORY, NULL); + MainBoxWrite(sys, l++, " [%s]", vlc_meta_TypeToLocalizedString(i)); + if (sys->color) color_set(C_DEFAULT, NULL); + MainBoxWrite(sys, l++, " %s", meta); + } + vlc_mutex_unlock(&item->lock); - /* Source */ - char *psz_uri = input_item_GetURI(input_GetItem(p_input)); - mvnprintw(y++, 0, COLS, _(" Source : %s"), psz_uri); - free(psz_uri); + return l; +} - /* 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 - { - audio_volume_t i_volume; +static int DrawInfo(intf_thread_t *intf) +{ + intf_sys_t *sys = intf->p_sys; + input_thread_t *p_input = sys->p_input; + input_item_t *item; + int l = 0; - /* Position */ - var_Get(p_input, "time", &val); - secstotimestr(buf1, val.i_time / CLOCK_FREQ); + if (!p_input) + return 0; - var_Get(p_input, "length", &val); - secstotimestr(buf2, val.i_time / CLOCK_FREQ); + item = input_GetItem(p_input); + vlc_mutex_lock(&item->lock); + for (int i = 0; i < item->i_categories; i++) { + info_category_t *p_category = item->pp_categories[i]; + if (sys->color) color_set(C_CATEGORY, NULL); + MainBoxWrite(sys, l++, _(" [%s]"), p_category->psz_name); + if (sys->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(sys, l++, _(" %s: %s"), + p_info->psz_name, p_info->psz_value); + } + } + vlc_mutex_unlock(&item->lock); - mvnprintw(y++, 0, COLS, _(" Position : %s/%s"), buf1, buf2); + return l; +} - /* Volume */ - aout_VolumeGet(p_playlist, &i_volume); - mvnprintw(y++, 0, COLS, _(" Volume : %i%%"), i_volume*200/AOUT_VOLUME_MAX); +static int DrawStats(intf_thread_t *intf) +{ + intf_sys_t *sys = intf->p_sys; + input_thread_t *p_input = sys->p_input; + input_item_t *item; + input_stats_t *p_stats; + int l = 0, i_audio = 0, i_video = 0; - /* Title */ - 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 : %"PRId64"/%d"), - val.i_int, i_title_count); - } + if (!p_input) + return 0; - /* Chapter */ - 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 : %"PRId64"/%d"), - val.i_int, i_chapter_count); - } - } + item = input_GetItem(p_input); + assert(item); + + vlc_mutex_lock(&item->lock); + p_stats = item->p_stats; + vlc_mutex_lock(&p_stats->lock); + + for (int i = 0; i < item->i_es ; i++) { + i_audio += (item->es[i]->i_cat == AUDIO_ES); + i_video += (item->es[i]->i_cat == VIDEO_ES); } - 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); + + /* Input */ + if (sys->color) color_set(C_CATEGORY, NULL); + MainBoxWrite(sys, l++, _("+-[Incoming]")); + if (sys->color) color_set(C_DEFAULT, NULL); + MainBoxWrite(sys, l++, _("| input bytes read : %8.0f KiB"), + (float)(p_stats->i_read_bytes)/1024); + MainBoxWrite(sys, l++, _("| input bitrate : %6.0f kb/s"), + p_stats->f_input_bitrate*8000); + MainBoxWrite(sys, l++, _("| demux bytes read : %8.0f KiB"), + (float)(p_stats->i_demux_read_bytes)/1024); + MainBoxWrite(sys, l++, _("| demux bitrate : %6.0f kb/s"), + p_stats->f_demux_bitrate*8000); + + /* Video */ + if (i_video) { + if (sys->color) color_set(C_CATEGORY, NULL); + MainBoxWrite(sys, l++, _("+-[Video Decoding]")); + if (sys->color) color_set(C_DEFAULT, NULL); + MainBoxWrite(sys, l++, _("| video decoded : %5"PRIi64), + p_stats->i_decoded_video); + MainBoxWrite(sys, l++, _("| frames displayed : %5"PRIi64), + p_stats->i_displayed_pictures); + MainBoxWrite(sys, l++, _("| frames lost : %5"PRIi64), + p_stats->i_lost_pictures); } - free(psz_state); - if (p_sys->b_color) - wcolor_set(p_sys->w, C_DEFAULT, NULL); + /* Audio*/ + if (i_audio) { + if (sys->color) color_set(C_CATEGORY, NULL); + MainBoxWrite(sys, l++, _("+-[Audio Decoding]")); + if (sys->color) color_set(C_DEFAULT, NULL); + MainBoxWrite(sys, l++, _("| audio decoded : %5"PRIi64), + p_stats->i_decoded_audio); + MainBoxWrite(sys, l++, _("| buffers played : %5"PRIi64), + p_stats->i_played_abuffers); + MainBoxWrite(sys, l++, _("| buffers lost : %5"PRIi64), + p_stats->i_lost_abuffers); + } + /* Sout */ + if (sys->color) color_set(C_CATEGORY, NULL); + MainBoxWrite(sys, l++, _("+-[Streaming]")); + if (sys->color) color_set(C_DEFAULT, NULL); + MainBoxWrite(sys, l++, _("| packets sent : %5"PRIi64), p_stats->i_sent_packets); + MainBoxWrite(sys, l++, _("| bytes sent : %8.0f KiB"), + (float)(p_stats->i_sent_bytes)/1025); + MainBoxWrite(sys, l++, _("| sending bitrate : %6.0f kb/s"), + p_stats->f_send_bitrate*8000); + if (sys->color) color_set(C_DEFAULT, NULL); + + vlc_mutex_unlock(&p_stats->lock); + vlc_mutex_unlock(&item->lock); + + return l; +} + +static int DrawHelp(intf_thread_t *intf) +{ + intf_sys_t *sys = intf->p_sys; + int l = 0; + +#define H(a) MainBoxWrite(sys, l++, a) + + if (sys->color) color_set(C_CATEGORY, NULL); + H(_("[Display]")); + if (sys->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 (sys->color) color_set(C_CATEGORY, NULL); + H(_("[Global]")); + if (sys->color) color_set(C_DEFAULT, NULL); + H(_(" q, Q, Esc Quit")); + H(_(" s Stop")); + H(_(" Pause/Play")); + H(_(" f Toggle Fullscreen")); + H(_(" c Cycle through audio tracks")); + H(_(" v Cycle through subtitles tracks")); + H(_(" b Cycle through video tracks")); + 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")); + H(_(" m Mute")); + /* 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 (sys->color) color_set(C_CATEGORY, NULL); + H(_("[Playlist]")); + if (sys->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(_(" ; Look for the next 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 (sys->color) color_set(C_CATEGORY, NULL); + H(_("[Filebrowser]")); + if (sys->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 (sys->color) color_set(C_CATEGORY, NULL); + H(_("[Player]")); + if (sys->color) color_set(C_DEFAULT, NULL); + /* xgettext: You can use ↑ and ↓ characters */ + H(_(" , Seek +/-5%%")); + +#undef H + return l; +} - DrawBox(p_sys->w, y, 0, 3, COLS, "", p_sys->b_color); - DrawEmptyLine(p_sys->w, y+1, 1, COLS-2); +static int DrawBrowse(intf_thread_t *intf) +{ + intf_sys_t *sys = intf->p_sys; - 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))); - } + for (int i = 0; i < sys->n_dir_entries; i++) { + struct dir_entry_t *dir_entry = sys->dir_entries[i]; + char type = dir_entry->file ? ' ' : '+'; - y += 3; + if (sys->color) + color_set(dir_entry->file ? C_DEFAULT : C_FOLDER, NULL); + MainBoxWrite(sys, i, " %c %s", type, dir_entry->path); + } - p_sys->i_box_y = y + 1; - p_sys->i_box_lines = LINES - y - 2; + return sys->n_dir_entries; +} - h = LINES - y; - y_end = y + h - 1; +static int DrawPlaylist(intf_thread_t *intf) +{ + intf_sys_t *sys = intf->p_sys; + playlist_t *p_playlist = pl_Get(intf); - 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, _(" 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) - 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; + PL_LOCK; + vlc_mutex_lock(&sys->pl_lock); + if (sys->need_update) { + PlaylistRebuild(intf); + sys->need_update = false; } - 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); + vlc_mutex_unlock(&sys->pl_lock); + PL_UNLOCK; - 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")); + if (sys->plidx_follow) + FindIndex(sys, p_playlist); - 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; + for (int i = 0; i < sys->plist_entries; i++) { + char c; + playlist_item_t *current_item; + playlist_item_t *item = sys->plist[i]->item; + vlc_mutex_lock(&sys->pl_lock); + playlist_item_t *node = sys->node; + vlc_mutex_unlock(&sys->pl_lock); - if (l - p_sys->i_box_start < p_sys->i_box_lines) - y += l - p_sys->i_box_start; + PL_LOCK; + assert(item); + current_item = playlist_CurrentPlayingItem(p_playlist); + if ((node && item->p_input == node->p_input) || + (!node && current_item && item->p_input == current_item->p_input)) + c = '*'; + else if (item == node || current_item == item) + c = '>'; else - y += p_sys->i_box_lines; + c = ' '; + PL_UNLOCK; + + if (sys->color) color_set(i%3 + C_PLAYLIST_1, NULL); + MainBoxWrite(sys, i, "%c%s", c, sys->plist[i]->display); + if (sys->color) color_set(C_DEFAULT, NULL); } - 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); + return sys->plist_entries; +} - 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); +static int DrawMessages(intf_thread_t *intf) +{ + intf_sys_t *sys = intf->p_sys; + int l = 0; + + vlc_mutex_lock(&sys->msg_lock); + int i = sys->i_msgs; + for(;;) { + vlc_log_t *msg = sys->msgs[i].item; + if (msg) { + if (sys->color) + color_set(sys->msgs[i].type + C_INFO, NULL); + MainBoxWrite(sys, l++, "[%s] %s", msg->psz_module, sys->msgs[i].msg); } - 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 (++i == sizeof sys->msgs / sizeof *sys->msgs) + i = 0; - y += __MIN(l - p_sys->i_box_start, p_sys->i_box_lines); + if (i == sys->i_msgs) /* did we loop around the ring buffer ? */ + break; } -#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); + vlc_mutex_unlock(&sys->msg_lock); + if (sys->color) + color_set(C_DEFAULT, NULL); + return l; +} + +static int DrawStatus(intf_thread_t *intf) +{ + intf_sys_t *sys = intf->p_sys; + input_thread_t *p_input = sys->p_input; + playlist_t *p_playlist = pl_Get(intf); + char *name = _("VLC media player"); + const size_t name_len = strlen(name) + sizeof(PACKAGE_VERSION); + int y = 0; + const char *repeat, *loop, *random; - i_start = p_intf->p_sys->p_sub->i_start; + /* Title */ + int padding = COLS - name_len; /* center title */ + if (padding < 0) + padding = 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); + attrset(A_REVERSE); + if (sys->color) color_set(C_TITLE, NULL); + DrawEmptyLine(y, 0, COLS); + mvnprintw(y++, padding / 2, COLS, "%s %s", name, PACKAGE_VERSION); + if (sys->color) color_set(C_STATUS, NULL); + attroff(A_REVERSE); - 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); - } + y++; /* leave a blank line */ - 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); + 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) { + vlc_value_t val; + char *path, *uri; - 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; + uri = input_item_GetURI(input_GetItem(p_input)); + path = make_path(uri); - 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; + mvnprintw(y++, 0, COLS, _(" Source : %s"), path?path:uri); + free(uri); + free(path); - for(i_item = i_start; i_item < i_stop; i_item++) + var_Get(p_input, "state", &val); + switch(val.i_int) { - 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); - } + 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]; + float volume; + + case INIT_S: + case END_S: + y += 2; + break; - } - 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); + case PLAYING_S: + case OPENING_S: + case PAUSE_S: + mvnprintw(y++, 0, COLS, _(input_state[val.i_int]), + repeat, random, loop); - 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; + 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); - 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); + mvnprintw(y++, 0, COLS, _(" Position : %s/%s"), buf1, buf2); - 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++; + volume = playlist_VolumeGet(p_playlist); + int mute = playlist_MuteGet(p_playlist); + mvnprintw(y++, 0, COLS, + mute ? _(" Volume : Mute") : + volume >= 0.f ? _(" Volume : %3ld%%") : _(" Volume : ----"), + lroundf(volume * 100.f)); + + 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 : %"PRId64"/%d"), + val.i_int, i_title_count); } - /* 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); + 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 : %"PRId64"/%d"), + val.i_int, i_chapter_count); + } } + } else { + mvnprintw(y++, 0, COLS, _(" Source: ")); + mvnprintw(y++, 0, COLS, " %s%s%s", repeat, random, loop); + mvnprintw(y++, 0, COLS, _(" [ h for help ]")); + DrawEmptyLine(y++, 0, COLS); } - 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) ")); + if (sys->color) color_set(C_DEFAULT, NULL); + DrawBox(y++, 1, sys->color, ""); /* position slider */ + DrawEmptyLine(y, 1, COLS-2); + if (p_input) + DrawLine(y, 1, (int)((COLS-2) * var_GetFloat(p_input, "position"))); - DrawBox(p_sys->w, y++, 0, h, COLS, psz_title, p_sys->b_color); - free(psz_title); + y += 2; /* skip slider and box */ - 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); + return y; +} - 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; +static void FillTextBox(intf_sys_t *sys) +{ + int width = COLS - 2; - 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; + DrawEmptyLine(7, 1, width); + if (sys->box_type == BOX_OPEN) + mvnprintw(7, 1, width, _("Open: %s"), sys->open_chain); + else + mvnprintw(7, 1, width, _("Find: %s"), sys->search_chain); +} - 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); +static void FillBox(intf_thread_t *intf) +{ + intf_sys_t *sys = 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, + }; - 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; + sys->box_lines_total = draw[sys->box_type](intf); - 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); - } + if (sys->box_type == BOX_SEARCH || sys->box_type == BOX_OPEN) + FillTextBox(sys); +} - } - else - y++; +static void Redraw(intf_thread_t *intf) +{ + intf_sys_t *sys = intf->p_sys; + int box = sys->box_type; + int y = DrawStatus(intf); - 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_old_search ? - p_sys->psz_old_search : p_sys->psz_search_chain); - } - 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); + sys->box_height = LINES - y - 2; + DrawBox(y++, sys->box_height, sys->color, _(box_title[box])); + + sys->box_y = y; + + if (box != BOX_NONE) { + FillBox(intf); + + if (sys->box_lines_total == 0) + sys->box_start = 0; + else if (sys->box_start > sys->box_lines_total - 1) + sys->box_start = sys->box_lines_total - 1; + y += __MIN(sys->box_lines_total - sys->box_start, + sys->box_height); } - while (y < y_end) - DrawEmptyLine(p_sys->w, y++, 1, COLS - 2); + while (y < LINES - 1) + DrawEmptyLine(y++, 1, COLS - 2); refresh(); - - *t_last_refresh = time(0); } -static void ChangePosition(intf_thread_t *p_intf, float increment) +static void ChangePosition(intf_thread_t *intf, float increment) { - intf_sys_t *p_sys = p_intf->p_sys; - input_thread_t *p_input = p_sys->p_input; + intf_sys_t *sys = intf->p_sys; + input_thread_t *p_input = sys->p_input; float pos; if (!p_input || var_GetInteger(p_input, "state") != PLAYING_S) @@ -1346,16 +1221,14 @@ static void ChangePosition(intf_thread_t *p_intf, float increment) var_SetFloat(p_input, "position", pos); } -static inline int RemoveLastUTF8Entity(char *psz, int len) +static inline void RemoveLastUTF8Entity(char *psz, int len) { - while (len && ((psz[--len] & 0xc0) == 0x80)); - /* UTF8 continuation byte */ - + 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 char *GetDiscDevice(intf_thread_t *intf, const char *name) { static const struct { const char *s; size_t n; const char *v; } devs[] = { @@ -1365,19 +1238,14 @@ static char *GetDiscDevice(intf_thread_t *p_intf, const char *name) }; char *device; - for (unsigned i = 0; i < sizeof devs / sizeof *devs; i++) - { + 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]) - { - case '\0': - case '@': - return config_GetPsz(p_intf, devs[i].v); - default: - /* Omit the beginning MRL-selector characters */ - return strdup(name + n); - } + if (!strncmp(name, devs[i].s, n)) { + if (name[n] == '@' || name[n] == '\0') + return config_GetPsz(intf, devs[i].v); + /* Omit the beginning MRL-selector characters */ + return strdup(name + n); + } } device = strdup(name); @@ -1388,59 +1256,56 @@ static char *GetDiscDevice(intf_thread_t *p_intf, const char *name) return device; } -static void Eject(intf_thread_t *p_intf) +static void Eject(intf_thread_t *intf) { - char *psz_device, *psz_name; - playlist_t * p_playlist = pl_Get(p_intf); + char *device, *name; + playlist_t * p_playlist = pl_Get(intf); /* If there's a stream playing, we aren't allowed to eject ! */ - if (p_intf->p_sys->p_input) + if (intf->p_sys->p_input) return; PL_LOCK; - if (!playlist_CurrentPlayingItem(p_playlist)) - { + if (!playlist_CurrentPlayingItem(p_playlist)) { PL_UNLOCK; return; } - psz_name = playlist_CurrentPlayingItem(p_playlist)->p_input->psz_name; - psz_device = psz_name ? GetDiscDevice(p_intf, psz_name) : NULL; + name = playlist_CurrentPlayingItem(p_playlist)->p_input->psz_name; + device = name ? GetDiscDevice(intf, name) : NULL; PL_UNLOCK; - if (psz_device) - { - intf_Eject(p_intf, psz_device); - free(psz_device); + if (device) { + intf_Eject(intf, device); + free(device); } } -static void PlayPause(intf_thread_t *p_intf) +static void PlayPause(intf_thread_t *intf) { - input_thread_t *p_input = p_intf->p_sys->p_input; + input_thread_t *p_input = intf->p_sys->p_input; - if (p_input) - { + if (p_input) { 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)); + } else + playlist_Play(pl_Get(intf)); } -static inline void BoxSwitch(intf_sys_t *p_sys, int box) +static inline void BoxSwitch(intf_sys_t *sys, int box) { - p_sys->i_box_type = (p_sys->i_box_type == box) ? BOX_NONE : box; + sys->box_type = (sys->box_type == box) ? BOX_NONE : box; + sys->box_start = 0; + sys->box_idx = 0; } -static bool HandlePlaylistKey(intf_thread_t *p_intf, int key) +static bool HandlePlaylistKey(intf_thread_t *intf, int key) { - bool b_box_plidx_follow = false; - intf_sys_t *p_sys = p_intf->p_sys; - playlist_t *p_playlist = pl_Get(p_intf); + intf_sys_t *sys = intf->p_sys; + playlist_t *p_playlist = pl_Get(intf); struct pl_item_t *p_pl_item; switch(key) @@ -1453,31 +1318,21 @@ static bool HandlePlaylistKey(intf_thread_t *p_intf, int key) /* Playlist sort */ case 'o': case 'O': - playlist_RecursiveNodeSort(p_playlist, PlaylistGetRoot(p_intf), + 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; + vlc_mutex_lock(&sys->pl_lock); + sys->need_update = true; + vlc_mutex_unlock(&sys->pl_lock); return true; - /* Playlist view */ - case 'v': - p_sys->category_view = !p_sys->category_view; - p_sys->b_need_update = true; + case ';': + SearchPlaylist(sys); return true; - /* Playlist navigation */ -#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_HOME: p_sys->i_box_plidx = 0; 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 'g': FindIndex(p_sys, p_playlist, false); break; + case 'g': + FindIndex(sys, p_playlist); + return true; /* Deletion */ case 'D': @@ -1485,121 +1340,105 @@ static bool HandlePlaylistKey(intf_thread_t *p_intf, int key) case 0x7f: case KEY_DC: { - playlist_item_t *p_item; + playlist_item_t *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); + item = sys->plist[sys->box_idx]->item; + if (item->i_children == -1) + playlist_DeleteFromInput(p_playlist, item->p_input, pl_Locked); else - playlist_NodeDelete(p_playlist, p_item, true , false); + playlist_NodeDelete(p_playlist, item, true , false); PL_UNLOCK; - p_sys->b_need_update = true; - break; + vlc_mutex_lock(&sys->pl_lock); + if (sys->box_idx >= sys->box_lines_total - 1) + sys->box_idx = sys->box_lines_total - 2; + sys->need_update = true; + vlc_mutex_unlock(&sys->pl_lock); + return true; } case KEY_ENTER: case '\r': case '\n': - if (!(p_pl_item = p_sys->pp_plist[p_sys->i_box_plidx])) + if (!(p_pl_item = sys->plist[sys->box_idx])) return false; - 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) - { - p_item = p_parent; + if (p_pl_item->item->i_children) { + playlist_item_t *item, *p_parent = p_pl_item->item; + if (p_parent->i_children == -1) { + item = p_parent; while (p_parent->p_parent) p_parent = p_parent->p_parent; - } - else - { - p_sys->p_node = p_parent; - p_item = NULL; + } else { + vlc_mutex_lock(&sys->pl_lock); + sys->node = p_parent; + vlc_mutex_unlock(&sys->pl_lock); + item = NULL; } playlist_Control(p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, - p_parent, p_item); - } - else - { /* We only want to set the current node */ + p_parent, item); + } else { /* We only want to set the current node */ playlist_Stop(p_playlist); - p_sys->p_node = p_pl_item->p_item; + vlc_mutex_lock(&sys->pl_lock); + sys->node = p_pl_item->item; + vlc_mutex_unlock(&sys->pl_lock); } - b_box_plidx_follow = true; - break; - - default: - return false; + sys->plidx_follow = true; + return true; } - if (p_sys->i_box_plidx > p_sys->i_plist_entries - 1) - p_sys->i_box_plidx = p_sys->i_plist_entries - 1; - if (p_sys->i_box_plidx < 0) - p_sys->i_box_plidx = 0; - - p_pl_item = p_sys->pp_plist[p_sys->i_box_plidx]; - - PL_LOCK; - if (PlaylistIsPlaying(p_playlist, p_pl_item->p_item)) - b_box_plidx_follow = true; - PL_UNLOCK; - p_sys->b_box_plidx_follow = b_box_plidx_follow; - return true; + return false; } -static bool HandleBrowseKey(intf_thread_t *p_intf, int key) +static bool HandleBrowseKey(intf_thread_t *intf, int key) { + intf_sys_t *sys = intf->p_sys; struct dir_entry_t *dir_entry; - intf_sys_t *p_sys = p_intf->p_sys; switch(key) { case '.': - p_sys->b_show_hidden_files = !p_sys->b_show_hidden_files; - ReadDir(p_intf); + sys->show_hidden_files = !sys->show_hidden_files; + ReadDir(intf); return true; case KEY_ENTER: case '\r': case '\n': case ' ': - dir_entry = p_sys->pp_dir_entries[p_sys->i_box_bidx]; + dir_entry = sys->dir_entries[sys->box_idx]; + char *path; + if (asprintf(&path, "%s" DIR_SEP "%s", sys->current_dir, + dir_entry->path) == -1) + return true; - if (!dir_entry->b_file && key != ' ') - { - char *current_dir = p_sys->psz_current_dir; - if (asprintf(&p_sys->psz_current_dir, "%s/%s", - p_sys->psz_current_dir, dir_entry->psz_path) != -1) - { - ReadDir(p_intf); - free(current_dir); - } - else - p_sys->psz_current_dir = current_dir; + if (!dir_entry->file && key != ' ') { + free(sys->current_dir); + sys->current_dir = path; + ReadDir(intf); + sys->box_start = 0; + sys->box_idx = 0; return true; } - char* psz_uri; - if (asprintf(&psz_uri, "%s://%s/%s", - dir_entry->b_file ? "file" : "directory", - p_sys->psz_current_dir, dir_entry->psz_path) == -1) - { - return false; - } + char *uri = vlc_path2uri(path, "file"); + free(path); + if (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; + playlist_t *p_playlist = pl_Get(intf); + vlc_mutex_lock(&sys->pl_lock); + playlist_item_t *p_parent = sys->node; + vlc_mutex_unlock(&sys->pl_lock); + if (!p_parent) { + playlist_item_t *item; PL_LOCK; - p_item = playlist_CurrentPlayingItem(p_playlist); - p_parent = p_item ? p_item->p_parent : NULL; + item = playlist_CurrentPlayingItem(p_playlist); + p_parent = item ? item->p_parent : NULL; PL_UNLOCK; if (!p_parent) p_parent = p_playlist->p_local_onelevel; @@ -1609,33 +1448,110 @@ static bool HandleBrowseKey(intf_thread_t *p_intf, int key) 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_Add(p_playlist, uri, NULL, PLAYLIST_APPEND, PLAYLIST_END, p_parent->p_input == p_input, false); - p_sys->i_box_type = BOX_PLAYLIST; - free(psz_uri); + BoxSwitch(sys, BOX_PLAYLIST); + free(uri); return true; + } -#ifdef __FreeBSD__ - case KEY_SELECT: -#endif - case KEY_END: p_sys->i_box_bidx = p_sys->i_dir_entries - 1; break; - case KEY_HOME: p_sys->i_box_bidx = 0; 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; + return false; +} - default: - return false; +static void OpenSelection(intf_thread_t *intf) +{ + intf_sys_t *sys = intf->p_sys; + char *uri = vlc_path2uri(sys->open_chain, NULL); + if (uri == NULL) + return; + + playlist_t *p_playlist = pl_Get(intf); + vlc_mutex_lock(&sys->pl_lock); + playlist_item_t *p_parent = sys->node; + vlc_mutex_unlock(&sys->pl_lock); + + PL_LOCK; + if (!p_parent) { + playlist_item_t *current; + current= playlist_CurrentPlayingItem(p_playlist); + p_parent = current ? current->p_parent : NULL; + if (!p_parent) + p_parent = p_playlist->p_local_onelevel; } - 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; + while (p_parent->p_parent && p_parent->p_parent->p_parent) + p_parent = p_parent->p_parent; + PL_UNLOCK; + + playlist_Add(p_playlist, uri, NULL, + PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END, + p_parent->p_input == p_playlist->p_local_onelevel->p_input, + false); - return true; + sys->plidx_follow = true; + free(uri); +} + +static void HandleEditBoxKey(intf_thread_t *intf, int key, int box) +{ + intf_sys_t *sys = intf->p_sys; + bool search = box == BOX_SEARCH; + char *str = search ? sys->search_chain: sys->open_chain; + size_t len = strlen(str); + + assert(box == BOX_SEARCH || box == BOX_OPEN); + + switch(key) + { + case 0x0c: /* ^l */ + case KEY_CLEAR: clear(); return; + + case KEY_ENTER: + case '\r': + case '\n': + if (search) + SearchPlaylist(sys); + else + OpenSelection(intf); + + sys->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) + sys->box_type = BOX_PLAYLIST; + return; + + case KEY_BACKSPACE: + case 0x7f: + RemoveLastUTF8Entity(str, len); + break; + + default: + if (len + 1 < (search ? sizeof sys->search_chain + : sizeof sys->open_chain)) { + str[len + 0] = key; + str[len + 1] = '\0'; + } + } + + if (search) + SearchPlaylist(sys); } static void InputNavigate(input_thread_t* p_input, const char *var) @@ -1644,310 +1560,273 @@ static void InputNavigate(input_thread_t* p_input, const char *var) var_TriggerCallback(p_input, var); } -static int HandleKey(intf_thread_t *p_intf) +static void CycleESTrack(intf_sys_t *sys, const char *var) { - intf_sys_t *p_sys = p_intf->p_sys; - playlist_t *p_playlist = pl_Get(p_intf); - int i_key = wgetch(p_sys->w); + input_thread_t *input = sys->p_input; - if (i_key == -1) - return 0; - - if (p_sys->i_box_type == BOX_PLAYLIST) - { - if (HandlePlaylistKey(p_intf, i_key)) - return 1; - } - else if (p_sys->i_box_type == BOX_BROWSE) - { - if (HandleBrowseKey(p_intf, i_key)) - 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) - { - bool ret = true; - switch(i_key) - { -#ifdef __FreeBSD__ - case KEY_SELECT: -#endif - case KEY_END: p_sys->i_box_start = p_sys->i_box_lines_total - 1; break; - case KEY_HOME: p_sys->i_box_start = 0; break; - case KEY_UP: p_sys->i_box_start--; break; - case KEY_DOWN: p_sys->i_box_start++; break; - case KEY_PPAGE:p_sys->i_box_start -= p_sys->i_box_lines; break; - case KEY_NPAGE:p_sys->i_box_start += p_sys->i_box_lines; break; + if (!input) + return; - default: - ret = false; - break; - } - if (ret) - { - if (p_sys->i_box_start < 0) - p_sys->i_box_start = 0; - 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; - return 1; - } - } - else if (p_sys->i_box_type == BOX_NONE) - { - switch(i_key) - { -#ifdef __FreeBSD__ - case KEY_SELECT: -#endif - case KEY_END: ChangePosition(p_intf, +.99); return 1; - case KEY_HOME: ChangePosition(p_intf, -1.0); return 1; - case KEY_UP: ChangePosition(p_intf, +0.05); return 1; - case KEY_DOWN: ChangePosition(p_intf, -0.05); return 1; - } - } - else if (p_sys->i_box_type == BOX_SEARCH) - { - size_t i_chain_len = strlen(p_sys->psz_search_chain); - switch(i_key) - { - case KEY_CLEAR: - case 0x0c: /* ^l */ - clear(); - return 1; - case KEY_ENTER: - case '\r': - case '\n': - if (i_chain_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); + vlc_value_t val; + if (var_Change(input, var, VLC_VAR_GETCHOICES, &val, NULL) < 0) + return; - switch(i_key) - { - case KEY_CLEAR: - case 0x0c: /* ^l */ - clear(); - return 1; - case KEY_ENTER: - case '\r': - case '\n': - if (i_chain_len) - { - 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; + vlc_list_t *list = val.p_list; + int64_t current = var_GetInteger(input, var); - 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); + int i; + for (i = 0; i < list->i_count; i++) + if (list->p_values[i].i_int == current) + break; - 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'; - } - } - return 1; - } + if (++i >= list->i_count) + i = 0; + var_SetInteger(input, var, list->p_values[i].i_int); +} - /* Common keys */ - switch(i_key) +static void HandleCommonKey(intf_thread_t *intf, int key) +{ + intf_sys_t *sys = intf->p_sys; + playlist_t *p_playlist = pl_Get(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; + libvlc_Quit(intf->p_libvlc); + sys->exit = true; // terminate the main loop + return; case 'h': - case 'H': BoxSwitch(p_sys, BOX_HELP); return 1; - case 'i': BoxSwitch(p_sys, BOX_INFO); return 1; - case 'm': BoxSwitch(p_sys, BOX_META); return 1; -// case 'L': BoxSwitch(p_sys, BOX_LOG) return 1; - case 'P': BoxSwitch(p_sys, BOX_PLAYLIST); return 1; - case 'B': BoxSwitch(p_sys, BOX_BROWSE); return 1; - case 'x': BoxSwitch(p_sys, BOX_OBJECTS); return 1; - case 'S': BoxSwitch(p_sys, BOX_STATS); return 1; + case 'H': BoxSwitch(sys, BOX_HELP); return; + case 'i': BoxSwitch(sys, BOX_INFO); return; + case 'M': BoxSwitch(sys, BOX_META); return; + case 'L': BoxSwitch(sys, BOX_LOG); return; + case 'P': BoxSwitch(sys, BOX_PLAYLIST); return; + case 'B': BoxSwitch(sys, BOX_BROWSE); return; + case 'x': BoxSwitch(sys, BOX_OBJECTS); return; + case 'S': BoxSwitch(sys, BOX_STATS); return; case '/': /* Search */ - 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; - return 1; + sys->plidx_follow = false; + BoxSwitch(sys, BOX_SEARCH); + return; case 'A': /* Open */ - p_sys->psz_open_chain[0] = '\0'; - p_sys->i_box_type = BOX_OPEN; - return 1; + sys->open_chain[0] = '\0'; + BoxSwitch(sys, BOX_OPEN); + return; /* Navigation */ - case KEY_RIGHT: ChangePosition(p_intf, +0.01); return 1; - case KEY_LEFT: ChangePosition(p_intf, -0.01); return 1; + case KEY_RIGHT: ChangePosition(intf, +0.01); return; + case KEY_LEFT: ChangePosition(intf, -0.01); return; /* Common control */ case 'f': - if (p_sys->p_input) - { - vout_thread_t *p_vout = input_GetVout(p_sys->p_input); - if (p_vout) - { + if (sys->p_input) { + vout_thread_t *p_vout = input_GetVout(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; + return; - case ' ': PlayPause(p_intf); return 1; - case 's': playlist_Stop(p_playlist); return 1; - case 'e': Eject(p_intf); return 1; + case ' ': PlayPause(intf); return; + case 's': playlist_Stop(p_playlist); return; + case 'e': Eject(intf); return; - case '[': InputNavigate(p_sys->p_input, "prev-title"); return 1; - case ']': InputNavigate(p_sys->p_input, "next-title"); return 1; - case '<': InputNavigate(p_sys->p_input, "prev-chapter"); return 1; - case '>': InputNavigate(p_sys->p_input, "next-chapter"); return 1; + case '[': InputNavigate(sys->p_input, "prev-title"); return; + case ']': InputNavigate(sys->p_input, "next-title"); return; + case '<': InputNavigate(sys->p_input, "prev-chapter"); return; + case '>': InputNavigate(sys->p_input, "next-chapter"); return; - case 'p': playlist_Prev(p_playlist); goto lclear; - case 'n': playlist_Next(p_playlist); goto lclear; - case 'a': aout_VolumeUp(p_playlist, 1, NULL); goto lclear; - case 'z': aout_VolumeDown(p_playlist, 1, NULL); goto lclear; + case 'p': playlist_Prev(p_playlist); break; + case 'n': playlist_Next(p_playlist); break; + case 'a': playlist_VolumeUp(p_playlist, 1, NULL); break; + case 'z': playlist_VolumeDown(p_playlist, 1, NULL); break; + case 'm': playlist_MuteToggle(p_playlist); break; + + case 'c': CycleESTrack(sys, "audio-es"); break; + case 'v': CycleESTrack(sys, "spu-es"); break; + case 'b': CycleESTrack(sys, "video-es"); break; -lclear: case 0x0c: /* ^l */ - case KEY_CLEAR: clear(); return 1; + case KEY_CLEAR: + break; + + default: + return; } - /* key not handled */ - return 0; + clear(); + return; } -/***************************************************************************** - * Run: ncurses thread - *****************************************************************************/ -static void Run(intf_thread_t *p_intf) +static bool HandleListKey(intf_thread_t *intf, int key) { - intf_sys_t *p_sys = p_intf->p_sys; - playlist_t *p_playlist = pl_Get(p_intf); - bool force_redraw = false; + intf_sys_t *sys = intf->p_sys; + playlist_t *p_playlist = pl_Get(intf); - time_t t_last_refresh; - int canc = vlc_savecancel(); + 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: sys->box_idx = sys->box_lines_total - 1; break; + case KEY_HOME: sys->box_idx = 0; break; + case KEY_UP: sys->box_idx--; break; + case KEY_DOWN: sys->box_idx++; break; + case KEY_PPAGE:sys->box_idx -= sys->box_height; break; + case KEY_NPAGE:sys->box_idx += sys->box_height; break; + default: + return false; + } - PlaylistRebuild(p_intf); - Redraw(p_intf, &t_last_refresh); + CheckIdx(sys); - var_AddCallback(p_playlist, "intf-change", PlaylistChanged, p_intf); - var_AddCallback(p_playlist, "playlist-item-append", PlaylistChanged, p_intf); + if (sys->box_type == BOX_PLAYLIST) { + PL_LOCK; + sys->plidx_follow = IsIndex(sys, p_playlist, sys->box_idx); + PL_UNLOCK; + } - while (vlc_object_alive(p_intf)) - { - msleep(INTF_IDLE_SLEEP); + return true; +} - /* 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) +static void HandleKey(intf_thread_t *intf) +{ + intf_sys_t *sys = intf->p_sys; + int key = getch(); + int box = sys->box_type; + + if (key == -1) + return; + + if (box == BOX_SEARCH || box == BOX_OPEN) { + HandleEditBoxKey(intf, key, sys->box_type); + return; + } + + if (box == BOX_NONE) + switch(key) { - vlc_object_release(p_sys->p_input); - p_sys->p_input = NULL; +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif + case KEY_END: ChangePosition(intf, +.99); return; + case KEY_HOME: ChangePosition(intf, -1.0); return; + case KEY_UP: ChangePosition(intf, +0.05); return; + case KEY_DOWN: ChangePosition(intf, -0.05); return; + default: HandleCommonKey(intf, key); return; } - PL_LOCK; - if (p_sys->b_box_plidx_follow && playlist_CurrentPlayingItem(p_playlist)) - FindIndex(p_sys, p_playlist, true); + if (box == BOX_BROWSE && HandleBrowseKey(intf, key)) + return; - PL_UNLOCK; + if (box == BOX_PLAYLIST && HandlePlaylistKey(intf, key)) + return; + + if (HandleListKey(intf, key)) + return; - while (HandleKey(p_intf)) - Redraw(p_intf, &t_last_refresh); + HandleCommonKey(intf, key); +} - if (force_redraw) - { - clear(); - Redraw(p_intf, &t_last_refresh); - force_redraw = false; - } +/* + * + */ +static vlc_log_t *msg_Copy (const vlc_log_t *msg) +{ + vlc_log_t *copy = (vlc_log_t *)xmalloc (sizeof (*copy)); + copy->i_object_id = msg->i_object_id; + copy->psz_object_type = msg->psz_object_type; + copy->psz_module = strdup (msg->psz_module); + copy->psz_header = msg->psz_header ? strdup (msg->psz_header) : NULL; + return copy; +} + +static void msg_Free (vlc_log_t *msg) +{ + free ((char *)msg->psz_module); + free ((char *)msg->psz_header); + free (msg); +} + +static void MsgCallback(void *data, int type, const vlc_log_t *msg, + const char *format, va_list ap) +{ + intf_sys_t *sys = data; + char *text; + + if (sys->verbosity < 0 + || sys->verbosity < (type - VLC_MSG_ERR) + || vasprintf(&text, format, ap) == -1) + return; + + vlc_mutex_lock(&sys->msg_lock); + + sys->msgs[sys->i_msgs].type = type; + if (sys->msgs[sys->i_msgs].item != NULL) + msg_Free(sys->msgs[sys->i_msgs].item); + sys->msgs[sys->i_msgs].item = msg_Copy(msg); + free(sys->msgs[sys->i_msgs].msg); + sys->msgs[sys->i_msgs].msg = text; + + if (++sys->i_msgs == (sizeof sys->msgs / sizeof *sys->msgs)) + sys->i_msgs = 0; + + vlc_mutex_unlock(&sys->msg_lock); +} + +static inline void UpdateInput(intf_sys_t *sys, playlist_t *p_playlist) +{ + if (!sys->p_input) { + sys->p_input = playlist_CurrentInput(p_playlist); + } else if (sys->p_input->b_dead) { + vlc_object_release(sys->p_input); + sys->p_input = NULL; + } +} + +static void cleanup_run(void *data) +{ + intf_thread_t *intf = data; + playlist_t *p_playlist = pl_Get(intf); + var_DelCallback(p_playlist, "intf-change", PlaylistChanged, intf); + var_DelCallback(p_playlist, "item-change", ItemChanged, intf); + var_DelCallback(p_playlist, "playlist-item-append", PlaylistChanged, intf); +} - if ((time(0) - t_last_refresh) >= 1) - Redraw(p_intf, &t_last_refresh); +/***************************************************************************** + * Run: ncurses thread + *****************************************************************************/ +static void *Run(void *data) +{ + intf_thread_t *intf = data; + intf_sys_t *sys = intf->p_sys; + playlist_t *p_playlist = pl_Get(intf); + + var_AddCallback(p_playlist, "intf-change", PlaylistChanged, intf); + var_AddCallback(p_playlist, "item-change", ItemChanged, intf); + var_AddCallback(p_playlist, "playlist-item-append", PlaylistChanged, intf); + + vlc_cleanup_push(cleanup_run, data); + while (!sys->exit) { + UpdateInput(sys, p_playlist); + Redraw(intf); + HandleKey(intf); } - var_DelCallback(p_playlist, "intf-change", PlaylistChanged, p_intf); - var_DelCallback(p_playlist, "playlist-item-append", PlaylistChanged, p_intf); - vlc_restorecancel(canc); + vlc_cleanup_pop(); + + return NULL; } /***************************************************************************** @@ -1955,44 +1834,52 @@ static void Run(intf_thread_t *p_intf) *****************************************************************************/ 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) + intf_thread_t *intf = (intf_thread_t *)p_this; + intf_sys_t *sys = intf->p_sys = calloc(1, sizeof(intf_sys_t)); + playlist_t *p_playlist = pl_Get(intf); + + if (!sys) return VLC_ENOMEM; - 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"); + vlc_mutex_init(&sys->msg_lock); + vlc_mutex_init(&sys->pl_lock); - p_sys->category_view = true; //FIXME: switching back & forth is broken + sys->verbosity = var_InheritInteger(intf, "verbose"); + vlc_LogSet(intf->p_libvlc, MsgCallback, sys); - 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); - } + sys->box_type = BOX_PLAYLIST; + sys->plidx_follow = true; + sys->color = var_CreateGetBool(intf, "color"); - p_sys->w = initscr(); /* Initialize the curses library */ + sys->current_dir = var_CreateGetNonEmptyString(intf, "browse-dir"); + if (!sys->current_dir) + sys->current_dir = config_GetUserDir(VLC_HOME_DIR); - if (p_sys->b_color) - start_color_and_pairs(p_intf); + initscr(); /* Initialize the curses library */ - 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); + if (sys->color) + start_color_and_pairs(intf); + + keypad(stdscr, TRUE); + nonl(); /* Don't do NL -> CR/NL */ + cbreak(); /* Take input chars one at a time */ + noecho(); /* Don't echo */ + curs_set(0); /* Invisible cursor */ + timeout(1000); /* blocking getch() */ clear(); /* Stop printing errors to the console */ - freopen("/dev/null", "wb", stderr); + if (!freopen("/dev/null", "wb", stderr)) + msg_Err(intf, "Couldn't close stderr (%s)", vlc_strerror_c(errno)); + + ReadDir(intf); + PL_LOCK; + PlaylistRebuild(intf), + PL_UNLOCK; - ReadDir(p_intf); + if (vlc_clone(&sys->thread, Run, intf, VLC_THREAD_PRIORITY_LOW)) + abort(); /* TODO */ - p_intf->pf_run = Run; return VLC_SUCCESS; } @@ -2001,21 +1888,32 @@ static int Open(vlc_object_t *p_this) *****************************************************************************/ static void Close(vlc_object_t *p_this) { - intf_sys_t *p_sys = ((intf_thread_t*)p_this)->p_sys; + intf_sys_t *sys = ((intf_thread_t*)p_this)->p_sys; - PlaylistDestroy(p_sys); - DirsDestroy(p_sys); + vlc_cancel(sys->thread); + vlc_join(sys->thread, NULL); - free(p_sys->psz_current_dir); - free(p_sys->psz_old_search); + PlaylistDestroy(sys); + DirsDestroy(sys); - if (p_sys->p_input) - vlc_object_release(p_sys->p_input); + free(sys->current_dir); - /* Close the ncurses interface */ - endwin(); + if (sys->p_input) + vlc_object_release(sys->p_input); -// msg_Unsubscribe(p_intf, p_sys->p_sub); - - free(p_sys); + if (can_change_color()) + /* Restore yellow to its original color */ + init_color(COLOR_YELLOW, sys->yellow_r, sys->yellow_g, sys->yellow_b); + + endwin(); /* Close the ncurses interface */ + + vlc_LogSet(p_this->p_libvlc, NULL, NULL); + vlc_mutex_destroy(&sys->msg_lock); + vlc_mutex_destroy(&sys->pl_lock); + for(unsigned i = 0; i < sizeof sys->msgs / sizeof *sys->msgs; i++) { + if (sys->msgs[i].item) + msg_Free(sys->msgs[i].item); + free(sys->msgs[i].msg); + } + free(sys); }