From f53ebf2f1c5f25e4b56c0933daf4cd8f98f52f2f Mon Sep 17 00:00:00 2001
From: naoto <unknown>
Date: Thu, 14 Oct 2010 11:37:22 -0700
Subject: [PATCH] 6575419: Solaris : XSetICFoucs is not called with Java
 application at appropriate timing Reviewed-by: okutsu

---
 src/solaris/classes/sun/awt/X11InputMethod.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/solaris/classes/sun/awt/X11InputMethod.java b/src/solaris/classes/sun/awt/X11InputMethod.java
index b87877c83..d958283af 100644
--- a/src/solaris/classes/sun/awt/X11InputMethod.java
+++ b/src/solaris/classes/sun/awt/X11InputMethod.java
@@ -96,6 +96,7 @@ public abstract class X11InputMethod extends InputMethodAdapter {
     private Component awtFocussedComponent = null;
     private Component lastXICFocussedComponent = null;
     private boolean   isLastXICActive = false;
+    private boolean   isLastTemporary = false;
     private boolean   isActive = false;
     private boolean   isActiveClient = false;
     private static Map[] highlightStyles;
@@ -349,7 +350,7 @@ public abstract class X11InputMethod extends InputMethodAdapter {
            current focussed component, change the XIC focus to the newly
            focussed component.
         */
-        if (lastXICFocussedComponentPeer != awtFocussedComponentPeer ||
+        if (isLastTemporary || lastXICFocussedComponentPeer != awtFocussedComponentPeer ||
             isLastXICActive != haveActiveClient()) {
             if (lastXICFocussedComponentPeer != null) {
                 setXICFocus(lastXICFocussedComponentPeer, false, isLastXICActive);
@@ -401,6 +402,7 @@ public abstract class X11InputMethod extends InputMethodAdapter {
         */
         lastXICFocussedComponent = awtFocussedComponent;
         isLastXICActive = isAc;
+        isLastTemporary = isTemporary;
         isActive = false;
     }
 
-- 
GitLab