X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen.c;h=781b68f22eb9e99c2d06b2590dce1990548041a6;hb=26efd1aa493c9c25cfbd167f225d48203ec8620b;hp=4050add277367c224a45b949ffc010a9e8a73b0d;hpb=abf74f74fc864c9dc2a928d72d9172eb9742e6aa;p=ncmpc.git

diff --git a/src/screen.c b/src/screen.c
index 4050add..781b68f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 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
@@ -132,18 +132,17 @@ 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(mode_fn));
+	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);
 }
@@ -157,8 +156,7 @@ paint_top_window(const char *header, const struct mpdclient *c)
 static void
 update_progress_window(struct mpdclient *c, bool repaint)
 {
-	unsigned elapsed, duration;
-
+	unsigned elapsed;
 	if (c->status == NULL)
 		elapsed = 0;
 	else if (seek_id >= 0 && seek_id == mpd_status_get_song_id(c->status))
@@ -166,7 +164,7 @@ update_progress_window(struct mpdclient *c, bool repaint)
 	else
 		elapsed = mpd_status_get_elapsed_time(c->status);
 
-	duration = mpdclient_is_playing(c)
+	unsigned duration = mpdclient_is_playing(c)
 		? mpd_status_get_total_time(c->status)
 		: 0;
 
@@ -221,16 +219,13 @@ screen_resize(struct mpdclient *c)
 	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 */
 	progress_bar_resize(&screen.progress_bar, screen.cols,
 			    screen.rows - 2, 0);
-	progress_bar_paint(&screen.progress_bar);
 
 	/* status window */
 	status_bar_resize(&screen.status_bar, screen.cols, screen.rows - 1, 0);
-	status_bar_paint(&screen.status_bar, c->status, c->song);
 
 	screen.buf_size = screen.cols;
 	g_free(screen.buf);
@@ -252,9 +247,7 @@ welcome_timer_callback(gpointer data)
 {
 	struct mpdclient *c = data;
 
-#ifndef NCMPC_MINI
 	screen.welcome_source_id = 0;
-#endif
 
 	paint_top_window(mode_fn->get_title != NULL
 			 ? mode_fn->get_title(screen.buf, screen.buf_size)
@@ -284,8 +277,8 @@ screen_init(struct mpdclient *c)
 #ifndef NCMPC_MINI
 	if (options.welcome_screen_list)
 		screen.welcome_source_id =
-			g_timeout_add(SCREEN_WELCOME_TIME * 1000,
-				      welcome_timer_callback, c);
+			g_timeout_add_seconds(SCREEN_WELCOME_TIME,
+					      welcome_timer_callback, c);
 #endif
 
 	/* create top window */
@@ -302,11 +295,9 @@ screen_init(struct mpdclient *c)
 	/* create progress window */
 	progress_bar_init(&screen.progress_bar, screen.cols,
 			  screen.rows - 2, 0);
-	progress_bar_paint(&screen.progress_bar);
 
 	/* 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);
 
 #ifdef ENABLE_COLORS
 	if (options.enable_colors) {
@@ -321,8 +312,6 @@ screen_init(struct mpdclient *c)
 	}
 #endif
 
-	doupdate();
-
 	/* initialize screens */
 	screen_list_init(screen.main_window.w,
 			 screen.main_window.cols, screen.main_window.rows);
@@ -331,19 +320,19 @@ screen_init(struct mpdclient *c)
 		mode_fn->open(c);
 }
 
-void
-screen_paint(struct mpdclient *c)
+static void
+screen_refresh(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 */
+	const char *title =
+#ifndef NCMPC_MINI
+		screen.welcome_source_id == 0 &&
+#endif
+		mode_fn->get_title != NULL
+		? mode_fn->get_title(screen.buf, screen.buf_size)
+		: "";
+	assert(title != NULL);
+	paint_top_window(title, c);
 
 	/* paint the bottom window */
 
@@ -352,9 +341,11 @@ screen_paint(struct mpdclient *c)
 
 	/* 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 (mode_fn->paint != NULL)
+			mode_fn->paint();
+	}
 
 	/* move the cursor to the origin */
 
@@ -367,6 +358,12 @@ screen_paint(struct mpdclient *c)
 	doupdate();
 }
 
+void
+screen_paint(struct mpdclient *c)
+{
+	screen_refresh(c, true);
+}
+
 void
 screen_update(struct mpdclient *c)
 {
@@ -434,36 +431,13 @@ screen_update(struct mpdclient *c)
 	    mpdclient_is_connected(c))
 		screen_status_printf(_("Database updated"));
 	was_connected = mpdclient_is_connected(c);
-
-	/* update title/header window */
-	if (screen.welcome_source_id != 0)
-		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);
-	} else
-		paint_top_window("", c);
-
-	/* update progress window */
-	update_progress_window(c, false);
-
-	/* 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);
-
-	/* tell curses to update */
-	doupdate();
+	screen_refresh(c, false);
 }
 
 #ifdef HAVE_GETMOUSE