[squeak-dev] The Trunk: Kernel-mt.1435.mcz

commits at source.squeak.org commits at source.squeak.org
Thu Dec 16 10:43:00 UTC 2021


Marcel Taeumel uploaded a new version of Kernel to project The Trunk:
http://source.squeak.org/trunk/Kernel-mt.1435.mcz

==================== Summary ====================

Name: Kernel-mt.1435
Author: mt
Time: 16 December 2021, 11:42:56.651138 am
UUID: 2c901737-e2fe-f542-a9e6-e68fd7b68441
Ancestors: Kernel-ct.1434

Removes dependency on Morphic.

=============== Diff against Kernel-ct.1434 ===============

Item was added:
+ ----- Method: EventSensor class>>anyMouseButtonMask (in category 'constants') -----
+ anyMouseButtonMask
+ 
+ 	^ 2r111!

Item was added:
+ ----- Method: EventSensor class>>numMouseButtons (in category 'constants') -----
+ numMouseButtons
+ 	"We support three button mice."
+ 
+ 	^ 3!

Item was changed:
  ----- Method: EventSensor>>anyModifierKeyPressed (in category 'modifier keys') -----
  anyModifierKeyPressed
  	"ignore, however, the shift keys 'cause that's not REALLY a modifier key"
  
+ 	^ self peekButtons anyMask: (2r1110 "cmd | opt | ctrl" bitShift: EventSensor numMouseButtons)!
- 	^ self peekButtons anyMask: (2r1110 "cmd | opt | ctrl" bitShift: MouseEvent numButtons)!

Item was changed:
  ----- Method: EventSensor>>commandKeyPressed (in category 'modifier keys') -----
  commandKeyPressed
  	"Answer whether the command key on the keyboard is being held down."
  
+ 	^ self peekButtons anyMask: (2r1000 "cmd" bitShift: EventSensor numMouseButtons)!
- 	^ self peekButtons anyMask: (2r1000 "cmd" bitShift: MouseEvent numButtons)!

Item was changed:
  ----- Method: EventSensor>>controlKeyPressed (in category 'modifier keys') -----
  controlKeyPressed
  	"Answer whether the control key on the keyboard is being held down."
  
+ 	^ self peekButtons anyMask: (2r0010 "ctrl" bitShift: EventSensor numMouseButtons)!
- 	^ self peekButtons anyMask: (2r0010 "ctrl" bitShift: MouseEvent numButtons)!

Item was changed:
  ----- Method: EventSensor>>optionKeyPressed (in category 'modifier keys') -----
  optionKeyPressed
  	"Answer whether the option key on the Macintosh keyboard is being held down. Macintosh specific.  Clients are discouraged from calling this directly, since it circumvents bert's attempt to eradicate option-key checks"
  
+ 	^ self peekButtons anyMask: (2r0100 "opt" bitShift: EventSensor numMouseButtons)!
- 	^ self peekButtons anyMask: (2r0100 "opt" bitShift: MouseEvent numButtons)!

Item was changed:
  ----- Method: EventSensor>>processKeyboardEvent: (in category 'private-I/O') -----
  processKeyboardEvent: evt
  	"process a keyboard event, updating EventSensor state"
  	"Never update keyboardBuffer if we have an eventQueue active"
+ 	mouseButtons := (mouseButtons bitAnd: EventSensor anyMouseButtonMask) bitOr: ((evt at: 5) bitShift: EventSensor numMouseButtons).
- 	mouseButtons := (mouseButtons bitAnd: MouseEvent anyButton) bitOr: ((evt at: 5) bitShift: MouseEvent numButtons).
  	
  	(evt at: 3) ifNotNil: "extra characters not handled in MVC"
  		[:charCode| | pressCode |
  		 (pressCode := evt at: 4) = EventKeyChar ifTrue: "key down/up not handled in MVC"
  			["mix in modifiers"
  			keyboardBuffer nextPut: (charCode bitOr: ((evt at: 5) bitShift: 8))]]!

Item was changed:
  ----- Method: EventSensor>>processMouseEvent: (in category 'private-I/O') -----
  processMouseEvent: evt
  	"process a mouse event, updating EventSensor state"
  	| modifiers buttons mapped |
  	mousePosition := (evt at: 3) @ (evt at: 4).
  	buttons := evt at: 5.
  	modifiers := evt at: 6.
  	mapped := self mapButtons: buttons modifiers: modifiers.
+ 	mouseButtons := mapped bitOr: (modifiers bitShift: EventSensor numMouseButtons)!
- 	mouseButtons := mapped bitOr: (modifiers bitShift: MouseEvent numButtons)!

Item was changed:
  ----- Method: EventSensor>>processMouseWheelEvent: (in category 'private-I/O') -----
  processMouseWheelEvent: evt
  	"process a mouse wheel event, updating EventSensor state"
  	
  	| modifiers buttons mapped |
  	mouseWheelDelta := mouseWheelDelta + ((evt at: 3) @ (evt at: 4)).
  	buttons := evt at: 5.
  	modifiers := evt at: 6.
  	mapped := self mapButtons: buttons modifiers: modifiers.
+ 	mouseButtons := mapped bitOr: (modifiers bitShift: EventSensor numMouseButtons)!
- 	mouseButtons := mapped bitOr: (modifiers bitShift: MouseEvent numButtons)!

Item was changed:
  ----- Method: EventSensor>>shiftPressed (in category 'modifier keys') -----
  shiftPressed
  	"Answer whether the shift key on the keyboard is being held down."
  
+ 	^ self peekButtons anyMask: (2r0001 "shift" bitShift: EventSensor numMouseButtons)!
- 	^ self peekButtons anyMask: (2r0001 "shift" bitShift: MouseEvent numButtons)!



More information about the Squeak-dev mailing list