hg/stx-libview: comparison WindowSensor.st

equal deleted inserted replaced

-:c982775d0f33
+:922ba14b4680
+"{ Encoding: utf8 }"
 "
 COPYRIGHT (c) 1993 by Claus Gittinger
 All Rights Reserved
 This software is furnished under a license and may be used
 NOTICE: in previous releases, only one listener was allowed, which was notified
 via #buttonPress/#buttonRelease ... invocations.
 We have changed this to allow multiple handlers, and also to pass the event to a single
 #handleEvent method.
-The old mechanism is kept for a while for backward compatibility, but will eventually
-vanish.
 [instance variables:]
 eventSemaphore          <Semaphore>     the semaphore to be signalled when an event
 (or damage) arrives
 translateKeyboardEvents <Boolean>       if true, keyboard events are translated via
 the devices leyboardMap; if false, they
 are reported as raw-keys. Default is true.
-eventListener           <Object>        if non nil, this one will get all pointer
-OBSOLETE - will vanish                  and keyboard events for this sensors views first.
-If it returns true, the event is supposed to
-be already handled by the listener and not sent to
-the view. If false, the event is handled as usual.
-This allows applications to catch events for any of
-its views.
-keyboardListener        <Object>        if non nil, this one will get all keyboard events
-OBSOLETE - will vanish                  for this sensors views first (but after the eventListener,
-if any).
-If it returns true, the event is supposed to
-be already handled by the listener and not sent to
-the view. If false, the event is handled as usual.
-This allows applications to catch events for any of
-its views.
-ApplicationModels can catch keyboard input with:
-postOpenWith:aBuilder
-aBuilder window sensor keyboardListener:self
 eventListeners          <Collection>    Collection of new event listeners.
-Each will be sent a #handleEvent: message.
-The event will not be enqueued, if any returns
-true.
-keyboardListeners       <Collection>    Collection of new event listeners.
 Each will be sent a #handleEvent: message.
 The event will not be enqueued, if any returns
 true.
 accessLock              <Semaphore>     controls access to the event queues
 (such as a long fileRead in the fileBrowser)
 without entering the debugger.
 (actually, Control-Y is wrong here; the actual
 key is #UserAbort, which may be mapped onto
 any key)
-EventListener           <Object>        if non nil, this one will get all pointer
-OBSOLETE - will vanish                  and keyboard events for ALL views first.
-If it returns true, the event is supposed to
-be already handled by the listener and not enqueued.
-If false, the event is handled as usual.
-This allows overall event catchers to be
-installed for example to implement event
-recorders, active help managers etc.
 EventListeners          <Collection>    Collection of new event listeners.
 Each will be sent a #handleEvent: message.
 The event will not be enqueued, if any returns
 true.
 changed. (For example, recorder/playback applications may
 want to make certain that the playback view is at the same
 position - or record any origin changes to translate later
 synthetic events)."
-| ev|
+|ev|
-"/    "/ backward compatibility ... will vanish
+EventListeners notEmptyOrNil ifTrue:[
-"/    EventListener notNil ifTrue:[
-"/        EventListener postCreateView:aView.
-"/    ].
-"/
-"/ new protocol
-EventListeners size > 0 ifTrue:[
 ev := WindowEvent postViewCreateNotification:aView.
 EventListeners copy do:[:aListener |
 aListener processEvent:ev
 ]
 ].
 "Modified: / 29-06-2011 / 18:56:05 / cg"
+"Modified (format): / 13-04-2018 / 14:46:22 / stefan"
 !
 preViewCreateNotification:aView
 "invoked right before a new view is created.
 Notify listeners and allow for the origin/extent to be
 changed. (For example, recorder/playback applications may
 want to make certain that the playback view is at the same
 position - or record any origin changes to translate later
 synthetic events)."
-|ret ev|
+|ev|
-"/    "/ backward compatibility ... will vanish
+EventListeners notEmptyOrNil ifTrue:[
-"/    EventListener notNil ifTrue:[
-"/        ret := EventListener preCreateView:aView origin:aView origin.
-"/        ret isPoint ifTrue:[
-"/            aView setOrigin:ret
-"/        ]
-"/    ].
-"/
-"/ new protocol
-EventListeners size > 0 ifTrue:[
 ev := WindowEvent preViewCreateNotification:aView.
 EventListeners copy do:[:aListener |
 aListener processEvent:ev
 ]
 ].
 "Modified: / 29-06-2011 / 18:54:57 / cg"
+"Modified: / 13-04-2018 / 14:46:17 / stefan"
 ! !
 !WindowSensor class methodsFor:'queries'!
 cursorPoint
 removeEventListener:aListener
 "remove a local eventListener (with new protocol - #processEvent:)
 - see documentation for what this can be used for"
 eventListeners notNil ifTrue:[
-eventListeners removeIdentical:aListener ifAbsent:nil
+eventListeners removeIdentical:aListener ifAbsent:nil.
-].
+eventListeners isEmpty ifTrue:[
+eventListeners := nil.
+].
+].
+"Modified: / 13-04-2018 / 14:41:05 / stefan"
 ! !
 !WindowSensor methodsFor:'accessing-private'!
 criticalDamageEventQueueAccess:aBlock
 "perform some action which needs synchronized (exclusive)
 access to the damage event queue.
 (i.e. protected by a critical region)"
-self criticalEventQueueAccess:damageEventAccessLock do:aBlock.
+^ self criticalEventQueueAccess:damageEventAccessLock do:aBlock.
+"Modified: / 13-04-2018 / 15:25:12 / stefan"
 !
 criticalEventQueueAccess:whichLock do:aBlock
 "perform some action which needs synchronized (exclusive)
 access to one of the event queues.
 |wasBlocked p|
 p := Processor activeProcess.
 wasBlocked := p blockInterrupts.
-[
+^ [
 whichLock critical:aBlock
 ] on:Error do:[:ex|
 ('WindowSensor [Warning]: Error in eventQ handling ignored: ' , ex description) errorPrintCR.
 "/ thisContext fullPrintAll.
 "/ whichLock printCR.
 ]
 ]
 "Created: / 06-06-1998 / 21:04:02 / cg"
 "Modified: / 14-10-1998 / 17:17:05 / cg"
-"Modified: / 31-01-2017 / 16:53:08 / stefan"
+"Modified: / 13-04-2018 / 15:25:02 / stefan"
 !
 criticalUserEventQueueAccess:aBlock
 "perform some action which needs synchronized (exclusive)
 access to the user event queue.
 (i.e. protected by a critical region)"
-self criticalEventQueueAccess:userEventAccessLock do:aBlock.
+^ self criticalEventQueueAccess:userEventAccessLock do:aBlock.
+"Modified: / 13-04-2018 / 15:24:42 / stefan"
 !
 damageEventAccessLock
 "return the semaphore which controls access to the damage event queue.
 This should probably not be exposed to the public,
 A helper for the various flush entries.
 Returns the last flushed event or nil."
 |lastFlushed whichLock|
-anEventQueue isNil ifTrue:[^ nil].
+anEventQueue isEmptyOrNil ifTrue:[
+^ nil
+].
 whichLock := (anEventQueue == damage) ifTrue:[damageEventAccessLock] ifFalse:[userEventAccessLock].
 self
 criticalEventQueueAccess:whichLock
 do:[
 ]
 ].
 ].
 ^ lastFlushed
-"Modified: / 6.6.1998 / 21:10:22 / cg"
+"Created: / 06-06-1998 / 21:17:54 / cg"
-"Created: / 6.6.1998 / 21:17:54 / cg"
+"Modified (format): / 13-04-2018 / 12:21:26 / stefan"
 !
 flushEventsFor:aViewOrNil where:aBlock
 "throw away all events for aView, for which aBlock evaluates to true
 or any view, if the argument is nil."
 ev := WindowEvent buttonMotion:buttonState x:x y:y view:aView.
 ev hasShift:shiftDown ctrl:ctrlDown alt:altDown meta:metaDown
 button1:leftButtonDown button2:middleButtonDown button3:rightButtonDown.
-"/ any eventListener
-"/ (self notifyEventListenersAbout:ev) ifTrue:[^ self].
 self pushEvent:ev.
 "Modified: / 29-06-2011 / 18:45:59 / cg"
+"Modified (comment): / 13-04-2018 / 15:35:11 / stefan"
 !
 buttonMultiPress:button x:x y:y view:aView
 "mouse button was pressed - this is sent from the device (Display)"
 ev := WindowEvent buttonMultiPress:button x:x y:y view:aView.
 ev hasShift:shiftDown ctrl:ctrlDown alt:altDown meta:metaDown
 button1:leftButtonDown button2:middleButtonDown button3:rightButtonDown.
-"/ any eventListener
-"/ (self notifyEventListenersAbout:ev) ifTrue:[^ self].
 self pushEvent:ev.
 "Modified: / 29-06-2011 / 18:46:03 / cg"
+"Modified (comment): / 13-04-2018 / 15:35:26 / stefan"
 !
 buttonPress:button x:x y:y view:aView
 "mouse button was pressed - this is sent from the device (Display)"
 ev := WindowEvent buttonPress:button x:x y:y view:aView.
 ev hasShift:shiftDown ctrl:ctrlDown alt:altDown meta:metaDown
 button1:leftButtonDown button2:middleButtonDown button3:rightButtonDown.
-"/ any eventListener
-"/ (self notifyEventListenersAbout:ev) ifTrue:[^ self].
 self pushEvent:ev.
 "Modified: / 29-06-2011 / 18:46:07 / cg"
+"Modified (comment): / 13-04-2018 / 15:35:33 / stefan"
 !
 buttonRelease:button x:x y:y view:aView
 "mouse button was released- this is sent from the device (Display)"
 ev := WindowEvent buttonRelease:button x:x y:y view:aView.
 ev hasShift:shiftDown ctrl:ctrlDown alt:altDown meta:metaDown
 button1:leftButtonDown button2:middleButtonDown button3:rightButtonDown.
-"/ any eventListener
-"/ (self notifyEventListenersAbout:ev) ifTrue:[^ self].
 self pushEvent:ev.
 "Modified: / 29-06-2011 / 18:46:11 / cg"
+"Modified (comment): / 13-04-2018 / 15:35:53 / stefan"
 !
 clientMessage:type format:format eventData:data view:aView
 "some other process has sent data to a view.
 This is an X-specific event. (see copyDataEvent for win32 variant)"
 ].
 "/
 "/ remove any old configure event (WIN32 speedup)
 "/
-damage size ~~ 0 ifTrue:[
+damage notEmpty ifTrue:[
 damage keysAndValuesDo:[:idx :aDamage |
 (aDamage notNil
 and:[aDamage type == #configureX:y:width:height:
 and:[aDamage view == aView]]) ifTrue:[
 damage at:idx put:nil.
 self pushDamageEvent:(WindowEvent configureX:x y:y width:w height:h view:aView).
 "Modified: / 29-04-1999 / 10:06:47 / cg"
 "Modified (comment): / 31-08-2017 / 20:18:59 / cg"
+"Modified: / 13-04-2018 / 11:29:12 / stefan"
 !
 copyDataEvent:parameter eventData:data view:aView
 "some other process has sent data to a view.
 This is a Win32-specific event. (see clientMessage for x-windows variant)"
 rawKey:keyWithModifier
 hasShift:shiftDown ctrl:ctrlDown alt:altDown meta:metaDown
 button1:leftButtonDown button2:middleButtonDown button3:rightButtonDown
 x:x y:y view:aView.
-"/ any eventListener
-"/ (self notifyEventListenersAbout:ev) ifTrue:[^ self].
 self pushEvent:ev.
 "Modified: / 10-02-2017 / 21:42:25 / cg"
+"Modified (comment): / 13-04-2018 / 15:36:20 / stefan"
 !
 keyRelease:key x:x y:y view:aView
 "key was released - this is sent from the device (Display)."
 rawKey:key
 hasShift:shiftDown ctrl:ctrlDown alt:altDown meta:metaDown
 button1:leftButtonDown button2:middleButtonDown button3:rightButtonDown
 x:x y:y view:aView.
-"/ any eventListener
-"/ (self notifyEventListenersAbout:ev) ifTrue:[^ self].
 self pushEvent:ev.
 "Modified: / 29-06-2011 / 18:46:46 / cg"
+"Modified (comment): / 13-04-2018 / 15:36:28 / stefan"
 !
 mappedView:aView
 "view was mapped (from window manager) - this is sent from the device (Display)"
 !
 mouseWheelMotion:state x:x y:y amount:amount deltaTime:dTime view:aView
 "mouse-wheel was turned - this is sent from the device (Display)"
-|ev affectedView windowGroup|
+|ev affectedView|
 "/ update my idea of button and modifier state information
 self updateModifierStateFrom:state device:(aView graphicsDevice).
 ignoreUserInput == true ifTrue:[
 ev := WindowEvent mouseWheelMotion:state x:x y:y amount:amount deltaTime:dTime view:affectedView.
 ev hasShift:shiftDown ctrl:ctrlDown alt:altDown meta:metaDown
 button1:leftButtonDown button2:middleButtonDown button3:rightButtonDown.
-"/ any eventListener
-"/ (self notifyEventListenersAbout:ev) ifTrue:[^ self].
 self pushEvent:ev.
 "Created: / 21-05-1999 / 13:05:18 / cg"
 "Modified: / 29-06-2011 / 18:46:54 / cg"
+"Modified (comment): / 13-04-2018 / 15:36:42 / stefan"
 !
 nativeWidgetCommand:command arguments:argVector view:aView
 "native widget action - this is sent from the device (Display).
 These are only delivered if native widgets are enabled under win32"
 ev := WindowEvent pointerEnter:state x:x y:y view:aView.
 ev hasShift:shiftDown ctrl:ctrlDown alt:altDown meta:metaDown
 button1:leftButtonDown button2:middleButtonDown button3:rightButtonDown.
-"/ any eventListener
-"/ (self notifyEventListenersAbout:ev) ifTrue:[^ self].
 self pushEvent:ev.
 "Modified: / 29-06-2011 / 18:47:05 / cg"
 "Modified (format): / 10-02-2017 / 21:36:45 / cg"
+"Modified (comment): / 13-04-2018 / 15:36:57 / stefan"
 !
 pointerLeave:state view:aView
 "mouse cursor was moved out of the view - this is sent from the device (Display)"
 self updateModifierStateFrom:state device:(aView graphicsDevice).
 ev := WindowEvent pointerLeave:state view:aView.
 ev hasShift:shiftDown ctrl:ctrlDown alt:altDown meta:metaDown
 button1:leftButtonDown button2:middleButtonDown button3:rightButtonDown.
-"/ any eventListener
-"/ (self notifyEventListenersAbout:ev) ifTrue:[^ self].
 self pushEvent:ev.
 "Modified: / 29-06-2011 / 18:47:09 / cg"
 "Modified (format): / 10-02-2017 / 21:36:50 / cg"
+"Modified (comment): / 13-04-2018 / 15:46:15 / stefan"
 !
 preViewCreateNotification:aView
 "invoked right before a new view is created.
 Notify listeners and allow for the origin/extent to be
 !
 trayAction:command arguments:argVector view:aView
 "native widget action - this is sent from the device (Display)"
-|ev|
+self pushEvent:(WindowEvent trayAction:command arguments:argVector view:aView).
-ev := WindowEvent trayAction:command arguments:argVector view:aView.
-self pushEvent:ev.
 "Created: / 31-10-2007 / 01:22:08 / cg"
+"Modified: / 13-04-2018 / 15:46:58 / stefan"
 !
 unmappedView:aView
 "view was unmapped (from window manager) - this is sent from the device (Display)"
 basicAddDamage:newRectangle view:aView
 "{ Pragma: +optSpeed }"
 "Add newRectangle to the view's update region.
+Answer true, if there are new damaged pixels, false otherwise.
 Must be careful, if the damage queue contains an event pattern such as:
 damage  map
 in this case, a new damage event is required to be added AFTER the map event,
 otherwise, the newRectangle will be processed in a state where the map has not yet been
 processed and the view thinks it can be ignored.
 In this case, the damage event is re-added at the end of the queue.
 Attention: this method MUST be called in a critical region, controlling the damage queue access"
 |sz  "{ Class: SmallInteger }"
-aDamageEvent oldDamageEvent oldDamageEventIndex anyOtherEventPending lastNilIndex
+aDamageEvent oldDamageEvent oldDamageEventIndex anyOtherEventPending lastNilIndex|
-ev "badGuy"|
 "/ NEWDAMAGE handling - experimental;
 "/ comment these lines if you encounter trouble.
 sz := damage size.
 (sz > 100) ifTrue:[
-damage := damage select:[:d | d notNil].
+damage removeAllSuchThat:[:each | each isNil].
 sz := damage size.
 ].
 "/ find any other damage for this view,
 "/ and as a side effect, find the index of the last empty damage queue slot (nil index)
-oldDamageEventIndex := nil.
 anyOtherEventPending := false.
 1 to:sz do:[:idx |
 aDamageEvent := damage at:idx.
 aDamageEvent notNil ifTrue:[
 (aDamageEvent isDamageForView:aView) ifTrue:[
 ] ifFalse:[
 lastNilIndex := idx
 ].
 ].
-oldDamageEventIndex notNil ifTrue:[
+oldDamageEvent notNil ifTrue:[
 "/ there is already a damage for this view in the queue
 "/ (which will wake up the WG, if currently sleeping).
 "/ so all we have to do is to add the reactangle to the view's updateRegion.
 "/ However, if the view was unmapped, and there is
 "/ a mapped event AFTER the expose, we MUST perform the expose
 anyOtherEventPending ifFalse:[
 ^ aView addUpdateRectangle:newRectangle.
 ].
 (oldDamageEventIndex > (sz-30)) ifTrue:[
+"can remove oldDamage, copy will be fast"
 damage removeIndex:oldDamageEventIndex.
 ] ifFalse:[
+"copy would take too long, just nil oldDamage"
 damage at:oldDamageEventIndex put:nil.
 (lastNilIndex notNil and:[lastNilIndex > (sz-30)]) ifTrue:[
 damage removeIndex:lastNilIndex.
 ].
 ].
-damage add:oldDamageEvent.
+] ifFalse:[
-aView addUpdateRectangle:newRectangle.
+(lastNilIndex notNil and:[lastNilIndex > (sz-30)]) ifTrue:[
-^ true
+damage removeIndex:lastNilIndex.
 ].
+oldDamageEvent := WindowEvent newDamageFor:aView.
-(lastNilIndex notNil and:[lastNilIndex > (sz-30)]) ifTrue:[
+].
-damage removeIndex:lastNilIndex.
-].
 aView addUpdateRectangle:newRectangle.
-ev := WindowEvent newDamageFor:aView.
+damage add:oldDamageEvent.
-damage add:ev.
 ^ true.
 "/    |newEvent r fullRedraw aDamageEvent
 "/     nDamagesForView bounds areaOfIndividualRects thisRectangle
 "/     mergedLeft mergedRight mergedTop mergedBottom
 "/
 "/    ^ true.
 "Modified: / 20-01-2011 / 22:41:50 / cg"
 "Modified (comment): / 29-01-2018 / 14:53:16 / mawalch"
+"Modified: / 13-04-2018 / 14:30:13 / stefan"
 !
 basicPushEvent:anEvent
 "internal basic event queueing"
 Return if there are no damage events.
 Remove it from the queue."
 |theEvent|
-damage size == 0 ifTrue:[^ nil].
+damage isEmpty ifTrue:[
+^ nil
+].
 "
 be careful: events are inserted at higher prio ...
 "
 self criticalDamageEventQueueAccess:[
 anEvent notNil ifTrue:[
 firstNonNilIndex isNil ifTrue:[
 firstNonNilIndex := idx
 ].
 (aViewOrNil isNil or:[anEvent view == aViewOrNil]) ifTrue:[
+theEvent := anEvent.
 damage at:idx put:nil.
-theEvent := anEvent.
+idx := damageSize.      "/ leave loop
-idx := damageSize.
 ].
 ].
 idx := idx + 1.
 ].
 firstNonNilIndex isNil ifTrue:[
 damage removeAll
 ] ifFalse:[
 firstNonNilIndex ~~ 1 ifTrue:[
 damage removeFromIndex:1 toIndex:(firstNonNilIndex-1)
 ]
-]
+].
 ].
 ^ theEvent
-"Created: / 3.12.1998 / 13:41:49 / cg"
+"Created: / 03-12-1998 / 13:41:49 / cg"
-"Modified: / 5.2.1999 / 20:58:20 / cg"
+"Modified: / 05-02-1999 / 20:58:20 / cg"
+"Modified (comment): / 13-04-2018 / 12:44:18 / stefan"
 !
 nextEvent
 "retrieve the next event or nil, if there is none.
 Remove it from the queue."
 Return nil if there are no expose events.
 Remove it from the queue."
 |theEvent|
-damage size == 0 ifTrue:[^ nil].
+damage isEmpty ifTrue:[
+^ nil
+].
 "
 be careful: events are inserted at higher prio ...
 "
 self criticalDamageEventQueueAccess:[
 anEvent isDamage ifTrue:[
 (aViewOrNil isNil or:[anEvent view == aViewOrNil]) ifTrue:[
 theEvent := anEvent.
 damage at:idx put:nil.
-idx := damageSize.
+idx := damageSize.      "/ leave loop
 ]
 ].
 ].
 idx := idx + 1.
 ].
 ^ theEvent
 "Created: / 21-05-1996 / 17:20:54 / cg"
 "Modified: / 05-02-1999 / 20:58:28 / cg"
-"Modified (comment): / 11-04-2018 / 11:45:54 / stefan"
+"Modified: / 13-04-2018 / 11:04:13 / stefan"
+"Modified (comment): / 13-04-2018 / 12:44:30 / stefan"
 !
 pendingEvent
 "retrieve the next pending user (i.e. non-damage) event.
 Return nil, if there is none pending.
 Do not remove it from the queue."
-|e|
+mouseAndKeyboard isEmpty ifTrue:[
+^ nil
-mouseAndKeyboard size == 0 ifTrue:[^ nil].
+].
 "
 be careful: events are inserted at higher prio ...
 "
-self criticalUserEventQueueAccess:[
+^ self criticalUserEventQueueAccess:[
-[e isNil] whileTrue:[
+|event|
-mouseAndKeyboard size == 0 ifTrue:[^ nil].
+[
-e := mouseAndKeyboard first.
+mouseAndKeyboard isEmpty ifTrue:[
-e isNil ifTrue:[
+^ nil
+].
+event := mouseAndKeyboard first.
+event isNil ifTrue:[
 mouseAndKeyboard removeFirst
 ].
-]
+event isNil.
-].
+] whileTrue.
-^ e
+event
+].
-"Modified: / 6.6.1998 / 21:10:51 / cg"
+"Modified: / 06-06-1998 / 21:10:51 / cg"
+"Modified: / 13-04-2018 / 15:28:31 / stefan"
 !
 pushDamageEvent:anEvent
 "put an event into the damage queue
 - this is not meant for public use"
 !
 initializeState
 "initialize the event queues to empty"
-damageEventAccessLock := RecursionLock new.
+damageEventAccessLock := RecursionLock name:'WSensor ev-q damageEventAccessLock'.
-damageEventAccessLock name:'WSensor ev-q damageEventAccessLock'.
+userEventAccessLock := RecursionLock name:'WSensor ev-q userEventAccessLock'.
-userEventAccessLock := RecursionLock new.
-userEventAccessLock name:'WSensor ev-q userEventAccessLock'.
 damage := OrderedCollection new.
 mouseAndKeyboard := OrderedCollection new.
 gotExpose := IdentitySet new.
 shiftDown := ctrlDown := altDown := metaDown := modeSwitchDown := false.
 leftButtonDown := middleButtonDown := rightButtonDown := false.
 collectedMouseWheelMotion := 0.
 "Modified: / 10-02-2017 / 22:33:44 / cg"
+"Modified: / 13-04-2018 / 11:02:36 / stefan"
 !
 reinitialize
 "called when an image is restarted;
 reinitialize the event queues to empty; leave other setup as-is"
 self initializeState.
 ! !
 !WindowSensor methodsFor:'queries-event queue'!
-damageCount
-"return the number of pending damage events (i.e. expose or resize)"
-^ damage size
-"Modified: / 2.4.1997 / 14:14:01 / cg"
-"Created: / 5.4.1998 / 11:35:04 / cg"
-!
-eventPending
-"return true, if either damage or events are pending"
-mouseAndKeyboard size ~~ 0 ifTrue:[^ true].
-^ damage size ~~ 0
-!
 hasButtonEventFor:aView
 "return true, if any button events are pending.
 If the argument, aView is nil, the information is regarding any
 view (i.e. is there a button event for any of my views);
 otherwise, the information is regarding that specific view."
-(self hasButtonMotionEventFor:aView) ifTrue:[^ true].
+^ (self hasButtonMotionEventFor:aView)
-(self hasButtonPressEventFor:aView) ifTrue:[^ true].
+or:[(self hasButtonPressEventFor:aView)
-^ (self hasButtonReleaseEventFor:aView)
+or:[self hasButtonReleaseEventFor:aView]].
-"Created: 1.11.1996 / 17:02:23 / cg"
+"Created: / 01-11-1996 / 17:02:23 / cg"
-"Modified: 1.11.1996 / 17:12:03 / cg"
+"Modified: / 13-04-2018 / 15:13:55 / stefan"
 !
 hasButtonMotionEventFor:aView
 "return true, if any buttonMotion events are pending.
 If the argument, aView is nil, the information is regarding any
 "Modified: 1.11.1996 / 17:11:27 / cg"
 !
 hasDamage
-"return true, if any damage events (i.e. expose or resize) are pending.
+"return true, if any damage events (i.e. expose or resize) might be pending.
 Since this is often invoked by ST-80 classes to poll the sensor,
 a yield is done here to avoid a busy wait blocking other processes."
 Processor yield.
-^ damage size ~~ 0
+^ damage notEmpty
-"Modified: 2.4.1997 / 14:14:01 / cg"
+"Modified: / 02-04-1997 / 14:14:01 / cg"
+"Modified: / 13-04-2018 / 11:25:57 / stefan"
+"Modified (comment): / 13-04-2018 / 12:47:15 / stefan"
 !
 hasDamageFor:aViewOrNil
 "return true, if any damage events (i.e. expose or resize)
 are pending for aViewOrNil. If nil, returns true if any damage is
 pending for this windowGroup."
-damage size ~~ 0 ifTrue:[
+damage isEmpty ifTrue:[
-damage do:[:aDamage |
+^ false.
-aDamage notNil ifTrue:[
+].
-(aViewOrNil isNil or:[aDamage view == aViewOrNil]) ifTrue:[^ true]
+damage do:[:aDamage |
-].
+aDamage notNil ifTrue:[
-]
+(aViewOrNil isNil or:[aDamage view == aViewOrNil]) ifTrue:[
+^ true
+]
+].
 ].
 ^ false
-"Modified: 21.5.1996 / 17:15:09 / cg"
+"Modified: / 21-05-1996 / 17:15:09 / cg"
+"Modified: / 13-04-2018 / 12:22:10 / stefan"
 !
 hasEvent:type for:aReceiverOrNil
 "return true, if a specific event is pending in my queues.
 Type is the type of event, dType the corresponding device event.
 If the argument, aReceiverOrNil is nil, the information is regarding any
 view (i.e. is there an event for any of my views);
 otherwise, the information is regarding to that specific view."
-mouseAndKeyboard size ~~ 0 ifTrue:[
+mouseAndKeyboard notEmpty ifTrue:[
-(self hasUserEvent:type for:aReceiverOrNil) ifTrue:[^ true].
+(self hasUserEvent:type for:aReceiverOrNil) ifTrue:[
-].
+^ true
-damage size ~~ 0 ifTrue:[
+].
-damage do:[:anEvent |
+].
-anEvent notNil ifTrue:[
+damage isEmpty ifTrue:[
-(aReceiverOrNil isNil or:[anEvent receiver == aReceiverOrNil]) ifTrue:[
+^ false.
-(type isNil or:[anEvent type == type]) ifTrue:[^ true].
+].
-]
+damage do:[:anEvent |
-].
+anEvent notNil ifTrue:[
-]
+(aReceiverOrNil isNil or:[anEvent receiver == aReceiverOrNil]) ifTrue:[
+(type isNil or:[anEvent type == type]) ifTrue:[
+^ true
+].
+]
+].
 ].
 ^ false
-"Created: / 10.6.1998 / 17:33:46 / cg"
+"Created: / 10-06-1998 / 17:33:46 / cg"
-"Modified: / 18.6.1998 / 09:29:18 / cg"
+"Modified: / 18-06-1998 / 09:29:18 / cg"
+"Modified: / 13-04-2018 / 12:22:46 / stefan"
 !
 hasEvent:type for:aView withArguments:argsOrNil
 "return true, if a specific event is pending in my queues.
 Type is the type of event, args are the arguments.
 view (i.e. is there an event for any of my views);
 otherwise, the information is regarding to that specific view.
 If the type-argument is nil, any event matches, otherwise only events with
 that type are matched."
-mouseAndKeyboard size ~~ 0 ifTrue:[
+|doBlock|
-mouseAndKeyboard do:[:anEvent |
-anEvent notNil ifTrue:[
+doBlock := [:eachEvent |
-(aReceiverOrNil isNil or:[anEvent receiver == aReceiverOrNil]) ifTrue:[
+eachEvent notNil ifTrue:[
-(type isNil or:[anEvent type == type]) ifTrue:[
+(aReceiverOrNil isNil or:[eachEvent receiver == aReceiverOrNil]) ifTrue:[
-(argMatchBlock value:anEvent arguments) ifTrue:[
+(type isNil or:[eachEvent type == type]) ifTrue:[
+(argMatchBlock value:eachEvent arguments) ifTrue:[
 ^ true
 ].
 ]
 ]
 ].
-]
+].
-].
-damage size ~~ 0 ifTrue:[
+mouseAndKeyboard notEmpty ifTrue:[
-damage do:[:anEvent |
+mouseAndKeyboard do:doBlock.
-anEvent notNil ifTrue:[
+].
-(aReceiverOrNil isNil or:[anEvent receiver == aReceiverOrNil]) ifTrue:[
+damage notEmpty ifTrue:[
-(type isNil or:[anEvent type == type]) ifTrue:[
+damage do:doBlock.
-(argMatchBlock value:anEvent arguments) ifTrue:[
+].
-^ true
-]
-].
-]
-].
-]
-].
 ^ false
-"Modified: 1.11.1996 / 17:11:47 / cg"
+"Modified: / 01-11-1996 / 17:11:47 / cg"
-"Created: 4.1.1997 / 14:00:29 / cg"
+"Created: / 04-01-1997 / 14:00:29 / cg"
+"Modified: / 13-04-2018 / 12:23:56 / stefan"
 !
 hasEvent:type orPendingDeviceEvent:dType for:aView
 "return true, if a specific event is pending in a queue
 or in the devices event queue.
 "Modified: / 10.6.1998 / 17:34:51 / cg"
 !
 hasEvents
-"return true, if any mouse/keyboard events are pending"
+"return true, if any mouse/keyboard events might be pending"
-mouseAndKeyboard size ~~ 0 ifTrue:[^ true].
+^ mouseAndKeyboard notEmpty or:[damage notEmpty].
-^ damage size ~~ 0
+"Modified: / 05-02-1999 / 22:30:23 / cg"
-"Modified: / 5.2.1999 / 22:30:23 / cg"
+"Modified: / 13-04-2018 / 11:05:20 / stefan"
+"Modified (comment): / 13-04-2018 / 12:47:37 / stefan"
 !
 hasExposeEventFor:aViewOrNil
 "return true, if any exposure events are pending for aView.
 If aViewOrNil is nil, return true if any exposure event for any view
 in my windowGroup is pending"
-damage size ~~ 0 ifTrue:[
+damage isEmpty ifTrue:[
-damage do:[:aDamage |
+^ false.
-aDamage notNil ifTrue:[
+].
-aDamage isDamage ifTrue:[
+damage do:[:eachDamage |
-(aViewOrNil isNil or:[aDamage view == aViewOrNil]) ifTrue:[^ true].
+(eachDamage notNil and:[eachDamage isDamage]) ifTrue:[
-]
+(aViewOrNil isNil or:[eachDamage view == aViewOrNil]) ifTrue:[
+^ true
 ].
-]
+].
 ].
 ^ false
-"Modified: 21.5.1996 / 17:13:09 / cg"
+"Modified: / 21-05-1996 / 17:13:09 / cg"
-"Created: 1.11.1996 / 17:05:41 / cg"
+"Created: / 01-11-1996 / 17:05:41 / cg"
+"Modified: / 13-04-2018 / 12:22:14 / stefan"
 !
 hasKeyEventFor:aViewOrNil
 "return true, if any key (press or release) events are pending.
 If the argument, aView is nil, the information is regarding any
 view (i.e. is there a key event for any of my views);
 otherwise, the information is regarding that specific view."
-(self hasKeyPressEventFor:aViewOrNil) ifTrue:[^ true].
+^ (self hasKeyPressEventFor:aViewOrNil) or:[self hasKeyReleaseEventFor:aViewOrNil]
-^ self hasKeyReleaseEventFor:aViewOrNil
+"Created: / 01-11-1996 / 17:08:03 / cg"
-"Created: 1.11.1996 / 17:08:03 / cg"
+"Modified: / 13-04-2018 / 15:11:30 / stefan"
-"Modified: 1.11.1996 / 17:11:55 / cg"
 !
 hasKeyPressEventFor:aViewOrNil
 "return true, if any keyPress events are pending.
 If the argument, aView is nil, the information is regarding any
 Type is the type of event, dType the corresponding device event.
 If the argument, aReceiverOrNil is nil, the information is regarding any
 view (i.e. is there an event for any of my views);
 otherwise, the information is regarding to that specific view."
-mouseAndKeyboard size ~~ 0 ifTrue:[
+mouseAndKeyboard notEmpty ifTrue:[
 mouseAndKeyboard do:[:anEvent |
 anEvent notNil ifTrue:[
 (aReceiverOrNil isNil or:[anEvent receiver == aReceiverOrNil]) ifTrue:[
 (type isNil or:[anEvent type == type]) ifTrue:[^ true].
 ]
 ].
 ]
 ].
 ^ false
-"Created: / 17.6.1998 / 12:55:54 / cg"
+"Created: / 17-06-1998 / 12:55:54 / cg"
-"Modified: / 18.6.1998 / 08:57:00 / cg"
+"Modified: / 18-06-1998 / 08:57:00 / cg"
+"Modified: / 13-04-2018 / 15:11:49 / stefan"
 !
 hasUserEvent:type for:aView withArguments:argsOrNil
 "return true, if a specific user event (non damage) is pending in my queues.
 Type is the type of event, args are the arguments.
 Type is the type of event, dType the corresponding device event.
 If the argument, aReceiverOrNil is nil, the information is regarding any
 view (i.e. is there an event for any of my views);
 otherwise, the information is regarding to that specific view."
-mouseAndKeyboard size ~~ 0 ifTrue:[
+mouseAndKeyboard notEmpty ifTrue:[
 mouseAndKeyboard do:[:anEvent |
 anEvent notNil ifTrue:[
 (aReceiverOrNil isNil or:[anEvent receiver == aReceiverOrNil]) ifTrue:[
 (type isNil or:[anEvent type == type]) ifTrue:[
 (argMatchBlock value:anEvent arguments) ifTrue:[
 ].
 ]
 ].
 ^ false
-"Created: / 17.6.1998 / 12:55:54 / cg"
+"Created: / 17-06-1998 / 12:55:54 / cg"
-"Modified: / 18.6.1998 / 08:57:00 / cg"
+"Modified: / 18-06-1998 / 08:57:00 / cg"
+"Modified: / 13-04-2018 / 15:12:07 / stefan"
 !
 hasUserEventFor:aView
 "return true, if any user event (i.e. key or button events) are pending.
 If the argument, aView is nil, the information is regarding any
 view (i.e. is there a user event for any of my views);
 otherwise, the information is regarding that specific view."
-(self hasKeyEventFor:aView) ifTrue:[^ true].
+^ (self hasKeyEventFor:aView) or:[self hasButtonEventFor:aView].
-^ (self hasButtonEventFor:aView)
+"Created: / 01-11-1996 / 17:08:50 / cg"
-"Created: 1.11.1996 / 17:08:50 / cg"
+"Modified: / 13-04-2018 / 15:12:32 / stefan"
-"Modified: 1.11.1996 / 17:12:21 / cg"
 !
 hasUserEvents
-"return true, if any mouse/keyboard events are pending"
+"return true, if any mouse/keyboard events might be pending"
-^ mouseAndKeyboard size ~~ 0
+^ mouseAndKeyboard notEmpty
-"Created: / 5.2.1999 / 22:29:11 / cg"
+"Created: / 05-02-1999 / 22:29:11 / cg"
+"Modified: / 13-04-2018 / 12:48:01 / stefan"
 !
 motionEventPending
 "return true, if any buttonMotion events are pending."

changeset 8335	922ba14b4680
parent 8332	a5540d67cf81
child 8338	f1a44724b64b