From owner-ports-jp@jp.freebsd.org  Wed Aug  5 13:09:22 1998
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.8.8+3.0Wbeta13/8.7.3) id NAA02938;
	Wed, 5 Aug 1998 13:09:22 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from diana.infonets.hiroshima-u.ac.jp (diana.infonets.hiroshima-u.ac.jp [133.41.33.53])
	by jaz.jp.freebsd.org (8.8.8+3.0Wbeta13/8.7.3) with ESMTP id NAA02927
	for <ports-jp@jp.freebsd.org>; Wed, 5 Aug 1998 13:09:20 +0900 (JST)
	(envelope-from taoka@infonets.hiroshima-u.ac.jp)
Received: from cal.infonets.hiroshima-u.ac.jp (cal.infonets.hiroshima-u.ac.jp [133.41.33.61]) by diana.infonets.hiroshima-u.ac.jp (8.8.8/3.6W) with ESMTP
	id NAA13807 for <ports-jp@jp.freebsd.org>; Wed, 5 Aug 1998 13:09:19 +0900 (JST)
Received: from localhost (localhost.infonets.hiroshima-u.ac.jp [127.0.0.1]) by cal.infonets.hiroshima-u.ac.jp (8.8.8/3.6W) with ESMTP
	id NAA10725 for <ports-jp@jp.freebsd.org>; Wed, 5 Aug 1998 13:09:19 +0900 (JST)
To: ports-jp@jp.freebsd.org
From: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
In-Reply-To: Your message of "Wed, 05 Aug 1998 13:07:22 +0900"
	<19980805130722Y.taoka@infonets.hiroshima-u.ac.jp>
References: <19980805130722Y.taoka@infonets.hiroshima-u.ac.jp>
X-Mailer: Mew version 1.92.4 on XEmacs 20.4 (Emerald)
X-Prom-Mew: Prom-Mew 1.92.9 (procmail reader for Mew)
X-URL: http://www.infonets.hiroshima-u.ac.jp/~taoka/
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Wed_Aug__5_13:09:14_1998_518)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19980805130918G.taoka@infonets.hiroshima-u.ac.jp>
Date: Wed, 05 Aug 1998 13:09:18 +0900
X-Dispatcher: imput version 971024
Lines: 319
Reply-To: ports-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+980729
X-Sequence: ports-jp 3910
Subject: [ports-jp 3910] Re: kinput2 (japanese/netscape4)
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org

----Next_Part(Wed_Aug__5_13:09:14_1998_518)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit


$BED2,$G$9!#(B

$BE:IU$9$k$N$rK:$l$^$7$?!#(B


----Next_Part(Wed_Aug__5_13:09:14_1998_518)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: patch

diff -aruN ../orig/kinput2-canna/pkg/DESCR ./kinput2-canna/pkg/DESCR
--- ../orig/kinput2-canna/pkg/DESCR	Tue May  2 10:53:12 1995
+++ ./kinput2-canna/pkg/DESCR	Mon Jun 29 17:00:55 1998
@@ -8,3 +8,8 @@
 
 The port was done by NIIMI Satoshi (sa2c@and.or.jp).  It supports
 Canna.
+
+WARNING: This kinput2 is applied the patch (patch-az in
+/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
+Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
+handle of XIM.
diff -aruN ../orig/kinput2-canna+sj3/pkg/DESCR ./kinput2-canna+sj3/pkg/DESCR
--- ../orig/kinput2-canna+sj3/pkg/DESCR	Tue Aug 20 19:27:39 1996
+++ ./kinput2-canna+sj3/pkg/DESCR	Mon Jun 29 17:01:45 1998
@@ -8,3 +8,8 @@
 
 The port was done by Hidekazu Kuroki (hidekazu@cs.titech.ac.jp).
 It supports Canna and SJ3.
+
+WARNING: This kinput2 is applied the patch (patch-az in
+/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
+Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
+handle of XIM.
diff -aruN ../orig/kinput2-canna+sj3+wnn4/pkg/DESCR ./kinput2-canna+sj3+wnn4/pkg/DESCR
--- ../orig/kinput2-canna+sj3+wnn4/pkg/DESCR	Sun Jun 28 10:05:38 1998
+++ ./kinput2-canna+sj3+wnn4/pkg/DESCR	Mon Jun 29 17:02:00 1998
@@ -11,5 +11,10 @@
 
 kinput2 -ccdef ccdef.kinput2.egg
 
+WARNING: This kinput2 is applied the patch (patch-az in
+/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
+Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
+handle of XIM.
+
 -- S. Taoka
 <taoka@infonets.hiroshima-u.ac.jp>
diff -aruN ../orig/kinput2-canna+sj3+wnn6/pkg/DESCR ./kinput2-canna+sj3+wnn6/pkg/DESCR
--- ../orig/kinput2-canna+sj3+wnn6/pkg/DESCR	Sun Jun 28 17:25:18 1998
+++ ./kinput2-canna+sj3+wnn6/pkg/DESCR	Mon Jun 29 17:02:15 1998
@@ -11,5 +11,10 @@
 
 kinput2 -ccdef ccdef.kinput2.egg
 
+WARNING: This kinput2 is applied the patch (patch-az in
+/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
+Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
+handle of XIM.
+
 -- S. Taoka
 <taoka@infonets.hiroshima-u.ac.jp>
diff -aruN ../orig/kinput2-canna+wnn4/pkg/DESCR ./kinput2-canna+wnn4/pkg/DESCR
--- ../orig/kinput2-canna+wnn4/pkg/DESCR	Sun Jun 28 23:22:24 1998
+++ ./kinput2-canna+wnn4/pkg/DESCR	Mon Jun 29 17:02:27 1998
@@ -11,5 +11,10 @@
 
 kinput2 -ccdef ccdef.kinput2.egg
 
+WARNING: This kinput2 is applied the patch (patch-az in
+/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
+Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
+handle of XIM.
+
 -- S. Taoka
 <taoka@infonets.hiroshima-u.ac.jp>
diff -aruN ../orig/kinput2-canna+wnn6/pkg/DESCR ./kinput2-canna+wnn6/pkg/DESCR
--- ../orig/kinput2-canna+wnn6/pkg/DESCR	Mon Jun 29 07:01:05 1998
+++ ./kinput2-canna+wnn6/pkg/DESCR	Mon Jun 29 17:02:40 1998
@@ -11,5 +11,10 @@
 
 kinput2 -ccdef ccdef.kinput2.egg
 
+WARNING: This kinput2 is applied the patch (patch-az in
+/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
+Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
+handle of XIM.
+
 -- S. Taoka
 <taoka@infonets.hiroshima-u.ac.jp>
diff -aruN ../orig/kinput2-sj3/pkg/DESCR ./kinput2-sj3/pkg/DESCR
--- ../orig/kinput2-sj3/pkg/DESCR	Tue Aug 20 19:25:51 1996
+++ ./kinput2-sj3/pkg/DESCR	Mon Jun 29 17:02:56 1998
@@ -8,3 +8,8 @@
 
 The port was done by Hidekazu Kuroki (hidekazu@cs.titech.ac.jp).
 It supports SJ3.
+
+WARNING: This kinput2 is applied the patch (patch-az in
+/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
+Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
+handle of XIM.
diff -aruN ../orig/kinput2-sj3+wnn4/pkg/DESCR ./kinput2-sj3+wnn4/pkg/DESCR
--- ../orig/kinput2-sj3+wnn4/pkg/DESCR	Mon Jun 29 23:16:19 1998
+++ ./kinput2-sj3+wnn4/pkg/DESCR	Mon Jun 29 17:03:07 1998
@@ -11,5 +11,10 @@
 
 kinput2 -ccdef ccdef.kinput2.egg
 
+WARNING: This kinput2 is applied the patch (patch-az in
+/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
+Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
+handle of XIM.
+
 -- S. Taoka
 <taoka@infonets.hiroshima-u.ac.jp>
diff -aruN ../orig/kinput2-sj3+wnn6/pkg/DESCR ./kinput2-sj3+wnn6/pkg/DESCR
--- ../orig/kinput2-sj3+wnn6/pkg/DESCR	Mon Jun 29 23:19:03 1998
+++ ./kinput2-sj3+wnn6/pkg/DESCR	Mon Jun 29 17:03:20 1998
@@ -11,5 +11,10 @@
 
 kinput2 -ccdef ccdef.kinput2.egg
 
+WARNING: This kinput2 is applied the patch (patch-az in
+/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
+Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
+handle of XIM.
+
 -- S. Taoka
 <taoka@infonets.hiroshima-u.ac.jp>
diff -aruN ../orig/kinput2-wnn4/patches/patch-az ./kinput2-wnn4/patches/patch-az
--- ../orig/kinput2-wnn4/patches/patch-az	Thu Jan  1 09:00:00 1970
+++ ./kinput2-wnn4/patches/patch-az	Mon Jun 29 16:13:15 1998
@@ -0,0 +1,149 @@
+--- ../work/lib/imlib/imattr.c	Tue Dec  9 17:38:08 1997
++++ lib/imlib/imattr.c	Sat Mar 14 00:50:26 1998
+@@ -127,6 +127,11 @@
+ static int getLineSpace _Pt_((IMIC *, unsigned int, int, int, char *, int));
+ static int getCursor _Pt_((IMIC *, unsigned int, int, int, char *, int));
+ 
++#ifndef	ORIGINAL
++static int setFilterEvents _Pt_((IMIC *, char *, int, int, int, int));
++static int getFilterEvents _Pt_((IMIC *, unsigned int, int, int, char *, int));
++#endif
++
+ static ICAttribute icAttributes[] = {
+     { XNInputStyle, TYPE_CARD32, OP_C|OP_G,
+ 	  setInputStyle, getInputStyle },
+@@ -134,6 +139,8 @@
+ 	  setClientWindow, getClientWindow },
+     { XNFocusWindow, TYPE_WINDOW, OP_C|OP_S|OP_G,
+ 	  setFocusWindow, getFocusWindow },
++    { XNFilterEvents, TYPE_CARD32, OP_C|OP_S|OP_G,
++	  setFilterEvents, getFilterEvents },
+     { XNPreeditAttributes, TYPE_NESTED_LIST, OP_C|OP_S|OP_G,
+ 	  setPreeditAttributes, getPreeditAttributes },
+     { XNStatusAttributes, TYPE_NESTED_LIST, OP_C|OP_S|OP_G,
+@@ -543,6 +550,34 @@
+     return 0;
+ }
+ 
++#ifndef	ORIGINAL
++/* ARGSUSED */
++static int
++setFilterEvents(icp, value, len, order, nest, op)
++IMIC *icp;
++char *value;
++int len;
++int order;
++int nest;
++int op;
++{
++    unsigned long filter_events;
++
++    TRACE(("imlib:setFilterEvents()\n"));
++
++    CHECK_ICATTR_SIZE(4, IMBadSomething);
++
++    filter_events = (unsigned long)getC32(value, order);
++    TRACE(("\tfilter events: %08lx\n", filter_events));
++
++    if (!(icp->common_attr.set_mask & ATTR_MASK_FILTER_EVENTS) ||
++	filter_events != icp->common_attr.filter_events) {
++	icp->common_attr.change_mask |= ATTR_MASK_FILTER_EVENTS;
++    }
++    return 0;
++}
++#endif
++
+ /* ARGSUSED */
+ static int
+ setPreeditAttributes(icp, value, len, order, nest, op)
+@@ -1261,6 +1296,42 @@
+     }
+ }
+ 
++#ifndef	ORIGINAL
++/* ARGSUSED */
++static int
++getFilterEvents(icp, id, nest, offset, data, len)
++IMIC *icp;
++unsigned int id;
++int nest;
++int offset;
++char *data;
++int len;
++{
++    IMConnection *conn = icp->im->connection;
++
++    TRACE(("imlib:getFilterEvents()\n"));
++
++    if (!(icp->common_attr.set_mask & ATTR_MASK_FILTER_EVENTS)) {
++    	/* fill default value */
++    	fillCommonDefault(icp, (unsigned long)ATTR_MASK_FILTER_EVENTS);
++    }
++
++    if (icp->common_attr.set_mask & ATTR_MASK_FILTER_EVENTS) {
++    	IMPutC16(conn, id);		/* attribute ID */
++    	IMPutC16(conn, 4);		/* value length */
++    	IMPutC32(conn, icp->common_attr.filter_events);
++    }
++    else {
++	/* no default is available */
++	DPRINT(("getFilterEvents without setting\n"));
++	IMCancelRequest(conn, offset);
++	IMSendError(conn, IMBadSomething, icp->im->id, icp->id,
++		    "filter events not specified yet");
++	return -1;
++    }
++}
++#endif
++
+ /* ARGSUSED */
+ static int
+ getArea(icp, id, nest, offset, data, len)
+@@ -1679,6 +1750,13 @@
+ 	    TRACE(("\tdefault focus window: %08lx\n", ap->focus));
+ 	}
+     }
++#ifndef	ORIGINAL
++    if (mask & ATTR_MASK_FILTER_EVENTS) {
++    	ap->filter_events = NoEventMask;
++    	ap->set_mask |= ATTR_MASK_FILTER_EVENTS;
++	TRACE(("\tdefault filter events: %08lx\n", ap->filter_events));
++    }
++#endif
+ }
+ 
+ static int
+@@ -1848,6 +1926,12 @@
+ 	    SENDERROR(IMBadFocusWindow, "invalid focus window ID");
+ 	}
+     }
++#ifndef	ORIGINAL
++    if (mask & ATTR_MASK_FILTER_EVENTS) {
++	DPRINT(("filter events not support\n"));
++	SENDERROR(IMBadSomething, "filter events not support");
++    }
++#endif
+ 
+     return ret;
+ #undef SENDERROR
+@@ -2070,7 +2154,6 @@
+ 	sattr->area = sattr->area_needed;
+     }
+ }
+-
+ 
+ /*
+  * Public functions
+--- ../work/lib/imlib/im.h	Tue Dec  9 17:38:07 1997
++++ lib/imlib/im.h	Fri Mar 13 21:12:00 1998
+@@ -158,6 +158,10 @@
+     XIMStyle input_style;
+     Window client;			/* client window */
+     Window focus;			/* focus window */
++#ifndef	ORIGINAL
++#define ATTR_MASK_FILTER_EVENTS	(1<<3)
++    unsigned long filter_events;	/* Event mask that IM need */
++#endif
+ } IMCommonAttributes;
+ 
+ typedef struct {
diff -aruN ../orig/kinput2-wnn4/pkg/DESCR ./kinput2-wnn4/pkg/DESCR
--- ../orig/kinput2-wnn4/pkg/DESCR	Sat Jun 27 21:49:27 1998
+++ ./kinput2-wnn4/pkg/DESCR	Mon Jun 29 17:03:34 1998
@@ -11,6 +11,11 @@
 
 kinput2 -ccdef ccdef.kinput2.egg
 
+WARNING: This kinput2 is applied the patch (patch-az in
+/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
+Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
+handle of XIM.
+
 -- S. Taoka
 <taoka@infonets.hiroshima-u.ac.jp>
 
diff -aruN ../orig/kinput2-wnn6/pkg/DESCR ./kinput2-wnn6/pkg/DESCR
--- ../orig/kinput2-wnn6/pkg/DESCR	Sun Jun 28 00:54:46 1998
+++ ./kinput2-wnn6/pkg/DESCR	Mon Jun 29 17:03:48 1998
@@ -11,5 +11,10 @@
 
 kinput2 -ccdef ccdef.kinput2.egg
 
+WARNING: This kinput2 is applied the patch (patch-az in
+/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
+Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
+handle of XIM.
+
 -- S. Taoka
 <taoka@infonets.hiroshima-u.ac.jp>

----Next_Part(Wed_Aug__5_13:09:14_1998_518)----
