aboutsummaryrefslogtreecommitdiffstats
path: root/chinese
diff options
context:
space:
mode:
authorvanilla <vanilla@FreeBSD.org>2002-01-27 12:57:13 +0800
committervanilla <vanilla@FreeBSD.org>2002-01-27 12:57:13 +0800
commit2864ab4ce355c0ffbf3ba412e1ae7385abc7d36a (patch)
tree5b8faecea11c766fd32b6b16833fd70b58e91598 /chinese
parent200f7e25af02338ab649ae69744db72bb5ba90c9 (diff)
downloadfreebsd-ports-gnome-2864ab4ce355c0ffbf3ba412e1ae7385abc7d36a.tar.gz
freebsd-ports-gnome-2864ab4ce355c0ffbf3ba412e1ae7385abc7d36a.tar.zst
freebsd-ports-gnome-2864ab4ce355c0ffbf3ba412e1ae7385abc7d36a.zip
Fix problem when irssi display a lone line at bottom line of display area.
PR: ports/34305 Submitted by: mhsin@mhsin.org
Diffstat (limited to 'chinese')
-rw-r--r--chinese/irssi/Makefile4
-rw-r--r--chinese/irssi/files/patch-src_fe-text_window.c (renamed from chinese/irssi/files/patch-src_fe-text_wrap.c)22
2 files changed, 17 insertions, 9 deletions
diff --git a/chinese/irssi/Makefile b/chinese/irssi/Makefile
index 58fe5bab2417..901c9057e83d 100644
--- a/chinese/irssi/Makefile
+++ b/chinese/irssi/Makefile
@@ -10,9 +10,9 @@ EXTRA_PATCHES= ${.CURDIR}/files/patch-config.h.in \
${.CURDIR}/files/patch-configure.in \
${.CURDIR}/files/patch-src_fe-text_gui-entry.c \
${.CURDIR}/files/patch-src_fe-text_screen.h \
- ${.CURDIR}/files/patch-src_fe-text_wrap.c
+ ${.CURDIR}/files/patch-src_fe-text_window.c
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= chinese
MAINTAINER= vanilla@FreeBSD.org
diff --git a/chinese/irssi/files/patch-src_fe-text_wrap.c b/chinese/irssi/files/patch-src_fe-text_window.c
index 13e58345b896..5e4ec9c6bc97 100644
--- a/chinese/irssi/files/patch-src_fe-text_wrap.c
+++ b/chinese/irssi/files/patch-src_fe-text_window.c
@@ -1,5 +1,5 @@
---- src/fe-text/gui-windows.c.orig Mon Oct 29 20:51:52 2001
-+++ src/fe-text/gui-windows.c Tue Oct 30 01:48:09 2001
+--- 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;
@@ -25,7 +25,7 @@
xpos = indent_pos;
sub = g_new(LINE_CACHE_SUB_REC, 1);
-@@ -376,8 +377,27 @@
+@@ -376,8 +377,25 @@
continue;
}
@@ -45,13 +45,21 @@
+ }
+ if(xpos <= COLS)
+ ptr += w;
-+ else
-+ ptr ++;
+
+ if(w == 1 && xpos <= COLS &&
-+ ptr[0] != '\0' && ptr[1] != '\0' &&
-+ is_big5(ptr[0], ptr[1]))
++ (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);
+ }
+