![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_play.c b/src/screen_play.c
index 3bb16ee638d49fa20e3a7102960468c25d981dce..58bf65a545c988d1df68412fa644df30b2c51d8a 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
-/*
- * $Id$
- *
+/*
* (c) 2004 by Kalle Wallin <kaw@linux.se>
*
* This program is free software; you can redistribute it and/or modify
*
*/
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <ncurses.h>
-#include <panel.h>
-
#include "config.h"
-#include "ncmpc.h"
+#include "i18n.h"
#include "options.h"
#include "support.h"
#include "mpdclient.h"
#include "colors.h"
#include "screen.h"
#include "screen_utils.h"
+#include "screen_play.h"
+#include "gcc.h"
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <glib.h>
#define MAX_SONG_LENGTH 512
+#ifndef NCMPC_MINI
+typedef struct
+{
+ GList **list;
+ GList **dir_list;
+ mpdclient_t *c;
+} completion_callback_data_t;
+#endif
+
+static struct mpdclient_playlist *playlist;
+static int current_song_id = -1;
static list_window_t *lw = NULL;
+static guint timer_hide_cursor_id;
+
+static void
+play_paint(void);
-static void
+static void
+playlist_repaint(void)
+{
+ play_paint();
+ wrefresh(lw->w);
+}
+
+static void
+playlist_repaint_if_active(void)
+{
+ if (screen_is_visible(&screen_playlist))
+ playlist_repaint();
+}
+
+static void
playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
{
- D("screen_play.c> playlist_callback() [%d]\n", event);
- switch(event)
- {
- case PLAYLIST_EVENT_DELETE:
- break;
- case PLAYLIST_EVENT_MOVE:
- lw->selected = *((int *) data);
- break;
- default:
- break;
- }
- /* make shure the playlist is repainted */
- lw->clear = 1;
- lw->repaint = 1;
- list_window_check_selected(lw, c->playlist.length);
+ switch (event) {
+ case PLAYLIST_EVENT_DELETE:
+ break;
+ case PLAYLIST_EVENT_MOVE:
+ lw->selected = *((int *) data);
+ if (lw->selected < lw->start)
+ lw->start--;
+ break;
+ default:
+ break;
+ }
+
+ list_window_check_selected(lw, c->playlist.list->len);
+ playlist_repaint_if_active();
}
-static char *
-list_callback(int index, int *highlight, void *data)
+static const char *
+list_callback(unsigned idx, int *highlight, mpd_unused void *data)
{
- static char songname[MAX_SONG_LENGTH];
- mpdclient_t *c = (mpdclient_t *) data;
- mpd_Song *song;
-
- *highlight = 0;
- if( (song=playlist_get_song(c, index)) == NULL )
- {
- return NULL;
- }
-
- if( c->song && song->id==c->song->id && !IS_STOPPED(c->status->state) )
- {
- *highlight = 1;
- }
- strfsong(songname, MAX_SONG_LENGTH, LIST_FORMAT, song);
- return songname;
+ static char songname[MAX_SONG_LENGTH];
+ mpd_Song *song;
+
+ if (playlist == NULL || idx >= playlist_length(playlist))
+ return NULL;
+
+ song = playlist_get(playlist, idx);
+ if (song->id == current_song_id)
+ *highlight = 1;
+
+ strfsong(songname, MAX_SONG_LENGTH, options.list_format, song);
+ return songname;
}
-static int
-center_playing_item(screen_t *screen, mpdclient_t *c)
+static void
+center_playing_item(mpdclient_t *c)
{
- int length = c->playlist.length;
- int offset = lw->selected-lw->start;
- int index;
-
- if( !lw || !c->song || length<lw->rows || IS_STOPPED(c->status->state) )
- return 0;
-
- /* try to center the song that are playing */
- index = playlist_get_index(c, c->song);
- D("Autocenter song id:%d pos:%d index:%d\n", c->song->id,c->song->pos,index);
- lw->start = index-(lw->rows/2);
- if( lw->start+lw->rows > length )
- lw->start = length-lw->rows;
- if( lw->start<0 )
- lw->start=0;
-
- /* make sure the cursor is in the window */
- lw->selected = lw->start+offset;
- list_window_check_selected(lw, length);
-
- lw->clear = 1;
- lw->repaint = 1;
-
- return 0;
+ unsigned length = c->playlist.list->len;
+ unsigned offset = lw->selected - lw->start;
+ int idx;
+
+ if (!c->song || length < lw->rows ||
+ c->status == NULL || IS_STOPPED(c->status->state))
+ return;
+
+ /* try to center the song that are playing */
+ idx = playlist_get_index(c, c->song);
+ if (idx < 0)
+ return;
+
+ list_window_center(lw, length, idx);
+
+ /* make sure the cursor is in the window */
+ lw->selected = lw->start+offset;
+ list_window_check_selected(lw, length);
}
-static int
-handle_save_playlist(screen_t *screen, mpdclient_t *c, char *name)
+#ifndef NCMPC_MINI
+static void
+save_pre_completion_cb(GCompletion *gcmp, mpd_unused gchar *line, void *data)
{
- gchar *filename;
- gint error;
-
- if( name==NULL )
- {
- /* query the user for a filename */
- filename=screen_getstr(screen->status_window.w, _("Save playlist as: "));
- filename=trim(filename);
- }
- else
- {
- filename=g_strdup(name);
- }
- if( filename==NULL || filename[0]=='\0' )
- return -1;
- /* send save command to mpd */
- D("Saving playlist as \'%s \'...\n", filename);
- if( (error=mpdclient_cmd_save_playlist(c, filename)) )
- {
- gint code = GET_ACK_ERROR_CODE(error);
-
- if( code == MPD_ACK_ERROR_EXIST )
- {
- char buf[256];
- int key;
-
- snprintf(buf, 256, _("Replace %s [%s/%s] ? "), filename, YES, NO);
- key = tolower(screen_getch(screen->status_window.w, buf));
- if( key == YES[0] )
- {
- char *filename_utf8 = locale_to_utf8(filename);
-
- if( mpdclient_cmd_delete_playlist(c, filename_utf8) )
- {
- g_free(filename);
- g_free(filename_utf8);
- return -1;
- }
- g_free(filename_utf8);
- error = handle_save_playlist(screen, c, filename);
- g_free(filename);
- return error;
- }
- screen_status_printf(_("Aborted!"));
+ completion_callback_data_t *tmp = (completion_callback_data_t *)data;
+ GList **list = tmp->list;
+ mpdclient_t *c = tmp->c;
+
+ if( *list == NULL ) {
+ /* create completion list */
+ *list = gcmp_list_from_path(c, "", NULL, GCMP_TYPE_PLAYLIST);
+ g_completion_add_items(gcmp, *list);
}
- g_free(filename);
- return -1;
- }
- /* success */
- screen_status_printf(_("Saved %s"), filename);
- g_free(filename);
- return 0;
}
-static int
-handle_add_to_playlist(screen_t *screen, mpdclient_t *c)
+static void
+save_post_completion_cb(mpd_unused GCompletion *gcmp, mpd_unused gchar *line,
+ GList *items, mpd_unused void *data)
{
- gchar *path;
- GCompletion *gcmp;
- GList *list = NULL;
- GList *dir_list = NULL;
-
- void add_dir(gchar *dir)
- {
- g_completion_remove_items(gcmp, list);
- list = string_list_remove(list, dir);
- list = gcmp_list_from_path(c, dir, list);
- g_completion_add_items(gcmp, list);
- dir_list = g_list_append(dir_list, g_strdup(dir));
- }
-
- void pre_completion_cb(GCompletion *gcmp, gchar *line)
- {
- if( list == NULL )
- {
- /* create initial list */
- list = gcmp_list_from_path(c, "", NULL);
- g_completion_add_items(gcmp, list);
+ if (g_list_length(items) >= 1)
+ screen_display_completion_list(items);
+}
+#endif
+
+int
+playlist_save(mpdclient_t *c, char *name, char *defaultname)
+{
+ gchar *filename;
+ gint error;
+#ifndef NCMPC_MINI
+ GCompletion *gcmp;
+ GList *list = NULL;
+ completion_callback_data_t data;
+#endif
+
+#ifdef NCMPC_MINI
+ (void)defaultname;
+#endif
+
+#ifndef NCMPC_MINI
+ if (name == NULL) {
+ /* initialize completion support */
+ gcmp = g_completion_new(NULL);
+ g_completion_set_compare(gcmp, strncmp);
+ data.list = &list;
+ data.dir_list = NULL;
+ data.c = c;
+ wrln_completion_callback_data = &data;
+ wrln_pre_completion_callback = save_pre_completion_cb;
+ wrln_post_completion_callback = save_post_completion_cb;
+
+
+ /* query the user for a filename */
+ filename = screen_readln(screen.status_window.w,
+ _("Save playlist as: "),
+ defaultname,
+ NULL,
+ gcmp);
+
+ /* destroy completion support */
+ wrln_completion_callback_data = NULL;
+ wrln_pre_completion_callback = NULL;
+ wrln_post_completion_callback = NULL;
+ g_completion_free(gcmp);
+ list = string_list_free(list);
+ if( filename )
+ filename=g_strstrip(filename);
+ } else
+#endif
+ filename=g_strdup(name);
+
+ if (filename == NULL || filename[0] == '\0')
+ return -1;
+
+ /* send save command to mpd */
+ if ((error = mpdclient_cmd_save_playlist(c, filename))) {
+ gint code = GET_ACK_ERROR_CODE(error);
+
+ if (code == MPD_ACK_ERROR_EXIST) {
+ char *buf;
+ int key;
+
+ buf = g_strdup_printf(_("Replace %s [%s/%s] ? "),
+ filename, YES, NO);
+ key = tolower(screen_getch(screen.status_window.w,
+ buf));
+ g_free(buf);
+
+ if (key == YES[0]) {
+ if (mpdclient_cmd_delete_playlist(c, filename)) {
+ g_free(filename);
+ return -1;
+ }
+
+ error = playlist_save(c, filename, NULL);
+ g_free(filename);
+ return error;
+ }
+
+ screen_status_printf(_("Aborted!"));
+ }
+
+ g_free(filename);
+ return -1;
}
- else if( line && line[0] && line[strlen(line)-1]=='/' &&
- string_list_find(dir_list, line) == NULL )
- {
- /* add directory content to list */
- add_dir(line);
+
+ /* success */
+ screen_status_printf(_("Saved %s"), filename);
+ g_free(filename);
+ return 0;
+}
+
+#ifndef NCMPC_MINI
+static void add_dir(GCompletion *gcmp, gchar *dir, GList **dir_list,
+ GList **list, mpdclient_t *c)
+{
+ g_completion_remove_items(gcmp, *list);
+ *list = string_list_remove(*list, dir);
+ *list = gcmp_list_from_path(c, dir, *list, GCMP_TYPE_RFILE);
+ g_completion_add_items(gcmp, *list);
+ *dir_list = g_list_append(*dir_list, g_strdup(dir));
+}
+
+static void add_pre_completion_cb(GCompletion *gcmp, gchar *line, void *data)
+{
+ completion_callback_data_t *tmp = (completion_callback_data_t *)data;
+ GList **dir_list = tmp->dir_list;
+ GList **list = tmp->list;
+ mpdclient_t *c = tmp->c;
+
+ if (*list == NULL) {
+ /* create initial list */
+ *list = gcmp_list_from_path(c, "", NULL, GCMP_TYPE_RFILE);
+ g_completion_add_items(gcmp, *list);
+ } else if (line && line[0] && line[strlen(line)-1]=='/' &&
+ string_list_find(*dir_list, line) == NULL) {
+ /* add directory content to list */
+ add_dir(gcmp, line, dir_list, list, c);
}
- }
-
- void post_completion_cb(GCompletion *gcmp, gchar *line, GList *items)
- {
- if( g_list_length(items)>1 )
- screen_display_completion_list(screen, items);
-
- if( line && line[0] && line[strlen(line)-1]=='/' &&
- string_list_find(dir_list, line) == NULL )
- {
- /* add directory content to list */
- add_dir(line);
+}
+
+static void add_post_completion_cb(GCompletion *gcmp, gchar *line,
+ GList *items, void *data)
+{
+ completion_callback_data_t *tmp = (completion_callback_data_t *)data;
+ GList **dir_list = tmp->dir_list;
+ GList **list = tmp->list;
+ mpdclient_t *c = tmp->c;
+
+ if (g_list_length(items) >= 1)
+ screen_display_completion_list(items);
+
+ if (line && line[0] && line[strlen(line) - 1] == '/' &&
+ string_list_find(*dir_list, line) == NULL) {
+ /* add directory content to list */
+ add_dir(gcmp, line, dir_list, list, c);
}
- }
-
-
- gcmp = g_completion_new(NULL);
- g_completion_set_compare(gcmp, strncmp);
-
- wrln_pre_completion_callback = pre_completion_cb;
- wrln_post_completion_callback = post_completion_cb;
- path = screen_readln(screen->status_window.w,
- _("Add: "),
- NULL,
- NULL,
- gcmp);
- wrln_pre_completion_callback = NULL;
- wrln_post_completion_callback = NULL;
-
- g_completion_free(gcmp);
-
- string_list_free(list);
- string_list_free(dir_list);
-
- if( path && path[0] )
- mpdclient_cmd_add_path(c, path);
-
- return 0;
+}
+#endif
+
+static int
+handle_add_to_playlist(mpdclient_t *c)
+{
+ gchar *path;
+#ifndef NCMPC_MINI
+ GCompletion *gcmp;
+ GList *list = NULL;
+ GList *dir_list = NULL;
+ completion_callback_data_t data;
+
+ /* initialize completion support */
+ gcmp = g_completion_new(NULL);
+ g_completion_set_compare(gcmp, strncmp);
+ data.list = &list;
+ data.dir_list = &dir_list;
+ data.c = c;
+ wrln_completion_callback_data = &data;
+ wrln_pre_completion_callback = add_pre_completion_cb;
+ wrln_post_completion_callback = add_post_completion_cb;
+#endif
+
+ /* get path */
+ path = screen_readln(screen.status_window.w,
+ _("Add: "),
+ NULL,
+ NULL,
+#ifdef NCMPC_MINI
+ NULL
+#else
+ gcmp
+#endif
+ );
+
+ /* destroy completion data */
+#ifndef NCMPC_MINI
+ wrln_completion_callback_data = NULL;
+ wrln_pre_completion_callback = NULL;
+ wrln_post_completion_callback = NULL;
+ g_completion_free(gcmp);
+ string_list_free(list);
+ string_list_free(dir_list);
+#endif
+
+ /* add the path to the playlist */
+ if (path && path[0])
+ mpdclient_cmd_add_path(c, path);
+
+ return 0;
}
static void
play_init(WINDOW *w, int cols, int rows)
{
- lw = list_window_init(w, cols, rows);
+ lw = list_window_init(w, cols, rows);
+}
+
+static gboolean
+timer_hide_cursor(gpointer data)
+{
+ struct mpdclient *c = data;
+
+ assert(options.hide_cursor > 0);
+ assert(timer_hide_cursor_id != 0);
+
+ timer_hide_cursor_id = 0;
+
+ /* 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;
+ playlist_repaint();
+ } else
+ timer_hide_cursor_id = g_timeout_add(options.hide_cursor * 1000,
+ timer_hide_cursor, c);
+
+ return FALSE;
}
static void
-play_open(screen_t *screen, mpdclient_t *c)
+play_open(mpdclient_t *c)
{
- static gboolean install_cb = TRUE;
+ static gboolean install_cb = TRUE;
+
+ playlist = &c->playlist;
+
+ assert(timer_hide_cursor_id == 0);
+ if (options.hide_cursor > 0) {
+ lw->flags &= ~LW_HIDE_CURSOR;
+ timer_hide_cursor_id = g_timeout_add(options.hide_cursor * 1000,
+ timer_hide_cursor, c);
+ }
+
+ if (install_cb) {
+ mpdclient_install_playlist_callback(c, playlist_changed_callback);
+ install_cb = FALSE;
+ }
+}
- if( install_cb )
- {
- mpdclient_install_playlist_callback(c, playlist_changed_callback);
- install_cb = FALSE;
- }
+static void
+play_close(void)
+{
+ if (timer_hide_cursor_id != 0) {
+ g_source_remove(timer_hide_cursor_id);
+ timer_hide_cursor_id = 0;
+ }
}
static void
play_resize(int cols, int rows)
{
- lw->cols = cols;
- lw->rows = rows;
+ lw->cols = cols;
+ lw->rows = rows;
}
static void
play_exit(void)
{
- list_window_free(lw);
+ list_window_free(lw);
}
-static char *
+static const char *
play_title(char *str, size_t size)
{
- if( strcmp(options.host, "localhost") == 0 )
- return _("Playlist");
-
- snprintf(str, size, _("Playlist on %s"), options.host);
+ if( strcmp(options.host, "localhost") == 0 )
+ return _("Playlist");
- return str;
+ g_snprintf(str, size, _("Playlist on %s"), options.host);
+ return str;
}
static void
-play_paint(screen_t *screen, mpdclient_t *c)
-{
- lw->clear = 1;
-
- list_window_paint(lw, list_callback, (void *) c);
- wnoutrefresh(lw->w);
+play_paint(void)
+{
+ list_window_paint(lw, list_callback, NULL);
}
static void
-play_update(screen_t *screen, mpdclient_t *c)
+play_update(mpdclient_t *c)
{
- if( options.auto_center )
- {
- static int prev_song_id = 0;
-
- if( c->song && prev_song_id != c->song->id )
- {
- center_playing_item(screen, c);
- prev_song_id = c->song->id;
+ static int prev_song_id = -1;
+
+ current_song_id = c->song != NULL && c->status != NULL &&
+ !IS_STOPPED(c->status->state) ? c->song->id : -1;
+
+ if (current_song_id != prev_song_id) {
+ prev_song_id = current_song_id;
+
+ /* center the cursor */
+ if (options.auto_center && current_song_id != -1)
+ center_playing_item(c);
+
+ playlist_repaint();
}
- }
-
- if( c->playlist.updated )
- {
- if( lw->selected >= c->playlist.length )
- lw->selected = c->playlist.length-1;
- if( lw->start >= c->playlist.length )
- list_window_reset(lw);
-
- play_paint(screen, c);
- c->playlist.updated = FALSE;
- }
- else if( lw->repaint || 1)
- {
- list_window_paint(lw, list_callback, (void *) c);
- wnoutrefresh(lw->w);
- lw->repaint = 0;
- }
}
+#ifdef HAVE_GETMOUSE
static int
-play_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
+handle_mouse_event(struct mpdclient *c)
{
- switch(cmd)
- {
- case CMD_PLAY:
- mpdclient_cmd_play(c, lw->selected);
- return 1;
- case CMD_DELETE:
- mpdclient_cmd_delete(c, lw->selected);
- return 1;
- case CMD_SAVE_PLAYLIST:
- handle_save_playlist(screen, c, NULL);
- return 1;
- case CMD_ADD:
- handle_add_to_playlist(screen, c);
- return 1;
- case CMD_SCREEN_UPDATE:
- center_playing_item(screen, c);
- return 1;
- case CMD_LIST_MOVE_UP:
- mpdclient_cmd_move(c, lw->selected, lw->selected-1);
- return 1;
- case CMD_LIST_MOVE_DOWN:
- mpdclient_cmd_move(c, lw->selected, lw->selected+1);
- return 1;
- case CMD_LIST_FIND:
- case CMD_LIST_RFIND:
- case CMD_LIST_FIND_NEXT:
- case CMD_LIST_RFIND_NEXT:
- return screen_find(screen, c,
- lw, c->playlist.length,
- cmd, list_callback);
- default:
- break;
- }
- return list_window_cmd(lw, c->playlist.length, cmd) ;
-}
+ int row;
+ unsigned selected;
+ unsigned long bstate;
+
+ if (screen_get_mouse_event(c, &bstate, &row) ||
+ list_window_mouse(lw, playlist_length(playlist), bstate, row)) {
+ playlist_repaint();
+ return 1;
+ }
+ if (bstate & BUTTON1_DOUBLE_CLICKED) {
+ /* stop */
+ screen_cmd(c, CMD_STOP);
+ return 1;
+ }
+ selected = lw->start + row;
-static list_window_t *
-play_lw(void)
-{
- return lw;
-}
+ if (bstate & BUTTON1_CLICKED) {
+ /* play */
+ if (lw->start + row < playlist_length(playlist))
+ mpdclient_cmd_play(c, lw->start + row);
+ } else if (bstate & BUTTON3_CLICKED) {
+ /* delete */
+ if (selected == lw->selected)
+ mpdclient_cmd_delete(c, lw->selected);
+ }
+
+ lw->selected = selected;
+ list_window_check_selected(lw, playlist_length(playlist));
+ playlist_repaint();
+ return 1;
+}
+#endif
-screen_functions_t *
-get_screen_playlist(void)
+static int
+play_cmd(mpdclient_t *c, command_t cmd)
{
- static screen_functions_t functions;
-
- memset(&functions, 0, sizeof(screen_functions_t));
- functions.init = play_init;
- functions.exit = play_exit;
- functions.open = play_open;
- functions.close = NULL;
- functions.resize = play_resize;
- functions.paint = play_paint;
- functions.update = play_update;
- functions.cmd = play_cmd;
- functions.get_lw = play_lw;
- functions.get_title = play_title;
-
- return &functions;
+ lw->flags &= ~LW_HIDE_CURSOR;
+
+ if (options.hide_cursor > 0) {
+ if (timer_hide_cursor_id != 0)
+ g_source_remove(timer_hide_cursor_id);
+ timer_hide_cursor_id = g_timeout_add(options.hide_cursor * 1000,
+ timer_hide_cursor, c);
+ }
+
+ if (list_window_cmd(lw, playlist_length(&c->playlist), cmd)) {
+ playlist_repaint();
+ return 1;
+ }
+
+ switch(cmd) {
+ case CMD_PLAY:
+ mpdclient_cmd_play(c, lw->selected);
+ return 1;
+ case CMD_DELETE:
+ mpdclient_cmd_delete(c, lw->selected);
+ return 1;
+ case CMD_SAVE_PLAYLIST:
+ playlist_save(c, NULL, NULL);
+ return 1;
+ case CMD_ADD:
+ handle_add_to_playlist(c);
+ return 1;
+ case CMD_SCREEN_UPDATE:
+ center_playing_item(c);
+ playlist_repaint();
+ return 0;
+
+ case CMD_LIST_MOVE_UP:
+ mpdclient_cmd_move(c, lw->selected, lw->selected-1);
+ return 1;
+ case CMD_LIST_MOVE_DOWN:
+ mpdclient_cmd_move(c, lw->selected, lw->selected+1);
+ return 1;
+ case CMD_LIST_FIND:
+ case CMD_LIST_RFIND:
+ case CMD_LIST_FIND_NEXT:
+ case CMD_LIST_RFIND_NEXT:
+ screen_find(lw, playlist_length(&c->playlist),
+ cmd, list_callback, NULL);
+ playlist_repaint();
+ return 1;
+
+#ifdef HAVE_GETMOUSE
+ case CMD_MOUSE_EVENT:
+ return handle_mouse_event(c);
+#endif
+
+#ifdef ENABLE_LYRICS_SCREEN
+ case CMD_SCREEN_LYRICS:
+ if (lw->selected < playlist_length(&c->playlist)) {
+ screen_lyrics_switch(c, playlist_get(&c->playlist, lw->selected));
+ return 1;
+ }
+
+ break;
+#endif
+
+ default:
+ break;
+ }
+
+ return 0;
}
+
+const struct screen_functions screen_playlist = {
+ .init = play_init,
+ .exit = play_exit,
+ .open = play_open,
+ .close = play_close,
+ .resize = play_resize,
+ .paint = play_paint,
+ .update = play_update,
+ .cmd = play_cmd,
+ .get_title = play_title,
+};