Use SynchronousWindowSensor if no windowGroup
authorStefan Vogel <sv@exept.de>
Tue, 15 Apr 2003 13:59:47 +0200
changeset 3858 ecbaa5d75c70
parent 3857 219231fc7e14
child 3859 a11d876ebc26
Use SynchronousWindowSensor if no windowGroup
DeviceWorkstation.st
SynchronousWindowSensor.st
WindowSensor.st
--- a/DeviceWorkstation.st	Tue Apr 15 13:59:23 2003 +0200
+++ b/DeviceWorkstation.st	Tue Apr 15 13:59:47 2003 +0200
@@ -3673,61 +3673,21 @@
 buttonMotion:button x:x y:y view:aView
     "forward a button-motion for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor buttonMotion:button x:x y:y view:aView
-    ] ifFalse:[
-	aView shown ifTrue:[ "/ could be a late event arrival
-	    "
-	     if there is no sensor ...
-	    "
-	    aView
-		dispatchEvent:#buttonMotion:x:y:
-		arguments:(Array with:button with:x with:y)
-
-"/            WindowEvent
-"/                sendEvent:#buttonMotion:x:y:
-"/                arguments:(Array with:button with:x with:y)
-"/                view:aView
-	]
-    ]
-
-    "Modified: / 20.5.1998 / 22:50:32 / cg"
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor buttonMotion:button x:x y:y view:aView
 !
 
 buttonMultiPress:button x:x y:y view:aView
     "forward a button-multi-press event for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor buttonMultiPress:button x:x y:y view:aView
-    ] ifFalse:[
-	aView shown ifTrue:[ "/ could be a late event arrival
-	    "
-	     if there is no sensor ...
-	    "
-	    aView
-		dispatchEvent:#buttonMultiPress:x:y:
-		arguments:(Array with:button with:x with:y)
-
-"/            WindowEvent
-"/                sendEvent:#buttonMultiPress:x:y:
-"/                arguments:(Array with:button with:x with:y)
-"/                view:aView
-	]
-    ]
-
-    "Modified: / 20.5.1998 / 22:50:49 / cg"
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor buttonMultiPress:button x:x y:y view:aView
 !
 
 buttonPress:button x:x y:y view:aView
@@ -3736,35 +3696,17 @@
     |sensor|
 
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	WindowsRightButtonBehavior == true ifTrue:[
-	    button >= 2 ifTrue:[
-		sensor buttonPress:1 x:x y:y view:aView.
-		^ self.
-	    ]
-	].
-
-	sensor buttonPress:button x:x y:y view:aView
-    ] ifFalse:[
-	aView shown ifTrue:[ "/ could be a late event arrival
-	    "
-	     if there is no sensor ...
-	    "
-	    aView
-		dispatchEvent:#buttonPress:x:y:
-		arguments:(Array with:button with:x with:y)
-
-"/            WindowEvent
-"/                sendEvent:#buttonPress:x:y:
-"/                arguments:(Array with:button with:x with:y)
-"/                view:aView
-	]
-    ]
-
-    "Modified: / 20.5.1998 / 22:51:02 / cg"
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    sensor := aView sensor.
+    WindowsRightButtonBehavior == true ifTrue:[
+        button >= 2 ifTrue:[
+            sensor buttonPress:1 x:x y:y view:aView.
+            ^ self.
+        ]
+    ].
+    sensor buttonPress:button x:x y:y view:aView
 !
 
 buttonRelease:button x:x y:y view:aView
@@ -3773,207 +3715,90 @@
     |sensor|
 
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	WindowsRightButtonBehavior == true ifTrue:[
-	    button >= 2 ifTrue:[
-		sensor buttonRelease:1 x:x y:y view:aView.
-		sensor buttonPress:button x:x y:y view:aView.
-		sensor buttonRelease:button x:x y:y view:aView.
-		^ self.
-	    ].
-	].
-	sensor buttonRelease:button x:x y:y view:aView
-    ] ifFalse:[
-	aView shown ifTrue:[ "/ could be a late event arrival
-	    "
-	     if there is no sensor ...
-	    "
-	    aView
-		dispatchEvent:#buttonRelease:x:y:
-		arguments:(Array with:button with:x with:y)
-
-"/            WindowEvent
-"/                sendEvent:#buttonRelease:x:y:
-"/                arguments:(Array with:button with:x with:y)
-"/                view:aView
-	]
-    ]
-
-    "Modified: / 20.5.1998 / 22:51:13 / cg"
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    sensor := aView sensor.
+    WindowsRightButtonBehavior == true ifTrue:[
+        button >= 2 ifTrue:[
+            sensor buttonRelease:1 x:x y:y view:aView.
+            sensor buttonPress:button x:x y:y view:aView.
+            sensor buttonRelease:button x:x y:y view:aView.
+            ^ self.
+        ].
+    ].
+    sensor buttonRelease:button x:x y:y view:aView
 !
 
 configureX:x y:y width:w height:h view:aView
     "forward a configure for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor configureX:x y:y width:w height:h view:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView configureX:x y:y width:w height:h 
-    ]
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor configureX:x y:y width:w height:h view:aView
 !
 
 coveredBy:otherView view:aView
     "forward a covered for some view
      (aView has been covered by otherView)"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor coveredBy:otherView view:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView coveredBy:otherView 
-    ]
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor coveredBy:otherView view:aView
 !
 
 destroyedView:aView
     "forward a destroyed event for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor destroyedView:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView destroyed
-    ]
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor destroyedView:aView
 !
 
 exposeX:x y:y width:w height:h view:aView
     "forward an expose for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor exposeX:x y:y width:w height:h view:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView
-	    dispatchEvent:#exposeX:y:width:height:
-	    arguments:(Array with:x with:y with:w with:h)
-
-"/        WindowEvent
-"/            sendEvent:#exposeX:y:width:height:
-"/            arguments:(Array with:x with:y with:w with:h)
-"/            view:aView
-    ]
-
-    "Modified: / 20.5.1998 / 22:51:31 / cg"
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor exposeX:x y:y width:w height:h view:aView
 !
 
 focusInView:aView
     "forward a focusIn event for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor focusInView:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView
-	    dispatchEvent:#focusIn
-	    arguments:nil
-
-"/        WindowEvent
-"/            sendEvent:#focusIn
-"/            arguments:nil
-"/            view:aView
-    ]
-
-    "Modified: / 20.5.1998 / 22:51:48 / cg"
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor focusInView:aView
 !
 
 focusOutView:aView 
     "forward a focusOut event for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor focusOutView:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView
-	    dispatchEvent:#focusOut
-	    arguments:nil
-
-"/        WindowEvent
-"/            sendEvent:#focusOut
-"/            arguments:nil
-"/            view:aView
-    ]
-
-    "Modified: / 20.5.1998 / 22:51:58 / cg"
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor focusOutView:aView
 !
 
 graphicsExposeX:x y:y width:w height:h final:final view:aView
     "forward a graphic expose for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor graphicsExposeX:x y:y width:w height:h final:final view:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView
-	    dispatchEvent:#graphicsExposeX:y:width:height:final:
-	    arguments:(Array with:x with:y with:w with:h with:final)
-
-"/        WindowEvent
-"/            sendEvent:#graphicsExposeX:y:width:height:final:
-"/            arguments:(Array with:x with:y with:w with:h with:final)
-"/            view:aView
-    ]
-
-    "Modified: / 20.5.1998 / 22:52:16 / cg"
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor graphicsExposeX:x y:y width:w height:h final:final view:aView
 !
 
 keyPress:untranslatedKey x:x y:y view:aView
@@ -3981,137 +3806,75 @@
 
     <resource: #keyboard (#Escape)>
 
-    |xlatedKey sensor|
+    |xlatedKey|
 
     "/
     "/ ctrl-Esc gives up focus
     "/
     untranslatedKey == #Escape ifTrue:[
-	(ctrlDown or:[metaDown]) ifTrue:[
-	    self ungrabPointer.  
-	    self ungrabKeyboard. 
-	    self setInputFocusTo:nil 
-	]
+        (ctrlDown or:[metaDown]) ifTrue:[
+            self ungrabPointer.  
+            self ungrabKeyboard. 
+            self setInputFocusTo:nil 
+        ]
     ].
 
     self modifierKeyProcessing:untranslatedKey down:true.
 
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
+        "/ event arrived, after I destroyed it myself
+        ^ self
     ].
 
     xlatedKey := self translateKey:untranslatedKey forView:aView.
     xlatedKey == #Hardcopy ifTrue:[
-	[
-	    Transcript topView application
-		saveScreenImage:(Image fromView:(aView topView) "inset:0" grab:true) defaultName:'hardcopy'.
-	] forkAt:Processor userSchedulingPriority + 1.
-	^ self.
-    ].
-
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor keyPress:untranslatedKey x:x y:y view:aView
-    ] ifFalse:[
-	aView shown ifTrue:[ "/ could be a late event arrival
-	    "
-	     if there is no sensor ...
-	    "
-	    xlatedKey notNil ifTrue:[
-		aView
-		    dispatchEvent:#keyPress:x:y:
-		    arguments:(Array with:xlatedKey with:x with:y)
-
-"/                WindowEvent
-"/                  sendEvent:#keyPress:x:y:
-"/                  arguments:(Array with:xlatedKey with:x with:y)
-"/                  view:aView
-	    ]
-	]
-    ]
-
-    "Modified: / 20.5.1998 / 22:52:36 / cg"
+        [
+            Transcript topView application
+                saveScreenImage:(Image fromView:(aView topView) "inset:0" grab:true) defaultName:'hardcopy'.
+        ] forkAt:Processor userSchedulingPriority + 1.
+        ^ self.
+    ].
+
+    aView sensor keyPress:untranslatedKey x:x y:y view:aView
 !
 
 keyRelease:untranslatedKey x:x y:y view:aView
     "forward a key-release event for some view"
 
-    |xlatedKey sensor|
+    |xlatedKey|
 
     self modifierKeyProcessing:untranslatedKey down:false.
 
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
+        "/ event arrived, after I destroyed it myself
+        ^ self
     ].
 
     xlatedKey := self translateKey:untranslatedKey forView:aView.
     xlatedKey == #Hardcopy ifTrue:[^ self].
 
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor keyRelease:untranslatedKey x:x y:y view:aView
-    ] ifFalse:[
-	aView shown ifTrue:[ "/ could be a late event arrival
-	    "
-	     if there is no sensor ...
-	    "
-	    xlatedKey notNil ifTrue:[
-		aView
-		    dispatchEvent:#keyRelease:x:y:
-		    arguments:(Array with:xlatedKey with:x with:y)
-
-"/                WindowEvent
-"/                    sendEvent:#keyRelease:x:y:
-"/                    arguments:(Array with:xlatedKey with:x with:y)
-"/                    view:aView
-	    ]
-	]
-    ]
-
-    "Modified: / 20.5.1998 / 22:52:52 / cg"
+    aView sensor keyRelease:untranslatedKey x:x y:y view:aView
 !
 
 mappedView:aView
     "forward a mapped event for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor mappedView:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView mapped
-    ]
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor mappedView:aView
 !
 
 mouseWheelMotion:buttonState x:x y:y amount:amount deltaTime:dTime view:aView
     "the mousewheel was moved by some amount (signed).
      This event is sent to the current pointer view (like keyPress/release)."
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor mouseWheelMotion:buttonState x:x y:y amount:amount deltaTime:dTime view:aView
-    ] ifFalse:[
-	aView shown ifTrue:[ "/ could be a late event arrival
-	    "
-	     if there is no sensor ...
-	    "
-	    aView
-		dispatchEvent:#mouseWheelMotion:x:y:amount:deltaTime:
-		arguments:(Array with:buttonState with:x with:y with:amount with:dTime )
-	]
-    ]
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor mouseWheelMotion:buttonState x:x y:y amount:amount deltaTime:dTime view:aView
 
     "Modified: / 21.5.1999 / 13:05:53 / cg"
 !
@@ -4119,133 +3882,61 @@
 noExposeView:aView
     "forward a noExpose event for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor noExposeView:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView noExpose 
-    ]
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor noExposeView:aView
 !
 
 pointerEnter:buttonState x:x y:y view:aView
     "forward a pointer enter for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor pointerEnter:buttonState x:x y:y view:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView
-	    dispatchEvent:#pointerEnter:x:y:
-	    arguments:(Array with:buttonState with:x with:y)
-
-"/        WindowEvent
-"/            sendEvent:#pointerEnter:x:y:
-"/            arguments:(Array with:buttonState with:x with:y)
-"/            view:aView
-    ]
-
-    "Modified: / 20.5.1998 / 22:53:13 / cg"
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor pointerEnter:buttonState x:x y:y view:aView
 !
 
 pointerLeave:buttonState view:aView
     "forward a pointer leave for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor pointerLeave:buttonState view:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView
-	    dispatchEvent:#pointerLeave:
-	    arguments:(Array with:buttonState)
-
-"/        WindowEvent
-"/            sendEvent:#pointerLeave:
-"/            arguments:(Array with:buttonState)
-"/            view:aView
-    ]
-
-    "Modified: / 20.5.1998 / 22:53:29 / cg"
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor pointerLeave:buttonState view:aView
 !
 
 saveAndTerminateView:aView
     "forward a saveAndTerminate event for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor saveAndTerminateView:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView saveAndTerminate
-    ]
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor saveAndTerminateView:aView
 !
 
 terminateView:aView
     "forward a terminate event for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor terminateView:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView terminate
-    ]
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor terminateView:aView.
 !
 
 unmappedView:aView
     "forward an unmapped event for some view"
 
-    |sensor|
-
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    (sensor := aView sensor) notNil ifTrue:[
-	sensor unmappedView:aView
-    ] ifFalse:[
-	"
-	 if there is no sensor ...
-	"
-	aView unmapped
-    ]
+        "/ event arrived, after I destroyed it myself
+        ^ self
+    ].
+    aView sensor unmappedView:aView
 ! !
 
 !DeviceWorkstation methodsFor:'event handling'!
@@ -6701,7 +6392,7 @@
 clipBoardEncoding
     "return the assumed default clibBoards encoding
      if a raw string (i.e. without encoding information) is pasted.
-     Useful on XWindows, if a sjis or euc string is pasted from a netscape
+     Useful on X11, if a sjis or euc string is pasted from a netscape
      or other program."
 
     ^ clipBoardEncoding
@@ -6715,9 +6406,9 @@
 !
 
 clipBoardEncoding:aSymbol
-    "set the assumed default clibBoards encoding
+    "set the assumed default clipBoard's encoding
      if a raw string (i.e. without encoding information) is pasted.
-     Useful on XWindows, if a sjis or euc string is pasted from a netscape
+     Useful on X11, if a sjis or euc string is pasted from a netscape
      or other program."
 
     clipBoardEncoding := aSymbol
@@ -7576,7 +7267,7 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.440 2003-04-02 17:45:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.441 2003-04-15 11:59:47 stefan Exp $'
 ! !
 
 DeviceWorkstation initialize!
--- a/SynchronousWindowSensor.st	Tue Apr 15 13:59:23 2003 +0200
+++ b/SynchronousWindowSensor.st	Tue Apr 15 13:59:47 2003 +0200
@@ -157,14 +157,6 @@
             dispatchEvent:#exposeX:y:width:height:
             arguments:(Array with:x with:y with:w with:h)
     ]
-
-"/    WindowEvent
-"/        sendEvent:#exposeX:y:width:height:
-"/        arguments:(Array with:x with:y with:w with:h)
-"/        view:aView
-
-    "Created: / 24.11.1995 / 19:15:54 / cg"
-    "Modified: / 20.5.1998 / 22:56:49 / cg"
 !
 
 focusInView:aView
@@ -198,19 +190,14 @@
     "/ (if an expose is pending)
 
     final ifTrue:[
-	(catchExpose includes:aView) ifTrue:[
-	    gotExpose add:aView.
-	]
+        (catchExpose includes:aView) ifTrue:[
+            gotExpose add:aView.
+        ]
     ].
 
     aView
-	dispatchEvent:#graphicsExposeX:y:width:height:final:
-	arguments:(Array with:x with:y with:w with:h with:final)
-
-"/    WindowEvent
-"/        sendEvent:#graphicsExposeX:y:width:height:final:
-"/        arguments:(Array with:x with:y with:w with:h with:final)
-"/        view:aView
+        dispatchEvent:#graphicsExposeX:y:width:height:final:
+        arguments:(Array with:x with:y with:w with:h with:final)
 
     "Created: / 24.11.1995 / 19:16:38 / cg"
     "Modified: / 20.5.1998 / 22:57:32 / cg"
@@ -301,6 +288,11 @@
     "Modified: 29.1.1997 / 20:46:47 / cg"
 !
 
+pasteFromClipBoard:s view:aView
+
+    ^ aView pasteFromClipBoard:s
+!
+
 pointerEnter:buttonState x:x y:y view:aView
     "forward a pointer enter for some view"
 
@@ -325,6 +317,11 @@
     "Modified: / 20.5.1998 / 22:58:35 / cg"
 !
 
+pushUserEvent:selector for:anyObject withArguments:argList
+
+    ^ anyObject perform:selector withArguments:argList.
+!
+
 saveAndTerminateView:aView
     "forward a saveAndTerminate event for some view"
 
@@ -355,9 +352,8 @@
 !SynchronousWindowSensor methodsFor:'private'!
 
 sendEvent:anEvent to:aView
-    WindowGroup lastEventQuerySignal handle:[:ex|
-        ex proceedWith:anEvent.
-    ] do:[
+
+    WindowGroup lastEventQuerySignal answer:anEvent do:[
         aView dispatchEvent:anEvent
     ].
 ! !
@@ -418,5 +414,5 @@
 !SynchronousWindowSensor class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/SynchronousWindowSensor.st,v 1.23 2002-08-02 11:55:31 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/SynchronousWindowSensor.st,v 1.24 2003-04-15 11:59:37 stefan Exp $'
 ! !
--- a/WindowSensor.st	Tue Apr 15 13:59:23 2003 +0200
+++ b/WindowSensor.st	Tue Apr 15 13:59:47 2003 +0200
@@ -1325,11 +1325,11 @@
     "an expose event arrived - this is sent from the device (Display)"
 
     ignoreExposeEvents ~~ true ifTrue:[
-	self addDamage:(Rectangle left:left top:top width:width height:height) 
-		  view:aView
-		wakeup:true.
+        self addDamage:(Rectangle left:left top:top width:width height:height) 
+                  view:aView
+                wakeup:true.
     ] ifFalse:[
-	'ignored expose' printCR
+        'ignored expose' infoPrintCR
     ]
 
     "Modified: / 9.11.1998 / 14:23:01 / cg"
@@ -1846,9 +1846,9 @@
 
     evView := anEvent view.
     (evView notNil and:[catchExpose includesIdentical:evView]) ifTrue:[
-        "/ dont signal sema, if we are currently waiting for an expose
+        "/ don't signal sema, if we are currently waiting for an expose
         "/ (confirmation of a scroll operation).
-        "/ instread, remember that any event arrived for this view.
+        "/ instead, remember that any event arrived for this view.
         gotOtherEvent add:evView.
         ^ self
     ].
@@ -2819,6 +2819,12 @@
     "Modified: 21.10.1996 / 11:37:31 / cg"
 !
 
+anyModifierKeyDown
+    "return true, if any modifier key is currently pressed."
+
+    ^ shiftDown or:[ctrlDown or:[altDown or:[metaDown]]]
+!
+
 ctrlDown
     "return true, if any CTRL key is currently pressed."
 
@@ -3088,7 +3094,7 @@
 !WindowSensor class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WindowSensor.st,v 1.211 2003-04-11 16:49:19 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WindowSensor.st,v 1.212 2003-04-15 11:59:42 stefan Exp $'
 ! !
 
 WindowSensor initialize!