![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_browser.c b/src/screen_browser.c
index 6d23980208061a1f5d9bd48ec5f764d28a6c17eb..29dd4bfa49f3865f524e6ae98e55a6fd1aac8853 100644 (file)
--- a/src/screen_browser.c
+++ b/src/screen_browser.c
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
- * Copyright (C) 2008 Max Kellermann <max@duempel.org>
- *
+/* 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
- *
- */
+
+ * 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_browser.h"
-#include "ncmpc.h"
+#include "i18n.h"
#include "options.h"
-#include "support.h"
+#include "charset.h"
#include "strfsong.h"
#include "screen_utils.h"
-#include "gcc.h"
#include <string.h>
-#define USE_OLD_LAYOUT
-#undef USE_OLD_ADD
-
#define BUFSIZE 1024
+#ifndef NCMPC_MINI
#define HIGHLIGHT (0x01)
+#endif
+
+static const char playlist_format[] = "*%s*";
+
+#ifndef NCMPC_MINI
/* clear the highlight flag for all items in the filelist */
static void
static void
set_highlight(mpdclient_filelist_t *fl, mpd_Song *song, int highlight)
{
- struct filelist_entry *entry = filelist_find_song(fl, song);
- mpd_InfoEntity *entity;
+ int i = filelist_find_song(fl, song);
+ struct filelist_entry *entry;
- if (entry == NULL)
+ if (i < 0)
return;
- entity = entry->entity;
+ entry = filelist_get(fl, i);
if (highlight)
entry->flags |= HIGHLIGHT;
else
}
}
-/* the playlist have been updated -> fix highlights */
+/* the playlist has been updated -> fix highlights */
void
browser_playlist_changed(struct screen_browser *browser, mpdclient_t *c,
int event, gpointer data)
}
}
+#endif
+
/* list_window callback */
const char *
-browser_lw_callback(unsigned idx, int *highlight, void *data)
+browser_lw_callback(unsigned idx, bool *highlight, void *data)
{
static char buf[BUFSIZE];
mpdclient_filelist_t *fl = (mpdclient_filelist_t *) data;
assert(entry != NULL);
entity = entry->entity;
- *highlight = (entry->flags & HIGHLIGHT);
+#ifndef NCMPC_MINI
+ *highlight = (entry->flags & HIGHLIGHT) != 0;
+#else
+ *highlight = false;
+#endif
if( entity == NULL )
return "[..]";
if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) {
mpd_Directory *dir = entity->info.directory;
- char *directory = utf8_to_locale(basename(dir->path));
+ char *directory = utf8_to_locale(g_basename(dir->path));
g_snprintf(buf, BUFSIZE, "[%s]", directory);
g_free(directory);
} else if( entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
mpd_Song *song = entity->info.song;
- strfsong(buf, BUFSIZE, LIST_FORMAT, song);
+ strfsong(buf, BUFSIZE, options.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));
+ char *filename = utf8_to_locale(g_basename(plf->path));
-#ifdef USE_OLD_LAYOUT
- g_snprintf(buf, BUFSIZE, "*%s*", filename);
-#else
- g_snprintf(buf, BUFSIZE, "<Playlist> %s", filename);
-#endif
+ g_snprintf(buf, BUFSIZE, playlist_format, filename);
g_free(filename);
return buf;
}
}
/* chdir */
-int
+bool
browser_change_directory(struct screen_browser *browser, mpdclient_t *c,
filelist_entry_t *entry, const char *new_path)
{
mpd_InfoEntity *entity = NULL;
gchar *path = NULL;
+ char *old_path;
+ int idx;
if( entry!=NULL )
entity = entry->entity;
else if( new_path==NULL )
- return -1;
+ return false;
if( entity==NULL ) {
if( entry || 0==strcmp(new_path, "..") ) {
if( strcmp(parent, ".") == 0 )
parent[0] = '\0';
path = g_strdup(parent);
- list_window_reset(browser->lw);
- /* restore previous list window state */
- list_window_pop_state(browser->lw_state, browser->lw);
+ g_free(parent);
} else {
/* entry==NULL, then new_path ("" is root) */
path = g_strdup(new_path);
- list_window_reset(browser->lw);
- /* restore first list window state (pop while returning true) */
- while(list_window_pop_state(browser->lw_state, browser->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(browser->lw_state, browser->lw);
+ path = g_strdup(dir->path);
+ } else
+ return false;
+
+ if (browser->filelist != NULL) {
+ old_path = g_strdup(browser->filelist->path);
+ filelist_free(browser->filelist);
} else
- return -1;
+ old_path = NULL;
- filelist_free(browser->filelist);
browser->filelist = mpdclient_filelist_get(c, path);
+#ifndef NCMPC_MINI
sync_highlights(c, browser->filelist);
- list_window_check_selected(browser->lw, filelist_length(browser->filelist));
+#endif
+
+ idx = old_path != NULL
+ ? filelist_find_directory(browser->filelist, old_path)
+ : -1;
+ g_free(old_path);
+
+ list_window_reset(browser->lw);
+ if (idx >= 0) {
+ list_window_set_selected(browser->lw, idx);
+ list_window_center(browser->lw,
+ filelist_length(browser->filelist), idx);
+ }
+
g_free(path);
- return 0;
+ return true;
}
-static int
+static bool
load_playlist(mpdclient_t *c, filelist_entry_t *entry)
{
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));
+ if (mpdclient_cmd_load_playlist(c, plf->path) == 0)
+ screen_status_printf(_("Loading playlist %s..."),
+ g_basename(filename));
g_free(filename);
- return 0;
+ return true;
}
-static int
+static bool
enqueue_and_play(mpdclient_t *c, filelist_entry_t *entry)
{
int idx;
mpd_InfoEntity *entity = entry->entity;
mpd_Song *song = entity->info.song;
+#ifndef NCMPC_MINI
if (!(entry->flags & HIGHLIGHT)) {
+#endif
if (mpdclient_cmd_add(c, song) == 0) {
char buf[BUFSIZE];
+#ifndef NCMPC_MINI
entry->flags |= HIGHLIGHT;
- strfsong(buf, BUFSIZE, LIST_FORMAT, song);
- screen_status_printf(_("Adding \'%s\' to playlist\n"), buf);
+#endif
+ strfsong(buf, BUFSIZE, options.list_format, song);
+ screen_status_printf(_("Adding \'%s\' to playlist"), buf);
mpdclient_update(c); /* get song id */
} else
- return -1;
+ return false;
+#ifndef NCMPC_MINI
}
+#endif
idx = playlist_get_index_from_file(c, song->file);
mpdclient_cmd_play(c, idx);
- return 0;
+ return true;
}
static struct filelist_entry *
return filelist_get(browser->filelist, browser->lw->selected);
}
-static int
+static struct filelist_entry *
+browser_get_index(const struct screen_browser *browser, unsigned i)
+{
+ if (browser->filelist == NULL ||
+ i >= filelist_length(browser->filelist))
+ return NULL;
+
+ return filelist_get(browser->filelist, i);
+}
+
+static bool
browser_handle_enter(struct screen_browser *browser, mpdclient_t *c)
{
struct filelist_entry *entry = browser_get_selected(browser);
mpd_InfoEntity *entity;
- if( entry==NULL )
- return -1;
+ if( entry==NULL || browser->lw->selected_start < browser->lw->selected_end)
+ return false;
entity = entry->entity;
if (entity == NULL || entity->type == MPD_INFO_ENTITY_TYPE_DIRECTORY)
return load_playlist(c, entry);
else if (entity->type == MPD_INFO_ENTITY_TYPE_SONG)
return enqueue_and_play(c, entry);
- return -1;
-}
-
-
-#ifdef USE_OLD_ADD
-/* NOTE - The add_directory functions should move to mpdclient.c */
-extern gint mpdclient_finish_command(mpdclient_t *c);
-
-static int
-add_directory(mpdclient_t *c, char *dir)
-{
- 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);
- } 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;
+ return false;
}
-#endif
-static int
+static bool
browser_select_entry(mpdclient_t *c, filelist_entry_t *entry,
- gboolean toggle)
+ G_GNUC_UNUSED gboolean toggle)
{
assert(entry != NULL);
assert(entry->entity != NULL);
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) {
+
+ if (mpdclient_cmd_add_path(c, dir->path) == 0) {
char *tmp = utf8_to_locale(dir->path);
- screen_status_printf(_("Adding \'%s\' to playlist\n"), tmp);
+ screen_status_printf(_("Adding \'%s\' to playlist"), tmp);
g_free(tmp);
}
-#endif
- return 0;
+
+ return true;
}
if (entry->entity->type != MPD_INFO_ENTITY_TYPE_SONG)
- return -1;
+ return false;
assert(entry->entity->info.song != NULL);
- if (!toggle || (entry->flags & HIGHLIGHT) == 0) {
+#ifndef NCMPC_MINI
+ if (!toggle || (entry->flags & HIGHLIGHT) == 0)
+#endif
+ {
mpd_Song *song = entry->entity->info.song;
+#ifndef NCMPC_MINI
entry->flags |= HIGHLIGHT;
+#endif
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);
+ strfsong(buf, BUFSIZE, options.list_format, song);
+ screen_status_printf(_("Adding \'%s\' to playlist"), buf);
}
+#ifndef NCMPC_MINI
} else {
/* remove song from playlist */
mpd_Song *song = entry->entity->info.song;
while ((idx = playlist_get_index_from_file(c, song->file)) >=0)
mpdclient_cmd_delete(c, idx);
+#endif
}
- return 0;
+ return true;
}
-static int
+static bool
browser_handle_select(struct screen_browser *browser, mpdclient_t *c)
{
- struct filelist_entry *entry = browser_get_selected(browser);
+ struct filelist_entry *entry;
+
+ if (browser->lw->range_selection) {
+ for (unsigned i = browser->lw->selected_start;
+ i <= browser->lw->selected_end; i++) {
+ entry = browser_get_index(browser, i);
+
+ if (entry != NULL && entry->entity != NULL)
+ browser_select_entry(c, entry, TRUE);
+ }
+ return false;
+ } else {
+ entry = browser_get_selected(browser);
- if (entry == NULL || entry->entity == NULL)
- return -1;
+ if (entry == NULL || entry->entity == NULL)
+ return false;
- return browser_select_entry(c, entry, TRUE);
+ return browser_select_entry(c, entry, TRUE);
+ }
}
-static int
+static bool
browser_handle_add(struct screen_browser *browser, mpdclient_t *c)
{
- struct filelist_entry *entry = browser_get_selected(browser);
+ struct filelist_entry *entry;
+
+ if (browser->lw->range_selection) {
+ for (unsigned i = browser->lw->selected_start;
+ i <= browser->lw->selected_end; i++) {
+ entry = browser_get_index(browser, i);
+
+ if (entry != NULL && entry->entity != NULL)
+ browser_select_entry(c, entry, FALSE);
+ }
+ return false;
+ } else {
+ entry = browser_get_selected(browser);
- if (entry == NULL || entry->entity == NULL)
- return -1;
+ if (entry == NULL || entry->entity == NULL)
+ return false;
- return browser_select_entry(c, entry, FALSE);
+ return browser_select_entry(c, entry, FALSE);
+ }
}
static void
#endif
bool
-browser_cmd(struct screen_browser *browser, struct screen *screen,
+browser_cmd(struct screen_browser *browser,
struct mpdclient *c, command_t cmd)
{
struct filelist_entry *entry;
return true;
case CMD_SELECT:
- if (browser_handle_select(browser, c) == 0)
+ if (browser_handle_select(browser, c))
/* continue and select next item... */
cmd = CMD_LIST_NEXT;
break;
case CMD_ADD:
- if (browser_handle_add(browser, c) == 0)
+ if (browser_handle_add(browser, c))
/* continue and select next item... */
cmd = CMD_LIST_NEXT;
case CMD_LIST_RFIND:
case CMD_LIST_FIND_NEXT:
case CMD_LIST_RFIND_NEXT:
- screen_find(screen,
- browser->lw, filelist_length(browser->filelist),
+ screen_find(browser->lw, filelist_length(browser->filelist),
cmd, browser_lw_callback,
browser->filelist);
return true;
+ case CMD_LIST_JUMP:
+ screen_jump(browser->lw, browser_lw_callback, browser->filelist);
+ return true;
#ifdef HAVE_GETMOUSE
case CMD_MOUSE_EVENT:
return true;
#endif
+#ifdef ENABLE_SONG_SCREEN
+ case CMD_SCREEN_SONG:
+ entry = browser_get_selected(browser);
+ if (entry == NULL || entry->entity == NULL ||
+ entry->entity->type != MPD_INFO_ENTITY_TYPE_SONG)
+ return false;
+
+ screen_song_switch(c, entry->entity->info.song);
+ return true;
+#endif
+
+ case CMD_LOCATE:
+ entry = browser_get_selected(browser);
+ if (entry == NULL || entry->entity == NULL ||
+ entry->entity->type != MPD_INFO_ENTITY_TYPE_SONG)
+ return false;
+
+ screen_file_goto_song(c, entry->entity->info.song);
+ return true;
+
#ifdef ENABLE_LYRICS_SCREEN
case CMD_SCREEN_LYRICS:
entry = browser_get_selected(browser);
screen_lyrics_switch(c, entry->entity->info.song);
return true;
#endif
+ case CMD_SCREEN_SWAP:
+ entry = browser_get_selected(browser);
+ if (entry->entity != NULL &&
+ entry->entity->type == MPD_INFO_ENTITY_TYPE_SONG)
+ screen_swap(c, entry->entity->info.song);
+ else
+ screen_swap(c, NULL);
+ return true;
default:
break;