[uim-commit] r2121 - in branches/0.4: gtk scm

[ekato at freedesktop.org]

Author: ekato
Date: 2005-11-12 05:57:41 -0800 (Sat, 12 Nov 2005)
New Revision: 2121

Modified:
   branches/0.4/gtk/gtk-im-uim.c
   branches/0.4/scm/skk.scm
Log:
* gtk/gtk-im-uim.c : Port r2207 from trunk.
* scm/skk.scm : Port r1990 from trunk.


Modified: branches/0.4/gtk/gtk-im-uim.c
===================================================================
--- branches/0.4/gtk/gtk-im-uim.c	2005-11-12 00:45:06 UTC (rev 2120)
+++ branches/0.4/gtk/gtk-im-uim.c	2005-11-12 13:57:41 UTC (rev 2121)
@@ -745,7 +745,7 @@
   g_string_free(tmp, TRUE);
 
   show_state = uim_scm_symbol_value_bool("bridge-show-input-state?");
-  if (show_state == UIM_TRUE) {
+  if (show_state == UIM_TRUE && uic->win) {
     gint timeout;
     gdk_window_get_origin(uic->win, &x, &y);
     caret_state_indicator_update(uic->caret_state_indicator, x, y, str);

Modified: branches/0.4/scm/skk.scm
===================================================================
--- branches/0.4/scm/skk.scm	2005-11-12 00:45:06 UTC (rev 2120)
+++ branches/0.4/scm/skk.scm	2005-11-12 13:57:41 UTC (rev 2121)
@@ -1218,7 +1218,7 @@
        (if (skk-special-midashi-key? key key-state)
 	   (begin
 	     (skk-append-residual-kana sc)
-	     (skk-append-string sc '(">"))
+	     (skk-append-string sc '(">" ">" ">"))
 	     (skk-begin-conversion sc)
 	     #f)
 	   #t)
@@ -1579,7 +1579,14 @@
 	(begin
 	  (skk-append-list-to-context-head
 	   sc
-	   (find-kana-list-from-rule ja-rk-rule-basic (car sl)))
+	   (if (or
+		(skk-context-latin-conv sc)
+		;; handle Setsubi-ji
+		(and
+		 (null? (cdr sl))
+		 (string=? ">" (car sl))))
+	       (list (car sl) (car sl) (car sl))
+	       (find-kana-list-from-rule ja-rk-rule-basic (car sl))))
 	  (skk-string-list-to-context-head sc (cdr sl)))
 	#f)))
 
@@ -1696,7 +1703,7 @@
 	 (if (skk-special-midashi-key? key key-state)
 	     (begin
 	       (skk-context-set-state! sc 'skk-state-kanji)
-	       (skk-append-string sc '(">"))
+	       (skk-append-string sc '(">" ">" ">"))
 	       (set! res #f))
 	     (set! res (skk-proc-state-direct c key key-state)))))
       res)))