Squeak-dev February 2016

squeak-dev@lists.squeakfoundation.org

28 participants
207 discussions

The Trunk: System-dtl.792.mcz
by commits＠source.squeak.org 02 Feb '16

02 Feb '16

David T. Lewis uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-dtl.792.mcz ==================== Summary ==================== Name: System-dtl.792 Author: dtl Time: 2 February 2016, 12:40:33.790655 pm UUID: 8f3c142b-21ca-4f91-83e8-e474425bd4ce Ancestors: System-dtl.791 Remove last references to InputSensor, which has bee replaced by EventSensor =============== Diff against System-dtl.791 =============== Item was changed: ----- Method: SmalltalkImage class>>initializeShutDownList (in category 'class initialization') ----- initializeShutDownList "SmalltalkImage initialize" | oldList | oldList := ShutDownList. ShutDownList := OrderedCollection new. "These get processed from the bottom up..." #( Delay DisplayScreen + EventSensor - InputSensor Form ControlManager PasteUpMorph StrikeFont Color FileDirectory SoundPlayer HttpUrl Password PWS MailDB ImageSegment ) do:[:clsName| Smalltalk at: clsName ifPresent:[:cls| Smalltalk addToShutDownList: cls]. ]. oldList ifNotNil: [oldList reverseDo: [:className | Smalltalk at: className ifPresent: [:theClass | Smalltalk addToShutDownList: theClass]]]. ! Item was changed: ----- Method: SmalltalkImage class>>initializeStartUpList (in category 'class initialization') ----- initializeStartUpList "SmalltalkImage initialize" | oldList | oldList := StartUpList. StartUpList := OrderedCollection new. "These get processed from the top down..." self flag: #'revisit in Squeak 5.3'. #( SmallInteger Delay DisplayScreen Cursor + EventSensor - InputSensor ProcessorScheduler "Starts low space watcher and bkground." FileDirectory "Enables file stack dump and opens sources." ShortIntegerArray ShortRunArray CrLfFileStream "Remove this in Squeak 5.3" ) do:[:clsName| Smalltalk at: clsName ifPresent:[:cls| Smalltalk addToStartUpList: cls]. ]. oldList ifNotNil: [oldList do: [:className | Smalltalk at: className ifPresent: [:theClass | Smalltalk addToStartUpList: theClass]]]. #( ImageSegment PasteUpMorph ControlManager ) do:[:clsName| Smalltalk at: clsName ifPresent:[:cls| Smalltalk addToStartUpList: cls]. ]. !

1 0

The Trunk: Kernel-dtl.985.mcz
by commits＠source.squeak.org 02 Feb '16

02 Feb '16

David T. Lewis uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-dtl.985.mcz ==================== Summary ==================== Name: Kernel-dtl.985 Author: dtl Time: 30 January 2016, 2:53:37.508491 pm UUID: 14804760-466d-4af1-a5f8-ad60b34fdc1d Ancestors: Kernel-dtl.984 EventSensor replaces InputSensor, update class and method comments. =============== Diff against Kernel-dtl.984 =============== Item was changed: Object subclass: #EventSensor instanceVariableNames: 'mouseButtons mousePosition keyboardBuffer interruptKey interruptSemaphore eventQueue inputSemaphore lastEventPoll hasInputSemaphore' classVariableNames: 'ButtonDecodeTable EventPollPeriod EventTicklerProcess InterruptSemaphore InterruptWatcherProcess KeyDecodeTable' poolDictionaries: 'EventSensorConstants' category: 'Kernel-Processes'! + !EventSensor commentStamp: 'dtl 1/30/2016 14:44' prior: 0! + An EventSensor is an interface to the user input devices. + There is at least one instance of EventSensor named Sensor in the system. - !EventSensor commentStamp: 'nk 4/13/2004 11:18' prior: 0! - EventSensor is a replacement for InputSensor based on a set of (optional) event primitives. An EventSensor updates its state when events are received so that all state based users of Sensor (e.g., Sensor keyboard, Sensor leftShiftDown, Sensor mouseButtons) will work exactly as before, by moving the current VM mechanisms into EventSensor itself. An optional input semaphore is part of the new design. + EventSensor is a replacement for the earlier InputSensor implementation based on a set of (optional) event primitives. An EventSensor updates its state when events are received so that all state based users of Sensor (e.g., Sensor keyboard, Sensor leftShiftDown, Sensor mouseButtons) will work exactly as before, by moving the current VM mechanisms into EventSensor itself. An optional input semaphore is part of the new design. + For platforms that support true asynchronous event notification, the semaphore will be signaled to indicate pending events. On platforms that do not support asynchronous notifications about events, the UI will have to poll EventSensor periodically to read events from the VM. Instance variables: mouseButtons <Integer> - mouse button state as replacement for primMouseButtons mousePosition <Point> - mouse position as replacement for primMousePt keyboardBuffer <SharedQueue> - keyboard input buffer interruptKey <Integer> - currently defined interrupt key interruptSemaphore <Semaphore> - the semaphore signaled when the interruptKey is detected eventQueue <SharedQueue> - an optional event queue for event driven applications inputSemaphore <Semaphore>- the semaphore signaled by the VM if asynchronous event notification is supported lastEventPoll <Integer> - the last millisecondClockValue at which we called fetchMoreEvents hasInputSemaphore <Boolean> - true if my inputSemaphore has actually been signaled at least once. Class variables: + ButtonDecodeTable <ByteArray> - maps mouse buttons as reported by the VM to ones reported in the events. + KeyDecodeTable <Dictionary<SmallInteger->SmallInteger>> - maps some keys and their modifiers to other keys (used for instance to map Ctrl-X to Alt-X) + InterruptSemaphore <Semaphore> - signalled by the the VM and/or the event loop upon receiving an interrupt keystroke. + InterruptWatcherProcess <Process> - waits on the InterruptSemaphore and then responds as appropriate. EventPollPeriod <Integer> - the number of milliseconds to wait between polling for more events in the userInterruptHandler. EventTicklerProcess <Process> - the process that makes sure that events are polled for often enough (at least every EventPollPeriod milliseconds). Event format: The current event format is very simple. Each event is recorded into an 8 element array. All events must provide some SmallInteger ID (the first field in the event buffer) and a time stamp (the second field in the event buffer), so that the difference between the time stamp of an event and the current time can be reported. Currently, the following events are defined: Null event ============= The Null event is returned when the ST side asks for more events but no more events are available. Structure: [1] - event type 0 [2-8] - unused Mouse event structure ========================== Mouse events are generated when mouse input is detected. Structure: [1] - event type 1 [2] - time stamp [3] - mouse x position [4] - mouse y position [5] - button state; bitfield with the following entries: 1 - yellow (e.g., right) button 2 - blue (e.g., middle) button 4 - red (e.g., left) button [all other bits are currently undefined] [6] - modifier keys; bitfield with the following entries: 1 - shift key 2 - ctrl key 4 - (Mac specific) option key 8 - Cmd/Alt key [all other bits are currently undefined] [7] - reserved. [8] - reserved. Keyboard events ==================== Keyboard events are generated when keyboard input is detected. [1] - event type 2 [2] - time stamp [3] - character code For now the character code is in Mac Roman encoding. [4] - press state; integer with the following meaning 0 - character 1 - key press (down) 2 - key release (up) [5] - modifier keys (same as in mouse events) [6] - reserved. [7] - reserved. [8] - reserved. ! Item was changed: ----- Method: EventSensor>>processKeyboardEvent: (in category 'private-I/O') ----- processKeyboardEvent: evt + "process a keyboard event, updating EventSensor state" - "process a keyboard event, updating InputSensor state" | charCode pressCode | "Never update keyboardBuffer if we have an eventQueue active" mouseButtons := (mouseButtons bitAnd: 7) bitOr: ((evt at: 5) bitShift: 3). eventQueue ifNotNil:[^self]. charCode := evt at: 3. charCode = nil ifTrue:[^self]. "extra characters not handled in MVC" pressCode := evt at: 4. pressCode = EventKeyChar ifFalse:[^self]. "key down/up not handled in MVC" "mix in modifiers" charCode := charCode bitOr: ((evt at: 5) bitShift: 8). keyboardBuffer nextPut: charCode.! Item was changed: ----- Method: EventSensor>>processMouseEvent: (in category 'private-I/O') ----- processMouseEvent: evt + "process a mouse event, updating EventSensor state" - "process a mouse event, updating InputSensor 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: 3).! Item was changed: ObjectTracer subclass: #ObjectViewer instanceVariableNames: 'valueBlock lastValue changeBlock' classVariableNames: '' poolDictionaries: '' category: 'Kernel-Objects'! + !ObjectViewer commentStamp: 'dtl 1/30/2016 14:50' prior: 0! + ObjectViewers offers the same kind of interception of messages (via doesnotUnderstand:) as ObjectTracers, but instead of just being wrappers, they actually replace the object being viewed. This makes them a lot more dangerous to use, but one can do amazing things. For instance, the example below actually intercepts the EventSensor object, and prints the mouse coordinates asynchronously, every time they change: - !ObjectViewer commentStamp: '<historical>' prior: 0! - ObjectViewers offers the same kind of interception of messages (via doesnotUnderstand:) as ObjectTracers, but instead of just being wrappers, they actually replace the object being viewed. This makes them a lot more dangerous to use, but one can do amazing things. For instance, the example below actually intercepts the InputSensor object, and prints the mouse coordinates asynchronously, every time they change: Sensor evaluate: [Sensor cursorPoint printString displayAt: 0@0] wheneverChangeIn: [Sensor cursorPoint]. To exit from this example, execute: Sensor xxxUnTrace !

1 0

The Trunk: Kernel-dtl.984.mcz
by commits＠source.squeak.org 02 Feb '16

02 Feb '16

David T. Lewis uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-dtl.984.mcz ==================== Summary ==================== Name: Kernel-dtl.984 Author: dtl Time: 30 January 2016, 2:37:27.663155 pm UUID: 16c765b5-65b4-49ef-ba63-abceec7cd80e Ancestors: Kernel-dtl.983 Remove InputSensor. EventSensor replaces InputSensor for both Morphic and MVC. Note: requires update to SmalltalkImage class initialization methods in package System. =============== Diff against Kernel-dtl.983 =============== Item was changed: + Object subclass: #EventSensor - InputSensor subclass: #EventSensor instanceVariableNames: 'mouseButtons mousePosition keyboardBuffer interruptKey interruptSemaphore eventQueue inputSemaphore lastEventPoll hasInputSemaphore' + classVariableNames: 'ButtonDecodeTable EventPollPeriod EventTicklerProcess InterruptSemaphore InterruptWatcherProcess KeyDecodeTable' - classVariableNames: 'EventPollPeriod EventTicklerProcess' poolDictionaries: 'EventSensorConstants' category: 'Kernel-Processes'! !EventSensor commentStamp: 'nk 4/13/2004 11:18' prior: 0! EventSensor is a replacement for InputSensor based on a set of (optional) event primitives. An EventSensor updates its state when events are received so that all state based users of Sensor (e.g., Sensor keyboard, Sensor leftShiftDown, Sensor mouseButtons) will work exactly as before, by moving the current VM mechanisms into EventSensor itself. An optional input semaphore is part of the new design. For platforms that support true asynchronous event notification, the semaphore will be signaled to indicate pending events. On platforms that do not support asynchronous notifications about events, the UI will have to poll EventSensor periodically to read events from the VM. Instance variables: mouseButtons <Integer> - mouse button state as replacement for primMouseButtons mousePosition <Point> - mouse position as replacement for primMousePt keyboardBuffer <SharedQueue> - keyboard input buffer interruptKey <Integer> - currently defined interrupt key interruptSemaphore <Semaphore> - the semaphore signaled when the interruptKey is detected eventQueue <SharedQueue> - an optional event queue for event driven applications inputSemaphore <Semaphore>- the semaphore signaled by the VM if asynchronous event notification is supported lastEventPoll <Integer> - the last millisecondClockValue at which we called fetchMoreEvents hasInputSemaphore <Boolean> - true if my inputSemaphore has actually been signaled at least once. Class variables: EventPollPeriod <Integer> - the number of milliseconds to wait between polling for more events in the userInterruptHandler. EventTicklerProcess <Process> - the process that makes sure that events are polled for often enough (at least every EventPollPeriod milliseconds). Event format: The current event format is very simple. Each event is recorded into an 8 element array. All events must provide some SmallInteger ID (the first field in the event buffer) and a time stamp (the second field in the event buffer), so that the difference between the time stamp of an event and the current time can be reported. Currently, the following events are defined: Null event ============= The Null event is returned when the ST side asks for more events but no more events are available. Structure: [1] - event type 0 [2-8] - unused Mouse event structure ========================== Mouse events are generated when mouse input is detected. Structure: [1] - event type 1 [2] - time stamp [3] - mouse x position [4] - mouse y position [5] - button state; bitfield with the following entries: 1 - yellow (e.g., right) button 2 - blue (e.g., middle) button 4 - red (e.g., left) button [all other bits are currently undefined] [6] - modifier keys; bitfield with the following entries: 1 - shift key 2 - ctrl key 4 - (Mac specific) option key 8 - Cmd/Alt key [all other bits are currently undefined] [7] - reserved. [8] - reserved. Keyboard events ==================== Keyboard events are generated when keyboard input is detected. [1] - event type 2 [2] - time stamp [3] - character code For now the character code is in Mac Roman encoding. [4] - press state; integer with the following meaning 0 - character 1 - key press (down) 2 - key release (up) [5] - modifier keys (same as in mouse events) [6] - reserved. [7] - reserved. [8] - reserved. ! Item was changed: ----- Method: EventSensor class>>initialize (in category 'class initialization') ----- initialize + Smalltalk addToStartUpList: self after: Cursor. + self installKeyDecodeTable. + self installMouseDecodeTable. + self install. + + ! - Smalltalk addToStartUpList: self after: Cursor! Item was removed: - Object subclass: #InputSensor - instanceVariableNames: '' - classVariableNames: 'ButtonDecodeTable InterruptSemaphore InterruptWatcherProcess KeyDecodeTable' - poolDictionaries: '' - category: 'Kernel-Processes'! - - !InputSensor commentStamp: '<historical>' prior: 0! - An InputSensor is an interface to the user input devices. - There is at least one (sub)instance of InputSensor named Sensor in the system. - - Class variables: - - ButtonDecodeTable <ByteArray> - maps mouse buttons as reported by the VM to ones reported in the events. - - KeyDecodeTable <Dictionary<SmallInteger->SmallInteger>> - maps some keys and their modifiers to other keys (used for instance to map Ctrl-X to Alt-X) - - InterruptSemaphore <Semaphore> - signalled by the the VM and/or the event loop upon receiving an interrupt keystroke. - - InterruptWatcherProcess <Process> - waits on the InterruptSemaphore and then responds as appropriate.! Item was removed: - ----- Method: InputSensor class>>initialize (in category 'class initialization') ----- - initialize - - Smalltalk removeFromStartUpList: self! Item was removed: - ----- Method: InputSensor class>>shutDown (in category 'system startup') ----- - shutDown - EventSensor shutDown! Item was removed: - ----- Method: InputSensor class>>startUp (in category 'system startup') ----- - startUp - EventSensor startUp!

1 0

The Trunk: Kernel-dtl.983.mcz
by commits＠source.squeak.org 02 Feb '16

02 Feb '16

David T. Lewis uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-dtl.983.mcz ==================== Summary ==================== Name: Kernel-dtl.983 Author: dtl Time: 30 January 2016, 2:12:42.962584 pm UUID: 5083c482-91e7-4fc6-b812-ed73abcbd69c Ancestors: Kernel-dtl.982 InputSensor removal. Consolidate class methods. Remove InputSensor from that system startup list, and add EventSensor. =============== Diff against Kernel-dtl.982 =============== Item was added: + ----- Method: EventSensor class>>default (in category 'public') ----- + default + "Answer the default system input sensor, Sensor." + + ^ Sensor! Item was added: + ----- Method: EventSensor class>>defaultCrossPlatformKeys (in category 'class initialization') ----- + defaultCrossPlatformKeys + "Answer a list of key letters that are used for common editing operations + on different platforms." + ^{ $c . $x . $v . $a . $s . $f . $g . $z } + ! Item was changed: ----- Method: EventSensor class>>initialize (in category 'class initialization') ----- initialize + Smalltalk addToStartUpList: self after: Cursor! - self flag: #REMOVE. "temporary initialization method to support InputSensor removal" - "Update the preferences" - { #swapMouseButtons . #swapControlAndAltKeys . #duplicateControlAndAltKeys . #duplicateAllControlAndAltKeys } - do: [ :key | | pref changeSelector | - pref := Preferences preferenceAt: key. - changeSelector := (key , #Changed) asSymbol. - pref ifNotNil: [ pref changeInformee: EventSensor changeSelector: changeSelector ] ]. - ! Item was added: + ----- Method: EventSensor class>>installDuplicateKeyEntryFor: (in category 'key decode table') ----- + installDuplicateKeyEntryFor: c + | key | + key := c asInteger. + "first do control->alt key" + KeyDecodeTable at: { key bitAnd: 16r9F . 2 } put: { key . 8 }. + "then alt->alt key" + KeyDecodeTable at: { key . 8 } put: { key . 8 } + ! Item was added: + ----- Method: EventSensor class>>installKeyDecodeTable (in category 'class initialization') ----- + installKeyDecodeTable + "Create a decode table that swaps some keys if + Preferences swapControlAndAltKeys is set" + KeyDecodeTable := Dictionary new. + Preferences duplicateControlAndAltKeys + ifTrue: [ self defaultCrossPlatformKeys do: + [ :c | self installDuplicateKeyEntryFor: c ] ]. + Preferences swapControlAndAltKeys + ifTrue: [ self defaultCrossPlatformKeys do: + [ :c | self installSwappedKeyEntryFor: c ] ]. + Preferences duplicateAllControlAndAltKeys + ifTrue: [ (Character allByteCharacters select: [:ea | ea isAlphaNumeric]) do: + [ :c | self installDuplicateKeyEntryFor: c ] ]. + ! Item was added: + ----- Method: EventSensor class>>installMouseDecodeTable (in category 'class initialization') ----- + installMouseDecodeTable + "Create a decode table that swaps the lowest-order 2 bits if + Preferences swapMouseButtons is set" + ButtonDecodeTable := Preferences swapMouseButtons + ifTrue: [ByteArray withAll: + ((0 to: 255) collect: [:ea | + ((ea bitAnd: 1) << 1 + bitOr: (ea bitAnd: 2) >> 1) + bitOr: (ea bitAnd: 16rFC) ])] + ifFalse: [ByteArray + withAll: (0 to: 255)]! Item was added: + ----- Method: EventSensor class>>installSwappedKeyEntryFor: (in category 'key decode table') ----- + installSwappedKeyEntryFor: c + | key | + key := c asInteger. + "first do control->alt key" + KeyDecodeTable at: { key bitAnd: 16r9F . 2 } put: { key . 8 }. + "then alt->control key" + KeyDecodeTable at: { key . 8 } put: { key bitAnd: 16r9F . 2 }! Item was added: + ----- Method: EventSensor class>>keyDecodeTable (in category 'key decode table') ----- + keyDecodeTable + ^KeyDecodeTable ifNil: [ self installKeyDecodeTable ]! Item was added: + ----- Method: EventSensor class>>shutDown (in category 'system startup') ----- + shutDown + self default shutDown.! Item was added: + ----- Method: EventSensor class>>startUp (in category 'system startup') ----- + startUp + + self installMouseDecodeTable. + self installKeyDecodeTable. + self default startUp! Item was added: + ----- Method: EventSensor>>installInterruptWatcher (in category 'user interrupts') ----- + installInterruptWatcher + "Initialize the interrupt watcher process. Terminate the old process if any." + "Sensor installInterruptWatcher" + + InterruptWatcherProcess ifNotNil: [InterruptWatcherProcess terminate]. + InterruptSemaphore := Semaphore new. + InterruptWatcherProcess := [self userInterruptWatcher] forkAt: Processor lowIOPriority. + self primInterruptSemaphore: InterruptSemaphore.! Item was added: + ----- Method: EventSensor>>interruptWatcherProcess (in category 'user interrupts') ----- + interruptWatcherProcess + "Answer my interrupt watcher process, if any" + ^InterruptWatcherProcess! Item was added: + ----- Method: EventSensor>>setInterruptKey: (in category 'user interrupts') ----- + setInterruptKey: anInteger + "Register the given keycode as the user interrupt key." + + self primSetInterruptKey: anInteger. + ! Item was changed: ----- Method: EventSensor>>shutDown (in category 'initialize') ----- shutDown + InterruptWatcherProcess ifNotNil: [ + InterruptWatcherProcess terminate. + InterruptWatcherProcess := nil ].! - super shutDown. - EventTicklerProcess ifNotNil: [ - EventTicklerProcess terminate. - EventTicklerProcess := nil. ]. - inputSemaphore ifNotNil:[Smalltalk unregisterExternalObject: inputSemaphore]. - ! Item was changed: ----- Method: EventSensor>>startUp (in category 'initialize') ----- startUp + self installInterruptWatcher.! - "Run the I/O process" - self initialize. - self primSetInputSemaphore: (Smalltalk registerExternalObject: inputSemaphore). - super startUp. - self installEventTickler. - Smalltalk isMorphic ifTrue:[self flushAllButDandDEvents]. - - "Attempt to discover whether the input semaphore is actually being signaled." - hasInputSemaphore := false. - inputSemaphore initSignals. - ! Item was added: + ----- Method: EventSensor>>userInterruptWatcher (in category 'user interrupts') ----- + userInterruptWatcher + "Wait for user interrupts and open a notifier on the active process when one occurs." + [ InterruptSemaphore wait. + Display deferUpdates: false. + SoundService defaultOrNil ifNotNil: [ : soundSystem | soundSystem shutDown ]. + Smalltalk handleUserInterrupt ] repeat! Item was removed: - ----- Method: InputSensor class>>default (in category 'public') ----- - default - "Answer the default system InputSensor, Sensor." - - ^ Sensor! Item was removed: - ----- Method: InputSensor class>>defaultCrossPlatformKeys (in category 'class initialization') ----- - defaultCrossPlatformKeys - "Answer a list of key letters that are used for common editing operations - on different platforms." - ^{ $c . $x . $v . $a . $s . $f . $g . $z } - ! Item was removed: - ----- Method: InputSensor class>>duplicateControlAndAltKeys: (in category 'public') ----- - duplicateControlAndAltKeys: aBoolean - "InputSensor duplicateControlAndAltKeys: true" - - Preferences setPreference: #duplicateControlAndAltKeys toValue: aBoolean. - self installKeyDecodeTable - ! Item was added: + ----- Method: InputSensor class>>initialize (in category 'class initialization') ----- + initialize + + Smalltalk removeFromStartUpList: self! Item was removed: - ----- Method: InputSensor class>>installDuplicateKeyEntryFor: (in category 'public') ----- - installDuplicateKeyEntryFor: c - | key | - key := c asInteger. - "first do control->alt key" - KeyDecodeTable at: { key bitAnd: 16r9F . 2 } put: { key . 8 }. - "then alt->alt key" - KeyDecodeTable at: { key . 8 } put: { key . 8 } - ! Item was removed: - ----- Method: InputSensor class>>installKeyDecodeTable (in category 'class initialization') ----- - installKeyDecodeTable - "Create a decode table that swaps some keys if - Preferences swapControlAndAltKeys is set" - KeyDecodeTable := Dictionary new. - Preferences duplicateControlAndAltKeys - ifTrue: [ self defaultCrossPlatformKeys do: - [ :c | self installDuplicateKeyEntryFor: c ] ]. - Preferences swapControlAndAltKeys - ifTrue: [ self defaultCrossPlatformKeys do: - [ :c | self installSwappedKeyEntryFor: c ] ]. - Preferences duplicateAllControlAndAltKeys - ifTrue: [ (Character allByteCharacters select: [:ea | ea isAlphaNumeric]) do: - [ :c | self installDuplicateKeyEntryFor: c ] ]. - ! Item was removed: - ----- Method: InputSensor class>>installMouseDecodeTable (in category 'class initialization') ----- - installMouseDecodeTable - "Create a decode table that swaps the lowest-order 2 bits if - Preferences swapMouseButtons is set" - ButtonDecodeTable := Preferences swapMouseButtons - ifTrue: [ByteArray withAll: - ((0 to: 255) collect: [:ea | - ((ea bitAnd: 1) << 1 - bitOr: (ea bitAnd: 2) >> 1) - bitOr: (ea bitAnd: 16rFC) ])] - ifFalse: [ByteArray - withAll: (0 to: 255)]! Item was removed: - ----- Method: InputSensor class>>installSwappedKeyEntryFor: (in category 'public') ----- - installSwappedKeyEntryFor: c - | key | - key := c asInteger. - "first do control->alt key" - KeyDecodeTable at: { key bitAnd: 16r9F . 2 } put: { key . 8 }. - "then alt->control key" - KeyDecodeTable at: { key . 8 } put: { key bitAnd: 16r9F . 2 }! Item was removed: - ----- Method: InputSensor class>>keyDecodeTable (in category 'public') ----- - keyDecodeTable - ^KeyDecodeTable ifNil: [ self installKeyDecodeTable ]! Item was changed: ----- Method: InputSensor class>>shutDown (in category 'system startup') ----- shutDown + EventSensor shutDown! - self default shutDown.! Item was changed: ----- Method: InputSensor class>>startUp (in category 'system startup') ----- startUp + EventSensor startUp! - - self installMouseDecodeTable. - self installKeyDecodeTable. - self default startUp! Item was removed: - ----- Method: InputSensor class>>swapControlAndAltKeys: (in category 'public') ----- - swapControlAndAltKeys: aBoolean - "InputSensor swapControlAndAltKeys: true" - - Preferences setPreference: #swapControlAndAltKeys toValue: aBoolean. - self installKeyDecodeTable! Item was removed: - ----- Method: InputSensor class>>swapMouseButtons: (in category 'public') ----- - swapMouseButtons: aBoolean - "InputSensor swapMouseButtons: true" - - Preferences setPreference: #swapMouseButtons toValue: aBoolean. - self installMouseDecodeTable.! Item was removed: - ----- Method: InputSensor>>flushEvents (in category 'initialize') ----- - flushEvents - "Do nothing"! Item was removed: - ----- Method: InputSensor>>installInterruptWatcher (in category 'user interrupts') ----- - installInterruptWatcher - "Initialize the interrupt watcher process. Terminate the old process if any." - "Sensor installInterruptWatcher" - - InterruptWatcherProcess ifNotNil: [InterruptWatcherProcess terminate]. - InterruptSemaphore := Semaphore new. - InterruptWatcherProcess := [self userInterruptWatcher] forkAt: Processor lowIOPriority. - self primInterruptSemaphore: InterruptSemaphore.! Item was removed: - ----- Method: InputSensor>>interruptWatcherProcess (in category 'user interrupts') ----- - interruptWatcherProcess - "Answer my interrupt watcher process, if any" - ^InterruptWatcherProcess! Item was removed: - ----- Method: InputSensor>>setInterruptKey: (in category 'user interrupts') ----- - setInterruptKey: anInteger - "Register the given keycode as the user interrupt key." - - self primSetInterruptKey: anInteger. - ! Item was removed: - ----- Method: InputSensor>>shutDown (in category 'initialize') ----- - shutDown - InterruptWatcherProcess ifNotNil: [ - InterruptWatcherProcess terminate. - InterruptWatcherProcess := nil ].! Item was removed: - ----- Method: InputSensor>>startUp (in category 'initialize') ----- - startUp - self installInterruptWatcher.! Item was removed: - ----- Method: InputSensor>>userInterruptWatcher (in category 'user interrupts') ----- - userInterruptWatcher - "Wait for user interrupts and open a notifier on the active process when one occurs." - [ InterruptSemaphore wait. - Display deferUpdates: false. - SoundService defaultOrNil ifNotNil: [ : soundSystem | soundSystem shutDown ]. - Smalltalk handleUserInterrupt ] repeat!

1 0

The Trunk: Kernel-dtl.982.mcz
by commits＠source.squeak.org 02 Feb '16

02 Feb '16

David T. Lewis uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-dtl.982.mcz ==================== Summary ==================== Name: Kernel-dtl.982 Author: dtl Time: 30 January 2016, 12:58:37.124434 pm UUID: b62b0fc9-af0f-4db5-a4f0-3af92256cc11 Ancestors: Kernel-dtl.981 Update preferences to use EventSensor rather than InputSensor. =============== Diff against Kernel-dtl.981 =============== Item was added: + ----- Method: EventSensor class>>duplicateAllControlAndAltKeysChanged (in category 'preference change notification') ----- + duplicateAllControlAndAltKeysChanged + "The Preference for duplicateAllControlAndAltKeys has changed; reset the other two." + "At some point the various exclusive CtrlAlt-key prefs should become a radio button set, then these methods wouldn't be needed." + (Preferences + valueOfFlag: #swapControlAndAltKeys + ifAbsent: [false]) ifTrue: [ + self inform: 'Resetting swapControlAndAltKeys preference'. + (Preferences preferenceAt: #swapControlAndAltKeys) rawValue: false. + ]. + (Preferences + valueOfFlag: #duplicateControlAndAltKeys + ifAbsent: [false]) ifTrue: [ + self inform: 'Resetting duplicateControlAndAltKeys preference'. + (Preferences preferenceAt: #duplicateControlAndAltKeys) rawValue: false. + ]. + self installKeyDecodeTable. + ! Item was added: + ----- Method: EventSensor class>>duplicateControlAndAltKeysChanged (in category 'preference change notification') ----- + duplicateControlAndAltKeysChanged + "The Preference for duplicateControlAndAltKeys has changed; reset the other two." + (Preferences + valueOfFlag: #swapControlAndAltKeys + ifAbsent: [false]) ifTrue: [ + self inform: 'Resetting swapControlAndAltKeys preference'. + (Preferences preferenceAt: #swapControlAndAltKeys) rawValue: false. + ]. + (Preferences + valueOfFlag: #duplicateAllControlAndAltKeys + ifAbsent: [false]) ifTrue: [ + self inform: 'Resetting duplicateAllControlAndAltKeys preference'. + (Preferences preferenceAt: #duplicateAllControlAndAltKeys) rawValue: false. + ]. + self installKeyDecodeTable. + ! Item was added: + ----- Method: EventSensor class>>initialize (in category 'class initialization') ----- + initialize + + self flag: #REMOVE. "temporary initialization method to support InputSensor removal" + "Update the preferences" + { #swapMouseButtons . #swapControlAndAltKeys . #duplicateControlAndAltKeys . #duplicateAllControlAndAltKeys } + do: [ :key | | pref changeSelector | + pref := Preferences preferenceAt: key. + changeSelector := (key , #Changed) asSymbol. + pref ifNotNil: [ pref changeInformee: EventSensor changeSelector: changeSelector ] ]. + ! Item was added: + ----- Method: EventSensor class>>swapControlAndAltKeysChanged (in category 'preference change notification') ----- + swapControlAndAltKeysChanged + "The Preference for swapControlAndAltKeys has changed; reset the other two." + (Preferences + valueOfFlag: #duplicateControlAndAltKeys + ifAbsent: [false]) ifTrue: [ + self inform: 'Resetting duplicateControlAndAltKeys preference'. + (Preferences preferenceAt: #duplicateControlAndAltKeys) rawValue: false. + ]. + (Preferences + valueOfFlag: #duplicateAllControlAndAltKeys + ifAbsent: [false]) ifTrue: [ + self inform: 'Resetting duplicateAllControlAndAltKeys preference'. + (Preferences preferenceAt: #duplicateAllControlAndAltKeys) rawValue: false. + ]. + self installKeyDecodeTable. + !

1 0

The Trunk: Kernel-dtl.981.mcz
by commits＠source.squeak.org 02 Feb '16

02 Feb '16

David T. Lewis uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-dtl.981.mcz ==================== Summary ==================== Name: Kernel-dtl.981 Author: dtl Time: 30 January 2016, 11:08:34.12478 am UUID: f28a2de4-862d-4499-90cd-5eb04e0649d3 Ancestors: Kernel-eem.980 InputSensor removal step 1. Move instance methods to EventSensor, eliminate super calls, resolve primitive fallbacks, recategorize. Preserve original method stamps where possible. Class variables and system startup/shutdown to be addressed next. =============== Diff against Kernel-eem.980 =============== Item was added: + ----- Method: EventSensor>>anyButtonPressed (in category 'mouse') ----- + anyButtonPressed + "Answer whether at least one mouse button is currently being pressed." + + ^ self primMouseButtons anyMask: 7 + ! Item was added: + ----- Method: EventSensor>>anyModifierKeyPressed (in category 'modifier keys') ----- + anyModifierKeyPressed + "ignore, however, the shift keys 'cause that's not REALLY a command key" + + ^ self primMouseButtons anyMask: 16r70 "cmd | opt | ctrl"! Item was added: + ----- Method: EventSensor>>blueButtonPressed (in category 'mouse') ----- + blueButtonPressed + "Answer whether only the blue mouse button is being pressed. + This is the third mouse button or cmd+click on the Mac." + + ^ (self primMouseButtons bitAnd: 7) = 1 + ! Item was added: + ----- Method: EventSensor>>characterForKeycode: (in category 'keyboard') ----- + characterForKeycode: keycode + "Map the given keycode to a Smalltalk character object. Encoding: + A keycode is 12 bits: <4 modifer bits><8 bit ISO character> + Modifier bits are: <command><option><control><shift>" + + "NOTE: the command and option keys are specific to the Macintosh and may not have equivalents on other platforms." + + keycode = nil ifTrue: [ ^nil ]. + keycode class = Character ifTrue: [ ^keycode ]. "to smooth the transition!!" + ^ Character value: (keycode bitAnd: 16rFF)! Item was added: + ----- Method: EventSensor>>commandKeyPressed (in category 'modifier keys') ----- + commandKeyPressed + "Answer whether the command key on the keyboard is being held down." + + ^ self primMouseButtons anyMask: 64! Item was added: + ----- Method: EventSensor>>controlKeyPressed (in category 'modifier keys') ----- + controlKeyPressed + "Answer whether the control key on the keyboard is being held down." + + ^ self primMouseButtons anyMask: 16! Item was added: + ----- Method: EventSensor>>cursorPoint (in category 'cursor') ----- + cursorPoint + "Answer a Point indicating the cursor location." + + ^self mousePoint! Item was added: + ----- Method: EventSensor>>cursorPoint: (in category 'cursor') ----- + cursorPoint: aPoint + "Set aPoint to be the current cursor location." + + ^self primCursorLocPut: aPoint! Item was changed: ----- Method: EventSensor>>eventQueue (in category 'accessing') ----- eventQueue + ^nil! - "Return the current event queue" - ^eventQueue! Item was added: + ----- Method: EventSensor>>eventQueue: (in category 'accessing') ----- + eventQueue: aSharedQueue + ! Item was added: + ----- Method: EventSensor>>flushKeyboard (in category 'keyboard') ----- + flushKeyboard + "Remove all characters from the keyboard buffer." + + [self keyboardPressed] + whileTrue: [self keyboard]! Item was added: + ----- Method: EventSensor>>hasTablet (in category 'tablet') ----- + hasTablet + "Answer true if there is a pen tablet available on this computer." + + ^ (self primTabletGetParameters: 1) notNil + ! Item was added: + ----- Method: EventSensor>>joystickButtons: (in category 'joystick') ----- + joystickButtons: index + + ^ ((self primReadJoystick: index) bitShift: -22) bitAnd: 16r71F + ! Item was added: + ----- Method: EventSensor>>joystickOn: (in category 'joystick') ----- + joystickOn: index + + ^ (((self primReadJoystick: index) bitShift: -27) bitAnd: 1) ~= 0 + ! Item was added: + ----- Method: EventSensor>>joystickXY: (in category 'joystick') ----- + joystickXY: index + + | inputWord x y | + inputWord := self primReadJoystick: index. + x := (inputWord bitAnd: 16r7FF) - 16r400. + y := ((inputWord bitShift: -11) bitAnd: 16r7FF) - 16r400. + ^ x@y + ! Item was added: + ----- Method: EventSensor>>keyboard (in category 'keyboard') ----- + keyboard + "Answer the next character from the keyboard." + + | firstCharacter secondCharactor stream multiCharacter converter | + firstCharacter := self characterForKeycode: self primKbdNext. + secondCharactor := self characterForKeycode: self primKbdPeek. + secondCharactor isNil + ifTrue: [^ firstCharacter]. + converter := TextConverter defaultSystemConverter. + converter isNil + ifTrue: [^ firstCharacter]. + stream := ReadStream + on: (String with: firstCharacter with: secondCharactor). + multiCharacter := converter nextFromStream: stream. + multiCharacter isOctetCharacter + ifTrue: [^ multiCharacter]. + self primKbdNext. + ^ multiCharacter + ! Item was added: + ----- Method: EventSensor>>keyboardPeek (in category 'keyboard') ----- + keyboardPeek + "Answer the next character in the keyboard buffer without removing it, or nil if it is empty." + + ^ self characterForKeycode: self primKbdPeek! Item was added: + ----- Method: EventSensor>>keyboardPressed (in category 'keyboard') ----- + keyboardPressed + "Answer true if keystrokes are available." + + ^self primKbdPeek notNil! Item was added: + ----- Method: EventSensor>>leftShiftDown (in category 'modifier keys') ----- + leftShiftDown + "Answer whether the shift key on the keyboard is being held down. The name of this message is a throwback to the Alto, which had independent left and right shift keys." + + ^ self primMouseButtons anyMask: 8! Item was added: + ----- Method: EventSensor>>mouseButtons (in category 'mouse') ----- + mouseButtons + "Answer a number from 0 to 7 that encodes the state of the three mouse buttons in its lowest 3 bits." + + ^ self primMouseButtons bitAnd: 7 + ! Item was added: + ----- Method: EventSensor>>mousePoint (in category 'mouse') ----- + mousePoint + "Answer a Point indicating the coordinates of the current mouse location." + + ^self primMousePt! Item was added: + ----- Method: EventSensor>>noButtonPressed (in category 'mouse') ----- + noButtonPressed + "Answer whether any mouse button is not being pressed." + + ^self anyButtonPressed not + ! Item was added: + ----- Method: EventSensor>>oldPrimInterruptSemaphore: (in category 'primitives-fallback') ----- + oldPrimInterruptSemaphore: aSemaphore + "Primitive. Install the argument as the semaphore to be signalled whenever the user presses the interrupt key. The semaphore will be signaled once each time the interrupt key is pressed." + + <primitive: 134> + ^self primitiveFailed + "Note: This primitive is obsolete with the new event driven architecture in which EventSensor can handle the interrupts itself. However, for supporting older images running on newer VMs the primitive must still be implemented."! Item was added: + ----- Method: EventSensor>>oldPrimKbdNext (in category 'primitives-fallback') ----- + oldPrimKbdNext + <primitive: 108> + ^ nil! Item was added: + ----- Method: EventSensor>>oldPrimMouseButtons (in category 'primitives-fallback') ----- + oldPrimMouseButtons + <primitive: 107> + ^ 0! Item was added: + ----- Method: EventSensor>>oldPrimMousePt (in category 'primitives-fallback') ----- + oldPrimMousePt + "Primitive. Poll the mouse to find out its position. Return a Point. Fail if + event-driven tracking is used instead of polling. Optional. See Object + documentation whatIsAPrimitive." + + <primitive: 90> + ^ 0@0! Item was added: + ----- Method: EventSensor>>oldPrimSetInterruptKey: (in category 'primitives-fallback') ----- + oldPrimSetInterruptKey: anInteger + "Primitive. Register the given keycode as the user interrupt key. The low byte of the keycode is the ISO character and its next four bits are the Smalltalk modifer bits <cmd><opt><ctrl><shift>." + + <primitive: 133> + ^self primitiveFailed + "Note: This primitive is obsolete with the new event driven architecture in which EventSensor can handle the interrupts itself. However, for supporting older images running on newer VMs the primitive must still be implemented."! Item was added: + ----- Method: EventSensor>>primCursorLocPut: (in category 'primitives-cursor') ----- + primCursorLocPut: aPoint + "If the primitive fails, try again with a rounded point." + + <primitive: 91> + ^ self primCursorLocPutAgain: aPoint rounded! Item was added: + ----- Method: EventSensor>>primCursorLocPutAgain: (in category 'primitives-cursor') ----- + primCursorLocPutAgain: aPoint + "Do nothing if primitive is not implemented." + + <primitive: 91> + ^ self! Item was changed: ----- Method: EventSensor>>primGetNextEvent: (in category 'private-I/O') ----- primGetNextEvent: array "Store the next OS event available into the provided array. Essential. If the VM is not event driven the ST code will fall back to the old-style mechanism and use the state based primitives instead." | kbd buttons modifiers pos mapped | <primitive: 94> "Simulate the events" array at: 1 put: EventTypeNone. "assume no more events" "First check for keyboard" + kbd := self oldPrimKbdNext. - kbd := super primKbdNext. kbd = nil ifFalse:[ "simulate keyboard event" array at: 1 put: EventTypeKeyboard. "evt type" array at: 2 put: Time eventMillisecondClock. "time stamp" array at: 3 put: (kbd bitAnd: 255). "char code" array at: 4 put: EventKeyChar. "key press/release" array at: 5 put: (kbd bitShift: -8). "modifier keys" ^self]. "Then check for mouse" + buttons := self oldPrimMouseButtons. + pos := self oldPrimMousePt. - buttons := super primMouseButtons. - pos := super primMousePt. modifiers := buttons bitShift: -3. buttons := buttons bitAnd: 7. mapped := self mapButtons: buttons modifiers: modifiers. (pos = mousePosition and:[(mapped bitOr: (modifiers bitShift: 3)) = mouseButtons]) ifTrue:[^self]. array at: 1 put: EventTypeMouse; at: 2 put: Time eventMillisecondClock; at: 3 put: pos x; at: 4 put: pos y; at: 5 put: mapped; at: 6 put: modifiers. ! Item was changed: ----- Method: EventSensor>>primInterruptSemaphore: (in category 'private') ----- primInterruptSemaphore: aSemaphore "Primitive. Install the argument as the semaphore to be signalled whenever the user presses the interrupt key. The semaphore will be signaled once each time the interrupt key is pressed." interruptSemaphore := aSemaphore. "backward compatibility: use the old primitive which is obsolete now" + self oldPrimInterruptSemaphore: aSemaphore! - super primInterruptSemaphore: aSemaphore! Item was added: + ----- Method: EventSensor>>primReadJoystick: (in category 'primitives-tablet') ----- + primReadJoystick: index + "Return the joystick input word for the joystick with the given index in the range [1..16]. Returns zero if the index does not correspond to a currently installed joystick." + + <primitive: 'primitiveReadJoystick' module: 'JoystickTabletPlugin'> + ^ 0 + + ! Item was changed: ----- Method: EventSensor>>primSetInterruptKey: (in category 'private') ----- primSetInterruptKey: anInteger "Primitive. Register the given keycode as the user interrupt key. The low byte of the keycode is the ISO character and its next four bits are the Smalltalk modifer bits <cmd><opt><ctrl><shift>." interruptKey := anInteger. "backward compatibility: use the old primitive which is obsolete now" + self oldPrimSetInterruptKey: anInteger! - super primSetInterruptKey: anInteger! Item was added: + ----- Method: EventSensor>>primTabletGetParameters: (in category 'primitives-tablet') ----- + primTabletGetParameters: cursorIndex + "Answer the pen tablet parameters. For parameters that differ from cursor to cursor, answer those associated with the cursor having the given index. Answer nil if there is no pen tablet. The parameters are: + 1. tablet width, in tablet units + 2. tablet height, in tablet units + 3. number of tablet units per inch + 4. number of cursors (pens, pucks, etc; some tablets have more than one) + 5. this cursor index + 6. and 7. x scale and x offset for scaling tablet coordintes (e.g., to fit the screen) + 8. and 9. y scale and y offset for scaling tablet coordintes (e.g., to fit the screen) + 10. number of pressure levels + 11. presure threshold needed close pen tip switch + 12. number of pen tilt angles" + + <primitive: 'primitiveGetTabletParameters' module: 'JoystickTabletPlugin'> + ^ nil + ! Item was added: + ----- Method: EventSensor>>primTabletRead: (in category 'primitives-tablet') ----- + primTabletRead: cursorIndex + "Answer the pen tablet data for the cursor having the given index. Answer nil if there is no pen tablet. The data is: + 1. index of the cursor to which this data applies + 2. timestamp of the last state chance for this cursor + 3., 4., and 5. x, y, and z coordinates of the cursor (z is typically 0) + 6. and 7. xTilt and yTilt of the cursor; (signed) + 8. type of cursor (0 = unknown, 1 = pen, 2 = puck, 3 = eraser) + 9. cursor buttons + 10. cursor pressure, downward + 11. cursor pressure, tangential + 12. flags" + + <primitive: 'primitiveReadTablet' module: 'JoystickTabletPlugin'> + self primitiveFailed + ! Item was added: + ----- Method: EventSensor>>rawMacOptionKeyPressed (in category 'modifier keys') ----- + rawMacOptionKeyPressed + "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 primMouseButtons anyMask: 32! Item was added: + ----- Method: EventSensor>>redButtonPressed (in category 'mouse') ----- + redButtonPressed + "Answer true if only the red mouse button is being pressed. + This is the first mouse button, usually the left one." + + ^ (self primMouseButtons bitAnd: 7) = 4 + ! Item was added: + ----- Method: EventSensor>>shiftPressed (in category 'modifier keys') ----- + shiftPressed + "Answer whether the shift key on the keyboard is being held down." + + ^ self primMouseButtons anyMask: 8 + ! Item was added: + ----- Method: EventSensor>>tabletExtent (in category 'tablet') ----- + tabletExtent + "Answer the full tablet extent in tablet coordinates." + + | params | + params := self primTabletGetParameters: 1. + params ifNil: [^ self error: 'no tablet available']. + ^ (params at: 1)@(params at: 2) + ! Item was added: + ----- Method: EventSensor>>tabletPoint (in category 'tablet') ----- + tabletPoint + "Answer the current position of the first tablet pointing device (pen, puck, or eraser) in tablet coordinates." + + | data | + data := self primTabletRead: 1. "state of first/primary pen" + ^ (data at: 3) @ (data at: 4) + ! Item was added: + ----- Method: EventSensor>>tabletPressure (in category 'tablet') ----- + tabletPressure + "Answer the current pressure of the first tablet pointing device (pen, puck, or eraser), a number between 0.0 (no pressure) and 1.0 (max pressure)" + + | params data | + params := self primTabletGetParameters: 1. + params ifNil: [^ self]. + data := self primTabletRead: 1. "state of first/primary pen" + ^ (data at: 10) asFloat / ((params at: 10) - 1) + ! Item was added: + ----- Method: EventSensor>>tabletTimestamp (in category 'tablet') ----- + tabletTimestamp + "Answer the time (in tablet clock ticks) at which the tablet's primary pen last changed state. This can be used in polling loops; if this timestamp hasn't changed, then the pen state hasn't changed either." + + | data | + data := self primTabletRead: 1. "state of first/primary pen" + ^ data at: 2 + ! Item was added: + ----- Method: EventSensor>>waitButton (in category 'mouse') ----- + waitButton + "Wait for the user to press any mouse button and then answer with the + current location of the cursor." + + | delay | + delay := Delay forMilliseconds: 50. + [self anyButtonPressed] whileFalse: [ delay wait ]. + ^self cursorPoint + ! Item was added: + ----- Method: EventSensor>>waitButtonOrKeyboard (in category 'mouse') ----- + waitButtonOrKeyboard + "Wait for the user to press either any mouse button or any key. + Answer the current cursor location or nil if a keypress occured." + + | delay | + delay := Delay forMilliseconds: 50. + [self anyButtonPressed] + whileFalse: [delay wait. + self keyboardPressed + ifTrue: [^ nil]]. + ^ self cursorPoint + ! Item was added: + ----- Method: EventSensor>>waitClickButton (in category 'mouse') ----- + waitClickButton + "Wait for the user to click (press and then release) any mouse button and + then answer with the current location of the cursor." + + self waitButton. + ^self waitNoButton! Item was added: + ----- Method: EventSensor>>waitNoButton (in category 'mouse') ----- + waitNoButton + "Wait for the user to release any mouse button and then answer the current location of the cursor." + + | delay | + delay := Delay forMilliseconds: 50. + [self anyButtonPressed] whileTrue: [ delay wait]. + ^self cursorPoint + ! Item was added: + ----- Method: EventSensor>>yellowButtonPressed (in category 'mouse') ----- + yellowButtonPressed + "Answer whether only the yellow mouse button is being pressed. + This is the second mouse button or option+click on the Mac." + + ^ (self primMouseButtons bitAnd: 7) = 2 + ! Item was removed: - ----- Method: InputSensor class>>duplicateAllControlAndAltKeysChanged (in category 'preference change notification') ----- - duplicateAllControlAndAltKeysChanged - "The Preference for duplicateAllControlAndAltKeys has changed; reset the other two." - "At some point the various exclusive CtrlAlt-key prefs should become a radio button set, then these methods wouldn't be needed." - (Preferences - valueOfFlag: #swapControlAndAltKeys - ifAbsent: [false]) ifTrue: [ - self inform: 'Resetting swapControlAndAltKeys preference'. - (Preferences preferenceAt: #swapControlAndAltKeys) rawValue: false. - ]. - (Preferences - valueOfFlag: #duplicateControlAndAltKeys - ifAbsent: [false]) ifTrue: [ - self inform: 'Resetting duplicateControlAndAltKeys preference'. - (Preferences preferenceAt: #duplicateControlAndAltKeys) rawValue: false. - ]. - self installKeyDecodeTable. - ! Item was removed: - ----- Method: InputSensor class>>duplicateControlAndAltKeysChanged (in category 'preference change notification') ----- - duplicateControlAndAltKeysChanged - "The Preference for duplicateControlAndAltKeys has changed; reset the other two." - (Preferences - valueOfFlag: #swapControlAndAltKeys - ifAbsent: [false]) ifTrue: [ - self inform: 'Resetting swapControlAndAltKeys preference'. - (Preferences preferenceAt: #swapControlAndAltKeys) rawValue: false. - ]. - (Preferences - valueOfFlag: #duplicateAllControlAndAltKeys - ifAbsent: [false]) ifTrue: [ - self inform: 'Resetting duplicateAllControlAndAltKeys preference'. - (Preferences preferenceAt: #duplicateAllControlAndAltKeys) rawValue: false. - ]. - self installKeyDecodeTable. - ! Item was removed: - ----- Method: InputSensor class>>swapControlAndAltKeysChanged (in category 'preference change notification') ----- - swapControlAndAltKeysChanged - "The Preference for swapControlAndAltKeys has changed; reset the other two." - (Preferences - valueOfFlag: #duplicateControlAndAltKeys - ifAbsent: [false]) ifTrue: [ - self inform: 'Resetting duplicateControlAndAltKeys preference'. - (Preferences preferenceAt: #duplicateControlAndAltKeys) rawValue: false. - ]. - (Preferences - valueOfFlag: #duplicateAllControlAndAltKeys - ifAbsent: [false]) ifTrue: [ - self inform: 'Resetting duplicateAllControlAndAltKeys preference'. - (Preferences preferenceAt: #duplicateAllControlAndAltKeys) rawValue: false. - ]. - self installKeyDecodeTable. - ! Item was removed: - ----- Method: InputSensor>>anyButtonPressed (in category 'mouse') ----- - anyButtonPressed - "Answer whether at least one mouse button is currently being pressed." - - ^ self primMouseButtons anyMask: 7 - ! Item was removed: - ----- Method: InputSensor>>anyModifierKeyPressed (in category 'modifier keys') ----- - anyModifierKeyPressed - "ignore, however, the shift keys 'cause that's not REALLY a command key" - - ^ self primMouseButtons anyMask: 16r70 "cmd | opt | ctrl"! Item was removed: - ----- Method: InputSensor>>blueButtonPressed (in category 'mouse') ----- - blueButtonPressed - "Answer whether only the blue mouse button is being pressed. - This is the third mouse button or cmd+click on the Mac." - - ^ (self primMouseButtons bitAnd: 7) = 1 - ! Item was removed: - ----- Method: InputSensor>>buttons (in category 'buttons') ----- - buttons - "Answer the result of primMouseButtons, but swap the mouse - buttons if Preferences swapMouseButtons is set." - ^ ButtonDecodeTable at: self primMouseButtons + 1! Item was removed: - ----- Method: InputSensor>>characterForKeycode: (in category 'private') ----- - characterForKeycode: keycode - "Map the given keycode to a Smalltalk character object. Encoding: - A keycode is 12 bits: <4 modifer bits><8 bit ISO character> - Modifier bits are: <command><option><control><shift>" - - "NOTE: the command and option keys are specific to the Macintosh and may not have equivalents on other platforms." - - keycode = nil ifTrue: [ ^nil ]. - keycode class = Character ifTrue: [ ^keycode ]. "to smooth the transition!!" - ^ Character value: (keycode bitAnd: 16rFF)! Item was removed: - ----- Method: InputSensor>>commandKeyPressed (in category 'modifier keys') ----- - commandKeyPressed - "Answer whether the command key on the keyboard is being held down." - - ^ self primMouseButtons anyMask: 64! Item was removed: - ----- Method: InputSensor>>controlKeyPressed (in category 'modifier keys') ----- - controlKeyPressed - "Answer whether the control key on the keyboard is being held down." - - ^ self primMouseButtons anyMask: 16! Item was removed: - ----- Method: InputSensor>>cursorPoint (in category 'cursor') ----- - cursorPoint - "Answer a Point indicating the cursor location." - - ^self mousePoint! Item was removed: - ----- Method: InputSensor>>cursorPoint: (in category 'cursor') ----- - cursorPoint: aPoint - "Set aPoint to be the current cursor location." - - ^self primCursorLocPut: aPoint! Item was removed: - ----- Method: InputSensor>>eventQueue (in category 'accessing') ----- - eventQueue - ^nil! Item was removed: - ----- Method: InputSensor>>eventQueue: (in category 'accessing') ----- - eventQueue: aSharedQueue - ! Item was removed: - ----- Method: InputSensor>>eventTicklerProcess (in category 'user interrupts') ----- - eventTicklerProcess - "Answer my event tickler process, if any" - ^nil! Item was removed: - ----- Method: InputSensor>>flushAllButDandDEvents (in category 'accessing') ----- - flushAllButDandDEvents! Item was removed: - ----- Method: InputSensor>>flushKeyboard (in category 'keyboard') ----- - flushKeyboard - "Remove all characters from the keyboard buffer." - - [self keyboardPressed] - whileTrue: [self keyboard]! Item was removed: - ----- Method: InputSensor>>hasTablet (in category 'tablet') ----- - hasTablet - "Answer true if there is a pen tablet available on this computer." - - ^ (self primTabletGetParameters: 1) notNil - ! Item was removed: - ----- Method: InputSensor>>inputProcess (in category 'user interrupts') ----- - inputProcess - "For non-event image compatibility" - ^ nil! Item was removed: - ----- Method: InputSensor>>joystickButtons: (in category 'joystick') ----- - joystickButtons: index - - ^ ((self primReadJoystick: index) bitShift: -22) bitAnd: 16r71F - ! Item was removed: - ----- Method: InputSensor>>joystickOn: (in category 'joystick') ----- - joystickOn: index - - ^ (((self primReadJoystick: index) bitShift: -27) bitAnd: 1) ~= 0 - ! Item was removed: - ----- Method: InputSensor>>joystickXY: (in category 'joystick') ----- - joystickXY: index - - | inputWord x y | - inputWord := self primReadJoystick: index. - x := (inputWord bitAnd: 16r7FF) - 16r400. - y := ((inputWord bitShift: -11) bitAnd: 16r7FF) - 16r400. - ^ x@y - ! Item was removed: - ----- Method: InputSensor>>kbdTest (in category 'keyboard') ----- - kbdTest "Sensor kbdTest" - "This test routine will print the unmodified character, its keycode, - and the OR of all its modifier bits, until the character x is typed" - | char | - char := nil. - [char = $x] whileFalse: - [[self keyboardPressed] whileFalse: []. - char := self characterForKeycode: self keyboard. - (String streamContents: - [:s | s nextPut: char; space; print: char asciiValue; - space; print: self primMouseButtons; nextPutAll: ' ']) - displayAt: 10@10]! Item was removed: - ----- Method: InputSensor>>keyboard (in category 'keyboard') ----- - keyboard - "Answer the next character from the keyboard." - - | firstCharacter secondCharactor stream multiCharacter converter | - firstCharacter := self characterForKeycode: self primKbdNext. - secondCharactor := self characterForKeycode: self primKbdPeek. - secondCharactor isNil - ifTrue: [^ firstCharacter]. - converter := TextConverter defaultSystemConverter. - converter isNil - ifTrue: [^ firstCharacter]. - stream := ReadStream - on: (String with: firstCharacter with: secondCharactor). - multiCharacter := converter nextFromStream: stream. - multiCharacter isOctetCharacter - ifTrue: [^ multiCharacter]. - self primKbdNext. - ^ multiCharacter - ! Item was removed: - ----- Method: InputSensor>>keyboardPeek (in category 'keyboard') ----- - keyboardPeek - "Answer the next character in the keyboard buffer without removing it, or nil if it is empty." - - ^ self characterForKeycode: self primKbdPeek! Item was removed: - ----- Method: InputSensor>>keyboardPressed (in category 'keyboard') ----- - keyboardPressed - "Answer true if keystrokes are available." - - ^self primKbdPeek notNil! Item was removed: - ----- Method: InputSensor>>leftShiftDown (in category 'modifier keys') ----- - leftShiftDown - "Answer whether the shift key on the keyboard is being held down. The name of this message is a throwback to the Alto, which had independent left and right shift keys." - - ^ self primMouseButtons anyMask: 8! Item was removed: - ----- Method: InputSensor>>mouseButtons (in category 'mouse') ----- - mouseButtons - "Answer a number from 0 to 7 that encodes the state of the three mouse buttons in its lowest 3 bits." - - ^ self primMouseButtons bitAnd: 7 - ! Item was removed: - ----- Method: InputSensor>>mousePoint (in category 'mouse') ----- - mousePoint - "Answer a Point indicating the coordinates of the current mouse location." - - ^self primMousePt! Item was removed: - ----- Method: InputSensor>>noButtonPressed (in category 'mouse') ----- - noButtonPressed - "Answer whether any mouse button is not being pressed." - - ^self anyButtonPressed not - ! Item was removed: - ----- Method: InputSensor>>peekButtons (in category 'mouse') ----- - peekButtons - ^self primMouseButtons! Item was removed: - ----- Method: InputSensor>>peekMousePt (in category 'mouse') ----- - peekMousePt - ^self primMousePt! Item was removed: - ----- Method: InputSensor>>peekPosition (in category 'cursor') ----- - peekPosition - ^self cursorPoint! Item was removed: - ----- Method: InputSensor>>primCursorLocPut: (in category 'private') ----- - primCursorLocPut: aPoint - "If the primitive fails, try again with a rounded point." - - <primitive: 91> - ^ self primCursorLocPutAgain: aPoint rounded! Item was removed: - ----- Method: InputSensor>>primCursorLocPutAgain: (in category 'private') ----- - primCursorLocPutAgain: aPoint - "Do nothing if primitive is not implemented." - - <primitive: 91> - ^ self! Item was removed: - ----- Method: InputSensor>>primInterruptSemaphore: (in category 'private') ----- - primInterruptSemaphore: aSemaphore - "Primitive. Install the argument as the semaphore to be signalled whenever the user presses the interrupt key. The semaphore will be signaled once each time the interrupt key is pressed." - - <primitive: 134> - ^self primitiveFailed - "Note: This primitive is obsolete with the new event driven architecture in which EventSensor can handle the interrupts itself. However, for supporting older images running on newer VMs the primitive must still be implemented."! Item was removed: - ----- Method: InputSensor>>primKbdNext (in category 'private') ----- - primKbdNext - <primitive: 108> - ^ nil! Item was removed: - ----- Method: InputSensor>>primKbdPeek (in category 'private') ----- - primKbdPeek - <primitive: 109> - ^ nil! Item was removed: - ----- Method: InputSensor>>primMouseButtons (in category 'private') ----- - primMouseButtons - <primitive: 107> - ^ 0! Item was removed: - ----- Method: InputSensor>>primMousePt (in category 'private') ----- - primMousePt - "Primitive. Poll the mouse to find out its position. Return a Point. Fail if - event-driven tracking is used instead of polling. Optional. See Object - documentation whatIsAPrimitive." - - <primitive: 90> - ^ 0@0! Item was removed: - ----- Method: InputSensor>>primReadJoystick: (in category 'private') ----- - primReadJoystick: index - "Return the joystick input word for the joystick with the given index in the range [1..16]. Returns zero if the index does not correspond to a currently installed joystick." - - <primitive: 'primitiveReadJoystick' module: 'JoystickTabletPlugin'> - ^ 0 - - ! Item was removed: - ----- Method: InputSensor>>primSetInterruptKey: (in category 'private') ----- - primSetInterruptKey: anInteger - "Primitive. Register the given keycode as the user interrupt key. The low byte of the keycode is the ISO character and its next four bits are the Smalltalk modifer bits <cmd><opt><ctrl><shift>." - - <primitive: 133> - ^self primitiveFailed - "Note: This primitive is obsolete with the new event driven architecture in which EventSensor can handle the interrupts itself. However, for supporting older images running on newer VMs the primitive must still be implemented."! Item was removed: - ----- Method: InputSensor>>primTabletGetParameters: (in category 'private') ----- - primTabletGetParameters: cursorIndex - "Answer the pen tablet parameters. For parameters that differ from cursor to cursor, answer those associated with the cursor having the given index. Answer nil if there is no pen tablet. The parameters are: - 1. tablet width, in tablet units - 2. tablet height, in tablet units - 3. number of tablet units per inch - 4. number of cursors (pens, pucks, etc; some tablets have more than one) - 5. this cursor index - 6. and 7. x scale and x offset for scaling tablet coordintes (e.g., to fit the screen) - 8. and 9. y scale and y offset for scaling tablet coordintes (e.g., to fit the screen) - 10. number of pressure levels - 11. presure threshold needed close pen tip switch - 12. number of pen tilt angles" - - <primitive: 'primitiveGetTabletParameters' module: 'JoystickTabletPlugin'> - ^ nil - ! Item was removed: - ----- Method: InputSensor>>primTabletRead: (in category 'private') ----- - primTabletRead: cursorIndex - "Answer the pen tablet data for the cursor having the given index. Answer nil if there is no pen tablet. The data is: - 1. index of the cursor to which this data applies - 2. timestamp of the last state chance for this cursor - 3., 4., and 5. x, y, and z coordinates of the cursor (z is typically 0) - 6. and 7. xTilt and yTilt of the cursor; (signed) - 8. type of cursor (0 = unknown, 1 = pen, 2 = puck, 3 = eraser) - 9. cursor buttons - 10. cursor pressure, downward - 11. cursor pressure, tangential - 12. flags" - - <primitive: 'primitiveReadTablet' module: 'JoystickTabletPlugin'> - self primitiveFailed - ! Item was removed: - ----- Method: InputSensor>>rawMacOptionKeyPressed (in category 'modifier keys') ----- - rawMacOptionKeyPressed - "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 primMouseButtons anyMask: 32! Item was removed: - ----- Method: InputSensor>>redButtonPressed (in category 'mouse') ----- - redButtonPressed - "Answer true if only the red mouse button is being pressed. - This is the first mouse button, usually the left one." - - ^ (self primMouseButtons bitAnd: 7) = 4 - ! Item was removed: - ----- Method: InputSensor>>shiftPressed (in category 'modifier keys') ----- - shiftPressed - "Answer whether the shift key on the keyboard is being held down." - - ^ self primMouseButtons anyMask: 8 - ! Item was removed: - ----- Method: InputSensor>>tabletExtent (in category 'tablet') ----- - tabletExtent - "Answer the full tablet extent in tablet coordinates." - - | params | - params := self primTabletGetParameters: 1. - params ifNil: [^ self error: 'no tablet available']. - ^ (params at: 1)@(params at: 2) - ! Item was removed: - ----- Method: InputSensor>>tabletPoint (in category 'tablet') ----- - tabletPoint - "Answer the current position of the first tablet pointing device (pen, puck, or eraser) in tablet coordinates." - - | data | - data := self primTabletRead: 1. "state of first/primary pen" - ^ (data at: 3) @ (data at: 4) - ! Item was removed: - ----- Method: InputSensor>>tabletPressure (in category 'tablet') ----- - tabletPressure - "Answer the current pressure of the first tablet pointing device (pen, puck, or eraser), a number between 0.0 (no pressure) and 1.0 (max pressure)" - - | params data | - params := self primTabletGetParameters: 1. - params ifNil: [^ self]. - data := self primTabletRead: 1. "state of first/primary pen" - ^ (data at: 10) asFloat / ((params at: 10) - 1) - ! Item was removed: - ----- Method: InputSensor>>tabletTimestamp (in category 'tablet') ----- - tabletTimestamp - "Answer the time (in tablet clock ticks) at which the tablet's primary pen last changed state. This can be used in polling loops; if this timestamp hasn't changed, then the pen state hasn't changed either." - - | data | - data := self primTabletRead: 1. "state of first/primary pen" - ^ data at: 2 - ! Item was removed: - ----- Method: InputSensor>>waitButton (in category 'mouse') ----- - waitButton - "Wait for the user to press any mouse button and then answer with the - current location of the cursor." - - | delay | - delay := Delay forMilliseconds: 50. - [self anyButtonPressed] whileFalse: [ delay wait ]. - ^self cursorPoint - ! Item was removed: - ----- Method: InputSensor>>waitButtonOrKeyboard (in category 'mouse') ----- - waitButtonOrKeyboard - "Wait for the user to press either any mouse button or any key. - Answer the current cursor location or nil if a keypress occured." - - | delay | - delay := Delay forMilliseconds: 50. - [self anyButtonPressed] - whileFalse: [delay wait. - self keyboardPressed - ifTrue: [^ nil]]. - ^ self cursorPoint - ! Item was removed: - ----- Method: InputSensor>>waitClickButton (in category 'mouse') ----- - waitClickButton - "Wait for the user to click (press and then release) any mouse button and - then answer with the current location of the cursor." - - self waitButton. - ^self waitNoButton! Item was removed: - ----- Method: InputSensor>>waitNoButton (in category 'mouse') ----- - waitNoButton - "Wait for the user to release any mouse button and then answer the current location of the cursor." - - | delay | - delay := Delay forMilliseconds: 50. - [self anyButtonPressed] whileTrue: [ delay wait]. - ^self cursorPoint - ! Item was removed: - ----- Method: InputSensor>>yellowButtonPressed (in category 'mouse') ----- - yellowButtonPressed - "Answer whether only the yellow mouse button is being pressed. - This is the second mouse button or option+click on the Mac." - - ^ (self primMouseButtons bitAnd: 7) = 2 - !

1 0

Not Squeak but... Ni goes multithreaded
by Göran Krampe 02 Feb '16

02 Feb '16

Hey guys! I am unfortunately not hacking in Squeak/Pharo anymore but I am instead playing along with my Ni-language in my spare time. But the Squeak community is still very dear to me and I just couldn't help sharing some fun I had last night! ;) As we all know native threads (multicore) and Smalltalk is not a "common combo" but Ni is now sporting a first trivial native threading mechanism! Last night I threw together a first hack on utilizing the native threadpool module in the underlying Nim. So in the REPL this works: gokr@yoda:~/nim/ni/src$ ./nirepl We are the knights who say... Ni! Enter shrubbary... eh, code and an empty line will evaluate previous lines, so hit enter twice. >>> 5 timesRepeat: [spawn [echo "yo"]] >>> yo yo yo yo yo nil >>> The "nil" at the end is the return value from timesRepeat: so nothing "wrong". If the code looks odd (spawn and echo) it's because Ni can use prefix syntax for functions as well as Smalltalkish style. This is "shared nothing" threading, the spawned block gets run in a completely separate instance of the Ni interpreter inside its own native thread. The code block passed over is deep copied. Each native thread has its own GC etc. Of course Nim has MUCH more advanced mechanisms for intercommunication so... this is just a toe dipping. ...but the larger commented trixier example below runs fine too! Next up is probably to try to make Ni "stackless" (rewrite the interpreter so that it doesn't nest the calls so). This would enable even more fun stuff. regards, Göran --------------------------------- # This is called a block in Ni. It is like an OrderedCollection. # At this point the block is just a series of nested words and literals. # Assignment is actually an infix function! code = [ # This is a local function to recursively calculate factorial. # ifelse is currently a 3-argument prefix function, but Ni could use # Smalltalk syntax for that too. factorial = func [ # Arguments are sucked in as we go, so no need to declare n first ifelse (:n > 0) [n * factorial (n - 1)] [1] ] # Echo is a prefix function. echo factorial 1 ] # Ni has keyword messages that can take the first argument from the left. # Ni also has closures and non local returns so we can implement Smalltalkish # control structures and things like select: or reject: easily. Or we can write # them as Nim primitive functions. 10 timesRepeat: [ # Ni is homoiconic so we can modify the block as if it is code. # We remove the last element of the code block (the number) and add # a random number from 1-20. code removeLast # In Ni the parenthesis is currently needed, evaluation is strict from left to right. code add: (20 random) # Spawn fires upp a native thread from a threadpool and # inside that thread a new fresh interpreter is created. # Spawn will deep copy the Ni node being passed and will # then run it as code in the new interpreter. # Currently the result value is not handled. spawn code ] echo "Spawned off threads" # Sleeping this thread to wait for the 10 above sleep 1000 echo "Done sleeping, bye"

2 2

Daily Commit Log
by commits＠source.squeak.org 01 Feb '16

01 Feb '16

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2016-February/009284.h… Name: Graphics-dtl.322 Ancestors: Graphics-eem.321 Move #testJoystick: to EventSensor because InputSensor will be removed. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-February/009285.h… Name: Morphic-mt.1070 Ancestors: Morphic-tpr.1069 Fixes bounds issue regarding refreshed items in object explorer and other tree applications. Thanks to Karl Ramberg for the idea. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-February/009286.h… Name: ToolBuilder-Morphic-mt.158 Ancestors: ToolBuilder-Morphic-mt.157 Adds support for selective refreshing in pluggable tree morphs that make use of the generic PluggableTreeItemNode. To use, send "self changed: #objectChanged with: anObject" in the tool's model. See ObjectExplorer >> #step for an example. Note that ObjectExplorer uses the customized ObjectExplorerWrapper instead of the PluggableTreeItemNode. However, this does not affect the basic idea behind #objectChanged. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-February/009287.h… Name: Tools-mt.668 Ancestors: Tools-mt.667 Adds support for selective refreshing to object explorer. Just re-select the current selection to refresh it. Item will get highlighted just like automatic monitor refresh to indicate inconsistency of displayed information. Make the still existing deficiency with volatile object state more descriptive with a pop-up instead of a generic assert error. Now that we support selective refreshing, the user is actually able to refresh and THEN invoke the context menu again. =============================================

1 0

InputSensor, EventSensor miscategorised?
by Frank Shearar 01 Feb '16

01 Feb '16

Kernel-Processes has Delay, Process, Monitor, Mutex, FutureMaker, Promise, etc. All these work together. They fit nicely in the category. And then there's InputSensor, EventSensor and EventSensorConstants. What. Where _should_ these classes belong? Maybe we should have a Kernel-Device or Kernel-Input category? (I'll not mention how Kernel's InputSensor >> #keyboard uses TextConverter that causes a dependency on Multilingual, which of course has a dependency on Kernel... oh, wait, I did.) frank

9 34

Squeak Oversight Board 2016
by Ron Teitelbaum 01 Feb '16

01 Feb '16

Hi all, The final candidates for the Squeak Oversight Board 2016 are: In the order they were announced. Tim Rowledge Marcel Taeumel Craig Latta Bert Freudenberg Chris Muller David T. Lewis Edgar J. De Cleene Levente Uzonyi You will soon be receiving a ballot. Please watch for the email from: andru(a)cs.cornell.edu on behalf of; Ron Teitelbaum (CIVS poll supervisor) ron(a)usmedrec.com Titled: Poll: Squeak Oversight Board Election 2016 Voting is important Please take the time to find the email, check your junk box, and vote! All the best, Ron Teitelbaum

1 1

Jump to page: