summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2012-11-30 18:16:49 +0100
committerSebastien Helleu <flashcode@flashtux.org>2012-11-30 18:16:49 +0100
commit72959d1d8b387adae0f0ba94365528a6a747ff64 (patch)
tree46d55cc47a511bba8a59d8616f05e6b12592a44c /src
parentb7abb77b4d55dea1814b1f62c3a01f9e0f36f55e (diff)
downloadweechat-72959d1d8b387adae0f0ba94365528a6a747ff64.zip
core: fix display of combining chars (patch from Nei) (bug #37775)
Diffstat (limited to 'src')
-rw-r--r--src/gui/curses/gui-curses-bar-window.c2
-rw-r--r--src/gui/curses/gui-curses-chat.c2
-rw-r--r--src/gui/gui-chat.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/curses/gui-curses-bar-window.c b/src/gui/curses/gui-curses-bar-window.c
index d225c9fd9..eb53656dc 100644
--- a/src/gui/curses/gui-curses-bar-window.c
+++ b/src/gui/curses/gui-curses-bar-window.c
@@ -334,7 +334,7 @@ gui_bar_window_print_string (struct t_gui_bar_window *bar_window,
}
size_on_screen = utf8_char_size_screen (utf_char);
- if (size_on_screen > 0)
+ if (size_on_screen >= 0)
{
if (hide_chars_if_scrolling
&& (x_with_hidden < bar_window->scroll_x))
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 838da8c14..6d7828326 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -391,7 +391,7 @@ gui_chat_display_word_raw (struct t_gui_window *window, struct t_gui_line *line,
{
return chars_displayed;
}
- if (display_char && (size_on_screen > 0))
+ if (display_char && (size_on_screen >= 0))
{
if (!simulate)
{
diff --git a/src/gui/gui-chat.c b/src/gui/gui-chat.c
index c83fa7c0e..7770c6c91 100644
--- a/src/gui/gui-chat.c
+++ b/src/gui/gui-chat.c
@@ -242,7 +242,7 @@ gui_chat_string_real_pos (const char *string, int pos)
real_pos = string;
real_pos_prev = string;
ptr_string = string;
- while (ptr_string && ptr_string[0] && (pos > 0))
+ while (ptr_string && ptr_string[0] && (pos >= 0))
{
ptr_string = gui_chat_string_next_char (NULL, NULL,
(unsigned char *)ptr_string,