[uim-commit] r1382 - branches/0.4/xim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-09-01 23:03:41 -0700 (Thu, 01 Sep 2005)
New Revision: 1382

Modified:
   branches/0.4/xim/ximic.cpp
   branches/0.4/xim/ximserver.cpp
Log:
* xim/ : Port changes in r1381 from trunk.


Modified: branches/0.4/xim/ximic.cpp
===================================================================
--- branches/0.4/xim/ximic.cpp	2005-09-02 06:02:09 UTC (rev 1381)
+++ branches/0.4/xim/ximic.cpp	2005-09-02 06:03:41 UTC (rev 1382)
@@ -389,22 +389,7 @@
 
     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

Modified: branches/0.4/xim/ximserver.cpp
===================================================================
--- branches/0.4/xim/ximserver.cpp	2005-09-02 06:02:09 UTC (rev 1381)
+++ branches/0.4/xim/ximserver.cpp	2005-09-02 06:03:41 UTC (rev 1382)
@@ -440,11 +440,14 @@
     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