screen: move mode_fn into struct screen

[ncmpc.git] / src / screen.h

diff --git a/src/screen.h b/src/screen.h
index f6cfa9cf710fbcbd61546dc514c0a1b3ac7818f0..7c2d2140da2c26c1e58953f57fdfb7426680b7a5 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
@@ -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
@@ -32,6 +32,8 @@
 
 #include <glib.h>
 
+#include <stdbool.h>
+
 struct mpdclient;
 struct screen_functions;
 
@@ -41,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;
@@ -63,7 +65,10 @@ 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
+screen_paint(struct mpdclient *c, bool main_dirty);
+
 void screen_update(struct mpdclient *c);
 void screen_cmd(struct mpdclient *c, command_t cmd);
 
@@ -72,8 +77,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);