aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvanilla <vanilla@FreeBSD.org>2004-04-13 23:31:28 +0800
committervanilla <vanilla@FreeBSD.org>2004-04-13 23:31:28 +0800
commitbde83dc23f704cfef475eccf42598d852b776f9b (patch)
treeb972a75d2cca9c9f0501464813d535aa740cecf5
parenteed88363650c7ebd7c7b8d267eb1024afbcb5068 (diff)
downloadfreebsd-ports-gnome-bde83dc23f704cfef475eccf42598d852b776f9b.tar.gz
freebsd-ports-gnome-bde83dc23f704cfef475eccf42598d852b776f9b.tar.zst
freebsd-ports-gnome-bde83dc23f704cfef475eccf42598d852b776f9b.zip
- Fix another chinese input string problem.
- Bump version. Submitted by: mhsin via #bsdchat
-rw-r--r--chinese/irssi/Makefile2
-rw-r--r--chinese/irssi/files/patch-src::fe-text::gui-entry.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/chinese/irssi/Makefile b/chinese/irssi/Makefile
index c8182b837ee7..d30b52d19b43 100644
--- a/chinese/irssi/Makefile
+++ b/chinese/irssi/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= chinese
MAINTAINER= vanilla@FreeBSD.org
diff --git a/chinese/irssi/files/patch-src::fe-text::gui-entry.c b/chinese/irssi/files/patch-src::fe-text::gui-entry.c
index 668df76c36bb..a7d5255c6172 100644
--- a/chinese/irssi/files/patch-src::fe-text::gui-entry.c
+++ b/chinese/irssi/files/patch-src::fe-text::gui-entry.c
@@ -1,5 +1,5 @@
--- src/fe-text/gui-entry.c.orig Sun Oct 26 13:45:02 2003
-+++ src/fe-text/gui-entry.c Wed Apr 7 11:08:29 2004
++++ src/fe-text/gui-entry.c Tue Apr 13 23:27:34 2004
@@ -68,28 +68,107 @@
g_free(entry);
}
@@ -172,11 +172,12 @@
end_xpos = entry->xpos + entry->width;
if (xpos > end_xpos)
return;
-@@ -131,7 +215,15 @@
+@@ -131,8 +215,16 @@
p = entry->scrstart + pos < entry->text_len ?
entry->text + entry->scrstart + pos : empty_str;
for (; *p != '\0'; p++) {
- xpos += utf8_width(*p);
+- if (xpos > end_xpos)
+ if (entry->hidden)
+ xpos++;
+ else if(term_type == TERM_TYPE_BIG5)
@@ -186,9 +187,10 @@
+ else
+ xpos++;
+
- if (xpos > end_xpos)
++ if (xpos >= end_xpos)
break;
+ if (entry->hidden)
@@ -285,8 +377,34 @@
if (entry->utf8)
utf16_to_utf8(entry->text, buf);