X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_file.c;h=da7969b7221d00e1da14d845551bf6f449799a61;hb=af6a330fd05bad62d1302e6801622ae82ef4725c;hp=116d32937bd31337986096b60ea7a3e09505352f;hpb=262019b93fb27d730837609347d458c07faf5099;p=ncmpc.git diff --git a/src/screen_file.c b/src/screen_file.c index 116d329..da7969b 100644 --- a/src/screen_file.c +++ b/src/screen_file.c @@ -1,26 +1,27 @@ /* ncmpc (Ncurses MPD Client) - * (c) 2004-2009 The Music Player Daemon Project + * (c) 2004-2010 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., * 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_status.h" +#include "screen_queue.h" #include "screen.h" #include "config.h" #include "i18n.h" @@ -28,7 +29,6 @@ #include "mpdclient.h" #include "filelist.h" #include "screen_utils.h" -#include "screen_play.h" #include "screen_client.h" #include @@ -51,19 +51,37 @@ screen_file_repaint(void) wrefresh(browser.lw->w); } +static void +screen_file_load_list(struct mpdclient *c, struct filelist *filelist) +{ + struct mpd_connection *connection; + + connection = mpdclient_get_connection(c); + if (connection == NULL) + return; + + mpd_send_list_meta(connection, current_path); + filelist_recv(filelist, connection); + + if (mpdclient_finish_command(c)) + filelist_sort_dir_play(filelist, compare_filelist_entry_path); +} + static void screen_file_reload(struct mpdclient *c) { if (browser.filelist != NULL) filelist_free(browser.filelist); - browser.filelist = mpdclient_filelist_get(c, current_path); - if (browser.filelist == NULL) - browser.filelist = filelist_new(); - + browser.filelist = filelist_new(); if (*current_path != 0) /* add a dummy entry for ./.. */ - filelist_prepend(browser.filelist, NULL); + filelist_append(browser.filelist, NULL); + + screen_file_load_list(c, browser.filelist); + + list_window_set_length(browser.lw, + filelist_length(browser.filelist)); } /** @@ -77,9 +95,7 @@ change_directory(struct mpdclient *c, const char *new_path) screen_file_reload(c); -#ifndef NCMPC_MINI screen_browser_sync_highlights(browser.filelist, &c->playlist); -#endif list_window_reset(browser.lw); @@ -113,9 +129,8 @@ change_to_parent(struct mpdclient *c) if (success && idx >= 0) { /* set the cursor on the previous working directory */ - list_window_set_selected(browser.lw, idx); - list_window_center(browser.lw, - filelist_length(browser.filelist), idx); + list_window_set_cursor(browser.lw, idx); + list_window_center(browser.lw, idx); } return success; @@ -149,21 +164,20 @@ screen_file_handle_enter(struct mpdclient *c) return change_to_entry(c, entry); } -static int +static void handle_save(struct mpdclient *c) { - struct filelist_entry *entry; + struct list_window_range range; const char *defaultname = NULL; char *defaultname_utf8 = NULL; - int ret; - unsigned selected; - if (browser.lw->selected >= filelist_length(browser.filelist)) - return -1; + list_window_get_range(browser.lw, &range); + if (range.start == range.end) + return; - for(selected = browser.lw->selected_start; selected <= browser.lw->selected_end; ++selected) - { - entry = filelist_get(browser.filelist, selected); + 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) { @@ -176,28 +190,26 @@ handle_save(struct mpdclient *c) if(defaultname) defaultname_utf8 = utf8_to_locale(defaultname); - ret = playlist_save(c, NULL, defaultname_utf8); + playlist_save(c, NULL, defaultname_utf8); g_free(defaultname_utf8); - - return ret; } -static int +static void handle_delete(struct mpdclient *c) { - struct filelist_entry *entry; + 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; - unsigned selected; - for(selected = browser.lw->selected_start; selected <= browser.lw->selected_end; ++selected) - { - if (selected >= filelist_length(browser.filelist)) - return -1; + if (connection == NULL) + return; - entry = filelist_get(browser.filelist, selected); + 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; @@ -216,15 +228,16 @@ handle_delete(struct mpdclient *c) 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)); + bool delete = screen_get_yesno(buf, false); g_free(buf); - if( key != YES[0] ) { + + if (!delete) { /* translators: a dialog was aborted by the user */ screen_status_printf(_("Aborted")); - return 0; + return; } - if (!mpd_run_rm(c->connection, mpd_playlist_get_path(playlist))) { + if (!mpd_run_rm(connection, mpd_playlist_get_path(playlist))) { mpdclient_handle_error(c); break; } @@ -235,7 +248,6 @@ handle_delete(struct mpdclient *c) user */ screen_status_printf(_("Playlist deleted")); } - return 0; } static void @@ -249,8 +261,7 @@ screen_file_init(WINDOW *w, int cols, int rows) static void screen_file_resize(int cols, int rows) { - browser.lw->cols = cols; - browser.lw->rows = rows; + list_window_resize(browser.lw, cols, rows); } static void @@ -267,6 +278,7 @@ static void screen_file_open(struct mpdclient *c) { screen_file_reload(c); + screen_browser_sync_highlights(browser.filelist, &c->playlist); } static const char * @@ -296,7 +308,7 @@ screen_file_get_title(char *str, size_t size) static void screen_file_paint(void) { - list_window_paint(browser.lw, browser_lw_callback, browser.filelist); + screen_browser_paint(&browser); } static void @@ -305,22 +317,16 @@ screen_file_update(struct mpdclient *c) if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST)) { /* the db has changed -> update the filelist */ screen_file_reload(c); - list_window_check_selected(browser.lw, - filelist_length(browser.filelist)); } -#ifndef NCMPC_MINI - if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST | - MPD_IDLE_PLAYLIST)) - screen_browser_sync_highlights(browser.filelist, &c->playlist); -#endif - if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST #ifndef NCMPC_MINI - | MPD_IDLE_PLAYLIST + | MPD_IDLE_QUEUE #endif - )) + )) { + screen_browser_sync_highlights(browser.filelist, &c->playlist); screen_file_repaint(); + } } static bool @@ -352,11 +358,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd) case CMD_SCREEN_UPDATE: screen_file_reload(c); -#ifndef NCMPC_MINI screen_browser_sync_highlights(browser.filelist, &c->playlist); -#endif - list_window_check_selected(browser.lw, - filelist_length(browser.filelist)); screen_file_repaint(); return false; @@ -440,7 +442,7 @@ screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song) if (i < 0) i = 0; - list_window_set_selected(browser.lw, i); + list_window_set_cursor(browser.lw, i); /* finally, switch to the file screen */ screen_switch(&screen_browse, c);