aboutsummaryrefslogtreecommitdiff
path: root/chinese/irssi/files/patch-src_fe-text_window.c
diff options
context:
space:
mode:
Diffstat (limited to 'chinese/irssi/files/patch-src_fe-text_window.c')
-rw-r--r--chinese/irssi/files/patch-src_fe-text_window.c65
1 files changed, 65 insertions, 0 deletions
diff --git a/chinese/irssi/files/patch-src_fe-text_window.c b/chinese/irssi/files/patch-src_fe-text_window.c
new file mode 100644
index 000000000000..5e4ec9c6bc97
--- /dev/null
+++ b/chinese/irssi/files/patch-src_fe-text_window.c
@@ -0,0 +1,65 @@
+--- src/fe-text/gui-windows.c.orig Sat Mar 17 07:55:50 2001
++++ src/fe-text/gui-windows.c Sat Jan 26 19:40:34 2002
+@@ -289,6 +289,7 @@
+ unsigned char cmd;
+ char *ptr, *last_space_ptr;
+ int xpos, pos, indent_pos, last_space, last_color, color;
++ int w = 0;
+
+ g_return_val_if_fail(line->text != NULL, NULL);
+
+@@ -343,14 +344,14 @@
+ continue;
+ }
+
+- if (xpos == COLS && sub != NULL &&
++ if (xpos >= COLS && sub != NULL &&
+ (last_space <= indent_pos || last_space <= 10)) {
+ /* long word, remove the indentation from this line */
+ xpos -= sub->indent;
+ sub->indent = 0;
+ }
+
+- if (xpos == COLS) {
++ if (xpos >= COLS) {
+ xpos = indent_pos;
+
+ sub = g_new(LINE_CACHE_SUB_REC, 1);
+@@ -376,8 +377,25 @@
+ continue;
+ }
+
+- xpos++;
+- if (*ptr++ == ' ') {
++ if(ptr[1] != '\0' && is_big5(ptr[0], ptr[1]))
++ w = 2;
++ else
++ w = 1;
++
++ xpos+=w;
++ if (*ptr == ' ' ||
++ (xpos <= COLS && w > 1)) {
++ last_space = xpos-1;
++ last_space_ptr = ptr + w;
++ last_color = color;
++ }
++ if(xpos <= COLS)
++ ptr += w;
++
++ if(w == 1 && xpos <= COLS &&
++ (ptr[0] == ' ' ||
++ (ptr[0] != '\0' && ptr[1] != '\0' && is_big5(ptr[0], ptr[1]))))
++ {
+ last_space = xpos-1;
+ last_space_ptr = ptr;
+ last_color = color;
+@@ -525,6 +543,9 @@
+ next_pos = (n+1 < cache->count) ?
+ cache->lines[n].start : NULL;
+
++ if(next_pos != NULL && next_pos > pos && *(next_pos - 1) == ' ')
++ while(next_pos > pos && *(next_pos - 1) == ' ')
++ next_pos --;
+ single_line_draw(gui, ypos, sub, pos, next_pos);
+ }
+