![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_play.c b/src/screen_play.c
index fc130b9861cc61845dd33cd8e4b5e04eac170f82..22d7198aa7e685f9e7831f3f9fbd3a92f8a3d91e 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
*
*/
-#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 "options.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>
+#include <ncurses.h>
#define MAX_SONG_LENGTH 512
+typedef struct
+{
+ GList **list;
+ GList **dir_list;
+ screen_t *screen;
+ mpdclient_t *c;
+} completion_callback_data_t;
+
static list_window_t *lw = NULL;
-static void
+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);
+ D("screen_play.c> playlist_callback() [%d]\n", event);
+ 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;
+ }
+ /* make shure the playlist is repainted */
+ lw->clear = 1;
+ lw->repaint = 1;
+ list_window_check_selected(lw, c->playlist.list->len);
}
-static char *
-list_callback(int index, int *highlight, void *data)
+static const char *
+list_callback(unsigned idx, int *highlight, void *data)
{
- static char songname[MAX_SONG_LENGTH];
- mpdclient_t *c = (mpdclient_t *) data;
- mpd_Song *song;
+ 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;
- }
+ *highlight = 0;
+ if( (song=playlist_get_song(c, idx)) == 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;
+ 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 int
-center_playing_item(screen_t *screen, mpdclient_t *c)
+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;
+ unsigned length = c->playlist.list->len;
+ unsigned offset = lw->selected - lw->start;
+ int idx;
+
+ if (!lw || !c->song || length<lw->rows ||
+ IS_STOPPED(c->status->state))
+ return 0;
+
+ /* try to center the song that are playing */
+ idx = playlist_get_index(c, c->song);
+ D("Autocenter song id:%d pos:%d index:%d\n", c->song->id,c->song->pos,idx);
+ idx -= (lw->rows / 2);
+ if (idx + (int)lw->rows > (int)length)
+ idx = length - lw->rows;
+ if (idx < 0)
+ idx = 0;
+ lw->start = idx;
+
+ /* 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;
+}
- return 0;
+static void
+save_pre_completion_cb(GCompletion *gcmp, mpd_unused gchar *line, void *data)
+{
+ 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);
+ }
}
-static int
-handle_save_playlist(screen_t *screen, mpdclient_t *c, char *name)
+static void
+save_post_completion_cb(mpd_unused GCompletion *gcmp, mpd_unused gchar *line,
+ GList *items, void *data)
+{
+ completion_callback_data_t *tmp = (completion_callback_data_t *)data;
+ screen_t *screen = tmp->screen;
+
+ if( g_list_length(items)>=1 ) {
+ screen_display_completion_list(screen, items);
+ lw->clear = 1;
+ lw->repaint = 1;
+ }
+}
+
+int
+playlist_save(screen_t *screen, mpdclient_t *c, char *name, char *defaultname)
{
gchar *filename;
gint error;
GCompletion *gcmp;
GList *list = NULL;
-
- void pre_completion_cb(GCompletion *gcmp, gchar *line)
- {
- if( list == NULL )
- {
- /* create completion list */
- list = gcmp_list_from_path(c, "", NULL, GCMP_TYPE_PLAYLIST);
- g_completion_add_items(gcmp, list);
- }
- }
-
- void post_completion_cb(GCompletion *gcmp, gchar *line, GList *items)
- {
- if( g_list_length(items)>=1 )
- screen_display_completion_list(screen, items);
- }
+ completion_callback_data_t data;
if( name==NULL )
{
/* initialize completion support */
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;
+ data.list = &list;
+ data.dir_list = NULL;
+ data.screen = screen;
+ 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: "),
- NULL,
+ defaultname,
NULL,
gcmp);
- filename=trim(filename);
/* 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
{
if( code == MPD_ACK_ERROR_EXIST )
{
- char buf[256];
+ char *buf;
int key;
- snprintf(buf, 256, _("Replace %s [%s/%s] ? "), filename, YES, NO);
+ 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] )
{
- char *filename_utf8 = locale_to_utf8(filename);
-
- if( mpdclient_cmd_delete_playlist(c, filename_utf8) )
+ if( mpdclient_cmd_delete_playlist(c, filename) )
{
g_free(filename);
- g_free(filename_utf8);
return -1;
}
- g_free(filename_utf8);
- error = handle_save_playlist(screen, c, filename);
+ error = playlist_save(screen, c, filename, NULL);
g_free(filename);
return error;
}
return 0;
}
-static int
-handle_add_to_playlist(screen_t *screen, mpdclient_t *c)
+static void add_dir(GCompletion *gcmp, gchar *dir, GList **dir_list,
+ GList **list, mpdclient_t *c)
{
- gchar *path;
- GCompletion *gcmp;
- GList *list = NULL;
- GList *dir_list = NULL;
+ 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;
- void add_dir(gchar *dir)
+ D("pre_completion()...\n");
+ if( *list == NULL )
{
- 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));
+ /* 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 pre_completion_cb(GCompletion *gcmp, gchar *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;
+ screen_t *screen = tmp->screen;
+
+ D("post_completion()...\n");
+ if( g_list_length(items)>=1 )
{
- D("pre_completion()...\n");
- 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(line);
- }
+ screen_display_completion_list(screen, items);
+ lw->clear = 1;
+ lw->repaint = 1;
}
- void post_completion_cb(GCompletion *gcmp, gchar *line, GList *items)
- {
- D("post_completion()...\n");
- 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);
- }
+ 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);
}
+}
+
+static int
+handle_add_to_playlist(screen_t *screen, mpdclient_t *c)
+{
+ gchar *path;
+ 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);
- wrln_pre_completion_callback = pre_completion_cb;
- wrln_post_completion_callback = post_completion_cb;
+ data.list = &list;
+ data.dir_list = &dir_list;
+ data.screen = screen;
+ data.c = c;
+ wrln_completion_callback_data = &data;
+ wrln_pre_completion_callback = add_pre_completion_cb;
+ wrln_post_completion_callback = add_post_completion_cb;
/* get path */
path = screen_readln(screen->status_window.w,
_("Add: "),
gcmp);
/* destroy completion data */
+ wrln_completion_callback_data = NULL;
wrln_pre_completion_callback = NULL;
wrln_post_completion_callback = NULL;
g_completion_free(gcmp);
if( path && path[0] )
mpdclient_cmd_add_path(c, path);
- lw->clear = 1;
- lw->repaint = 1;
-
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 void
-play_open(screen_t *screen, mpdclient_t *c)
+play_open(mpd_unused screen_t *screen, mpdclient_t *c)
{
- static gboolean install_cb = TRUE;
+ static gboolean install_cb = TRUE;
- 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_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;
+play_paint(mpd_unused screen_t *screen, mpdclient_t *c)
+{
+ lw->clear = 1;
- list_window_paint(lw, list_callback, (void *) c);
- wnoutrefresh(lw->w);
+ list_window_paint(lw, list_callback, (void *) c);
+ wnoutrefresh(lw->w);
}
static void
play_update(screen_t *screen, 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;
+ /* hide the cursor when mpd are playing and the user are inactive */
+ if( options.hide_cursor>0 && c->status->state == MPD_STATUS_STATE_PLAY &&
+ time(NULL)-screen->input_timestamp >= options.hide_cursor ) {
+ lw->flags |= LW_HIDE_CURSOR;
+ } else {
+ lw->flags &= ~LW_HIDE_CURSOR;
}
- }
- 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);
+ /* center the cursor */
+ if( options.auto_center ) {
+ static int prev_song_id = 0;
- 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;
- }
+ if( c->song && prev_song_id != c->song->id ) {
+ center_playing_item(c);
+ prev_song_id = c->song->id;
+ }
+ }
+
+ if( c->playlist.updated ) {
+ if (lw->selected >= c->playlist.list->len)
+ lw->selected = c->playlist.list->len - 1;
+ if (lw->start >= c->playlist.list->len)
+ 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(mpd_unused screen_t *screen, mpdclient_t *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, lw, c->playlist.list->len, &bstate, &row))
+ return 1;
+ if (bstate & BUTTON1_DOUBLE_CLICKED) {
+ /* stop */
+ screen_cmd(c, CMD_STOP);
+ return 1;
+ }
+
+ selected = lw->start + row;
+
+ if (bstate & BUTTON1_CLICKED) {
+ /* play */
+ if (lw->start + row < c->playlist.list->len)
+ 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, c->playlist.list->len);
+
+ return 1;
+}
+#else
+#define handle_mouse_event(s,c) (0)
+#endif
+
+static int
+play_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
+{
+ 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(screen, c, NULL, NULL);
+ return 1;
+ case CMD_ADD:
+ handle_add_to_playlist(screen, c);
+ return 1;
+ case CMD_SCREEN_UPDATE:
+ screen->painted = 0;
+ lw->clear = 1;
+ lw->repaint = 1;
+ center_playing_item(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,
+ lw, c->playlist.list->len,
+ cmd, list_callback, (void *) c);
+ case CMD_MOUSE_EVENT:
+ return handle_mouse_event(screen,c);
+ default:
+ break;
+ }
+ return list_window_cmd(lw, c->playlist.list->len, cmd);
+}
static list_window_t *
play_lw(void)
return lw;
}
-
-screen_functions_t *
-get_screen_playlist(void)
-{
- 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;
-}
+const struct screen_functions screen_playlist = {
+ .init = play_init,
+ .exit = play_exit,
+ .open = play_open,
+ .close = NULL,
+ .resize = play_resize,
+ .paint = play_paint,
+ .update = play_update,
+ .cmd = play_cmd,
+ .get_lw = play_lw,
+ .get_title = play_title,
+};