lyrics/leoslyrics: don't print backtrace on HTTP failure

[ncmpc.git] / src / charset.c

diff --git a/src/charset.c b/src/charset.c
index 5e10bbd5d24983c45285b1557af8d96119a833fa..7e2e2d1aeffa5acbacc2f67dd3ad1d7be91dee0e 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1,5 +1,5 @@
 /* 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
@@ -32,10 +32,25 @@ charset_init(void)
 {
        noconvert = g_get_charset(&charset);
        return charset;
-       return NULL;
 }
 #endif
 
+#ifdef ENABLE_WIDE
+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 /* ENABLE_WIDE */
+
 unsigned
 utf8_width(const char *str)
 {
@@ -52,7 +67,7 @@ utf8_width(const char *str)
 
                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);
                }
 
@@ -63,6 +78,88 @@ utf8_width(const char *str)
 #endif
 }
 
+unsigned
+locale_width(const char *p)
+{
+#if defined(ENABLE_LOCALE) && defined(ENABLE_MULTIBYTE)
+       char *utf8;
+       unsigned width;
+
+       if (noconvert)
+               return utf8_width(p);
+
+       utf8 = locale_to_utf8(p);
+       width = utf8_width(utf8);
+       g_free(utf8);
+
+       return width;
+#else
+       return strlen(p);
+#endif
+}
+
+static inline unsigned
+ascii_cut_width(char *p, unsigned max_width)
+{
+       size_t length = strlen(p);
+       if (length <= (size_t)max_width)
+               return (unsigned)length;
+
+       p[max_width] = 0;
+       return max_width;
+}
+
+static inline unsigned
+narrow_cut_width(char *p, unsigned max_width)
+{
+       size_t length = g_utf8_strlen(p, -1);
+       if (length <= (size_t)max_width)
+               return (unsigned)length;
+
+       *g_utf8_offset_to_pointer(p, max_width) = 0;
+       return max_width;
+}
+
+static inline unsigned
+wide_cut_width(char *p, unsigned max_width)
+{
+       size_t length = g_utf8_strlen(p, -1);
+       unsigned width = 0, prev_width;
+       gunichar c;
+
+       while (length-- > 0) {
+               c = g_utf8_get_char(p);
+               prev_width = width;
+               width += g_unichar_iswide(c) ? 2 : 1;
+               if (width > max_width) {
+                       /* too wide - cut the rest off */
+                       *p = 0;
+                       return prev_width;
+               }
+
+               p += g_unichar_to_utf8(c, NULL);
+       }
+
+       return width;
+}
+
+unsigned
+utf8_cut_width(char *p, unsigned max_width)
+{
+       assert(p != NULL);
+
+#ifdef ENABLE_WIDE
+       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)
+       return narrow_cut_width(p, max_width);
+#else
+       return ascii_cut_width(p, max_width);
+#endif
+}
+
 char *
 utf8_to_locale(const char *utf8str)
 {
@@ -108,3 +205,34 @@ locale_to_utf8(const char *localestr)
        return g_strdup(localestr);
 #endif
 }
+
+char *
+replace_utf8_to_locale(char *src)
+{
+#ifdef ENABLE_LOCALE
+       assert(src != NULL);
+
+       if (noconvert)
+               return src;
+
+       return utf8_to_locale(src);
+#else
+       return src;
+#endif
+}
+
+
+char *
+replace_locale_to_utf8(char *src)
+{
+#ifdef ENABLE_LOCALE
+       assert(src != NULL);
+
+       if (noconvert)
+               return src;
+
+       return locale_to_utf8(src);
+#else
+       return src;
+#endif
+}