diff options
| author | Timo Sirainen <cras@irssi.org> | 2004-01-24 22:05:51 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2004-01-24 22:05:51 +0000 |
| commit | f3ab905f7eef0dbde53bc0682846b3e9912a8a55 (patch) | |
| tree | b099cd13984fb23b8ee52c4dbcf93ee22e30187d | |
| parent | 0ccd528b338a44bcb16336e49da00b526f470d26 (diff) | |
| download | irssi-f3ab905f7eef0dbde53bc0682846b3e9912a8a55.zip | |
reversed utf8 change, it's glib2 specific and I don't yet want to drop support for 1.x
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3216 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | src/fe-common/core/formats.c | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index 235bc60c..22ed82be 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -297,44 +297,14 @@ void format_create_dest_tag(TEXT_DEST_REC *dest, void *server, window_find_closest(server, target, level); } -static gboolean term_is_utf8 (void) -{ - const char *charset; - - charset = settings_get_str("term_type"); - if (*charset) - return ! g_strcasecmp(charset, "utf-8"); - - return g_get_charset(&charset); -} - -static int advance (char const **str, gboolean utf8) -{ - if (utf8) { - gunichar c; - - c = g_utf8_get_char(*str); - *str = g_utf8_next_char(*str); - - return g_unichar_iswide(c) ? 2 : 1; - } else { - *str += 1; - - return 1; - } -} - /* Return length of text part in string (ie. without % codes) */ int format_get_length(const char *str) { GString *tmp; int len; - gboolean utf8; g_return_val_if_fail(str != NULL, 0); - utf8 = term_is_utf8() && g_utf8_validate(str, -1, NULL); - tmp = g_string_new(NULL); len = 0; while (*str != '\0') { @@ -351,7 +321,8 @@ int format_get_length(const char *str) len++; } - len += advance(&str, utf8); + len++; + str++; } g_string_free(tmp, TRUE); @@ -365,13 +336,10 @@ int format_real_length(const char *str, int len) { GString *tmp; const char *start; - gboolean utf8; g_return_val_if_fail(str != NULL, 0); g_return_val_if_fail(len >= 0, 0); - utf8 = term_is_utf8() && g_utf8_validate(str, -1, NULL); - start = str; tmp = g_string_new(NULL); while (*str != '\0' && len > 0) { @@ -390,7 +358,8 @@ int format_real_length(const char *str, int len) } } - len -= advance(&str, utf8); + len--; + str++; } g_string_free(tmp, TRUE); |