aboutsummaryrefslogtreecommitdiff
path: root/java/jdk16/files/patch-awt_InputMethod.c
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>2003-01-16 05:08:57 +0000
committercvs2svn <cvs2svn@FreeBSD.org>2003-01-16 05:08:57 +0000
commitdf3e7e93b8317ece24fbe7d0c9e4aa1ebb0feca0 (patch)
tree1d9ecedb74d255866c8e1e5df9db0f2739a8ba66 /java/jdk16/files/patch-awt_InputMethod.c
parentc31f9d6cf28e3aa831ff2390ee3ab6ea031dbc76 (diff)
Notes
Diffstat (limited to 'java/jdk16/files/patch-awt_InputMethod.c')
-rw-r--r--java/jdk16/files/patch-awt_InputMethod.c63
1 files changed, 0 insertions, 63 deletions
diff --git a/java/jdk16/files/patch-awt_InputMethod.c b/java/jdk16/files/patch-awt_InputMethod.c
deleted file mode 100644
index db52b6d18e88..000000000000
--- a/java/jdk16/files/patch-awt_InputMethod.c
+++ /dev/null
@@ -1,63 +0,0 @@
-$FreeBSD$
-
-diff -u -r1.5 awt_InputMethod.c
---- ../src/solaris/native/sun/awt/awt_InputMethod.c 10 Sep 2001 05:31:35 -0000 1.5
-+++ ../src/solaris/native/sun/awt/awt_InputMethod.c 18 Oct 2002 02:58:26 -0000
-@@ -1320,17 +1320,56 @@
- X11InputMethodData *pX11IMData =
- (X11InputMethodData *) (unsigned long) data;
- char *xText;
-+ char *ret;
- jstring jText;
-
-+ XIMPreeditState preeditState = XIMPreeditUnKnown;
-+ XVaNestedList preeditAttr;
-+ int bGetState = FALSE;
-+
- AWT_LOCK();
-
-- if (pX11IMData->current_ic)
-+ if (pX11IMData->current_ic) {
-+ preeditAttr = XVaCreateNestedList(0, XNPreeditState, &preeditState,
-+ NULL);
-+ if (!XGetICValues(pX11IMData->current_ic, XNPreeditAttributes,
-+ preeditAttr, NULL)) {
-+ bGetState = TRUE;
-+ }
-+ XFree(preeditAttr);
-+
- xText = XmbResetIC(pX11IMData->current_ic);
-+
-+ if (bGetState) {
-+ preeditAttr = XVaCreateNestedList(0, XNPreeditState,
-+ preeditState, 0);
-+ XSetICValues(pX11IMData->current_ic,
-+ XNPreeditAttributes, preeditAttr, NULL);
-+ XFree(preeditAttr);
-+ }
-+ }
- else {
- /*
- * If there is no reference to the current XIC, try to reset both XICs.
- */
-+ preeditAttr = XVaCreateNestedList(0, XNPreeditState, &preeditState,
-+ NULL);
-+ if (!XGetICValues(pX11IMData->ic_active, XNPreeditAttributes,
-+ preeditAttr, NULL)) {
-+ bGetState = TRUE;
-+ }
-+ XFree(preeditAttr);
-+
- xText = XmbResetIC(pX11IMData->ic_active);
-+
-+ if (bGetState) {
-+ preeditAttr = XVaCreateNestedList(0, XNPreeditState,
-+ preeditState, 0);
-+ XSetICValues(pX11IMData->ic_active, XNPreeditAttributes,
-+ preeditAttr, NULL);
-+ XFree(preeditAttr);
-+ }
-+
- /*it may also means that the real client component does
- not have focus -- has been deactivated... its xic should
- not have the focus, bug#4284651 showes reset XIC for htt