X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_file.c;h=25a86d1bb8f0c0ca8d75f5746818fe361b9d8d4a;hb=3a0114cd65186bbbcb6e0ff3c7eeb9c05fac0ab3;hp=14a11478c210836d3c143cfeab4fdf56f7666d09;hpb=7f611951dc9f46941c7db2daeb9f3d6f084d7c20;p=ncmpc.git diff --git a/src/screen_file.c b/src/screen_file.c index 14a1147..25a86d1 100644 --- a/src/screen_file.c +++ b/src/screen_file.c @@ -1,744 +1,452 @@ -/* - * $Id$ - * - * (c) 2004 by Kalle Wallin - * +/* ncmpc (Ncurses MPD Client) + * (c) 2004-2009 The Music Player Daemon Project + * Project homepage: http://musicpd.org + * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -#include -#include -#include -#include -#include + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ +#include "screen_file.h" +#include "screen_browser.h" +#include "screen_interface.h" +#include "screen_message.h" +#include "screen_queue.h" +#include "screen.h" #include "config.h" -#include "ncmpc.h" -#include "options.h" -#include "support.h" +#include "i18n.h" +#include "charset.h" #include "mpdclient.h" -#include "strfsong.h" -#include "command.h" -#include "screen.h" +#include "filelist.h" #include "screen_utils.h" -#include "screen_browse.h" -#include "screen_play.h" - -#define USE_OLD_LAYOUT -#undef USE_OLD_ADD - -#define BUFSIZE 1024 - -#define HIGHLIGHT (0x01) +#include "screen_client.h" +#include -static list_window_t *lw = NULL; -static list_window_state_t *lw_state = NULL; -static mpdclient_filelist_t *filelist = NULL; +#include +#include +#include +#include +static struct screen_browser browser; +static char *current_path; +static void +screen_file_paint(void); -/* clear the highlight flag for all items in the filelist */ -void -clear_highlights(mpdclient_filelist_t *filelist) +static void +screen_file_repaint(void) { - GList *list = g_list_first(filelist->list); - - while( list ) - { - filelist_entry_t *entry = list->data; - - entry->flags &= ~HIGHLIGHT; - list = list->next; - } + screen_file_paint(); + wrefresh(browser.lw->w); } -/* change the highlight flag for a song */ -void -set_highlight(mpdclient_filelist_t *filelist, mpd_Song *song, int highlight) +static void +screen_file_load_list(struct mpdclient *c, struct filelist *filelist) { - GList *list = g_list_first(filelist->list); - - if( !song ) - return; - - while( list ) - { - filelist_entry_t *entry = list->data; - mpd_InfoEntity *entity = entry->entity; - - if( entity && entity->type==MPD_INFO_ENTITY_TYPE_SONG ) - { - mpd_Song *song2 = entity->info.song; - - if( strcmp(song->file, song2->file) == 0 ) - { - if(highlight) - entry->flags |= HIGHLIGHT; - else - entry->flags &= ~HIGHLIGHT; - } - } - list = list->next; - } -} + struct mpd_connection *connection; -/* sync highlight flags with playlist */ -void -sync_highlights(mpdclient_t *c, mpdclient_filelist_t *filelist) -{ - GList *list = g_list_first(filelist->list); - - while(list) - { - filelist_entry_t *entry = list->data; - mpd_InfoEntity *entity = entry->entity; - - if( entity && entity->type==MPD_INFO_ENTITY_TYPE_SONG ) - { - mpd_Song *song = entity->info.song; - - if( playlist_get_index_from_file(c, song->file) >= 0 ) - entry->flags |= HIGHLIGHT; - else - entry->flags &= ~HIGHLIGHT; - } - list=list->next; - } -} + connection = mpdclient_get_connection(c); + if (connection == NULL) + return; -/* the db have changed -> update the filelist */ -static void -file_changed_callback(mpdclient_t *c, int event, gpointer data) -{ - D("screen_file.c> filelist_callback() [%d]\n", event); - filelist = mpdclient_filelist_update(c, filelist); - sync_highlights(c, filelist); - list_window_check_selected(lw, filelist->length); -} + mpd_send_list_meta(connection, current_path); + filelist_recv(filelist, connection); -/* the playlist have been updated -> fix highlights */ -static void -playlist_changed_callback(mpdclient_t *c, int event, gpointer data) -{ - D("screen_file.c> playlist_callback() [%d]\n", event); - switch(event) - { - case PLAYLIST_EVENT_CLEAR: - clear_highlights(filelist); - break; - case PLAYLIST_EVENT_ADD: - set_highlight(filelist, (mpd_Song *) data, 1); - break; - case PLAYLIST_EVENT_DELETE: - set_highlight(filelist, (mpd_Song *) data, 0); - break; - case PLAYLIST_EVENT_MOVE: - break; - default: - sync_highlights(c, filelist); - break; - } + if (mpd_response_finish(connection)) + filelist_sort_dir_play(filelist, compare_filelist_entry_path); + else + mpdclient_handle_error(c); } -/* list_window callback */ -char * -browse_lw_callback(int index, int *highlight, void *data) +static void +screen_file_reload(struct mpdclient *c) { - static char buf[BUFSIZE]; - mpdclient_filelist_t *filelist = (mpdclient_filelist_t *) data; - filelist_entry_t *entry; - mpd_InfoEntity *entity; - - *highlight = 0; - if( (entry=(filelist_entry_t *)g_list_nth_data(filelist->list,index))==NULL ) - return NULL; - - entity = entry->entity; - *highlight = (entry->flags & HIGHLIGHT); - - if( entity == NULL ) - { - return "[..]"; - } - if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) - { - mpd_Directory *dir = entity->info.directory; - char *dirname = utf8_to_locale(basename(dir->path)); - - g_snprintf(buf, BUFSIZE, "[%s]", dirname); - g_free(dirname); - return buf; - } - else if( entity->type==MPD_INFO_ENTITY_TYPE_SONG ) - { - mpd_Song *song = entity->info.song; - - strfsong(buf, BUFSIZE, LIST_FORMAT, song); - return buf; - } - else if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) - { - mpd_PlaylistFile *plf = entity->info.playlistFile; - char *filename = utf8_to_locale(basename(plf->path)); - -#ifdef USE_OLD_LAYOUT - g_snprintf(buf, BUFSIZE, "*%s*", filename); -#else - g_snprintf(buf, BUFSIZE, " %s", filename); -#endif - g_free(filename); - return buf; - } - return "Error: Unknown entry!"; -} + if (browser.filelist != NULL) + filelist_free(browser.filelist); -/* chdir */ -static int -change_directory(screen_t *screen, mpdclient_t *c, filelist_entry_t *entry, char *new_path) -{ - mpd_InfoEntity *entity = NULL; - gchar *path = NULL; - - if( entry!=NULL ) - entity = entry->entity; - else if( new_path==NULL ) - return -1; - - if( entity==NULL ) - { - if( entry || 0==strcmp(new_path, "..") ) - { - /* return to parent */ - char *parent = g_path_get_dirname(filelist->path); - if( strcmp(parent, ".") == 0 ) - { - parent[0] = '\0'; - } - path = g_strdup(parent); - list_window_reset(lw); - /* restore previous list window state */ - list_window_pop_state(lw_state,lw); - } - else - { - /* entry==NULL, then new_path ("" is root) */ - path = g_strdup(new_path); - list_window_reset(lw); - /* restore first list window state (pop while returning true) */ - while(list_window_pop_state(lw_state,lw)); - } - } - else - if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY) - { - /* enter sub */ - mpd_Directory *dir = entity->info.directory; - path = utf8_to_locale(dir->path); - /* save current list window state */ - list_window_push_state(lw_state,lw); - } - else - return -1; - - filelist = mpdclient_filelist_free(filelist); - filelist = mpdclient_filelist_get(c, path); - sync_highlights(c, filelist); - list_window_check_selected(lw, filelist->length); - g_free(path); - return 0; + browser.filelist = filelist_new(); + if (*current_path != 0) + /* add a dummy entry for ./.. */ + filelist_append(browser.filelist, NULL); + + screen_file_load_list(c, browser.filelist); + + list_window_set_length(browser.lw, + filelist_length(browser.filelist)); } -static int -load_playlist(screen_t *screen, mpdclient_t *c, filelist_entry_t *entry) +/** + * Change to the specified absolute directory. + */ +static bool +change_directory(struct mpdclient *c, const char *new_path) { - mpd_InfoEntity *entity = entry->entity; - mpd_PlaylistFile *plf = entity->info.playlistFile; - char *filename = utf8_to_locale(plf->path); - - if( mpdclient_cmd_load_playlist_utf8(c, plf->path) == 0 ) - screen_status_printf(_("Loading playlist %s..."), basename(filename)); - g_free(filename); - return 0; + g_free(current_path); + current_path = g_strdup(new_path); + + screen_file_reload(c); + + screen_browser_sync_highlights(browser.filelist, &c->playlist); + + list_window_reset(browser.lw); + + return browser.filelist != NULL; } -static int -handle_save(screen_t *screen, mpdclient_t *c) +/** + * Change to the parent directory of the current directory. + */ +static bool +change_to_parent(struct mpdclient *c) { - filelist_entry_t *entry; - char *defaultname = NULL; - - - entry=( filelist_entry_t *) g_list_nth_data(filelist->list,lw->selected); - if( entry && entry->entity ) - { - mpd_InfoEntity *entity = entry->entity; - if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) - { - mpd_PlaylistFile *plf = entity->info.playlistFile; - defaultname = plf->path; + char *parent = g_path_get_dirname(current_path); + char *old_path; + int idx; + bool success; + + if (strcmp(parent, ".") == 0) + parent[0] = '\0'; + + old_path = current_path; + current_path = NULL; + + success = change_directory(c, parent); + g_free(parent); + + idx = success + ? filelist_find_directory(browser.filelist, old_path) + : -1; + g_free(old_path); + + if (success && idx >= 0) { + /* set the cursor on the previous working directory */ + list_window_set_cursor(browser.lw, idx); + list_window_center(browser.lw, idx); } - } - return playlist_save(screen, c, NULL, defaultname); -} -static int -handle_delete(screen_t *screen, mpdclient_t *c) -{ - filelist_entry_t *entry; - mpd_InfoEntity *entity; - mpd_PlaylistFile *plf; - char *str, *buf; - int key; - - entry=( filelist_entry_t *) g_list_nth_data(filelist->list,lw->selected); - if( entry==NULL || entry->entity==NULL ) - return -1; - - entity = entry->entity; - - if( entity->type!=MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) - { - screen_status_printf(_("You can only delete playlists!")); - screen_bell(); - return -1; - } - - plf = entity->info.playlistFile; - str = utf8_to_locale(basename(plf->path)); - buf = g_strdup_printf(_("Delete playlist %s [%s/%s] ? "), str, YES, NO); - g_free(str); - key = tolower(screen_getch(screen->status_window.w, buf)); - g_free(buf); - if( key==KEY_RESIZE ) - screen_resize(); - if( key != YES[0] ) - { - screen_status_printf(_("Aborted!")); - return 0; - } - - if( mpdclient_cmd_delete_playlist_utf8(c, plf->path) ) - { - return -1; - } - screen_status_printf(_("Playlist deleted!")); - return 0; + return success; } -static int -enqueue_and_play(screen_t *screen, mpdclient_t *c, filelist_entry_t *entry) +/** + * Change to the directory referred by the specified #filelist_entry + * object. + */ +static bool +change_to_entry(struct mpdclient *c, const struct filelist_entry *entry) { - int index; - mpd_InfoEntity *entity = entry->entity; - mpd_Song *song = entity->info.song; - - if(!( entry->flags & HIGHLIGHT )) - { - if( mpdclient_cmd_add(c, song) == 0 ) - { - char buf[BUFSIZE]; - - entry->flags |= HIGHLIGHT; - strfsong(buf, BUFSIZE, LIST_FORMAT, song); - screen_status_printf(_("Adding \'%s\' to playlist\n"), buf); - mpdclient_update(c); /* get song id */ - } - else - return -1; - } - - index = playlist_get_index_from_file(c, song->file); - mpdclient_cmd_play(c, index); - return 0; + assert(entry != NULL); + + if (entry->entity == NULL) + return change_to_parent(c); + else if (mpd_entity_get_type(entry->entity) == MPD_ENTITY_TYPE_DIRECTORY) + return change_directory(c, mpd_directory_get_path(mpd_entity_get_directory(entry->entity))); + else + return false; } -int -browse_handle_enter(screen_t *screen, - mpdclient_t *c, - list_window_t *lw, - mpdclient_filelist_t *filelist) +static bool +screen_file_handle_enter(struct mpdclient *c) { - filelist_entry_t *entry; - mpd_InfoEntity *entity; - - if ( filelist==NULL ) - return -1; - entry = ( filelist_entry_t *) g_list_nth_data(filelist->list, lw->selected); - if( entry==NULL ) - return -1; - - entity = entry->entity; - if( entity==NULL || entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) - return change_directory(screen, c, entry, NULL); - else if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) - return load_playlist(screen, c, entry); - else if( entity->type==MPD_INFO_ENTITY_TYPE_SONG ) - return enqueue_and_play(screen, c, entry); - return -1; -} + const struct filelist_entry *entry = browser_get_selected_entry(&browser); + if (entry == NULL) + return false; -#ifdef USE_OLD_ADD -/* NOTE - The add_directory functions should move to mpdclient.c */ -extern gint mpdclient_finish_command(mpdclient_t *c); + return change_to_entry(c, entry); +} -static int -add_directory(mpdclient_t *c, char *dir) +static void +handle_save(struct mpdclient *c) { - mpd_InfoEntity *entity; - GList *subdir_list = NULL; - GList *list = NULL; - char *dirname; - - dirname = utf8_to_locale(dir); - screen_status_printf(_("Adding directory %s...\n"), dirname); - doupdate(); - g_free(dirname); - dirname = NULL; - - mpd_sendLsInfoCommand(c->connection, dir); - mpd_sendCommandListBegin(c->connection); - while( (entity=mpd_getNextInfoEntity(c->connection)) ) - { - if( entity->type==MPD_INFO_ENTITY_TYPE_SONG ) - { - mpd_Song *song = entity->info.song; - mpd_sendAddCommand(c->connection, song->file); - mpd_freeInfoEntity(entity); + struct list_window_range range; + const char *defaultname = NULL; + char *defaultname_utf8 = NULL; + + list_window_get_range(browser.lw, &range); + if (range.start == range.end) + return; + + for (unsigned i = range.start; i < range.end; ++i) { + struct filelist_entry *entry = + filelist_get(browser.filelist, i); + if( entry && entry->entity ) { + struct mpd_entity *entity = entry->entity; + if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST) { + const struct mpd_playlist *playlist = + mpd_entity_get_playlist(entity); + defaultname = mpd_playlist_get_path(playlist); + } + } } - else if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) - { - subdir_list = g_list_append(subdir_list, (gpointer) entity); - } - else - mpd_freeInfoEntity(entity); - } - mpd_sendCommandListEnd(c->connection); - mpdclient_finish_command(c); - c->need_update = TRUE; - - list = g_list_first(subdir_list); - while( list!=NULL ) - { - mpd_Directory *dir; - - entity = list->data; - dir = entity->info.directory; - add_directory(c, dir->path); - mpd_freeInfoEntity(entity); - list->data=NULL; - list=list->next; - } - g_list_free(subdir_list); - return 0; + + if(defaultname) + defaultname_utf8 = utf8_to_locale(defaultname); + playlist_save(c, NULL, defaultname_utf8); + g_free(defaultname_utf8); } -#endif -int -browse_handle_select(screen_t *screen, - mpdclient_t *c, - list_window_t *lw, - mpdclient_filelist_t *filelist) +static void +handle_delete(struct mpdclient *c) { - filelist_entry_t *entry; - - if ( filelist==NULL ) - return -1; - entry=( filelist_entry_t *) g_list_nth_data(filelist->list, lw->selected); - if( entry==NULL || entry->entity==NULL) - return -1; - - if( entry->entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) - return load_playlist(screen, c, entry); - - if( entry->entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) - { - mpd_Directory *dir = entry->entity->info.directory; -#ifdef USE_OLD_ADD - add_directory(c, tmp); -#else - if( mpdclient_cmd_add_path_utf8(c, dir->path) == 0 ) - { - char *tmp = utf8_to_locale(dir->path); - - screen_status_printf(_("Adding \'%s\' to playlist\n"), tmp); - g_free(tmp); - } -#endif - return 0; - } - - if( entry->entity->type!=MPD_INFO_ENTITY_TYPE_SONG ) - return -1; - - if( entry->flags & HIGHLIGHT ) - entry->flags &= ~HIGHLIGHT; - else - entry->flags |= HIGHLIGHT; - - if( entry->flags & HIGHLIGHT ) - { - if( entry->entity->type==MPD_INFO_ENTITY_TYPE_SONG ) - { - mpd_Song *song = entry->entity->info.song; - - if( mpdclient_cmd_add(c, song) == 0 ) - { - char buf[BUFSIZE]; - - strfsong(buf, BUFSIZE, LIST_FORMAT, song); - screen_status_printf(_("Adding \'%s\' to playlist\n"), buf); - } + struct mpd_connection *connection = mpdclient_get_connection(c); + struct list_window_range range; + struct mpd_entity *entity; + const struct mpd_playlist *playlist; + char *str, *buf; + int key; + + if (connection == NULL) + return; + + list_window_get_range(browser.lw, &range); + for (unsigned i = range.start; i < range.end; ++i) { + struct filelist_entry *entry = + filelist_get(browser.filelist, i); + if( entry==NULL || entry->entity==NULL ) + continue; + + entity = entry->entity; + + if (mpd_entity_get_type(entity) != MPD_ENTITY_TYPE_PLAYLIST) { + /* translators: the "delete" command is only possible + for playlists; the user attempted to delete a song + or a directory or something else */ + screen_status_printf(_("Deleting this item is not possible")); + screen_bell(); + continue; + } + + playlist = mpd_entity_get_playlist(entity); + str = utf8_to_locale(g_basename(mpd_playlist_get_path(playlist))); + buf = g_strdup_printf(_("Delete playlist %s [%s/%s] ? "), str, YES, NO); + g_free(str); + key = tolower(screen_getch(buf)); + g_free(buf); + if( key != YES[0] ) { + /* translators: a dialog was aborted by the user */ + screen_status_printf(_("Aborted")); + return; + } + + if (!mpd_run_rm(connection, mpd_playlist_get_path(playlist))) { + mpdclient_handle_error(c); + break; + } + + c->events |= MPD_IDLE_STORED_PLAYLIST; + + /* translators: MPD deleted the playlist, as requested by the + user */ + screen_status_printf(_("Playlist deleted")); } - } - else - { - /* remove song from playlist */ - if( entry->entity->type==MPD_INFO_ENTITY_TYPE_SONG ) - { - mpd_Song *song = entry->entity->info.song; - - if( song ) - { - int index = playlist_get_index_from_file(c, song->file); - - while( (index=playlist_get_index_from_file(c, song->file))>=0 ) - mpdclient_cmd_delete(c, index); - } - } - } - return 0; } static void -browse_init(WINDOW *w, int cols, int rows) +screen_file_init(WINDOW *w, int cols, int rows) { - lw = list_window_init(w, cols, rows); - lw_state = list_window_init_state(); + current_path = g_strdup(""); + + browser.lw = list_window_init(w, cols, rows); } static void -browse_resize(int cols, int rows) +screen_file_resize(int cols, int rows) { - lw->cols = cols; - lw->rows = rows; + list_window_resize(browser.lw, cols, rows); } static void -browse_exit(void) +screen_file_exit(void) { - if( filelist ) - filelist = mpdclient_filelist_free(filelist); - lw = list_window_free(lw); - lw_state = list_window_free_state(lw_state); -} + if (browser.filelist) + filelist_free(browser.filelist); + list_window_free(browser.lw); -static void -browse_open(screen_t *screen, mpdclient_t *c) -{ - if( filelist == NULL ) - { - filelist = mpdclient_filelist_get(c, ""); - mpdclient_install_playlist_callback(c, playlist_changed_callback); - mpdclient_install_browse_callback(c, file_changed_callback); - } + g_free(current_path); } static void -browse_close(void) +screen_file_open(struct mpdclient *c) { + screen_file_reload(c); + screen_browser_sync_highlights(browser.filelist, &c->playlist); } -static char * -browse_title(char *str, size_t size) +static const char * +screen_file_get_title(char *str, size_t size) { - char *pathcopy; - char *parentdir; - pathcopy = strdup(filelist->path); - parentdir = dirname(pathcopy); - parentdir = basename(parentdir); - if( parentdir[0] == '.' && strlen(parentdir) == 1 ) - { - parentdir = NULL; - } - g_snprintf(str, size, _("Browse: %s%s%s"), - parentdir ? parentdir : "", - parentdir ? "/" : "", - basename(filelist->path)); - free(pathcopy); - return str; -} + const char *path = NULL, *prev = NULL, *slash = current_path; + char *path_locale; -static void -browse_paint(screen_t *screen, mpdclient_t *c) -{ - lw->clear = 1; - - list_window_paint(lw, browse_lw_callback, (void *) filelist); - wnoutrefresh(lw->w); + /* determine the last 2 parts of the path */ + while ((slash = strchr(slash, '/')) != NULL) { + path = prev; + prev = ++slash; + } + + if (path == NULL) + /* fall back to full path */ + path = current_path; + + path_locale = utf8_to_locale(path); + g_snprintf(str, size, "%s: %s", + /* translators: caption of the browser screen */ + _("Browse"), path_locale); + g_free(path_locale); + return str; } -static void -browse_update(screen_t *screen, mpdclient_t *c) +static void +screen_file_paint(void) { - if( filelist->updated ) - { - browse_paint(screen, c); - filelist->updated = FALSE; - return; - } - list_window_paint(lw, browse_lw_callback, (void *) filelist); - wnoutrefresh(lw->w); + screen_browser_paint(&browser); } - -#ifdef HAVE_GETMOUSE -int -browse_handle_mouse_event(screen_t *screen, - mpdclient_t *c, - list_window_t *lw, - mpdclient_filelist_t *filelist) +static void +screen_file_update(struct mpdclient *c) { - int row; - int prev_selected = lw->selected; - unsigned long bstate; - int length; - - if ( filelist ) - length = filelist->length; - else - length = 0; - - if( screen_get_mouse_event(c, lw, length, &bstate, &row) ) - return 1; - - lw->selected = lw->start+row; - list_window_check_selected(lw, length); - - if( bstate & BUTTON1_CLICKED ) - { - if( prev_selected == lw->selected ) - browse_handle_enter(screen, c, lw, filelist); - } - else if( bstate & BUTTON3_CLICKED ) - { - if( prev_selected == lw->selected ) - browse_handle_select(screen, c, lw, filelist); - } - - return 1; + if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST)) { + /* the db has changed -> update the filelist */ + screen_file_reload(c); + } + + if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST +#ifndef NCMPC_MINI + | MPD_IDLE_PLAYLIST +#endif + )) { + screen_browser_sync_highlights(browser.filelist, &c->playlist); + screen_file_repaint(); + } } -#endif -static int -browse_cmd(screen_t *screen, mpdclient_t *c, command_t cmd) +static bool +screen_file_cmd(struct mpdclient *c, command_t cmd) { - switch(cmd) - { - case CMD_PLAY: - browse_handle_enter(screen, c, lw, filelist); - return 1; - case CMD_GO_ROOT_DIRECTORY: - return change_directory(screen, c, NULL, ""); - break; - case CMD_GO_PARENT_DIRECTORY: - return change_directory(screen, c, NULL, ".."); - break; - case CMD_SELECT: - if( browse_handle_select(screen, c, lw, filelist) == 0 ) - { - /* continue and select next item... */ - cmd = CMD_LIST_NEXT; + switch(cmd) { + case CMD_PLAY: + if (screen_file_handle_enter(c)) { + screen_file_repaint(); + return true; + } + + break; + + case CMD_GO_ROOT_DIRECTORY: + change_directory(c, ""); + screen_file_repaint(); + return true; + case CMD_GO_PARENT_DIRECTORY: + change_to_parent(c); + screen_file_repaint(); + return true; + + case CMD_LOCATE: + /* don't let browser_cmd() evaluate the locate command + - it's a no-op, and by the way, leads to a + segmentation fault in the current implementation */ + return false; + + case CMD_SCREEN_UPDATE: + screen_file_reload(c); + screen_browser_sync_highlights(browser.filelist, &c->playlist); + screen_file_repaint(); + return false; + + default: + break; } - break; - case CMD_DELETE: - handle_delete(screen, c); - break; - case CMD_SAVE_PLAYLIST: - handle_save(screen, c); - break; - case CMD_SCREEN_UPDATE: - screen->painted = 0; - lw->clear = 1; - lw->repaint = 1; - filelist = mpdclient_filelist_update(c, filelist); - list_window_check_selected(lw, filelist->length); - screen_status_printf(_("Screen updated!")); - return 1; - case CMD_DB_UPDATE: - if( !c->status->updatingDb ) - { - if( mpdclient_cmd_db_update_utf8(c,filelist->path)==0 ) - { - if(strcmp(filelist->path,"")) { - screen_status_printf(_("Database update of %s started!"), - filelist->path); - } else { - screen_status_printf(_("Database update started!")); - } - /* set updatingDb to make shure the browse callback gets called - * even if the updated has finished before status is updated */ - c->status->updatingDb = 1; - } + + if (browser_cmd(&browser, c, cmd)) { + if (screen_is_visible(&screen_browse)) + screen_file_repaint(); + return true; } - else - screen_status_printf(_("Database update running...")); - return 1; - case CMD_LIST_FIND: - case CMD_LIST_RFIND: - case CMD_LIST_FIND_NEXT: - case CMD_LIST_RFIND_NEXT: - return screen_find(screen, c, - lw, filelist->length, - cmd, browse_lw_callback, (void *) filelist); - case CMD_MOUSE_EVENT: - return browse_handle_mouse_event(screen,c,lw,filelist); - default: - break; - } - return list_window_cmd(lw, filelist->length, cmd); -} + if (!mpdclient_is_connected(c)) + return false; -list_window_t * -get_filelist_window() -{ - return lw; -} + switch(cmd) { + case CMD_DELETE: + handle_delete(c); + screen_file_repaint(); + break; + case CMD_SAVE_PLAYLIST: + handle_save(c); + break; + case CMD_DB_UPDATE: + screen_database_update(c, current_path); + return true; + default: + break; + } -screen_functions_t * -get_screen_browse(void) -{ - static screen_functions_t functions; - - memset(&functions, 0, sizeof(screen_functions_t)); - functions.init = browse_init; - functions.exit = browse_exit; - functions.open = browse_open; - functions.close = browse_close; - functions.resize = browse_resize; - functions.paint = browse_paint; - functions.update = browse_update; - functions.cmd = browse_cmd; - functions.get_lw = get_filelist_window; - functions.get_title = browse_title; - - return &functions; + return false; } +const struct screen_functions screen_browse = { + .init = screen_file_init, + .exit = screen_file_exit, + .open = screen_file_open, + .resize = screen_file_resize, + .paint = screen_file_paint, + .update = screen_file_update, + .cmd = screen_file_cmd, + .get_title = screen_file_get_title, +}; + +bool +screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song) +{ + const char *uri, *slash, *parent; + char *allocated = NULL; + bool ret; + int i; + + assert(song != NULL); + + uri = mpd_song_get_uri(song); + + if (strstr(uri, "//") != NULL) + /* an URL? */ + return false; + + /* determine the song's parent directory and go there */ + + slash = strrchr(uri, '/'); + if (slash != NULL) + parent = allocated = g_strndup(uri, slash - uri); + else + parent = ""; + + ret = change_directory(c, parent); + g_free(allocated); + if (!ret) + return false; + + /* select the specified song */ + + i = filelist_find_song(browser.filelist, song); + if (i < 0) + i = 0; + + list_window_set_cursor(browser.lw, i); + + /* finally, switch to the file screen */ + screen_switch(&screen_browse, c); + return true; +}