![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_play.c b/src/screen_play.c
index 4b50f7459916481650c5735c6732f2ce6b055c39..eb26893c1e5ace2e61fe1d26f2af1280fa381f86 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
- *
+/* 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 "config.h"
#include "i18n.h"
#include "charset.h"
#include "options.h"
-#include "support.h"
#include "mpdclient.h"
#include "utils.h"
#include "strfsong.h"
#include "screen.h"
#include "screen_utils.h"
#include "screen_play.h"
-#include "gcc.h"
+
+#ifndef NCMPC_MINI
+#include "hscroll.h"
+#endif
#include <ctype.h>
#include <stdlib.h>
case PLAYLIST_EVENT_DELETE:
break;
case PLAYLIST_EVENT_MOVE:
- lw->selected = *((int *) data);
- if (lw->selected < lw->start)
- lw->start--;
+ if(lw->visual_selection < 0)
+ {
+ lw->selected = *((int *) data);
+ if (lw->selected < lw->start)
+ lw->start--;
+ }
break;
default:
break;
}
static const char *
-list_callback(unsigned idx, int *highlight, mpd_unused void *data)
+list_callback(unsigned idx, bool *highlight, G_GNUC_UNUSED void *data)
{
static char songname[MAX_SONG_LENGTH];
+#ifndef NCMPC_MINI
+ static scroll_state_t st;
+#endif
mpd_Song *song;
if (playlist == NULL || idx >= playlist_length(playlist))
song = playlist_get(playlist, idx);
if (song->id == current_song_id)
- *highlight = 1;
+ *highlight = true;
strfsong(songname, MAX_SONG_LENGTH, options.list_format, song);
+
+#ifndef NCMPC_MINI
+ if (options.scroll && (unsigned)song->pos == lw->selected &&
+ utf8_width(songname) > (unsigned)COLS) {
+ static unsigned current_song;
+ char *tmp;
+
+ if (current_song != lw->selected) {
+ st.offset = 0;
+ current_song = lw->selected;
+ }
+
+ tmp = strscroll(songname, options.scroll_sep,
+ MAX_SONG_LENGTH, &st);
+ g_strlcpy(songname, tmp, MAX_SONG_LENGTH);
+ g_free(tmp);
+ } else if ((unsigned)song->pos == lw->selected)
+ st.offset = 0;
+#endif
+
return songname;
}
/* make sure the cursor is in the window */
lw->selected = lw->start+offset;
+ lw->selected_start = lw->selected;
+ lw->selected_end = lw->selected;
list_window_check_selected(lw, length);
}
#ifndef NCMPC_MINI
static void
-save_pre_completion_cb(GCompletion *gcmp, mpd_unused gchar *line, void *data)
+save_pre_completion_cb(GCompletion *gcmp, G_GNUC_UNUSED gchar *line,
+ void *data)
{
completion_callback_data_t *tmp = (completion_callback_data_t *)data;
GList **list = tmp->list;
}
static void
-save_post_completion_cb(mpd_unused GCompletion *gcmp, mpd_unused gchar *line,
- GList *items, mpd_unused void *data)
+save_post_completion_cb(G_GNUC_UNUSED GCompletion *gcmp,
+ G_GNUC_UNUSED gchar *line, GList *items,
+ G_GNUC_UNUSED void *data)
{
if (g_list_length(items) >= 1)
screen_display_completion_list(items);
}
#endif
+#ifndef NCMPC_MINI
+/**
+ * Wrapper for strncmp(). We are not allowed to pass &strncmp to
+ * g_completion_set_compare(), because strncmp() takes size_t where
+ * g_completion_set_compare passes a gsize value.
+ */
+static gint
+completion_strncmp(const gchar *s1, const gchar *s2, gsize n)
+{
+ return strncmp(s1, s2, n);
+}
+#endif
+
int
playlist_save(mpdclient_t *c, char *name, char *defaultname)
{
if (name == NULL) {
/* initialize completion support */
gcmp = g_completion_new(NULL);
- g_completion_set_compare(gcmp, strncmp);
+ g_completion_set_compare(gcmp, completion_strncmp);
data.list = &list;
data.dir_list = NULL;
data.c = c;
return error;
}
- screen_status_printf(_("Aborted!"));
+ screen_status_printf(_("Aborted"));
}
g_free(filename);
/* initialize completion support */
gcmp = g_completion_new(NULL);
- g_completion_set_compare(gcmp, strncmp);
+ g_completion_set_compare(gcmp, completion_strncmp);
data.list = &list;
data.dir_list = &dir_list;
data.c = c;
/* hide the cursor when mpd is playing and the user is inactive */
if (c->status != NULL && c->status->state == MPD_STATUS_STATE_PLAY) {
- lw->flags |= LW_HIDE_CURSOR;
+ lw->hide_cursor = true;
playlist_repaint();
} else
timer_hide_cursor_id = g_timeout_add(options.hide_cursor * 1000,
assert(timer_hide_cursor_id == 0);
if (options.hide_cursor > 0) {
- lw->flags &= ~LW_HIDE_CURSOR;
+ lw->hide_cursor = false;
timer_hide_cursor_id = g_timeout_add(options.hide_cursor * 1000,
timer_hide_cursor, c);
}
center_playing_item(c);
playlist_repaint();
+#ifndef NCMPC_MINI
+ } else if (options.scroll) {
+ /* always repaint if horizontal scrolling is
+ enabled */
+ playlist_repaint();
+#endif
}
}
static bool
play_cmd(mpdclient_t *c, command_t cmd)
{
- lw->flags &= ~LW_HIDE_CURSOR;
+ lw->hide_cursor = false;
if (options.hide_cursor > 0) {
if (timer_hide_cursor_id != 0)
mpdclient_cmd_play(c, lw->selected);
return true;
case CMD_DELETE:
- mpdclient_cmd_delete(c, lw->selected);
+ {
+ int i = lw->selected_end, start = lw->selected_start;
+ for(; i >= start; --i)
+ mpdclient_cmd_delete(c, i);
+
+ i++;
+ if(i >= (int)playlist_length(&c->playlist))
+ i--;
+ lw->selected = i;
+ lw->selected_start = i;
+ lw->selected_end = i;
+ lw->visual_selection = false;
+
return true;
+ }
case CMD_SAVE_PLAYLIST:
playlist_save(c, NULL, NULL);
return true;
center_playing_item(c);
playlist_repaint();
return false;
+ case CMD_SHUFFLE:
+ {
+ unsigned i = lw->selected_start + 1;
+ unsigned last_selected = lw->selected;
+ if(!lw->visual_selection)
+ /* No visual selection, shuffle all list. */
+ break;
+ for(; i <= lw->selected_end; ++i)
+ mpdclient_cmd_move(c, i, lw->selected_start + (rand() % ((i - lw->selected_start) + 1)));
+
+ lw->selected = last_selected;
+ screen_status_printf(_("Shuffled selection!"));
+ return true;
+ }
case CMD_LIST_MOVE_UP:
- mpdclient_cmd_move(c, lw->selected, lw->selected-1);
+ if(lw->selected_start == 0)
+ return false;
+ if(lw->visual_selection)
+ {
+ unsigned i = lw->selected_start;
+ unsigned last_selected = lw->selected;
+ for(; i <= lw->selected_end; ++i)
+ mpdclient_cmd_move(c, i, i-1);
+ lw->selected_start--;
+ lw->selected_end--;
+ lw->selected = last_selected - 1;
+ lw->visual_base--;
+ }
+ else
+ mpdclient_cmd_move(c, lw->selected, lw->selected-1);
return true;
case CMD_LIST_MOVE_DOWN:
- mpdclient_cmd_move(c, lw->selected, lw->selected+1);
+ if(lw->selected_end+1 >= playlist_length(&c->playlist))
+ return false;
+ if(lw->visual_selection)
+ {
+ int i = lw->selected_end;
+ unsigned last_selected = lw->selected;
+ for(; i >= (int)lw->selected_start; --i)
+ mpdclient_cmd_move(c, i, i+1);
+ lw->selected_start++;
+ lw->selected_end++;
+ lw->selected = last_selected + 1;
+ lw->visual_base++;
+ }
+ else
+ mpdclient_cmd_move(c, lw->selected, lw->selected+1);
return true;
case CMD_LIST_FIND:
case CMD_LIST_RFIND:
return handle_mouse_event(c);
#endif
+#ifdef ENABLE_SONG_SCREEN
+ case CMD_VIEW:
+ if (lw->selected < playlist_length(&c->playlist)) {
+ screen_song_switch(c, playlist_get(&c->playlist, lw->selected));
+ return true;
+ }
+
+ break;
+#endif
+
case CMD_LOCATE:
if (lw->selected < playlist_length(&c->playlist)) {
screen_file_goto_song(c, playlist_get(&c->playlist, lw->selected));