![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_search.c b/src/screen_search.c
index 723409028565cde135932103b93b55f3c44d0d3f..bf9278b53fa4c6280c946c486fad02ed8f042660 100644 (file)
--- a/src/screen_search.c
+++ b/src/screen_search.c
*
*/
-#include "config.h"
-
-#ifndef DISABLE_SEARCH_SCREEN
-#include "ncmpc.h"
+#include "i18n.h"
#include "options.h"
-#include "support.h"
+#include "charset.h"
#include "mpdclient.h"
#include "strfsong.h"
#include "command.h"
#include <glib.h>
#include <ncurses.h>
-/* new search stuff with qball's libmpdclient */
-#define FUTURE
-
-#ifdef FUTURE
-
-extern gint mpdclient_finish_command(mpdclient_t *c);
-
-typedef struct {
- int id;
+static const struct {
const char *name;
const char *localname;
-} search_tag_t;
-
-static search_tag_t search_tag[] = {
- { MPD_TAG_ITEM_ARTIST, "artist", N_("artist") },
- { MPD_TAG_ITEM_ALBUM, "album", N_("album") },
- { MPD_TAG_ITEM_TITLE, "title", N_("title") },
- { MPD_TAG_ITEM_TRACK, "track", N_("track") },
- { MPD_TAG_ITEM_NAME, "name", N_("name") },
- { MPD_TAG_ITEM_GENRE, "genre", N_("genre") },
- { MPD_TAG_ITEM_DATE, "date", N_("date") },
- { MPD_TAG_ITEM_COMPOSER, "composer", N_("composer") },
- { MPD_TAG_ITEM_PERFORMER, "performer", N_("performer") },
- { MPD_TAG_ITEM_COMMENT, "comment", N_("comment") },
- { MPD_TAG_ITEM_FILENAME, "filename", N_("file") },
- { -1, NULL, NULL }
+} search_tag[MPD_TAG_NUM_OF_ITEM_TYPES] = {
+ [MPD_TAG_ITEM_ARTIST] = { "artist", N_("artist") },
+ [MPD_TAG_ITEM_ALBUM] = { "album", N_("album") },
+ [MPD_TAG_ITEM_TITLE] = { "title", N_("title") },
+ [MPD_TAG_ITEM_TRACK] = { "track", N_("track") },
+ [MPD_TAG_ITEM_NAME] = { "name", N_("name") },
+ [MPD_TAG_ITEM_GENRE] = { "genre", N_("genre") },
+ [MPD_TAG_ITEM_DATE] = { "date", N_("date") },
+ [MPD_TAG_ITEM_COMPOSER] = { "composer", N_("composer") },
+ [MPD_TAG_ITEM_PERFORMER] = { "performer", N_("performer") },
+ [MPD_TAG_ITEM_COMMENT] = { "comment", N_("comment") },
+ [MPD_TAG_ITEM_FILENAME] = { "filename", N_("file") },
};
static int
search_get_tag_id(char *name)
{
- int i = 0;
+ unsigned i;
- while (search_tag[i].name) {
- if (strcasecmp(search_tag[i].name, name) == 0 ||
- strcasecmp(search_tag[i].localname, name) == 0)
- return search_tag[i].id;
- i++;
- }
+ for (i = 0; i < MPD_TAG_NUM_OF_ITEM_TYPES; ++i)
+ if (search_tag[i].name != NULL &&
+ (strcasecmp(search_tag[i].name, name) == 0 ||
+ strcasecmp(search_tag[i].localname, name) == 0))
+ return i;
return -1;
}
-#endif
-
#define SEARCH_TITLE 0
#define SEARCH_ARTIST 1
#define SEARCH_ALBUM 2
return NULL;
}
+static void
+paint(void);
+
+static void
+search_repaint(void)
+{
+ paint();
+ wrefresh(browser.lw->w);
+}
+
+static void
+search_repaint_if_active(void)
+{
+ if (screen_is_visible(&screen_search))
+ search_repaint();
+}
+
/* the playlist have been updated -> fix highlights */
static void
playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
{
browser_playlist_changed(&browser, c, event, data);
+ search_repaint_if_active();
}
/* sanity check search mode value */
}
}
-#ifdef FUTURE
static mpdclient_filelist_t *
filelist_search(mpdclient_t *c, mpd_unused int exact_match, int table,
gchar *local_pattern)
}
filelist_sort(list, compare_filelistentry_format);
- list->updated = TRUE;
} else {
list = mpdclient_filelist_search(c, FALSE, table, local_pattern);
if (list == NULL)
i=0;
while (strv[i]) {
- D("strv[%d] = \"%s\"\n", i, strv[i]);
i++;
}
arg[j] = g_strdup_printf("%s %s", arg[j], strv[i]);
g_free(tmp);
} else {
- D("Bad search tag %s\n", strv[i]);
screen_status_printf(_("Bad search tag %s"), strv[i]);
}
i++;
} else if (strv[i+1] == NULL || strlen(strv[i+1]) == 0) {
- D("No argument for search tag %s\n", strv[i]);
screen_status_printf(_("No argument for search tag %s"), strv[i]);
i++;
// j--;
if (mpdclient_finish_command(c) && fl)
filelist_free(fl);
-
- fl->updated = TRUE;
}
i=0;
return fl;
}
-#else
-#define search_advanced_query(pattern,c) (NULL)
-#endif
static void
search_new(screen_t *screen, mpdclient_t *c)
}
static void
-paint(mpd_unused screen_t *screen, mpdclient_t *c)
+paint(void)
{
if (browser.filelist) {
browser.lw->flags = 0;
list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
- browser.filelist->updated = FALSE;
} else {
browser.lw->flags = LW_HIDE_CURSOR;
list_window_paint(browser.lw, lw_search_help_callback, NULL);
- if( !MPD_VERSION_LT(c, 0, 12, 0) )
- g_strdup_printf("Advanced search disabled (MPD version < 0.12.0");
- // wmove(lw->w, 0, 0);
- //wclrtobot(lw->w);
}
}
-static void
-update(screen_t *screen, mpdclient_t *c)
-{
- if (browser.filelist == NULL || browser.filelist->updated) {
- paint(screen, c);
- return;
- }
-
- list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
-}
-
static const char *
get_title(char *str, size_t size)
{
search_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
{
switch (cmd) {
- case CMD_PLAY:
- browser_handle_enter(&browser, c);
- return 1;
-
- case CMD_SELECT:
- if (browser_handle_select(&browser, c) == 0) {
- /* continue and select next item... */
- cmd = CMD_LIST_NEXT;
- }
- /* call list_window_cmd to go to the next item */
- return list_window_cmd(browser.lw, filelist_length(browser.filelist), cmd);
-
- case CMD_SELECT_ALL:
- browser_handle_select_all(&browser, c);
- paint (screen, c);
- return 0;
-
case CMD_SEARCH_MODE:
options.search_mode++;
if (mode[options.search_mode].label == NULL)
pattern);
sync_highlights(c, browser.filelist);
}
+ search_repaint();
return 1;
case CMD_SCREEN_SEARCH:
search_new(screen, c);
+ search_repaint();
return 1;
case CMD_CLEAR:
search_clear(screen, c, TRUE);
list_window_reset(browser.lw);
+ search_repaint();
return 1;
- case CMD_LIST_FIND:
- case CMD_LIST_RFIND:
- case CMD_LIST_FIND_NEXT:
- case CMD_LIST_RFIND_NEXT:
- if (browser.filelist)
- return screen_find(screen,
- browser.lw, filelist_length(browser.filelist),
- cmd, browser_lw_callback,
- browser.filelist);
- else
- return 1;
-
- case CMD_MOUSE_EVENT:
- return browser_handle_mouse_event(&browser, c);
-
default:
- if (browser.filelist)
- return list_window_cmd(browser.lw,
- filelist_length(browser.filelist), cmd);
+ break;
+ }
+
+ if (browser.filelist != NULL &&
+ browser_cmd(&browser, screen, c, cmd)) {
+ search_repaint();
+ return 1;
}
return 0;
.open = open,
.resize = resize,
.paint = paint,
- .update = update,
.cmd = search_cmd,
.get_title = get_title,
};
-
-#endif /* ENABLE_SEARCH_SCREEN */