[uim-commit] r2674 - trunk/scm

[ekato at freedesktop.org]

Author: ekato
Date: 2005-12-20 14:08:46 -0800 (Tue, 20 Dec 2005)
New Revision: 2674

Modified:
   trunk/scm/anthy.scm
   trunk/scm/canna.scm
   trunk/scm/mana.scm
Log:
* scm/anthy.scm
* scm/mana.scm
* scm/canna.scm
  - Revert changes in r2658.


Modified: trunk/scm/anthy.scm
===================================================================
--- trunk/scm/anthy.scm	2005-12-20 21:58:20 UTC (rev 2673)
+++ trunk/scm/anthy.scm	2005-12-20 22:08:46 UTC (rev 2674)
@@ -228,6 +228,7 @@
     (list 'candidate-op-count 0)
     (list 'wide-latin         #f)
     (list 'kana-mode          anthy-type-hiragana)
+    (list 'commit-raw         #t)
     (list 'input-rule         anthy-input-rule-roma)
     (list 'raw-ustr           #f))))
 (define-record 'anthy-context anthy-context-rec-spec)
@@ -259,7 +260,8 @@
 
 (define anthy-commit-raw
   (lambda (ac)
-    (im-commit-raw ac)))
+    (im-commit-raw ac)
+    (anthy-context-set-commit-raw! ac #t)))
 
 (define anthy-context-kana-toggle
   (lambda (ac)
@@ -370,14 +372,16 @@
 
 (define anthy-update-preedit
   (lambda (ac)
-    (let ((segments (if (anthy-context-on ac)
-                        (if (anthy-context-transposing ac)
-                            (anthy-context-transposing-state-preedit ac)
-                            (if (anthy-context-converting ac)
-                                (anthy-converting-state-preedit ac)
-                                (anthy-input-state-preedit ac)))
-                        ())))
-      (context-update-preedit ac segments))))
+    (if (not (anthy-context-commit-raw ac))
+	(let ((segments (if (anthy-context-on ac)
+			    (if (anthy-context-transposing ac)
+				(anthy-context-transposing-state-preedit ac)
+				(if (anthy-context-converting ac)
+				    (anthy-converting-state-preedit ac)
+				    (anthy-input-state-preedit ac)))
+			    ())))
+	  (context-update-preedit ac segments))
+	(anthy-context-set-commit-raw! ac #f))))
   
 (define anthy-proc-raw-state
   (lambda (ac key key-state)
@@ -509,7 +513,8 @@
 	(if (not (anthy-commit-key? key key-state))
 	    (begin 
 	      (anthy-context-set-transposing! ac #f)
-	      (anthy-proc-input-state ac key key-state))))))))
+	      (anthy-proc-input-state ac key key-state)
+              (anthy-context-set-commit-raw! ac #f))))))))
 
 (define anthy-proc-input-state-with-preedit
   (lambda (ac key key-state)

Modified: trunk/scm/canna.scm
===================================================================
--- trunk/scm/canna.scm	2005-12-20 21:58:20 UTC (rev 2673)
+++ trunk/scm/canna.scm	2005-12-20 22:08:46 UTC (rev 2674)
@@ -208,6 +208,7 @@
     (list 'candidate-op-count ())
     (list 'wide-latin         #f)
     (list 'kana-mode          multi-segment-type-hiragana)
+    (list 'commit-raw         #t)
     (list 'input-rule         canna-input-rule-roma))))
 (define-record 'canna-context canna-context-rec-spec)
 (define canna-context-new-internal canna-context-new)
@@ -226,7 +227,8 @@
     cc))
 
 (define (canna-commit-raw cc)
-  (im-commit-raw cc))
+  (im-commit-raw cc)
+  (canna-context-set-commit-raw! cc #t))
 
 (define canna-opposite-kana
   (lambda (kana)

Modified: trunk/scm/mana.scm
===================================================================
--- trunk/scm/mana.scm	2005-12-20 21:58:20 UTC (rev 2673)
+++ trunk/scm/mana.scm	2005-12-20 22:08:46 UTC (rev 2674)
@@ -380,6 +380,7 @@
       (list 'candidate-op-count 0)
       (list 'wide-latin         #f)
       (list 'kana-mode          mana-type-hiragana)
+      (list 'commit-raw         #t)
       (list 'input-rule         mana-input-rule-roma)
       (list 'raw-ustr           #f))))
 (define-record 'mana-context mana-context-rec-spec)
@@ -409,7 +410,8 @@
 
 (define mana-commit-raw
   (lambda (mc)
-    (im-commit-raw mc)))
+    (im-commit-raw mc)
+    (mana-context-set-commit-raw! mc #t)))
 
 (define mana-context-kana-toggle
   (lambda (mc)
@@ -522,14 +524,16 @@
 
 (define mana-update-preedit
   (lambda (mc)
-    (let ((segments (if (mana-context-on mc)
-                        (if (mana-context-transposing mc)
-                            (mana-context-transposing-state-preedit mc)
-                            (if (mana-context-converting mc)
-                                (mana-converting-state-preedit mc)
-                                (mana-input-state-preedit mc)))
-                        ())))
-      (context-update-preedit mc segments))))
+    (if (not (mana-context-commit-raw mc))
+        (let ((segments (if (mana-context-on mc)
+                            (if (mana-context-transposing mc)
+                                (mana-context-transposing-state-preedit mc)
+                                (if (mana-context-converting mc)
+                                    (mana-converting-state-preedit mc)
+                                    (mana-input-state-preedit mc)))
+                            ())))
+          (context-update-preedit mc segments))
+        (mana-context-set-commit-raw! mc #f))))
 
 (define mana-proc-raw-state
   (lambda (mc key key-state)
@@ -665,7 +669,8 @@
           (if (not (mana-commit-key? key key-state))
               (begin 
                 (mana-context-set-transposing! mc #f)
-                (mana-proc-input-state mc key key-state))))))))
+                (mana-proc-input-state mc key key-state)
+                (mana-context-set-commit-raw! mc #f))))))))
 
 (define mana-proc-input-state-with-preedit
   (lambda (mc key key-state)