[uim-commit] r337 - trunk/scm

[ekato@freedesktop.org]

Author: ekato
Date: 2005-01-20 06:03:32 -0800 (Thu, 20 Jan 2005)
New Revision: 337

Modified:
   trunk/scm/skk.scm
Log:
* scm/skk.scm (skk-state-direct-no-preedit-nop-key?) : New key
  definition.  Keys in this list will have no effect on
  proc-state-direct-no-preedit.
* scm/skk.scm (skk-proc-state-direct-no-preedit) : Update r335
  using skk-state-direct-no-preedit-nop-key?  See [Anthy-dev
  1613].


Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2005-01-20 12:45:12 UTC (rev 336)
+++ trunk/scm/skk.scm	2005-01-20 14:03:32 UTC (rev 337)
@@ -75,6 +75,7 @@
 (define-key skk-conv-wide-latin-key? '("<Control>q" "<Control>Q"))
 (define-key skk-plain-space-key? " ")  ;; should not be changed
 (define-key skk-vi-escape-key? '("escape" "<Control>["))
+(define-key skk-state-direct-no-preedit-nop-key? '("<Control>j" "<Control>J"))
 
 ;; style specification
 (define skk-style-spec
@@ -787,10 +788,6 @@
      ((skk-kana-toggle-key? key key-state)
       (skk-context-kana-toggle sc)
       #f)
-     ;; Don't forward C-j as native event in direct-mode.  I think
-     ;; this should be configurable --ekato
-     ((skk-on-key? key key-state)
-      #f)
      ;; bad strategy. see bug #528
      ((symbol? key)
       (skk-commit-raw sc key key-state)
@@ -800,7 +797,8 @@
 	   (not (and
 	         (shift-key-mask key-state)
 		 (alphabet-char? key))))
-      (skk-commit-raw sc key key-state)
+      (if (not (skk-state-direct-no-preedit-nop-key? key key-state))
+          (skk-commit-raw sc key key-state))
       #f)
      (else
       #t))))