X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen.h;h=3d7bc3922f0e8ac2d45565d65f5eceb3bb933fa1;hb=63fc23f1c83f52eb47b5511e97bb1fe7cf7d82d5;hp=e3b00626fc7d762477bf53d6655ed4c5a412fa7d;hpb=6c29c9b2dc0aab7c7273b093609edcc175510df7;p=ncmpc.git

diff --git a/src/screen.h b/src/screen.h
index e3b0062..3d7bc39 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -1,21 +1,21 @@
 /* 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
  * 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,16 +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
+#include <stdbool.h>
 
 struct mpdclient;
 struct screen_functions;
@@ -46,7 +43,7 @@ struct screen {
 	struct progress_bar progress_bar;
 	struct status_bar status_bar;
 
-	unsigned cols, rows;
+	const struct screen_functions *current_page;
 
 	char *buf;
 	size_t buf_size;
@@ -68,19 +65,30 @@ extern struct screen screen;
 void screen_init(struct mpdclient *c);
 void screen_exit(void);
 void screen_resize(struct mpdclient *c);
-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);
 
+#ifdef HAVE_GETMOUSE
+bool
+screen_mouse(struct mpdclient *c, int x, int y, mmask_t bstate);
+#endif
+
 void
 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);
-
-int
-screen_get_mouse_event(struct mpdclient *c, unsigned long *bstate, int *row);
+static inline bool
+screen_is_visible(const struct screen_functions *sf)
+{
+	return sf == screen.current_page;
+}
 
 #endif