diff --git a/src/hscroll.c b/src/hscroll.c
index 109293d3364254666aae645fb1c1c756fa739bf3..dafae93dee2dc3a0d9190267c34aa62e0e63d54d 100644 (file)
--- a/src/hscroll.c
+++ b/src/hscroll.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
* This program is free software; you can redistribute it and/or modify
#include "hscroll.h"
#include "charset.h"
+#include "ncfix.h"
+#include "glib_compat.h"
#include <assert.h>
#include <string.h>
unsigned width)
{
gchar *tmp, *buf;
- gsize len, size, ulen;
assert(hscroll != NULL);
assert(str != NULL);
assert(separator != NULL);
- if (hscroll->offset == 0)
- return g_strdup(str);
-
/* create a buffer containing the string and the separator */
- tmp = replace_locale_to_utf8(g_strconcat(str, separator, NULL));
- len = utf8_width(tmp);
+ tmp = replace_locale_to_utf8(g_strconcat(str, separator,
+ str, separator, NULL));
- if (hscroll->offset >= len)
+ if (hscroll->offset >= (unsigned)g_utf8_strlen(tmp, -1) / 2)
hscroll->offset = 0;
/* create the new scrolled string */
- size = width+1;
- buf = g_malloc(size * 6);// max length of utf8 char is 6
- g_utf8_strncpy(buf, g_utf8_offset_to_pointer(tmp,
- hscroll->offset), size);
- if ((ulen = g_utf8_strlen(buf, -1)) < width)
- g_utf8_strncpy(buf + strlen(buf), tmp, size - ulen - 1);
+ 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);
- tmp = utf8_to_locale(buf);
- g_free(buf);
- return 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)
+{
+ attr_t old_attrs;
+ short old_pair;
+ char *p;
+
+ assert(hscroll != NULL);
+ assert(hscroll->w != NULL);
+ assert(hscroll->text != NULL);
+
+ /* set stored attributes and color */
+ 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 */
+ 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);
}