[uim-commit] r1262 - trunk/xim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-08-21 02:39:44 -0700 (Sun, 21 Aug 2005)
New Revision: 1262

Modified:
   trunk/xim/convdisp.cpp
Log:
* xim/convdisp.cpp (Convdisp::update_caret_state) : Check
  "bridge-show-input-state?" here.
(ConvdispRw::update_preedit) : Call update_caret_state() at proper
  timing.
(ConvdispOv::update_preedit) : Ditto.
(ConvdispOv::update_icxatr) : Move check for
  "bridge-show-input-state?" into (Convdisp::update_caret_state).


Modified: trunk/xim/convdisp.cpp
===================================================================
--- trunk/xim/convdisp.cpp	2005-08-21 08:13:30 UTC (rev 1261)
+++ trunk/xim/convdisp.cpp	2005-08-21 09:39:44 UTC (rev 1262)
@@ -951,6 +951,9 @@
 
 void Convdisp::update_caret_state()
 {
+    if (!uim_scm_symbol_value_bool("bridge-show-input-state?"))
+	return;
+
     Canddisp *disp = canddisp_singleton();
     InputContext *focusedContext = InputContext::focusedContext();
 
@@ -982,6 +985,7 @@
     if (!m_pe->get_char_count()) {
 	clear_preedit();
 	move_candwin(); // reset candwin position
+	update_caret_state();
 	return;
     }
 
@@ -1004,6 +1008,7 @@
     mPeWin->draw();
 
     move_candwin();
+    update_caret_state();
 }
 
 void ConvdispRw::clear_preedit()
@@ -1067,6 +1072,7 @@
 {
     draw_preedit();
     move_candwin();
+    update_caret_state();
 }
 
 void ConvdispOv::move_candwin()
@@ -1160,9 +1166,7 @@
 
     if (m_atr->is_changed(ICA_SpotLocation)) {
 	move_candwin();
-	uim_bool  show_caret_state = uim_scm_symbol_value_bool("bridge-show-input-state?");
-	if (show_caret_state == UIM_TRUE)
-	    update_caret_state();
+	update_caret_state();
     }
 
     if (!m_ov_win)