diff --git a/src/hscroll.c b/src/hscroll.c
index d3e47d8e1d9e12a98634340cb0d03b58eaa529f4..eae689ee364582f07ecfc833088c67148c0d1929 100644 (file)
--- a/src/hscroll.c
+++ b/src/hscroll.c
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
+/* ncmpc (Ncurses MPD Client)
+ * (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
* 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
*
+ * 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.
*/
#include "hscroll.h"
#include "charset.h"
+#include "ncfix.h"
#include <assert.h>
-#include <ctype.h>
#include <string.h>
-// FIXME: utf-8 length
char *
-strscroll(char *str, char *separator, int width, scroll_state_t *st)
+strscroll(struct hscroll *hscroll, const char *str, const char *separator,
+ unsigned width)
{
- gchar *tmp, *buf;
- gsize len, size;
-
+ assert(hscroll != NULL);
assert(str != NULL);
assert(separator != NULL);
- assert(st != NULL);
-
- if( st->offset==0 ) {
- st->offset++;
- return g_strdup(str);
- }
/* create a buffer containing the string and the separator */
- size = strlen(str)+strlen(separator)+1;
- tmp = g_malloc(size);
- g_strlcpy(tmp, str, size);
- g_strlcat(tmp, separator, size);
- len = utf8_width(tmp);
-
- if (st->offset >= len)
- st->offset = 0;
+ char *tmp = replace_locale_to_utf8(g_strconcat(str, separator,
+ str, separator, NULL));
+ if (hscroll->offset >= (unsigned)g_utf8_strlen(tmp, -1) / 2)
+ hscroll->offset = 0;
/* create the new scrolled string */
- size = width+1;
- if (g_utf8_validate(tmp, -1, NULL) ) {
- int ulen;
- buf = g_malloc(size*6);// max length of utf8 char is 6
- g_utf8_strncpy(buf, g_utf8_offset_to_pointer(tmp,st->offset), size);
- if( (ulen = g_utf8_strlen(buf, -1)) < width )
- g_utf8_strncpy(buf+strlen(buf), tmp, size - ulen - 1);
- } else {
- buf = g_malloc(size);
- g_strlcpy(buf, tmp+st->offset, size);
- if (strlen(buf) < (size_t)width)
- g_strlcat(buf, tmp, size);
- }
- if( time(NULL)-st->t >= 1 ) {
- st->t = time(NULL);
- st->offset++;
- }
+ char *buf = g_utf8_offset_to_pointer(tmp, hscroll->offset);
+ utf8_cut_width(buf, width);
+
+ /* convert back to locale */
+ buf = utf8_to_locale(buf);
g_free(tmp);
return buf;
}
+
+/**
+ * This timer scrolls the area by one and redraws.
+ */
+static gboolean
+hscroll_timer_callback(gpointer data)
+{
+ struct hscroll *hscroll = data;
+
+ hscroll_step(hscroll);
+ hscroll_draw(hscroll);
+ wrefresh(hscroll->w);
+ return true;
+}
+
+void
+hscroll_set(struct hscroll *hscroll, unsigned x, unsigned y, unsigned width,
+ const char *text)
+{
+ assert(hscroll != NULL);
+ assert(hscroll->w != NULL);
+ assert(text != NULL);
+
+ if (hscroll->text != NULL && hscroll->x == x && hscroll->y == y &&
+ hscroll->width == width && strcmp(hscroll->text, text) == 0)
+ /* no change, do nothing (and, most importantly, do
+ not reset the current offset!) */
+ return;
+
+ hscroll_clear(hscroll);
+
+ hscroll->x = x;
+ hscroll->y = y;
+ hscroll->width = width;
+
+ /* obtain the ncurses attributes and the current color, store
+ them */
+ fix_wattr_get(hscroll->w, &hscroll->attrs, &hscroll->pair, NULL);
+
+ hscroll->text = g_strdup(text);
+ hscroll->offset = 0;
+ hscroll->source_id = g_timeout_add_seconds(1, hscroll_timer_callback,
+ hscroll);
+}
+
+void
+hscroll_clear(struct hscroll *hscroll)
+{
+ assert(hscroll != NULL);
+
+ if (hscroll->text == NULL)
+ return;
+
+ g_source_remove(hscroll->source_id);
+
+ g_free(hscroll->text);
+ hscroll->text = NULL;
+}
+
+void
+hscroll_draw(struct hscroll *hscroll)
+{
+ assert(hscroll != NULL);
+ assert(hscroll->w != NULL);
+ assert(hscroll->text != NULL);
+
+ /* set stored attributes and color */
+ attr_t old_attrs;
+ short old_pair;
+ fix_wattr_get(hscroll->w, &old_attrs, &old_pair, NULL);
+ wattr_set(hscroll->w, hscroll->attrs, hscroll->pair, NULL);
+
+ /* scroll the string, and draw it */
+ char *p = strscroll(hscroll, hscroll->text, hscroll->separator,
+ hscroll->width);
+ mvwaddstr(hscroll->w, hscroll->y, hscroll->x, p);
+ g_free(p);
+
+ /* restore previous attributes and color */
+ wattr_set(hscroll->w, old_attrs, old_pair, NULL);
+}