[uim-commit] r768 - branches/composer/scm

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-03-07 08:49:30 -0800 (Mon, 07 Mar 2005)
New Revision: 768

Modified:
   branches/composer/scm/anthy.scm
Log:
* scm/anthy.scm
  - (anthy-flush): Simplify with anthy-reset-candidate-window
  - (anthy-set-candidate): Fix broken candidate window handling. This
    makes re-activation of candidate window working
  - (anthy-converting-state-action): Remove unnecessary
    action_anthy_backspace handling. anthy-preedit-input! does
    equivalent one implicitly


Modified: branches/composer/scm/anthy.scm
===================================================================
--- branches/composer/scm/anthy.scm	2005-03-07 16:41:06 UTC (rev 767)
+++ branches/composer/scm/anthy.scm	2005-03-07 16:49:30 UTC (rev 768)
@@ -998,10 +998,7 @@
     (ustr-clear! (anthy-context-preconv-ustr ac))
     (ustr-clear! (anthy-context-segments ac))
     (anthy-context-set-converting! ac #f)
-    (if (anthy-context-candidate-window ac)
-	(im-deactivate-candidate-selector ac))
-    (anthy-context-set-candidate-window! ac #f)
-    (anthy-context-set-candidate-op-count! ac 0)
+    (anthy-reset-candidate-window ac)
     (anthy-select-ruletree! ac)  ;; to reset transposed ruletree
     (anthy-update-preedit ac)  ;; TODO: remove this
     ))
@@ -1297,7 +1294,7 @@
       (if (anthy-context-candidate-window ac)
 	  ;;(im-select-candidate ac compensated-idx)
 	  (begin
-	    (im-deactivate-candidate-selector ac)
+	    (anthy-reset-candidate-window ac)
 	    (anthy-update-preedit ac))))))
 
 (define anthy-move-candidate
@@ -1434,10 +1431,6 @@
 	 (anthy-correct-segment-cursor segments)
 	 (anthy-reset-candidate-window ac))
 
-	((action_anthy_backspace)
-	 (anthy-cancel-conv ac)
-	 (ustr-cursor-delete-backside! preconv-ustr))
-
 	((action_anthy_next_candidate)
 	 (anthy-move-candidate ac 1))