screen_text: add support for appending text

[ncmpc.git] / src / screen_file.c

diff --git a/src/screen_file.c b/src/screen_file.c
index 1387cee519fc066f0bc96bf0b02d8627de5d187c..da7969b7221d00e1da14d845551bf6f449799a61 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
@@ -1,26 +1,26 @@
 /* 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"
@@ -56,18 +56,15 @@ screen_file_load_list(struct mpdclient *c, struct filelist *filelist)
 {
        struct mpd_connection *connection;
 
-       if (!mpdclient_is_connected(c))
-               return;
-
        connection = mpdclient_get_connection(c);
+       if (connection == NULL)
+               return;
 
        mpd_send_list_meta(connection, current_path);
        filelist_recv(filelist, connection);
 
-       if (mpd_response_finish(connection))
+       if (mpdclient_finish_command(c))
                filelist_sort_dir_play(filelist, compare_filelist_entry_path);
-       else
-               mpdclient_handle_error(c);
 }
 
 static void
@@ -98,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);
 
@@ -169,17 +164,16 @@ screen_file_handle_enter(struct mpdclient *c)
        return change_to_entry(c, entry);
 }
 
-static int
+static void
 handle_save(struct mpdclient *c)
 {
        struct list_window_range range;
        const char *defaultname = NULL;
        char *defaultname_utf8 = NULL;
-       int ret;
 
        list_window_get_range(browser.lw, &range);
        if (range.start == range.end)
-               return -1;
+               return;
 
        for (unsigned i = range.start; i < range.end; ++i) {
                struct filelist_entry *entry =
@@ -196,13 +190,11 @@ 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 mpd_connection *connection = mpdclient_get_connection(c);
@@ -210,7 +202,9 @@ handle_delete(struct mpdclient *c)
        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) {
@@ -234,12 +228,13 @@ 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(connection, mpd_playlist_get_path(playlist))) {
@@ -253,7 +248,6 @@ handle_delete(struct mpdclient *c)
                   user */
                screen_status_printf(_("Playlist deleted"));
        }
-       return 0;
 }
 
 static void
@@ -284,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 *
@@ -324,18 +319,14 @@ screen_file_update(struct mpdclient *c)
                screen_file_reload(c);
        }
 
-#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
@@ -367,9 +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
                screen_file_repaint();
                return false;