Author: yamaken
Date: Thu Mar 3 23:25:18 2005
New Revision: 748
Modified:
branches/composer/scm/anthy.scm
branches/composer/scm/event.scm
branches/composer/scm/evmap.scm
Log:
* scm/evmap.scm
- (key-event-inspect): Move to event.scm and renamed to
key-event-print-inspected to fix conflicted procedure name
* scm/event.scm
- (key-event-print-inspected): Moved from key-event-inspect of
evmap.scm and renamed to fix the conflict with preexisting
key-event-inspect
* scm/anthy.scm
- (anthy-key-handler): Fix key-event-inspect with
key-event-print-inspected
Modified: branches/composer/scm/anthy.scm
==============================================================================
--- branches/composer/scm/anthy.scm (original)
+++ branches/composer/scm/anthy.scm Thu Mar 3 23:25:18 2005
@@ -928,9 +928,9 @@
(lambda (ac key key-state press?)
(let ((ev (legacy-key->key-event key key-state press?))
(keytrans-emc (anthy-context-keytrans-emc ac)))
- (key-event-inspect "key-event: " ev)
+ (key-event-print-inspected "key-event: " ev)
(key-event-translator-translate! keytrans-emc ev)
- (key-event-inspect "translated: " ev)
+ (key-event-print-inspected "translated: " ev)
(if (anthy-context-on ac)
(if (anthy-context-converting ac)
(anthy-proc-converting-state ac ev key key-state)
Modified: branches/composer/scm/event.scm
==============================================================================
--- branches/composer/scm/event.scm (original)
+++ branches/composer/scm/event.scm Thu Mar 3 23:25:18 2005
@@ -207,3 +207,9 @@
"consumed"
"not-consumed")
"\n")))
+
+(define key-event-print-inspected
+ (lambda (msg ev)
+ (if inspect-key-event-translation?
+ (puts (string-append msg
+ (key-event-inspect ev))))))
Modified: branches/composer/scm/evmap.scm
==============================================================================
--- branches/composer/scm/evmap.scm (original)
+++ branches/composer/scm/evmap.scm Thu Mar 3 23:25:18 2005
@@ -911,12 +911,6 @@
(lambda ()
(evmap-context-new key-event-translator-ruletree)))
-(define key-event-inspect
- (lambda (msg ev)
- (if inspect-key-event-translation?
- (puts (string-append msg
- (key-event-inspect ev))))))
-
;; TODO: write test
(define key-event-translator-translate!
(lambda (emc ev)
