X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen.c;h=abd241d16e14e84981ed686fe7e12d3a99442627;hb=63fc23f1c83f52eb47b5511e97bb1fe7cf7d82d5;hp=569df7a51022a615edeb209eecfb2e4b21fb7dde;hpb=01388b0ea33e583358562d864cd0e481b2465308;p=ncmpc.git

diff --git a/src/screen.c b/src/screen.c
index 569df7a..abd241d 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1,5 +1,6 @@
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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
@@ -10,81 +11,92 @@
  * 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.h"
+#include "screen_interface.h"
 #include "screen_list.h"
-#include "screen_utils.h"
+#include "screen_status.h"
 #include "config.h"
 #include "i18n.h"
-#include "support.h"
 #include "charset.h"
 #include "mpdclient.h"
-#include "utils.h"
 #include "options.h"
-#include "colors.h"
-#include "strfsong.h"
+#include "player_command.h"
+#include "screen_help.h"
+#include "screen_queue.h"
+#include "screen_file.h"
+#include "screen_artist.h"
+#include "screen_search.h"
+#include "screen_song.h"
+#include "screen_keydef.h"
+#include "screen_lyrics.h"
+#include "screen_outputs.h"
+#include "screen_chat.h"
+
+#include <mpd/client.h>
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdarg.h>
 #include <string.h>
 #include <time.h>
-#include <locale.h>
-
-#ifndef NCMPC_MINI
-/** welcome message time [s] */
-static const GTime SCREEN_WELCOME_TIME = 10;
-#endif
-
-/** status message time [s] */
-static const GTime SCREEN_STATUS_MESSAGE_TIME = 3;
-
-/* minumum window size */
-static const int SCREEN_MIN_COLS = 14;
-static const int SCREEN_MIN_ROWS = 5;
 
 /* screens */
 
-#ifndef NCMPC_MINI
-static gboolean welcome = TRUE;
-#endif
+struct screen screen = {
+	.current_page = &screen_queue,
+};
 
-struct screen screen;
-static const struct screen_functions *mode_fn = &screen_playlist;
-static int seek_id = -1;
-static int seek_target_time = 0;
-
-gboolean
-screen_is_visible(const struct screen_functions *sf)
-{
-	return sf == mode_fn;
-}
+static const struct screen_functions *mode_fn_prev = &screen_queue;
 
 void
 screen_switch(const struct screen_functions *sf, struct mpdclient *c)
 {
 	assert(sf != NULL);
 
-	if (sf == mode_fn)
+	if (sf == screen.current_page)
 		return;
 
+	mode_fn_prev = screen.current_page;
+
 	/* close the old mode */
-	if (mode_fn->close != NULL)
-		mode_fn->close();
+	if (screen.current_page->close != NULL)
+		screen.current_page->close();
 
 	/* get functions for the new mode */
-	mode_fn = sf;
+	screen.current_page = sf;
 
 	/* open the new mode */
-	if (mode_fn->open != NULL)
-		mode_fn->open(c);
+	if (sf->open != NULL)
+		sf->open(c);
 
-	screen_paint(c);
+	screen_paint(c, true);
+}
+
+void
+screen_swap(struct mpdclient *c, const struct mpd_song *song)
+{
+	if (song != NULL)
+	{
+		if (false)
+			{ /* just a hack to make the ifdefs less ugly */ }
+#ifdef ENABLE_SONG_SCREEN
+		if (mode_fn_prev == &screen_song)
+			screen_song_switch(c, song);
+#endif
+#ifdef ENABLE_LYRICS_SCREEN
+		else if (mode_fn_prev == &screen_lyrics)
+			screen_lyrics_switch(c, song, true);
+#endif
+		else
+			screen_switch(mode_fn_prev, c);
+	}
+	else
+		screen_switch(mode_fn_prev, c);
 }
 
 static int
@@ -100,693 +112,115 @@ find_configured_screen(const char *name)
 }
 
 static void
-screen_next_mode(mpdclient_t *c, int offset)
+screen_next_mode(struct mpdclient *c, int offset)
 {
 	int max = g_strv_length(options.screen_list);
-	int current, next;
-	const struct screen_functions *sf;
 
 	/* find current screen */
-	current = find_configured_screen(screen_get_name(mode_fn));
-	next = current + offset;
+	int current = find_configured_screen(screen_get_name(screen.current_page));
+	int next = current + offset;
 	if (next<0)
 		next = max-1;
 	else if (next>=max)
 		next = 0;
 
-	sf = screen_lookup_name(options.screen_list[next]);
+	const struct screen_functions *sf =
+		screen_lookup_name(options.screen_list[next]);
 	if (sf != NULL)
 		screen_switch(sf, c);
 }
 
-#ifndef NCMPC_MINI
-static void
-print_hotkey(WINDOW *w, command_t cmd, const char *label)
-{
-	colors_use(w, COLOR_TITLE_BOLD);
-	waddstr(w, get_key_names(cmd, FALSE));
-	colors_use(w, COLOR_TITLE);
-	waddch(w, ':');
-	waddstr(w, label);
-	waddch(w, ' ');
-	waddch(w, ' ');
-}
-#endif
-
-static void
-paint_top_window2(const char *header, mpdclient_t *c)
-{
-	char flags[5];
-	WINDOW *w = screen.top_window.w;
-	char buf[32];
-
-	if (header[0]) {
-		colors_use(w, COLOR_TITLE_BOLD);
-		mvwaddstr(w, 0, 0, header);
-#ifndef NCMPC_MINI
-	} else {
-		print_hotkey(w, CMD_SCREEN_HELP, _("Help"));
-		print_hotkey(w, CMD_SCREEN_PLAY, _("Playlist"));
-		print_hotkey(w, CMD_SCREEN_FILE, _("Browse"));
-#ifdef ENABLE_ARTIST_SCREEN
-		print_hotkey(w, CMD_SCREEN_ARTIST, _("Artist"));
-#endif
-#ifdef ENABLE_SEARCH_SCREEN
-		print_hotkey(w, CMD_SCREEN_SEARCH, _("Search"));
-#endif
-#ifdef ENABLE_LYRICS_SCREEN
-		print_hotkey(w, CMD_SCREEN_LYRICS, _("Lyrics"));
-#endif
-#endif
-	}
-
-	if (c->status == NULL || c->status->volume == MPD_STATUS_NO_VOLUME) {
-		g_snprintf(buf, 32, _("Volume n/a "));
-	} else {
-		g_snprintf(buf, 32, _(" Volume %d%%"), c->status->volume);
-	}
-	colors_use(w, COLOR_TITLE);
-	mvwaddstr(w, 0, screen.top_window.cols - utf8_width(buf), buf);
-
-	flags[0] = 0;
-	if (c->status != NULL) {
-		if (c->status->repeat)
-			g_strlcat(flags, "r", sizeof(flags));
-		if (c->status->random)
-			g_strlcat(flags, "z", sizeof(flags));;
-		if (c->status->crossfade)
-			g_strlcat(flags, "x", sizeof(flags));
-		if (c->status->updatingDb)
-			g_strlcat(flags, "U", sizeof(flags));
-	}
-
-	colors_use(w, COLOR_LINE);
-	mvwhline(w, 1, 0, ACS_HLINE, screen.top_window.cols);
-	if (flags[0]) {
-		wmove(w,1,screen.top_window.cols-strlen(flags)-3);
-		waddch(w, '[');
-		colors_use(w, COLOR_LINE_BOLD);
-		waddstr(w, flags);
-		colors_use(w, COLOR_LINE);
-		waddch(w, ']');
-	}
-	wnoutrefresh(w);
-}
-
-static void
-paint_top_window(const char *header, mpdclient_t *c, int full_repaint)
-{
-	static int prev_volume = -1;
-	static unsigned prev_header_len = -1;
-	WINDOW *w = screen.top_window.w;
-
-	if (prev_header_len != utf8_width(header)) {
-		prev_header_len = utf8_width(header);
-		full_repaint = 1;
-	}
-
-	if (full_repaint) {
-		wmove(w, 0, 0);
-		wclrtoeol(w);
-	}
-
-	if ((c->status != NULL && prev_volume != c->status->volume) ||
-	    full_repaint)
-		paint_top_window2(header, c);
-}
-
-static void
-paint_progress_window(mpdclient_t *c)
-{
-	double p;
-	int width;
-	int elapsedTime;
-
-	if (c->status==NULL || IS_STOPPED(c->status->state)) {
-		mvwhline(screen.progress_window.w, 0, 0, ACS_HLINE,
-			 screen.progress_window.cols);
-		wnoutrefresh(screen.progress_window.w);
-		return;
-	}
-
-	if (c->song && seek_id == c->song->id)
-		elapsedTime = seek_target_time;
-	else
-		elapsedTime = c->status->elapsedTime;
-
-	p = ((double) elapsedTime) / ((double) c->status->totalTime);
-
-	width = (int) (p * (double) screen.progress_window.cols);
-	mvwhline(screen.progress_window.w,
-		 0, 0,
-		 ACS_HLINE,
-		 screen.progress_window.cols);
-	whline(screen.progress_window.w, '=', width-1);
-	mvwaddch(screen.progress_window.w, 0, width-1, 'O');
-	wnoutrefresh(screen.progress_window.w);
-}
-
-static void
-paint_status_window(mpdclient_t *c)
-{
-	WINDOW *w = screen.status_window.w;
-	mpd_Status *status = c->status;
-	mpd_Song *song = c->song;
-	int elapsedTime = 0;
-#ifdef NCMPC_MINI
-	static char bitrate[1];
-#else
-	char bitrate[16];
-#endif
-	const char *str = NULL;
-	int x = 0;
-
-	if( time(NULL) - screen.status_timestamp <= SCREEN_STATUS_MESSAGE_TIME )
-		return;
-
-	wmove(w, 0, 0);
-	wclrtoeol(w);
-	colors_use(w, COLOR_STATUS_BOLD);
-
-	switch (status == NULL ? MPD_STATUS_STATE_STOP : status->state) {
-	case MPD_STATUS_STATE_PLAY:
-		str = _("Playing:");
-		break;
-	case MPD_STATUS_STATE_PAUSE:
-		str = _("[Paused]");
-		break;
-	case MPD_STATUS_STATE_STOP:
-	default:
-		break;
-	}
-
-	if (str) {
-		waddstr(w, str);
-		x += utf8_width(str) + 1;
-	}
-
-	/* create time string */
-	memset(screen.buf, 0, screen.buf_size);
-	if (status != NULL && (IS_PLAYING(status->state) ||
-			       IS_PAUSED(status->state))) {
-		if (status->totalTime > 0) {
-			/*checks the conf to see whether to display elapsed or remaining time */
-			if(!strcmp(options.timedisplay_type,"elapsed"))
-				elapsedTime = c->status->elapsedTime;
-			else if(!strcmp(options.timedisplay_type,"remaining"))
-				elapsedTime = (c->status->totalTime - c->status->elapsedTime);
-
-			if( c->song && seek_id == c->song->id )
-				elapsedTime = seek_target_time;
-
-			/* display bitrate if visible-bitrate is true */
-#ifndef NCMPC_MINI
-			if (options.visible_bitrate) {
-				g_snprintf(bitrate, 16,
-				           " [%d kbps]", status->bitRate);
-			} else {
-				bitrate[0] = '\0';
-			}
-#endif
-
-			/*write out the time, using hours if time over 60 minutes*/
-			if (c->status->totalTime > 3600) {
-				g_snprintf(screen.buf, screen.buf_size,
-					   "%s [%i:%02i:%02i/%i:%02i:%02i]",
-					   bitrate, elapsedTime/3600, (elapsedTime%3600)/60, elapsedTime%60,
-					   status->totalTime/3600, (status->totalTime%3600)/60,  status->totalTime%60);
-			} else {
-				g_snprintf(screen.buf, screen.buf_size,
-					   "%s [%i:%02i/%i:%02i]",
-					   bitrate, elapsedTime/60, elapsedTime%60,
-					   status->totalTime/60,   status->totalTime%60 );
-			}
-#ifndef NCMPC_MINI
-		} else {
-			g_snprintf(screen.buf, screen.buf_size,
-				   " [%d kbps]", status->bitRate );
-#endif
-		}
-#ifndef NCMPC_MINI
-	} else {
-		time_t timep;
-
-		time(&timep);
-		strftime(screen.buf, screen.buf_size, "%X ",localtime(&timep));
-#endif
-	}
-
-	/* display song */
-	if (status != NULL && (IS_PLAYING(status->state) ||
-			       IS_PAUSED(status->state))) {
-		char songname[MAX_SONGNAME_LENGTH];
-#ifndef NCMPC_MINI
-		int width = COLS - x - utf8_width(screen.buf);
-#endif
-
-		if (song)
-			strfsong(songname, MAX_SONGNAME_LENGTH,
-				 options.status_format, song);
-		else
-			songname[0] = '\0';
-
-		colors_use(w, COLOR_STATUS);
-		/* scroll if the song name is to long */
-#ifndef NCMPC_MINI
-		if (options.scroll && utf8_width(songname) > (unsigned)width) {
-			static  scroll_state_t st = { 0, 0 };
-			char *tmp = strscroll(songname, options.scroll_sep, width, &st);
-
-			g_strlcpy(songname, tmp, MAX_SONGNAME_LENGTH);
-			g_free(tmp);
-		}
-#endif
-		//mvwaddnstr(w, 0, x, songname, width);
-		mvwaddstr(w, 0, x, songname);
-	}
-
-	/* display time string */
-	if (screen.buf[0]) {
-		x = screen.status_window.cols - strlen(screen.buf);
-		colors_use(w, COLOR_STATUS_TIME);
-		mvwaddstr(w, 0, x, screen.buf);
-	}
-
-	wnoutrefresh(w);
-}
-
-void
-screen_exit(void)
-{
-	if (mode_fn->close != NULL)
-		mode_fn->close();
-
-	screen_list_exit();
-
-	string_list_free(screen.find_history);
-	g_free(screen.buf);
-	g_free(screen.findbuf);
-}
-
 void
-screen_resize(struct mpdclient *c)
-{
-	if (COLS<SCREEN_MIN_COLS || LINES<SCREEN_MIN_ROWS) {
-		screen_exit();
-		fprintf(stderr, _("Error: Screen to small\n"));
-		exit(EXIT_FAILURE);
-	}
-
-	resizeterm(LINES, COLS);
-
-	screen.cols = COLS;
-	screen.rows = LINES;
-
-	/* top window */
-	screen.top_window.cols = screen.cols;
-	wresize(screen.top_window.w, 2, screen.cols);
-
-	/* main window */
-	screen.main_window.cols = screen.cols;
-	screen.main_window.rows = screen.rows-4;
-	wresize(screen.main_window.w, screen.main_window.rows, screen.cols);
-	wclear(screen.main_window.w);
-
-	/* progress window */
-	screen.progress_window.cols = screen.cols;
-	wresize(screen.progress_window.w, 1, screen.cols);
-	mvwin(screen.progress_window.w, screen.rows-2, 0);
-
-	/* status window */
-	screen.status_window.cols = screen.cols;
-	wresize(screen.status_window.w, 1, screen.cols);
-	mvwin(screen.status_window.w, screen.rows-1, 0);
-
-	screen.buf_size = screen.cols;
-	g_free(screen.buf);
-	screen.buf = g_malloc(screen.cols);
-
-	/* resize all screens */
-	screen_list_resize(screen.main_window.cols, screen.main_window.rows);
-
-	/* ? - without this the cursor becomes visible with aterm & Eterm */
-	curs_set(1);
-	curs_set(0);
-
-	screen_paint(c);
-}
-
-void
-screen_status_message(const char *msg)
-{
-	WINDOW *w = screen.status_window.w;
-
-	wmove(w, 0, 0);
-	wclrtoeol(w);
-	colors_use(w, COLOR_STATUS_ALERT);
-	waddstr(w, msg);
-	wnoutrefresh(w);
-	screen.status_timestamp = time(NULL);
-}
-
-void
-screen_status_printf(const char *format, ...)
-{
-	char *msg;
-	va_list ap;
-
-	va_start(ap,format);
-	msg = g_strdup_vprintf(format,ap);
-	va_end(ap);
-	screen_status_message(msg);
-	g_free(msg);
-}
-
-void
-screen_init(mpdclient_t *c)
-{
-	if (COLS < SCREEN_MIN_COLS || LINES < SCREEN_MIN_ROWS) {
-		fprintf(stderr, _("Error: Screen to small\n"));
-		exit(EXIT_FAILURE);
-	}
-
-	screen.cols = COLS;
-	screen.rows = LINES;
-
-	screen.buf  = g_malloc(screen.cols);
-	screen.buf_size = screen.cols;
-	screen.findbuf = NULL;
-	screen.start_timestamp = time(NULL);
-	screen.last_cmd = CMD_NONE;
-
-	/* create top window */
-	screen.top_window.rows = 2;
-	screen.top_window.cols = screen.cols;
-	screen.top_window.w = newwin(screen.top_window.rows,
-				      screen.top_window.cols,
-				      0, 0);
-	leaveok(screen.top_window.w, TRUE);
-	keypad(screen.top_window.w, TRUE);
-
-	/* create main window */
-	screen.main_window.rows = screen.rows-4;
-	screen.main_window.cols = screen.cols;
-	screen.main_window.w = newwin(screen.main_window.rows,
-				       screen.main_window.cols,
-				       2,
-				       0);
-
-	//  leaveok(screen.main_window.w, TRUE); temporary disabled
-	keypad(screen.main_window.w, TRUE);
-
-	/* create progress window */
-	screen.progress_window.rows = 1;
-	screen.progress_window.cols = screen.cols;
-	screen.progress_window.w = newwin(screen.progress_window.rows,
-					   screen.progress_window.cols,
-					   screen.rows-2,
-					   0);
-	leaveok(screen.progress_window.w, TRUE);
-
-	/* create status window */
-	screen.status_window.rows = 1;
-	screen.status_window.cols = screen.cols;
-	screen.status_window.w = newwin(screen.status_window.rows,
-					 screen.status_window.cols,
-					 screen.rows-1,
-					 0);
-
-	leaveok(screen.status_window.w, FALSE);
-	keypad(screen.status_window.w, TRUE);
-
-#ifdef ENABLE_COLORS
-	if (options.enable_colors) {
-		/* set background attributes */
-		wbkgd(stdscr, COLOR_PAIR(COLOR_LIST));
-		wbkgd(screen.main_window.w,     COLOR_PAIR(COLOR_LIST));
-		wbkgd(screen.top_window.w,      COLOR_PAIR(COLOR_TITLE));
-		wbkgd(screen.progress_window.w, COLOR_PAIR(COLOR_PROGRESSBAR));
-		wbkgd(screen.status_window.w,   COLOR_PAIR(COLOR_STATUS));
-		colors_use(screen.progress_window.w, COLOR_PROGRESSBAR);
-	}
-#endif
-
-	refresh();
-
-	/* initialize screens */
-	screen_list_init(screen.main_window.w,
-			 screen.main_window.cols, screen.main_window.rows);
-
-	if (mode_fn->open != NULL)
-		mode_fn->open(c);
-}
-
-void
-screen_paint(mpdclient_t *c)
-{
-	const char *title = NULL;
-
-	if (mode_fn->get_title != NULL)
-		title = mode_fn->get_title(screen.buf, screen.buf_size);
-
-	/* paint the title/header window */
-	if( title )
-		paint_top_window(title, c, 1);
-	else
-		paint_top_window("", c, 1);
-
-	/* paint the main window */
-	wclear(screen.main_window.w);
-	if (mode_fn->paint != NULL)
-		mode_fn->paint();
-
-	paint_progress_window(c);
-	paint_status_window(c);
-	wmove(screen.main_window.w, 0, 0);
-	wnoutrefresh(screen.main_window.w);
-
-	/* tell curses to update */
-	doupdate();
-}
-
-void
-screen_update(mpdclient_t *c)
+screen_update(struct mpdclient *c)
 {
 #ifndef NCMPC_MINI
-	static int repeat = -1;
-	static int random_enabled = -1;
-	static int crossfade = -1;
-	static int dbupdate = -1;
+	static bool was_connected;
+	static bool initialized = false;
+	static bool repeat;
+	static bool random_enabled;
+	static bool single;
+	static bool consume;
+	static unsigned crossfade;
 
 	/* print a message if mpd status has changed */
-	if (c->status != NULL) {
-		if (repeat < 0) {
-			repeat = c->status->repeat;
-			random_enabled = c->status->random;
-			crossfade = c->status->crossfade;
-			dbupdate = c->status->updatingDb;
+	if ((c->events & MPD_IDLE_OPTIONS) && c->status != NULL) {
+		if (!initialized) {
+			repeat = mpd_status_get_repeat(c->status);
+			random_enabled = mpd_status_get_random(c->status);
+			single = mpd_status_get_single(c->status);
+			consume = mpd_status_get_consume(c->status);
+			crossfade = mpd_status_get_crossfade(c->status);
+			initialized = true;
 		}
 
-		if (repeat != c->status->repeat)
-			screen_status_printf(c->status->repeat ?
-					     _("Repeat is on") :
-					     _("Repeat is off"));
-
-		if (random_enabled != c->status->random)
-			screen_status_printf(c->status->random ?
-					     _("Random is on") :
-					     _("Random is off"));
-
-		if (crossfade != c->status->crossfade)
-			screen_status_printf(_("Crossfade %d seconds"), c->status->crossfade);
-
-		if (dbupdate && dbupdate != c->status->updatingDb) {
-			screen_status_printf(_("Database updated"));
-			mpdclient_browse_callback(c, BROWSE_DB_UPDATED, NULL);
-		}
-
-		repeat = c->status->repeat;
-		random_enabled = c->status->random;
-		crossfade = c->status->crossfade;
-		dbupdate = c->status->updatingDb;
+		if (repeat != mpd_status_get_repeat(c->status))
+			screen_status_printf(mpd_status_get_repeat(c->status) ?
+					     _("Repeat mode is on") :
+					     _("Repeat mode is off"));
+
+		if (random_enabled != mpd_status_get_random(c->status))
+			screen_status_printf(mpd_status_get_random(c->status) ?
+					     _("Random mode is on") :
+					     _("Random mode is off"));
+
+		if (single != mpd_status_get_single(c->status))
+			screen_status_printf(mpd_status_get_single(c->status) ?
+					     /* "single" mode means
+						that MPD will
+						automatically stop
+						after playing one
+						single song */
+					     _("Single mode is on") :
+					     _("Single mode is off"));
+
+		if (consume != mpd_status_get_consume(c->status))
+			screen_status_printf(mpd_status_get_consume(c->status) ?
+					     /* "consume" mode means
+						that MPD removes each
+						song which has
+						finished playing */
+					     _("Consume mode is on") :
+					     _("Consume mode is off"));
+
+		if (crossfade != mpd_status_get_crossfade(c->status))
+			screen_status_printf(_("Crossfade %d seconds"),
+					     mpd_status_get_crossfade(c->status));
+
+		repeat = mpd_status_get_repeat(c->status);
+		random_enabled = mpd_status_get_random(c->status);
+		single = mpd_status_get_single(c->status);
+		consume = mpd_status_get_consume(c->status);
+		crossfade = mpd_status_get_crossfade(c->status);
 	}
 
-	/* update title/header window */
-	if (welcome && options.welcome_screen_list &&
-	    screen.last_cmd==CMD_NONE &&
-	    time(NULL)-screen.start_timestamp <= SCREEN_WELCOME_TIME)
-		paint_top_window("", c, 0);
-	else
+	if ((c->events & MPD_IDLE_DATABASE) != 0 && was_connected &&
+	    mpdclient_is_connected(c))
+		screen_status_printf(_("Database updated"));
+	was_connected = mpdclient_is_connected(c);
 #endif
-	if (mode_fn->get_title != NULL) {
-		paint_top_window(mode_fn->get_title(screen.buf,screen.buf_size), c, 0);
-#ifndef NCMPC_MINI
-		welcome = FALSE;
-#endif
-	} else
-		paint_top_window("", c, 0);
 
 	/* update the main window */
-	if (mode_fn->update != NULL)
-		mode_fn->update(c);
-
-	/* update progress window */
-	paint_progress_window(c);
-
-	/* update status window */
-	paint_status_window(c);
-
-	/* move the cursor to the origin */
-	wmove(screen.main_window.w, 0, 0);
-	wnoutrefresh(screen.main_window.w);
-
-	/* tell curses to update */
-	doupdate();
-}
-
-void
-screen_idle(mpdclient_t *c)
-{
-	if (c->song && seek_id == c->song->id &&
-	    (screen.last_cmd == CMD_SEEK_FORWARD ||
-	     screen.last_cmd == CMD_SEEK_BACKWARD))
-		mpdclient_cmd_seek(c, seek_id, seek_target_time);
-
-	screen.last_cmd = CMD_NONE;
-	seek_id = -1;
-}
-
-#ifdef HAVE_GETMOUSE
-int
-screen_get_mouse_event(mpdclient_t *c, unsigned long *bstate, int *row)
-{
-	MEVENT event;
-
-	/* retreive the mouse event from ncurses */
-	getmouse(&event);
-	/* calculate the selected row in the list window */
-	*row = event.y - screen.top_window.rows;
-	/* copy button state bits */
-	*bstate = event.bstate;
-	/* if button 2 was pressed switch screen */
-	if (event.bstate & BUTTON2_CLICKED) {
-		screen_cmd(c, CMD_SCREEN_NEXT);
-		return 1;
-	}
-
-	return 0;
-}
-#endif
-
-static int
-screen_client_cmd(mpdclient_t *c, command_t cmd)
-{
-	if (c->connection == NULL || c->status == NULL)
-		return 0;
-
-	switch(cmd) {
-		/*
-	case CMD_PLAY:
-		mpdclient_cmd_play(c, MPD_PLAY_AT_BEGINNING);
-		break;
-		*/
-	case CMD_PAUSE:
-		mpdclient_cmd_pause(c, !IS_PAUSED(c->status->state));
-		break;
-	case CMD_STOP:
-		mpdclient_cmd_stop(c);
-		break;
-	case CMD_CROP:
-		mpdclient_cmd_crop(c);
-		break;
-	case CMD_SEEK_FORWARD:
-		if (!IS_STOPPED(c->status->state)) {
-			if (c->song && seek_id != c->song->id) {
-				seek_id = c->song->id;
-				seek_target_time = c->status->elapsedTime;
-			}
-			seek_target_time+=options.seek_time;
-			if (seek_target_time < c->status->totalTime)
-				break;
-			seek_target_time = c->status->totalTime;
-			/* seek_target_time=0; */
-		}
-		break;
-		/* fall through... */
-	case CMD_TRACK_NEXT:
-		if (!IS_STOPPED(c->status->state))
-			mpdclient_cmd_next(c);
-		break;
-	case CMD_SEEK_BACKWARD:
-		if (!IS_STOPPED(c->status->state)) {
-			if (seek_id != c->song->id) {
-				seek_id = c->song->id;
-				seek_target_time = c->status->elapsedTime;
-			}
-			seek_target_time-=options.seek_time;
-			if (seek_target_time < 0)
-				seek_target_time=0;
-		}
-		break;
-	case CMD_TRACK_PREVIOUS:
-		if (!IS_STOPPED(c->status->state))
-			mpdclient_cmd_prev(c);
-		break;
-	case CMD_SHUFFLE:
-		if (mpdclient_cmd_shuffle(c) == 0)
-			screen_status_message(_("Shuffled playlist"));
-		break;
-	case CMD_CLEAR:
-		if (mpdclient_cmd_clear(c) == 0)
-			screen_status_message(_("Cleared playlist"));
-		break;
-	case CMD_REPEAT:
-		mpdclient_cmd_repeat(c, !c->status->repeat);
-		break;
-	case CMD_RANDOM:
-		mpdclient_cmd_random(c, !c->status->random);
-		break;
-	case CMD_CROSSFADE:
-		if (c->status->crossfade)
-			mpdclient_cmd_crossfade(c, 0);
-		else
-			mpdclient_cmd_crossfade(c, options.crossfade_time);
-		break;
-	case CMD_DB_UPDATE:
-		if (!c->status->updatingDb) {
-			if( mpdclient_cmd_db_update(c,NULL)==0 )
-				screen_status_printf(_("Database update started"));
-		} else
-			screen_status_printf(_("Database update running..."));
-		break;
-	case CMD_VOLUME_UP:
-		if( c->status->volume!=MPD_STATUS_NO_VOLUME && c->status->volume<100 )
-			mpdclient_cmd_volume(c, ++c->status->volume);
-		break;
-	case CMD_VOLUME_DOWN:
-		if( c->status->volume!=MPD_STATUS_NO_VOLUME && c->status->volume>0 )
-			mpdclient_cmd_volume(c, --c->status->volume);
-		break;
-
-	default:
-		return 0;
-	}
+	if (screen.current_page->update != NULL)
+		screen.current_page->update(c);
 
-	return 1;
+	screen_paint(c, false);
 }
 
 void
-screen_cmd(mpdclient_t *c, command_t cmd)
+screen_cmd(struct mpdclient *c, command_t cmd)
 {
-	screen.last_cmd = cmd;
 #ifndef NCMPC_MINI
-	welcome = FALSE;
+	if (screen.welcome_source_id != 0) {
+		g_source_remove(screen.welcome_source_id);
+		screen.welcome_source_id = 0;
+	}
 #endif
 
-	if (mode_fn->cmd != NULL && mode_fn->cmd(c, cmd))
+	if (screen.current_page->cmd != NULL &&
+	    screen.current_page->cmd(c, cmd))
 		return;
 
-	if (screen_client_cmd(c, cmd))
+	if (handle_player_command(c, cmd))
 		return;
 
 	switch(cmd) {
@@ -803,7 +237,7 @@ screen_cmd(mpdclient_t *c, command_t cmd)
 				     _("Auto center mode: Off"));
 		break;
 	case CMD_SCREEN_UPDATE:
-		screen_paint(c);
+		screen_paint(c, true);
 		break;
 	case CMD_SCREEN_PREVIOUS:
 		screen_next_mode(c, -1);
@@ -812,7 +246,7 @@ screen_cmd(mpdclient_t *c, command_t cmd)
 		screen_next_mode(c, 1);
 		break;
 	case CMD_SCREEN_PLAY:
-		screen_switch(&screen_playlist, c);
+		screen_switch(&screen_queue, c);
 		break;
 	case CMD_SCREEN_FILE:
 		screen_switch(&screen_browse, c);
@@ -832,6 +266,11 @@ screen_cmd(mpdclient_t *c, command_t cmd)
 		screen_switch(&screen_artist, c);
 		break;
 #endif
+#ifdef ENABLE_SONG_SCREEN
+	case CMD_SCREEN_SONG:
+		screen_switch(&screen_song, c);
+		break;
+#endif
 #ifdef ENABLE_KEYDEF_SCREEN
 	case CMD_SCREEN_KEYDEF:
 		screen_switch(&screen_keydef, c);
@@ -842,7 +281,50 @@ screen_cmd(mpdclient_t *c, command_t cmd)
 		screen_switch(&screen_lyrics, c);
 		break;
 #endif
+#ifdef ENABLE_OUTPUTS_SCREEN
+	case CMD_SCREEN_OUTPUTS:
+		screen_switch(&screen_outputs, c);
+		break;
+#endif
+#ifdef ENABLE_CHAT_SCREEN
+	case CMD_SCREEN_CHAT:
+		screen_switch(&screen_chat, c);
+		break;
+#endif
+	case CMD_SCREEN_SWAP:
+		screen_swap(c, NULL);
+		break;
+
 	default:
 		break;
 	}
 }
+
+#ifdef HAVE_GETMOUSE
+
+static bool
+screen_current_page_mouse(struct mpdclient *c, int x, int y, mmask_t bstate)
+{
+	if (screen.current_page->mouse == NULL)
+		return false;
+
+	y -= screen.title_bar.window.rows;
+	return screen.current_page->mouse(c, x, y, bstate);
+}
+
+bool
+screen_mouse(struct mpdclient *c, int x, int y, mmask_t bstate)
+{
+	if (screen_current_page_mouse(c, x, y, bstate))
+		return true;
+
+	/* if button 2 was pressed switch screen */
+	if (bstate & BUTTON2_CLICKED) {
+		screen_cmd(c, CMD_SCREEN_NEXT);
+		return true;
+	}
+
+	return false;
+}
+
+#endif