[uim-commit] r321 - in trunk: scm xim

[ekato@freedesktop.org]

Author: ekato
Date: 2005-01-18 02:57:04 -0800 (Tue, 18 Jan 2005)
New Revision: 321

Modified:
   trunk/scm/skk.scm
   trunk/xim/ximserver.cpp
Log:
* xim/ximserver.cpp (XimServer::customContext) : Re-enable IM
  updating.

* scm/skk.scm (skk-proc-state-direct-no-preedit) : Add modifier
  key handling in no-preedit state as in skk-proc-state-direct.
  This avoids unwanted skk-flush enbuged in r246.


Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2005-01-18 10:31:05 UTC (rev 320)
+++ trunk/scm/skk.scm	2005-01-18 10:57:04 UTC (rev 321)
@@ -790,6 +790,10 @@
      ((symbol? key)
       (skk-commit-raw sc key key-state)
       #f)
+     ((and (modifier-key-mask key-state)
+	   (not (shift-key-mask key-state)))
+      (skk-commit-raw sc key key-state)
+      #f)
      (else
       #t))))
 

Modified: trunk/xim/ximserver.cpp
===================================================================
--- trunk/xim/ximserver.cpp	2005-01-18 10:31:05 UTC (rev 320)
+++ trunk/xim/ximserver.cpp	2005-01-18 10:57:04 UTC (rev 321)
@@ -156,7 +156,7 @@
 }
 
 void XimServer::customContext(const char *custom, const char *val) {
-#if 0
+#if 1
     // Updated ximserver's global im with customized one.
     // This is temporal hack.
     if (!strcmp(custom, "custom-activate-default-im-name?")) {