X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen.c;h=a08cf595dab01ad5c1616aeff53b2ffa8b362f52;hb=655cd7831d0226c2e223280c61228be26f1bb8f8;hp=a7c46b943e7c080e1f65697f1ace76f900e95407;hpb=4052c59420cf7884579d320969140c00bffb4a5d;p=ncmpc.git

diff --git a/src/screen.c b/src/screen.c
index a7c46b9..a08cf59 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1,27 +1,27 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (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
  * 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.,
  * 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_message.h"
+#include "screen_status.h"
 #include "config.h"
 #include "i18n.h"
 #include "charset.h"
@@ -31,7 +31,7 @@
 #include "colors.h"
 #include "player_command.h"
 #include "screen_help.h"
-#include "screen_play.h"
+#include "screen_queue.h"
 #include "screen_file.h"
 #include "screen_artist.h"
 #include "screen_search.h"
@@ -39,6 +39,7 @@
 #include "screen_keydef.h"
 #include "screen_lyrics.h"
 #include "screen_outputs.h"
+#include "screen_chat.h"
 
 #include <mpd/client.h>
 
@@ -54,47 +55,39 @@ static const GTime SCREEN_WELCOME_TIME = 10;
 #endif
 
 /* minimum window size */
-static const int SCREEN_MIN_COLS = 14;
-static const int SCREEN_MIN_ROWS = 5;
+static const unsigned SCREEN_MIN_COLS = 14;
+static const unsigned 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 const struct screen_functions *mode_fn_prev = &screen_playlist;
-
-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 = mode_fn;
+	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
@@ -135,55 +128,61 @@ static void
 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);
 }
 
 static void
-paint_top_window(const char *header, const struct mpdclient *c)
+paint_top_window(const struct mpdclient *c)
 {
-	title_bar_paint(&screen.title_bar, header, c->status);
+	const char *title =
+#ifndef NCMPC_MINI
+		screen.welcome_source_id == 0 &&
+#endif
+		screen.current_page->get_title != NULL
+		? screen.current_page->get_title(screen.buf, screen.buf_size)
+		: "";
+	assert(title != NULL);
+
+	title_bar_paint(&screen.title_bar, title, c->status);
 }
 
 static void
-paint_progress_window(struct mpdclient *c)
+update_progress_window(struct mpdclient *c, bool repaint)
 {
-	unsigned elapsed, duration;
-
-	if (c->song != NULL && seek_id == (int)mpd_song_get_id(c->song))
+	unsigned elapsed;
+	if (c->status == NULL)
+		elapsed = 0;
+	else if (seek_id >= 0 && seek_id == mpd_status_get_song_id(c->status))
 		elapsed = seek_target_time;
-	else if (c->status != NULL)
-		elapsed = mpd_status_get_elapsed_time(c->status);
 	else
-		elapsed = 0;
+		elapsed = mpd_status_get_elapsed_time(c->status);
 
-	duration = c->status != NULL &&
-		(mpd_status_get_state(c->status) == MPD_STATE_PLAY ||
-		 mpd_status_get_state(c->status) == MPD_STATE_PAUSE)
+	unsigned duration = mpdclient_is_playing(c)
 		? mpd_status_get_total_time(c->status)
 		: 0;
 
-	if (progress_bar_set(&screen.progress_bar, elapsed, duration))
+	if (progress_bar_set(&screen.progress_bar, elapsed, duration) ||
+	    repaint)
 		progress_bar_paint(&screen.progress_bar);
 }
 
 void
 screen_exit(void)
 {
-	if (mode_fn->close != NULL)
-		mode_fn->close();
+	if (screen.current_page->close != NULL)
+		screen.current_page->close();
 
 	screen_list_exit();
 
@@ -195,42 +194,45 @@ screen_exit(void)
 	delwin(screen.main_window.w);
 	progress_bar_deinit(&screen.progress_bar);
 	status_bar_deinit(&screen.status_bar);
+
+#ifndef NCMPC_MINI
+	if (screen.welcome_source_id != 0)
+		g_source_remove(screen.welcome_source_id);
+#endif
 }
 
 void
 screen_resize(struct mpdclient *c)
 {
-	if (COLS<SCREEN_MIN_COLS || LINES<SCREEN_MIN_ROWS) {
+	const unsigned cols = COLS, rows = LINES;
+	if (cols < SCREEN_MIN_COLS || rows < SCREEN_MIN_ROWS) {
 		screen_exit();
-		fprintf(stderr, "%s", _("Error: Screen too small"));
+		fprintf(stderr, "%s\n", _("Error: Screen too small"));
 		exit(EXIT_FAILURE);
 	}
 
-	resizeterm(LINES, COLS);
-
-	screen.cols = COLS;
-	screen.rows = LINES;
+#ifdef PDCURSES
+	resize_term(rows, cols);
+#else 
+	resizeterm(rows, cols);
+#endif
 
-	title_bar_resize(&screen.title_bar, screen.cols);
+	title_bar_resize(&screen.title_bar, 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);
+	screen.main_window.cols = cols;
+	screen.main_window.rows = rows - 4;
+	wresize(screen.main_window.w, screen.main_window.rows, cols);
 
 	/* progress window */
-	progress_bar_resize(&screen.progress_bar, screen.cols,
-			    screen.rows - 2, 0);
-	progress_bar_paint(&screen.progress_bar);
+	progress_bar_resize(&screen.progress_bar, cols, rows - 2, 0);
 
 	/* status window */
-	status_bar_resize(&screen.status_bar, screen.cols, screen.rows - 1, 0);
-	status_bar_paint(&screen.status_bar, c->status, c->song);
+	status_bar_resize(&screen.status_bar, cols, rows - 1, 0);
 
-	screen.buf_size = screen.cols;
+	screen.buf_size = cols;
 	g_free(screen.buf);
-	screen.buf = g_malloc(screen.cols);
+	screen.buf = g_malloc(cols);
 
 	/* resize all screens */
 	screen_list_resize(screen.main_window.cols, screen.main_window.rows);
@@ -239,42 +241,60 @@ screen_resize(struct mpdclient *c)
 	curs_set(1);
 	curs_set(0);
 
-	screen_paint(c);
+	screen_paint(c, true);
 }
 
+#ifndef NCMPC_MINI
+static gboolean
+welcome_timer_callback(gpointer data)
+{
+	struct mpdclient *c = data;
+
+	screen.welcome_source_id = 0;
+
+	paint_top_window(c);
+	doupdate();
+
+	return false;
+}
+#endif
+
 void
 screen_init(struct mpdclient *c)
 {
-	if (COLS < SCREEN_MIN_COLS || LINES < SCREEN_MIN_ROWS) {
+	const unsigned cols = COLS, rows = LINES;
+	if (cols < SCREEN_MIN_COLS || rows < SCREEN_MIN_ROWS) {
 		fprintf(stderr, "%s\n", _("Error: Screen too small"));
 		exit(EXIT_FAILURE);
 	}
 
-	screen.cols = COLS;
-	screen.rows = LINES;
-
-	screen.buf  = g_malloc(screen.cols);
-	screen.buf_size = screen.cols;
+	screen.buf = g_malloc(cols);
+	screen.buf_size = cols;
 	screen.findbuf = NULL;
-	screen.start_timestamp = time(NULL);
+
+#ifndef NCMPC_MINI
+	if (options.welcome_screen_list)
+		screen.welcome_source_id =
+			g_timeout_add_seconds(SCREEN_WELCOME_TIME,
+					      welcome_timer_callback, c);
+#endif
 
 	/* create top window */
-	title_bar_init(&screen.title_bar, screen.cols, 0, 0);
+	title_bar_init(&screen.title_bar, cols, 0, 0);
 
 	/* create main window */
-	window_init(&screen.main_window, screen.rows - 4, screen.cols, 2, 0);
+	window_init(&screen.main_window, rows - 4, cols, 2, 0);
+
+	if (!options.hardware_cursor)
+		leaveok(screen.main_window.w, TRUE);
 
-	//  leaveok(screen.main_window.w, TRUE); temporary disabled
 	keypad(screen.main_window.w, TRUE);
 
 	/* create progress window */
-	progress_bar_init(&screen.progress_bar, screen.cols,
-			  screen.rows - 2, 0);
-	progress_bar_paint(&screen.progress_bar);
+	progress_bar_init(&screen.progress_bar, cols, rows - 2, 0);
 
 	/* create status window */
-	status_bar_init(&screen.status_bar, screen.cols, screen.rows - 1, 0);
-	status_bar_paint(&screen.status_bar, c->status, c->song);
+	status_bar_init(&screen.status_bar, cols, rows - 1, 0);
 
 #ifdef ENABLE_COLORS
 	if (options.enable_colors) {
@@ -289,40 +309,32 @@ screen_init(struct mpdclient *c)
 	}
 #endif
 
-	doupdate();
-
 	/* 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);
+	if (screen.current_page->open != NULL)
+		screen.current_page->open(c);
 }
 
 void
-screen_paint(struct mpdclient *c)
+screen_paint(struct mpdclient *c, bool main_dirty)
 {
-	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);
-	else
-		paint_top_window("", c);
+	/* update title/header window */
+	paint_top_window(c);
 
 	/* paint the bottom window */
 
-	paint_progress_window(c);
+	update_progress_window(c, true);
 	status_bar_paint(&screen.status_bar, c->status, c->song);
 
 	/* paint the main window */
 
-	wclear(screen.main_window.w);
-	if (mode_fn->paint != NULL)
-		mode_fn->paint();
+	if (main_dirty) {
+		wclear(screen.main_window.w);
+		if (screen.current_page->paint != NULL)
+			screen.current_page->paint();
+	}
 
 	/* move the cursor to the origin */
 
@@ -339,6 +351,7 @@ void
 screen_update(struct mpdclient *c)
 {
 #ifndef NCMPC_MINI
+	static bool was_connected;
 	static bool initialized = false;
 	static bool repeat;
 	static bool random_enabled;
@@ -397,42 +410,17 @@ screen_update(struct mpdclient *c)
 		crossfade = mpd_status_get_crossfade(c->status);
 	}
 
-	if (c->events & MPD_IDLE_DATABASE)
+	if ((c->events & MPD_IDLE_DATABASE) != 0 && was_connected &&
+	    mpdclient_is_connected(c))
 		screen_status_printf(_("Database updated"));
-
-	/* update title/header window */
-	if (welcome && options.welcome_screen_list &&
-	    time(NULL)-screen.start_timestamp <= SCREEN_WELCOME_TIME)
-		paint_top_window("", c);
-	else
-#endif
-	if (mode_fn->get_title != NULL) {
-		paint_top_window(mode_fn->get_title(screen.buf,screen.buf_size), c);
-#ifndef NCMPC_MINI
-		welcome = FALSE;
+	was_connected = mpdclient_is_connected(c);
 #endif
-	} else
-		paint_top_window("", c);
-
-	/* update progress window */
-	paint_progress_window(c);
-
-	/* update status window */
-	status_bar_paint(&screen.status_bar, c->status, c->song);
 
 	/* update the main window */
-	if (mode_fn->update != NULL)
-		mode_fn->update(c);
-
-	/* move the cursor to the origin */
-
-	if (!options.hardware_cursor)
-		wmove(screen.main_window.w, 0, 0);
-
-	wnoutrefresh(screen.main_window.w);
+	if (screen.current_page->update != NULL)
+		screen.current_page->update(c);
 
-	/* tell curses to update */
-	doupdate();
+	screen_paint(c, false);
 }
 
 #ifdef HAVE_GETMOUSE
@@ -441,8 +429,12 @@ screen_get_mouse_event(struct mpdclient *c, unsigned long *bstate, int *row)
 {
 	MEVENT event;
 
-	/* retrieve the mouse event from ncurses */
+	/* retrieve the mouse event from curses */
+#ifdef PDCURSES
+	nc_getmouse(&event);
+#else
 	getmouse(&event);
+#endif
 	/* calculate the selected row in the list window */
 	*row = event.y - screen.title_bar.window.rows;
 	/* copy button state bits */
@@ -461,10 +453,14 @@ void
 screen_cmd(struct mpdclient *c, command_t 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 (handle_player_command(c, cmd))
@@ -484,7 +480,7 @@ screen_cmd(struct mpdclient *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);
@@ -493,7 +489,7 @@ screen_cmd(struct mpdclient *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);
@@ -532,10 +528,15 @@ screen_cmd(struct mpdclient *c, command_t cmd)
 	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;
-#endif
 
 	default:
 		break;