[uim-commit] r766 - trunk/xim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-03-07 07:47:08 -0800 (Mon, 07 Mar 2005)
New Revision: 766

Modified:
   trunk/xim/convdisp.cpp
   trunk/xim/ximic.cpp
   trunk/xim/ximserver.cpp
Log:
* xim/ximic.cpp (setFocus) : Call move_cadwin() here.
* xim/ximserver.cpp (InputContext::focusIn) : Don't call
  move_candwin() from here.
* xim/convdisp.cpp (ConvdispOv::move_candwin) : Disable redundant
  flash player workaround.


Modified: trunk/xim/convdisp.cpp
===================================================================
--- trunk/xim/convdisp.cpp	2005-03-07 14:46:46 UTC (rev 765)
+++ trunk/xim/convdisp.cpp	2005-03-07 15:47:08 UTC (rev 766)
@@ -726,8 +726,7 @@
 
 void ConvdispOv::move_candwin()
 {
-    if (m_atr->has_atr(ICA_SpotLocation) &&
-		mKkContext == InputContext::focusedContext()) {
+    if (m_atr->has_atr(ICA_SpotLocation) ) {
 	int x = -1, y = -1;
 	Window win;
 
@@ -761,7 +760,7 @@
 	    Canddisp *disp = canddisp_singleton();
 	    disp->move(x, y + UNDERLINE_HEIGHT + 1);
 	}
-#ifdef FLASHPLAYER_WORKAROUND
+#if 0
     } else if (m_atr->has_atr(ICA_SpotLocation)) {
 	int x = -1, y = -1;
 	Window win;

Modified: trunk/xim/ximic.cpp
===================================================================
--- trunk/xim/ximic.cpp	2005-03-07 14:46:46 UTC (rev 765)
+++ trunk/xim/ximic.cpp	2005-03-07 15:47:08 UTC (rev 766)
@@ -388,6 +388,7 @@
 	mConvdisp->unset_focus();
     }
 
+    mConvdisp->move_candwin();
     m_kkContext->focusIn();
 
     if (mConvdisp && is_candwin_active == true) {

Modified: trunk/xim/ximserver.cpp
===================================================================
--- trunk/xim/ximserver.cpp	2005-03-07 14:46:46 UTC (rev 765)
+++ trunk/xim/ximserver.cpp	2005-03-07 15:47:08 UTC (rev 766)
@@ -482,7 +482,6 @@
     check_helper_connection();
     uim_helper_client_focus_in(mUc);
     mFocusedContext = this;
-    mXic->move_candwin(); // move candwin before updating prop label
     uim_prop_list_update(mUc);	
     uim_prop_label_update(mUc);	
 }