X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcharset.h;h=3dcdea7219dad6694e4532b22cd589cee4859776;hb=057875e822828d9dd7e656613b19c784853c7e18;hp=11993771024b60177f6a9dc3773585c9a0355c57;hpb=b693269fd9740a3074b84da5645f6bd9daa6486e;p=ncmpc.git

diff --git a/src/charset.h b/src/charset.h
index 1199377..3dcdea7 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -1,36 +1,75 @@
-/*
- * (c) 2006 by Kalle Wallin <kaw@linux.se>
- * Copyright (C) 2008 Max Kellermann <max@duempel.org>
- *
+/* ncmpc (Ncurses MPD Client)
+ * (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., 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.
+*/
 
 #ifndef CHARSET_H
 #define CHARSET_H
 
+#include "config.h"
+
+#include <glib.h>
+
 #include <stdbool.h>
-#include <stddef.h>
 
-void charset_init(bool disable);
+#ifdef ENABLE_LOCALE
+const char *
+charset_init(void);
+#endif
 
 /**
  * Returns the number of terminal cells occupied by this string.
  */
-size_t my_strlen(const char *str);
+G_GNUC_PURE
+unsigned
+utf8_width(const char *str);
+
+/**
+ * Returns the number of terminal cells occupied by this string.
+ */
+G_GNUC_PURE
+unsigned
+locale_width(const char *p);
+
+/**
+ * Limits the width of the specified string.  Cuts it off before the
+ * specified width is exceeded.
+ *
+ * @return the resulting width of the string
+ */
+unsigned
+utf8_cut_width(char *p, unsigned max_width);
 
 char *utf8_to_locale(const char *str);
 char *locale_to_utf8(const char *str);
 
+/**
+ * Converts the UTF-8 string to the locale, and frees the source
+ * pointer.  Returns the source pointer as-is if no conversion is
+ * required.
+ */
+char *
+replace_utf8_to_locale(char *src);
+
+/**
+ * Converts the locale string to UTF-8, and frees the source pointer.
+ * Returns the source pointer as-is if no conversion is required.
+ */
+char *
+replace_locale_to_utf8(char *src);
+
 #endif