release v0.29

[ncmpc.git] / src / screen_text.h

diff --git a/src/screen_text.h b/src/screen_text.h
index 5358feb82e9329f73c00e778d3596fe71f3ff63e..099101f38bb309ac4b70b3be7064465e67afd536 100644 (file)
--- a/src/screen_text.h
+++ b/src/screen_text.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_TEXT_H
 #define SCREEN_TEXT_H
@@ -33,7 +33,7 @@ struct screen_text {
 };
 
 static inline void
-screen_text_init(struct screen_text *text, WINDOW *w, int cols, int rows)
+screen_text_init(struct screen_text *text, WINDOW *w, unsigned cols, unsigned rows)
 {
        text->lines = g_ptr_array_new();
 
@@ -54,7 +54,7 @@ screen_text_deinit(struct screen_text *text)
 }
 
 static inline void
-screen_text_resize(struct screen_text *text, int cols, int rows)
+screen_text_resize(struct screen_text *text, unsigned cols, unsigned rows)
 {
        list_window_resize(text->lw, cols, rows);
 }
@@ -66,10 +66,17 @@ screen_text_is_empty(const struct screen_text *text)
 }
 
 void
-screen_text_set(struct screen_text *text, const GString *str);
+screen_text_append(struct screen_text *text, const char *str);
+
+static inline void
+screen_text_set(struct screen_text *text, const char *str)
+{
+       screen_text_clear(text);
+       screen_text_append(text, str);
+}
 
 const char *
-screen_text_list_callback(unsigned idx, bool *highlight, char** sc, void *data);
+screen_text_list_callback(unsigned idx, void *data);
 
 static inline void
 screen_text_paint(struct screen_text *text)