[uim-commit] r1268 - in branches/0.4: doc xim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-08-21 05:49:11 -0700 (Sun, 21 Aug 2005)
New Revision: 1268

Modified:
   branches/0.4/doc/HELPER-CANDWIN
   branches/0.4/xim/convdisp.cpp
Log:
* doc/HELPER-CANDWIN : Port r1172 from trunk.
* xim/convdisp.cpp : Port r1262 from trunk.


Modified: branches/0.4/doc/HELPER-CANDWIN
===================================================================
--- branches/0.4/doc/HELPER-CANDWIN	2005-08-21 11:48:30 UTC (rev 1267)
+++ branches/0.4/doc/HELPER-CANDWIN	2005-08-21 12:49:11 UTC (rev 1268)
@@ -22,7 +22,8 @@
 	      hide       |
 	      deactivate |
 	      show_caret_state |
-	      update_caret_state) "\n"
+	      update_caret_state |
+	      hide_caret_state) "\n"
   charset_specifier = "charset=" charset "\n"
   charset = "UTF-8" | "EUC-JP" | "GB18030" |
             <or any name that can be specified as iconv_open(3) argument>
@@ -82,6 +83,11 @@
 
     update_caret_state = "update_caret_state" "\n"
 
+  9. hide_caret_state
+    Hide caret state of the input mode
+
+    hide_caret_state = "hide_caret_state" "\n"
+
 Sending Message format BNF
   session  = messages
   messages = messages message | message

Modified: branches/0.4/xim/convdisp.cpp
===================================================================
--- branches/0.4/xim/convdisp.cpp	2005-08-21 11:48:30 UTC (rev 1267)
+++ branches/0.4/xim/convdisp.cpp	2005-08-21 12:49:11 UTC (rev 1268)
@@ -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)