--- a/EventMonitor.st	Mon Feb 20 10:50:53 2006 +0100
+++ b/EventMonitor.st	Mon Feb 20 10:51:03 2006 +0100
@@ -20,7 +20,7 @@
 !
 
 View subclass:#EventMonitorView
-	instanceVariableNames:'outputStream labelHolder'
+	instanceVariableNames:'outputStream labelHolder showButtonMotion'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:EventMonitor
@@ -142,6 +142,23 @@
             )
           )
          (MenuItem
+            label: 'Filter'
+            translateLabel: true
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  label: 'Show ButtonMotion'
+                  itemValue: showButtonMotion:
+                  translateLabel: true
+                  indication: showButtonMotion
+                )
+               )
+              nil
+              nil
+            )
+          )
+         (MenuItem
             label: 'Output'
             translateLabel: true
             submenu: 
@@ -197,6 +214,10 @@
 
 !EventMonitor methodsFor:'aspects'!
 
+eventMonitorView
+    ^ (self builder componentAt:#eventMonitorView)
+!
+
 outputSelector
     outputSelector isNil ifTrue:[
         outputSelector := #stdout asValue.
@@ -209,7 +230,15 @@
     |stream|
 
     stream := self outputSelector value == #transcript ifTrue:[Transcript] ifFalse:[Stdout].
-    (self builder componentAt:#eventMonitorView) outputStream:stream.
+    self eventMonitorView outputStream:stream.
+!
+
+showButtonMotion
+    ^ self eventMonitorView showButtonMotion
+!
+
+showButtonMotion:aBoolean
+    ^ self eventMonitorView showButtonMotion:aBoolean
 ! !
 
 !EventMonitor methodsFor:'menu actions'!
@@ -268,6 +297,15 @@
     outputStream == Transcript ifTrue:[
         labelHolder value: 'See event trace\on the Transcript' withCRs.
     ].
+    self invalidate.
+!
+
+showButtonMotion
+    ^ showButtonMotion ? true
+!
+
+showButtonMotion:something
+    showButtonMotion := something.
 ! !
 
 !EventMonitor::EventMonitorView methodsFor:'drawing'!
@@ -289,6 +327,8 @@
 !EventMonitor::EventMonitorView methodsFor:'events'!
 
 buttonMotion:state x:x y:y
+    self showButtonMotion ifFalse:[^ self].
+
     outputStream nextPutAll:'buttonMotion x:'.
     x printOn:outputStream.
     outputStream nextPutAll:' y:'.
@@ -396,17 +436,17 @@
     s printOn:outputStream.
 
     (key isMemberOf:Character) ifTrue:[
-        s := ' character key:' , key printString
+        s := ' character key:' , key storeString
              , ' (' , key asciiValue printString , ')'.
     ] ifFalse:[
         s := ' symbolic key:' , key storeString.
         untranslatedKey := device keyboardMap keyAtValue:key ifAbsent:key.
         untranslatedKey ~~ key ifTrue:[
-            s := s , ' untranslated key:' , untranslatedKey printString
+            s := s , ' untranslated key:' , untranslatedKey storeString
         ].
     ].
     rawKey := (WindowGroup lastEventQuerySignal query) rawKey.
-    s := s , ' rawKey:' , rawKey printString.
+    s := s , ' rawKey:' , rawKey storeString.
 
     s printOn:outputStream.
     outputStream cr.
@@ -423,17 +463,17 @@
     (key isMemberOf:Character) ifTrue:[
         key codePoint <= 16rFF ifTrue:[
             ' character key:' printOn:outputStream.
-            key printOn:outputStream.
+            key storeString printOn:outputStream.
         ] ifFalse:[
             ' unicode character utf8:' printOn:outputStream.
             key asString utf8Encoded asByteArray hexPrintOn:outputStream.
         ].
         ' (' printOn:outputStream. key asciiValue printOn:outputStream. ')' printOn:outputStream
     ] ifFalse:[
-        ' symbolic key:' print. key storeString print.
+        ' symbolic key:' print. key storeString printOn:outputStream.
         untranslatedKey := device keyboardMap keyAtValue:key ifAbsent:key.
         untranslatedKey ~~ key ifTrue:[
-            ' untranslated key:' printOn:outputStream. untranslatedKey printOn:outputStream
+            ' untranslated key:' printOn:outputStream. untranslatedKey storeString printOn:outputStream
         ]
     ].
 
@@ -468,6 +508,11 @@
     "Modified: 5.4.1997 / 01:24:05 / cg"
 !
 
+sizeChanged:how
+    super sizeChanged:how.
+    self invalidate
+!
+
 unmapped
     outputStream nextPutLine:'unmapped '.
 
@@ -510,5 +555,5 @@
 !EventMonitor class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/EventMonitor.st,v 1.23 2006-02-01 19:06:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/EventMonitor.st,v 1.24 2006-02-20 09:51:03 cg Exp $'
 ! !