[uim-commit] r834 - trunk/scm

[ekato at freedesktop.org]

Author: ekato
Date: 2005-05-06 01:46:22 -0700 (Fri, 06 May 2005)
New Revision: 834

Modified:
   trunk/scm/skk.scm
Log:
* scm/skk.scm (skk-commit-by-label-key) : Don't use fixed numeral
  heading label with uim's candidate selection style as well as
  ddskk-like style.
(skk-get-candidate-handler) : Ditto.
(skk-heading-label-char?) : Indentation fix.


Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2005-05-06 07:50:08 UTC (rev 833)
+++ trunk/scm/skk.scm	2005-05-06 08:46:22 UTC (rev 834)
@@ -1292,10 +1292,10 @@
 	  (res #f))
       (cond
        ((= skk-candidate-selection-style 'uim)
-	(let ((num (numeral-char->number key)))
-	  (if (= num 0)
-	      (set! num 9) ; pressing key_0
-	      (set! num (- num 1)))
+	(let ((num (- (length skk-uim-heading-label-char-list)
+		      (length
+		       (member (charcode->string key)
+			       skk-uim-heading-label-char-list)))))
 	  (if (or (< num skk-nr-candidate-max)
 		  (= skk-nr-candidate-max 0))
 	      (set! idx (+ (* cur-page skk-nr-candidate-max) num)))))
@@ -1513,7 +1513,8 @@
   (lambda (key)
     (cond
      ((= skk-candidate-selection-style 'uim)
-      (if (member (charcode->string key) skk-uim-heading-label-char-list)
+      (if (member (charcode->string key)
+      		  skk-uim-heading-label-char-list)
 	  #t
 	  #f))
      ((= skk-candidate-selection-style 'ddskk-like)
@@ -1753,7 +1754,14 @@
 	((= skk-candidate-selection-style 'uim)
 	 (if (= skk-nr-candidate-max 0)
 	     (digit->string (+ idx 1))
-	     (digit->string (+ (remainder idx skk-nr-candidate-max) 1))))
+	     (begin
+	       (set! idx (remainder idx skk-nr-candidate-max))
+	       (if (< idx (length skk-uim-heading-label-char-list))
+		   (charcode->string
+		    (char-upcase
+		     (string->charcode
+		      (nth idx skk-uim-heading-label-char-list))))
+		   ""))))
 	((= skk-candidate-selection-style 'ddskk-like)
 	 (if (> skk-nr-candidate-max 0)
 	     (set! idx (remainder idx skk-nr-candidate-max)))