From 771e21b4ac4c3e915ddc22512c187e26333ffa8e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 12 Dec 2008 22:06:27 +0100 Subject: [PATCH 1/1] screen_text: new library for displaying large texts Took a lot of code from screen_lyrics. --- configure.ac | 1 + src/Makefile.am | 5 ++ src/screen_text.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ src/screen_text.h | 94 +++++++++++++++++++++++++++++++++++++ 4 files changed, 217 insertions(+) create mode 100644 src/screen_text.c create mode 100644 src/screen_text.h diff --git a/configure.ac b/configure.ac index 1c14135..74d1dcb 100644 --- a/configure.ac +++ b/configure.ac @@ -367,6 +367,7 @@ AC_DEFINE_UNQUOTED([LYRICS_PLUGIN_DIR], ["$lyrics_plugin_dir"], AC_SUBST(lyrics_plugin_dir) AM_CONDITIONAL(ENABLE_PLUGIN_LIBRARY, test x$lyrics_screen = xyes) +AM_CONDITIONAL(ENABLE_SCREEN_TEXT, test x$lyrics_screen = xyes) dnl Optional screen - outputs AC_MSG_CHECKING([whether to include the outputs screen]) diff --git a/src/Makefile.am b/src/Makefile.am index 0078380..085396d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,6 +39,7 @@ ncmpc_headers = \ defaults.h \ i18n.h \ screen_browser.h \ + screen_text.h \ plugin.h \ lyrics.h \ str_pool.h \ @@ -105,6 +106,10 @@ if ENABLE_PLUGIN_LIBRARY ncmpc_SOURCES += plugin.c endif +if ENABLE_SCREEN_TEXT +ncmpc_SOURCES += screen_text.c +endif + if ENABLE_LYRICS_SCREEN ncmpc_SOURCES += screen_lyrics.c lyrics.c endif diff --git a/src/screen_text.c b/src/screen_text.c new file mode 100644 index 0000000..13bc58d --- /dev/null +++ b/src/screen_text.c @@ -0,0 +1,117 @@ +/* + * (c) 2004-2008 The Music Player Daemon Project + * http://www.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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "screen_text.h" +#include "screen_utils.h" +#include "charset.h" + +#include +#include + +void +screen_text_clear(struct screen_text *text) +{ + list_window_reset(text->lw); + + for (guint i = 0; i < text->lines->len; ++i) + g_free(g_ptr_array_index(text->lines, i)); + + g_ptr_array_set_size(text->lines, 0); +} + +void +screen_text_set(struct screen_text *text, const GString *str) +{ + const char *p, *eol, *next; + + assert(str != NULL); + + screen_text_clear(text); + + p = str->str; + while ((eol = strchr(p, '\n')) != NULL) { + char *line; + + next = eol + 1; + + /* strip whitespace at end */ + + while (eol > p && (unsigned char)eol[-1] <= 0x20) + --eol; + + /* create copy and append it to text->lines */ + + line = g_malloc(eol - p + 1); + memcpy(line, p, eol - p); + line[eol - p] = 0; + + g_ptr_array_add(text->lines, line); + + /* reset control characters */ + + for (eol = line + (eol - p); line < eol; ++line) + if ((unsigned char)*line < 0x20) + *line = ' '; + + p = next; + } + + if (*p != 0) + g_ptr_array_add(text->lines, g_strdup(p)); +} + +const char * +screen_text_list_callback(unsigned idx, G_GNUC_UNUSED bool *highlight, + void *data) +{ + const struct screen_text *text = data; + static char buffer[256]; + char *value; + + if (idx >= text->lines->len) + return NULL; + + value = utf8_to_locale(g_ptr_array_index(text->lines, idx)); + g_strlcpy(buffer, value, sizeof(buffer)); + g_free(value); + + return buffer; +} + +bool +screen_text_cmd(struct screen_text *text, + G_GNUC_UNUSED struct mpdclient *c, command_t cmd) +{ + if (list_window_scroll_cmd(text->lw, text->lines->len, cmd)) { + screen_text_repaint(text); + return true; + } + + text->lw->selected = text->lw->start + text->lw->rows; + if (screen_find(text->lw, text->lines->len, + cmd, screen_text_list_callback, text)) { + /* center the row */ + list_window_center(text->lw, text->lines->len, + text->lw->selected); + screen_text_repaint(text); + return true; + } + + return false; +} diff --git a/src/screen_text.h b/src/screen_text.h new file mode 100644 index 0000000..031c29f --- /dev/null +++ b/src/screen_text.h @@ -0,0 +1,94 @@ +/* + * (c) 2004-2008 The Music Player Daemon Project + * http://www.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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef SCREEN_TEXT_H +#define SCREEN_TEXT_H + +#include "list_window.h" + +#include + +struct mpdclient; + +struct screen_text { + GPtrArray *lines; + + struct list_window *lw; +}; + +static inline void +screen_text_init(struct screen_text *text, WINDOW *w, int cols, int rows) +{ + text->lines = g_ptr_array_new(); + + text->lw = list_window_init(w, cols, rows); + text->lw->hide_cursor = true; +} + +void +screen_text_clear(struct screen_text *text); + +static inline void +screen_text_deinit(struct screen_text *text) +{ + screen_text_clear(text); + g_ptr_array_free(text->lines, TRUE); + + list_window_free(text->lw); +} + +static inline void +screen_text_resize(struct screen_text *text, int cols, int rows) +{ + text->lw->cols = cols; + text->lw->rows = rows; +} + +static inline bool +screen_text_is_empty(const struct screen_text *text) +{ + return text->lines->len == 0; +} + +void +screen_text_set(struct screen_text *text, const GString *str); + +const char * +screen_text_list_callback(unsigned idx, bool *highlight, void *data); + +static inline void +screen_text_paint(struct screen_text *text) +{ + list_window_paint(text->lw, screen_text_list_callback, text); +} + +/** + * Repaint and update the screen. + */ +static inline void +screen_text_repaint(struct screen_text *text) +{ + screen_text_paint(text); + wrefresh(text->lw->w); +} + +bool +screen_text_cmd(struct screen_text *text, struct mpdclient *c, command_t cmd); + +#endif -- 2.30.2