X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen.h;h=8a91d46279254a7205a16af18d899196de787d2e;hb=f2b8b4378b3760e8ba5a1ed54a5f8635d3dac85e;hp=5ed300fa67551d4cad85127e4558a20bd71cc4dc;hpb=d5067195b96dfbad5e07e1485fe4f75507b6d558;p=ncmpc.git

diff --git a/src/screen.h b/src/screen.h
index 5ed300f..8a91d46 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -1,21 +1,21 @@
 /* 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.
-*/
+ */
 
 #ifndef SCREEN_H
 #define SCREEN_H
@@ -26,18 +26,13 @@
 #include "title_bar.h"
 #include "progress_bar.h"
 #include "status_bar.h"
+#include "ncmpc_curses.h"
 
 #include <mpd/client.h>
 
 #include <glib.h>
 
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#else
-#include <ncurses.h>
-#endif
-
-#define MAX_SONGNAME_LENGTH   512
+#include <stdbool.h>
 
 struct mpdclient;
 struct screen_functions;
@@ -48,16 +43,21 @@ struct screen {
 	struct progress_bar progress_bar;
 	struct status_bar status_bar;
 
-	/* GTime is equivalent to time_t */
-	GTime start_timestamp;
-
-	unsigned cols, rows;
+	const struct screen_functions *current_page;
 
 	char *buf;
 	size_t buf_size;
 
 	char *findbuf;
 	GList *find_history;
+
+#ifndef NCMPC_MINI
+	/**
+	 * Non-zero when the welcome message is currently being
+	 * displayed.  The associated timer will disable it.
+	 */
+	guint welcome_source_id;
+#endif
 };
 
 extern struct screen screen;
@@ -65,9 +65,13 @@ extern struct screen screen;
 void screen_init(struct mpdclient *c);
 void screen_exit(void);
 void screen_resize(struct mpdclient *c);
-void screen_status_message(const char *msg);
-void screen_status_printf(const char *format, ...);
-void screen_paint(struct mpdclient *c);
+
+void
+paint_top_window(const struct mpdclient *c);
+
+void
+screen_paint(struct mpdclient *c, bool main_dirty);
+
 void screen_update(struct mpdclient *c);
 void screen_cmd(struct mpdclient *c, command_t cmd);
 
@@ -76,8 +80,11 @@ screen_switch(const struct screen_functions *sf, struct mpdclient *c);
 void 
 screen_swap(struct mpdclient *c, const struct mpd_song *song);
 
-gboolean
-screen_is_visible(const struct screen_functions *sf);
+static inline bool
+screen_is_visible(const struct screen_functions *sf)
+{
+	return sf == screen.current_page;
+}
 
 int
 screen_get_mouse_event(struct mpdclient *c, unsigned long *bstate, int *row);