diff --git a/src/charset.c b/src/charset.c
index 6282fbf35167cc7015dafd7822c486934809a0b2..157e022e48a0c3bd30c34544cdfcce786d547ec7 100644 (file)
--- a/src/charset.c
+++ b/src/charset.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
* 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.
-*/
+ */
#include "charset.h"
}
#endif
+#ifdef HAVE_CURSES_ENHANCED
+static inline unsigned
+unicode_char_width(gunichar ch)
+{
+#if GLIB_CHECK_VERSION(2,14,0)
+ if (g_unichar_iszerowidth(ch))
+ return 0;
+#endif
+
+ if (g_unichar_iswide(ch))
+ return 2;
+
+ return 1;
+}
+#endif /* HAVE_CURSES_ENHANCED */
+
unsigned
utf8_width(const char *str)
{
assert(str != NULL);
-#if defined(ENABLE_MULTIBYTE) && !defined(ENABLE_WIDE)
+#if defined(ENABLE_MULTIBYTE) && !defined(HAVE_CURSES_ENHANCED)
return g_utf8_strlen(str, -1);
#else
-#ifdef ENABLE_WIDE
+#ifdef HAVE_CURSES_ENHANCED
if (g_utf8_validate(str, -1, NULL)) {
size_t len = g_utf8_strlen(str, -1);
unsigned width = 0;
while (len--) {
c = g_utf8_get_char(str);
- width += g_unichar_iswide(c) ? 2 : 1;
+ width += unicode_char_width(c);
str += g_unichar_to_utf8(c, NULL);
}
return width;
#else
- return strlen(str);
+ return strlen(p);
#endif
}
{
assert(p != NULL);
-#ifdef ENABLE_WIDE
+#ifdef HAVE_CURSES_ENHANCED
if (!g_utf8_validate(p, -1, NULL))
return ascii_cut_width(p, max_width);
return wide_cut_width(p, max_width);
-#elif defined(ENABLE_MULTIBYTE) && !defined(ENABLE_WIDE)
+#elif defined(ENABLE_MULTIBYTE) && !defined(HAVE_CURSES_ENHANCED)
return narrow_cut_width(p, max_width);
#else
return ascii_cut_width(p, max_width);