diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2017-01-31 14:18:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-31 14:18:48 +0100 |
| commit | 1ee25d228655e4a35114c3f9d0045c5efd5597cc (patch) | |
| tree | 5b27c35328811cfbf6a015c107d4f193f40b02d1 /src/fe-common | |
| parent | 4031b92b9b88a0492d5f77e4d61bf31fabaf9e96 (diff) | |
| parent | a39e210ea8e0b0cdccb37eae212d1ade8c036ae2 (diff) | |
| download | irssi-1ee25d228655e4a35114c3f9d0045c5efd5597cc.zip | |
Merge pull request #590 from LemonBoy/hi-minor
Minor cleanup in the highlighting signal.
Diffstat (limited to 'src/fe-common')
| -rw-r--r-- | src/fe-common/core/hilight-text.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c index 037cde5c..dd38be87 100644 --- a/src/fe-common/core/hilight-text.c +++ b/src/fe-common/core/hilight-text.c @@ -399,34 +399,29 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text, char *middle; int pos, color_pos, color_len; - tmp = g_string_new(NULL); - /* start of the line */ pos = strip_real_length(text, hilight_start, NULL, NULL); - g_string_append(tmp, text); - g_string_truncate(tmp, pos); + tmp = g_string_new_len(text, pos); /* color */ g_string_append(tmp, color); /* middle of the line, stripped */ - middle = strip_codes(text+pos); - pos = tmp->len; - g_string_append(tmp, middle); - g_string_truncate(tmp, pos+hilight_len); + middle = strip_codes(text + pos); + g_string_append_len(tmp, middle, hilight_len); g_free(middle); /* end of the line */ pos = strip_real_length(text, hilight_end, &color_pos, &color_len); if (color_pos > 0) - g_string_append_len(tmp, text+color_pos, color_len); + g_string_append_len(tmp, text + color_pos, color_len); else { /* no colors in line, change back to default */ g_string_append_c(tmp, 4); g_string_append_c(tmp, FORMAT_STYLE_DEFAULTS); } - g_string_append(tmp, text+pos); + g_string_append(tmp, text + pos); newstr = tmp->str; g_string_free(tmp, FALSE); |