Commit: 6bcd2a4a2e2a1e437ee46a136bf126e5c661b9cb - uim (git)

A multilingual input method framework

Commit MetaInfo

• Revision: 6bcd2a4a2e2a1e437ee46a136bf126e5c661b9cb (tree)
• Time: 2005-09-02 15:03:41
• Author: ekato <ekato@ff9a...>
• Commiter: ekato

Log Message

* xim/ : Port changes in r1381 from trunk.

Change Summary

• modified: xim/ximic.cpp
• modified: xim/ximserver.cpp

Incremental Difference

--- a/xim/ximic.cpp
+++ b/xim/ximic.cpp
@@ -389,22 +389,7 @@ void XimIC::setFocus()
 
     current_ic = this;
     mIsActive = true;
-
-    bool is_candwin_active = m_kkContext->hasActiveCandwin();
-
-    if (mConvdisp && is_candwin_active == false) {
-	// unset_focus before move_candwin in m_kkContext->focusIn()
-	mConvdisp->unset_focus();
-    }
-
     m_kkContext->focusIn();
-
-    if (mConvdisp && is_candwin_active == true) {
-	// Updating preedit here causes string mismatch if the context
-	// receives XIM_RESET_IC after XIM_SET_IC_FOCUS.  Should only
-	// update candidate window.
-	m_kkContext->candidate_update();
-    }
 }
 
 // Note that the sequence of XIM_SET_IC_FOCUS and XIM_UNSET_FOCUS

--- a/xim/ximserver.cpp
+++ b/xim/ximserver.cpp
@@ -440,11 +440,14 @@ InputContext::focusIn()
     uim_helper_client_focus_in(mUc);
     mFocusedContext = this;
     if (mConvdisp) {
+	mConvdisp->unset_focus();
 	mConvdisp->move_candwin();
 	mConvdisp->update_caret_state();
     }
     uim_prop_list_update(mUc);	
     uim_prop_label_update(mUc);	
+    if (hasActiveCandwin())
+	candidate_update();
 }
 
 void