[uim-commit] r684 - trunk/scm

tkng at freedesktop.org tkng at freedesktop.org
Sun Feb 20 07:28:27 PST 2005


Author: tkng
Date: 2005-02-20 07:28:24 -0800 (Sun, 20 Feb 2005)
New Revision: 684

Added:
   trunk/scm/tutcode-key-custom.scm
Modified:
   trunk/scm/tutcode.scm
Log:
* scm/tutcode-key-custom.scm: New file for key configuration of tutcode.
* scm/tutcode.scm: Move some key definitions to scm/tutcode-key-custom.scm.
Thanks to KIHARA Hideto <deton at m1.interq.or.jp> for this patch.



Added: trunk/scm/tutcode-key-custom.scm
===================================================================
--- trunk/scm/tutcode-key-custom.scm	2005-02-20 14:07:30 UTC (rev 683)
+++ trunk/scm/tutcode-key-custom.scm	2005-02-20 15:28:24 UTC (rev 684)
@@ -0,0 +1,95 @@
+;;; tutcode-key-custom.scm: Customization variables for tutcode key bindings
+;;;
+;;; Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
+;;;
+;;; All rights reserved.
+;;;
+;;; Redistribution and use in source and binary forms, with or without
+;;; modification, are permitted provided that the following conditions
+;;; are met:
+;;; 1. Redistributions of source code must retain the above copyright
+;;;    notice, this list of conditions and the following disclaimer.
+;;; 2. Redistributions in binary form must reproduce the above copyright
+;;;    notice, this list of conditions and the following disclaimer in the
+;;;    documentation and/or other materials provided with the distribution.
+;;; 3. Neither the name of authors nor the names of its contributors
+;;;    may be used to endorse or promote products derived from this software
+;;;    without specific prior written permission.
+;;;
+;;; THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+;;; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+;;; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+;;; ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+;;; FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+;;; DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+;;; OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+;;; HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;;; LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+;;; OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+;;; SUCH DAMAGE.
+;;;;
+
+(require "i18n.scm")
+
+;; key defs
+
+;;; TUT-Code¥â¡¼¥É¤ËÆþ¤ë¥­¡¼(CTRL-\)¤«¤É¤¦¤«¤òȽÄꤹ¤ë¡£
+;;; @param key ȽÄꤹ¤ë¥­¡¼
+;;; @param key-state ¥³¥ó¥È¥í¡¼¥ë¥­¡¼Åù¤Î¾õÂÖ
+;;; @return #t: key¤¬TUT-Code¥â¡¼¥É¤ËÆþ¤ë¥­¡¼¤Î¾ì¹ç¡£
+;;;	    #f: ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡£ 
+;(define-key tutcode-on-key? "<Control>\\")
+
+;;; TUT-Code¥â¡¼¥É¤òÈ´¤±¤ë¥­¡¼(CTRL-\)¤«¤É¤¦¤«¤òȽÄꤹ¤ë¡£
+;;; @param key ȽÄꤹ¤ë¥­¡¼
+;;; @param key-state ¥³¥ó¥È¥í¡¼¥ë¥­¡¼Åù¤Î¾õÂÖ
+;;; @return #t: key¤¬TUT-Code¥â¡¼¥É¤òÈ´¤±¤ë¥­¡¼¤Î¾ì¹ç¡£
+;;;	    #f: ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡£ 
+;(define-key tutcode-off-key? "<Control>\\")
+
+;;; ¤Ò¤é¤¬¤Ê/¥«¥¿¥«¥Ê¥â¡¼¥É¤ÎÀÚ¤êÂؤ¨¤ò¹Ô¤¦¥­¡¼(')¤«¤É¤¦¤«¤òȽÄꤹ¤ë¡£
+;;; @param key ȽÄꤹ¤ë¥­¡¼
+;;; @param key-state ¥³¥ó¥È¥í¡¼¥ë¥­¡¼Åù¤Î¾õÂÖ
+;;; @return #t: key¤¬¤Ò¤é¤¬¤Ê/¥«¥¿¥«¥Ê¥â¡¼¥É¤ÎÀÚ¤êÂؤ¨¥­¡¼¤Î¾ì¹ç¡£
+;;;	    #f: ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡£ 
+;(define-key tutcode-kana-toggle-key? "'")
+
+;;; Backspace¥­¡¼¤«¤É¤¦¤«¤òȽÄꤹ¤ë¡£
+;;; @param key ȽÄꤹ¤ë¥­¡¼
+;;; @param key-state ¥³¥ó¥È¥í¡¼¥ë¥­¡¼Åù¤Î¾õÂÖ
+;;; @return #t: key¤¬Backspace¥­¡¼¤Î¾ì¹ç¡£
+;;;	    #f: ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡£ 
+;(define-key tutcode-backspace-key? 'generic-backspace-key?)
+
+(define-custom-group 'tutcode-keys1
+		     (_ "tutcode key bindings 1")
+		     (_ "long description will be here."))
+
+(define-custom-group 'tutcode-keys2
+		     (_ "tutcode key bindings 2")
+		     (_ "long description will be here."))
+
+(define-custom 'tutcode-on-key '("<Control>\\" generic-on-key)
+               '(tutcode-keys1 mode-transition)
+	       '(key)
+	       (_ "[tutcode] on")
+	       (_ "long description will be here"))
+
+(define-custom 'tutcode-off-key '("<Control>\\" generic-off-key)
+               '(tutcode-keys1 mode-transition)
+	       '(key)
+	       (_ "[tutcode] off")
+	       (_ "long description will be here"))
+
+(define-custom 'tutcode-kana-toggle-key '("'")
+               '(tutcode-keys1 mode-transition)
+	       '(key)
+	       (_ "[tutcode] toggle hiragana/katakana mode")
+	       (_ "long description will be here"))
+
+
+(define-custom 'tutcode-backspace-key '(generic-backspace-key)
+               '(tutcode-keys2)
+	       '(key)
+	       (_ "[tutcode] backspace")
+	       (_ "long description will be here"))

Modified: trunk/scm/tutcode.scm
===================================================================
--- trunk/scm/tutcode.scm	2005-02-20 14:07:30 UTC (rev 683)
+++ trunk/scm/tutcode.scm	2005-02-20 15:28:24 UTC (rev 684)
@@ -50,39 +50,11 @@
 ;;;     #t¤Î¾ì¹ç:¥«¥¿¥«¥Ê¥â¡¼¥É¡£#f¤Î¾ì¹ç:¤Ò¤é¤¬¤Ê¥â¡¼¥É¡£
 
 (require "generic.scm")
+(require-custom "generic-key-custom.scm")
+(require-custom "tutcode-key-custom.scm")
 
 ;;; user configs
 
-;; key defs
-
-;;; TUT-Code¥â¡¼¥É¤ËÆþ¤ë¥­¡¼(CTRL-\)¤«¤É¤¦¤«¤òȽÄꤹ¤ë¡£
-;;; @param key ȽÄꤹ¤ë¥­¡¼
-;;; @param key-state ¥³¥ó¥È¥í¡¼¥ë¥­¡¼Åù¤Î¾õÂÖ
-;;; @return #t: key¤¬TUT-Code¥â¡¼¥É¤ËÆþ¤ë¥­¡¼¤Î¾ì¹ç¡£
-;;;	    #f: ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡£ 
-(define-key tutcode-on-key? "<Control>\\")
-
-;;; TUT-Code¥â¡¼¥É¤òÈ´¤±¤ë¥­¡¼(CTRL-\)¤«¤É¤¦¤«¤òȽÄꤹ¤ë¡£
-;;; @param key ȽÄꤹ¤ë¥­¡¼
-;;; @param key-state ¥³¥ó¥È¥í¡¼¥ë¥­¡¼Åù¤Î¾õÂÖ
-;;; @return #t: key¤¬TUT-Code¥â¡¼¥É¤òÈ´¤±¤ë¥­¡¼¤Î¾ì¹ç¡£
-;;;	    #f: ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡£ 
-(define-key tutcode-off-key? "<Control>\\")
-
-;;; ¤Ò¤é¤¬¤Ê/¥«¥¿¥«¥Ê¥â¡¼¥É¤ÎÀÚ¤êÂؤ¨¤ò¹Ô¤¦¥­¡¼(')¤«¤É¤¦¤«¤òȽÄꤹ¤ë¡£
-;;; @param key ȽÄꤹ¤ë¥­¡¼
-;;; @param key-state ¥³¥ó¥È¥í¡¼¥ë¥­¡¼Åù¤Î¾õÂÖ
-;;; @return #t: key¤¬¤Ò¤é¤¬¤Ê/¥«¥¿¥«¥Ê¥â¡¼¥É¤ÎÀÚ¤êÂؤ¨¥­¡¼¤Î¾ì¹ç¡£
-;;;	    #f: ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡£ 
-(define-key tutcode-kana-toggle-key? "'")
-
-;;; Backspace¥­¡¼¤«¤É¤¦¤«¤òȽÄꤹ¤ë¡£
-;;; @param key ȽÄꤹ¤ë¥­¡¼
-;;; @param key-state ¥³¥ó¥È¥í¡¼¥ë¥­¡¼Åù¤Î¾õÂÖ
-;;; @return #t: key¤¬Backspace¥­¡¼¤Î¾ì¹ç¡£
-;;;	    #f: ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡£ 
-(define-key tutcode-backspace-key? 'generic-backspace-key?)
-
 ;; widgets and actions
 
 ;; widgets



More information about the Uim-commit mailing list