use mpdclient_is_connected()

[ncmpc.git] / src / screen_search.c

diff --git a/src/screen_search.c b/src/screen_search.c
index 9ab9a3f716f6be9e6ccb03bb43e62d931aac2791..3829f8dfa1bcbbd3d037265db62906c4058cd6f7 100644 (file)
--- a/src/screen_search.c
+++ b/src/screen_search.c
@@ -17,20 +17,20 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "screen_search.h"
+#include "screen_interface.h"
+#include "screen_message.h"
+#include "screen.h"
 #include "i18n.h"
 #include "options.h"
 #include "charset.h"
 #include "mpdclient.h"
 #include "strfsong.h"
-#include "command.h"
-#include "screen.h"
 #include "utils.h"
 #include "screen_utils.h"
 #include "screen_browser.h"
 #include "filelist.h"
 
-#include <ctype.h>
-#include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 
@@ -124,30 +124,15 @@ lw_search_help_callback(unsigned idx, G_GNUC_UNUSED bool *highlight,
 }
 
 static void
-paint(void);
+screen_search_paint(void);
 
 static void
 search_repaint(void)
 {
-       paint();
+       screen_search_paint();
        wrefresh(browser.lw->w);
 }
 
-static void
-search_repaint_if_active(void)
-{
-       if (screen_is_visible(&screen_search))
-               search_repaint();
-}
-
-/* the playlist has been updated -> fix highlights */
-static void
-playlist_changed_callback(struct mpdclient *c, int event, gpointer data)
-{
-       browser_playlist_changed(&browser, c, event, data);
-       search_repaint_if_active();
-}
-
 /* sanity check search mode value */
 static void
 search_check_mode(void)
@@ -163,11 +148,9 @@ search_check_mode(void)
 }
 
 static void
-search_clear(struct mpdclient *c,
-            gboolean clear_pattern)
+search_clear(bool clear_pattern)
 {
        if (browser.filelist) {
-               mpdclient_remove_playlist_callback(c, playlist_changed_callback);
                filelist_free(browser.filelist);
                browser.filelist = filelist_new();
        }
@@ -299,8 +282,12 @@ search_advanced_query(char *query, struct mpdclient *c)
                while ((entity = mpd_recv_entity(c->connection)) != NULL)
                        filelist_append(fl, entity);
 
-               if (mpdclient_finish_command(c) && fl)
+               if (!mpd_response_finish(c->connection)) {
                        filelist_free(fl);
+                       fl = NULL;
+
+                       mpdclient_handle_error(c);
+               }
        }
 
        i=0;
@@ -313,14 +300,13 @@ search_advanced_query(char *query, struct mpdclient *c)
 static void
 search_new(struct mpdclient *c)
 {
-       if (c->connection == NULL)
+       if (!mpdclient_is_connected(c))
                return;
 
-       search_clear(c, TRUE);
+       search_clear(true);
 
        g_free(pattern);
-       pattern = screen_readln(screen.status_window.w,
-                               _("Search"),
+       pattern = screen_readln(_("Search"),
                                NULL,
                                &search_history,
                                NULL);
@@ -346,21 +332,18 @@ search_new(struct mpdclient *c)
        if (browser.filelist == NULL)
                browser.filelist = filelist_new();
 
-       sync_highlights(c, browser.filelist);
-       mpdclient_install_playlist_callback(c, playlist_changed_callback);
+       screen_browser_sync_highlights(browser.filelist, &c->playlist);
        list_window_check_selected(browser.lw, filelist_length(browser.filelist));
 }
 
-
-
 static void
-init(WINDOW *w, int cols, int rows)
+screen_search_init(WINDOW *w, int cols, int rows)
 {
        browser.lw = list_window_init(w, cols, rows);
 }
 
 static void
-quit(void)
+screen_search_quit(void)
 {
        if (search_history)
                string_list_free(search_history);
@@ -375,7 +358,7 @@ quit(void)
 }
 
 static void
-open(G_GNUC_UNUSED struct mpdclient *c)
+screen_search_open(G_GNUC_UNUSED struct mpdclient *c)
 {
        //  if( pattern==NULL )
        //    search_new(screen, c);
@@ -386,14 +369,14 @@ open(G_GNUC_UNUSED struct mpdclient *c)
 }
 
 static void
-resize(int cols, int rows)
+screen_search_resize(int cols, int rows)
 {
        browser.lw->cols = cols;
        browser.lw->rows = rows;
 }
 
 static void
-paint(void)
+screen_search_paint(void)
 {
        if (browser.filelist) {
                browser.lw->hide_cursor = false;
@@ -405,7 +388,7 @@ paint(void)
 }
 
 static const char *
-get_title(char *str, size_t size)
+screen_search_get_title(char *str, size_t size)
 {
        if (advanced_search_mode && pattern)
                g_snprintf(str, size, _("Search: %s"), pattern);
@@ -422,8 +405,17 @@ get_title(char *str, size_t size)
        return str;
 }
 
+static void
+screen_search_update(struct mpdclient *c)
+{
+       if (browser.filelist != NULL && c->events & MPD_IDLE_PLAYLIST) {
+               screen_browser_sync_highlights(browser.filelist, &c->playlist);
+               search_repaint();
+       }
+}
+
 static bool
-search_cmd(struct mpdclient *c, command_t cmd)
+screen_search_cmd(struct mpdclient *c, command_t cmd)
 {
        switch (cmd) {
        case CMD_SEARCH_MODE:
@@ -435,12 +427,13 @@ search_cmd(struct mpdclient *c, command_t cmd)
                /* continue and update... */
        case CMD_SCREEN_UPDATE:
                if (pattern) {
-                       search_clear(c, FALSE);
+                       search_clear(false);
                        browser.filelist = filelist_search(c,
                                                          FALSE,
                                                          mode[options.search_mode].table,
                                                          pattern);
-                       sync_highlights(c, browser.filelist);
+                       screen_browser_sync_highlights(browser.filelist,
+                                                      &c->playlist);
                }
                search_repaint();
                return true;
@@ -451,7 +444,7 @@ search_cmd(struct mpdclient *c, command_t cmd)
                return true;
 
        case CMD_CLEAR:
-               search_clear(c, TRUE);
+               search_clear(true);
                list_window_reset(browser.lw);
                search_repaint();
                return true;
@@ -471,11 +464,12 @@ search_cmd(struct mpdclient *c, command_t cmd)
 }
 
 const struct screen_functions screen_search = {
-       .init = init,
-       .exit = quit,
-       .open = open,
-       .resize = resize,
-       .paint = paint,
-       .cmd = search_cmd,
-       .get_title = get_title,
+       .init = screen_search_init,
+       .exit = screen_search_quit,
+       .open = screen_search_open,
+       .resize = screen_search_resize,
+       .paint = screen_search_paint,
+       .update = screen_search_update,
+       .cmd = screen_search_cmd,
+       .get_title = screen_search_get_title,
 };