pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-05 17:23:15 +02:00
Code Activity

core: fix cut of chars in "cutscr" of evaluated strings

Browse Source 
This fixes two problems:
- stop before max char displayed with wide chars
- preserve combining chars in the output

Before the fix (wrong):

>> ${cutscr:3,+,こんにちは世界}
== [こん+]
>> ${cutscr:1,+,a${\u0308}}
== [a+]

After the fix (OK):

>> ${cutscr:3,+,こんにちは世界}
== [こ+]
>> ${cutscr:1,+,a${\u0308}}
== [ä]
This commit is contained in:
Sébastien Helleu
2017-03-28 20:45:31 +02:00
parent ee82ba7461
commit 3045021430
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gui-chat.c
+3 -1
View File
@@ -224,7 +224,7 @@ gui_chat_string_add_offset_screen (const char *string, int offset_screen)
{
int size_on_screen;
while (string && string[0] && (offset_screen > 0))
while (string && string[0] && (offset_screen >= 0))
{
string = gui_chat_string_next_char (NULL, NULL,
(unsigned char *)string,
@@ -233,6 +233,8 @@ gui_chat_string_add_offset_screen (const char *string, int offset_screen)
{
size_on_screen = gui_chat_char_size_screen (string);
offset_screen -= size_on_screen;
if (offset_screen < 0)
return string;
string = utf8_next_char (string);
}
}
tests/unit/core/test-eval.cpp
+30
View File
@@ -220,16 +220,46 @@ TEST(Eval, EvalExpression)
/* test cut of chars */
WEE_CHECK_EVAL("", "${cut:0,,}");
WEE_CHECK_EVAL("", "${cutscr:0,,}");
WEE_CHECK_EVAL("", "${cut:0,+,}");
WEE_CHECK_EVAL("", "${cutscr:0,+,}");
WEE_CHECK_EVAL("", "${cut:0,,test}");
WEE_CHECK_EVAL("", "${cutscr:0,,test}");
WEE_CHECK_EVAL("+", "${cut:0,+,test}");
WEE_CHECK_EVAL("+", "${cutscr:0,+,test}");
WEE_CHECK_EVAL("te", "${cut:2,,test}");
WEE_CHECK_EVAL("te", "${cutscr:2,,test}");
WEE_CHECK_EVAL("te+", "${cut:2,+,test}");
WEE_CHECK_EVAL("te+", "${cutscr:2,+,test}");
WEE_CHECK_EVAL("éà", "${cut:2,,éàô}");
WEE_CHECK_EVAL("éà", "${cutscr:2,,éàô}");
WEE_CHECK_EVAL("éà+", "${cut:2,+,éàô}");
WEE_CHECK_EVAL("éà+", "${cutscr:2,+,éàô}");
WEE_CHECK_EVAL("こ+", "${cut:1,+,こんにちは世界}");
WEE_CHECK_EVAL("+", "${cutscr:1,+,こんにちは世界}");
WEE_CHECK_EVAL("こん+", "${cut:2,+,こんにちは世界}");
WEE_CHECK_EVAL("こ+", "${cutscr:2,+,こんにちは世界}");
WEE_CHECK_EVAL("こんに+", "${cut:3,+,こんにちは世界}");
WEE_CHECK_EVAL("こ+", "${cutscr:3,+,こんにちは世界}");
WEE_CHECK_EVAL("こんにち+", "${cut:4,+,こんにちは世界}");
WEE_CHECK_EVAL("こん+", "${cutscr:4,+,こんにちは世界}");
WEE_CHECK_EVAL("こんにちは+", "${cut:5,+,こんにちは世界}");
WEE_CHECK_EVAL("こん+", "${cutscr:4,+,こんにちは世界}");
WEE_CHECK_EVAL("こん+", "${cutscr:4,+,こんにちは世界}");
/* test color */
WEE_CHECK_EVAL(gui_color_get_custom ("green"), "${color:green}");
WEE_CHECK_EVAL(gui_color_get_custom ("*214"), "${color:*214}");