Packages June 2016

packages@lists.squeakfoundation.org

1 participants
85 discussions

The Trunk: Morphic-mt.1181.mcz
by commits＠source.squeak.org 15 Jun '16

15 Jun '16

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1181.mcz ==================== Summary ==================== Name: Morphic-mt.1181 Author: mt Time: 15 June 2016, 11:20:40.050378 am UUID: 855f8338-73de-5947-9dc5-99e912d115a2 Ancestors: Morphic-mt.1180 ixes regression in event dispatching and coordinate transformations. Do not reset transformation in the event copy delivered to submorphs. They need those for, e.g., double click, drag-and-drop, etc. Our events do, more or less, not change after being created and initialized. The only exception is #wasHandled, #wasIgnored, and #position during event dispatching. Keep it that way. If you plan to change some event state in an event filter, create a new event instead and do not mess around with the current one. =============== Diff against Morphic-mt.1180 =============== Item was changed: ----- Method: MorphicEventDispatcher>>dispatchEvent:toSubmorphsOf: (in category 'private') ----- dispatchEvent: anEvent toSubmorphsOf: aMorph + "Dispatch the given event to the submorphs of the given morph. For coordinate transformations, work only with copies. Either return the given event or a copy of any filtered event to employ immutability to some extent. --- PRIVATE!!" - "Dispatch the given event to the submorphs of the given morph. --- PRIVATE!!" + | localEvent filteredEvent | - | filteredEvent | aMorph submorphsDo: [:child | + localEvent := anEvent transformedBy: (child transformedFrom: aMorph). filteredEvent := child + processEvent: localEvent - processEvent: (anEvent transformedBy: (child transformedFrom: aMorph)) using: self. "use same dispatcher" + filteredEvent == #rejected ifFalse: [ "some event or #rejected symbol" + self flag: #overlappingChildren. "mt: We cannot give two overlapping siblings the chance to handle the event!!" + filteredEvent == localEvent + ifTrue: [ + localEvent wasHandled ifTrue: [anEvent copyHandlerState: localEvent]. + anEvent wasIgnored: localEvent wasIgnored. + ^ anEvent] + ifFalse: [ + filteredEvent := filteredEvent copy. + filteredEvent translateTo: anEvent position. "restore to untransformed coordinates" + filteredEvent wasHandled ifFalse: [filteredEvent copyHandlerState: anEvent]. "restore handler if needed" + ^ filteredEvent]]]. - filteredEvent == #rejected ifFalse: [ "filteredEvent or #rejected" - filteredEvent translateTo: anEvent position. "restore to untransformed coordinates" - filteredEvent wasHandled ifFalse: [filteredEvent copyHandlerState: anEvent]. "restore handler if needed" - self flag: #overlappingChildren. "mt: We cannot give two overlapping siblings the chance to handle the event!!" - ^ filteredEvent]]. ^ #rejected!

1 0

The Trunk: Morphic-mt.1180.mcz
by commits＠source.squeak.org 15 Jun '16

15 Jun '16

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1180.mcz ==================== Summary ==================== Name: Morphic-mt.1180 Author: mt Time: 15 June 2016, 10:37:35.384378 am UUID: 82bb6072-42a5-7d45-afb0-f324d6604079 Ancestors: Morphic-mt.1179 Fixes a regression with event filterung and bubbling in general, which affects events sent to morphs that are submorphs of the hand. Escaping drag-and-drop, for example, where events are sent to the TransferMorph. =============== Diff against Morphic-mt.1179 =============== Item was changed: ----- Method: Morph>>handleFocusEvent: (in category 'events-processing') ----- handleFocusEvent: anEvent "Handle the given event. This message is sent if the receiver currently has the focus and is therefore receiving events directly from some hand. 1) Event bubbling. Do event bubbling known from MorphicEventDispatcher by calling #handleEvent: also on all owners. 2) Event capture filters. Walk along the owner chain in reverse order and apply capture filters as known from MorphicEventDispatcher. If you want to overwrite this in a subclass (for example to implement modal dialogs) ensure to call super instead if #handleEvent: directly." | filteredEvent | filteredEvent := anEvent. "TODO: Add a check to ensure that our event dispatcher is actually of kind MorphicEventDispatcher?!! We do copy its behavior though... like self defaultEventDispatcher class == MorphicEventDispatcher? Or #isKindOf:? Anyway, the outermost morph determines the event dispatcher. See HandMorph >> #sendEvent:focus:clear: and PasteUpMorph >> #processEvent:." "Event capturing. Filters only because the capturing phase was bypassed by using the keyboard/mouse focus." self withAllOwners reverseDo: [:morph | "reverse order to comply with default MorphEventDispatcher" + morph == anEvent hand ifFalse: [ "Fixes drag-and-drop bug." + filteredEvent := morph sendFilterEventCapture: filteredEvent for: morph. + filteredEvent wasIgnored ifTrue: [^ filteredEvent]]]. - filteredEvent := morph sendFilterEventCapture: filteredEvent for: morph. - filteredEvent wasIgnored ifTrue: [^ filteredEvent]]. "Event bubbling. Filters are processed in #handleEvent:." self withAllOwnersDo: [:morph | + morph == anEvent hand ifFalse: [ "Fixes drag-and-drop bug." + filteredEvent := morph handleEvent: filteredEvent. + filteredEvent wasIgnored ifTrue: [^ filteredEvent]]]. - filteredEvent := morph handleEvent: filteredEvent. - filteredEvent wasIgnored ifTrue: [^ filteredEvent]]. ^ filteredEvent!

1 0

The Trunk: Graphics-mt.349.mcz
by commits＠source.squeak.org 15 Jun '16

15 Jun '16

Marcel Taeumel uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-mt.349.mcz ==================== Summary ==================== Name: Graphics-mt.349 Author: mt Time: 15 June 2016, 10:17:51.81283 am UUID: d844e07e-8a5e-584b-9705-c09c8a6b34a4 Ancestors: Graphics-topa.348 Improves dark-map rendering of DejaVu Sans. Now, it does not look so bold anymore but is still way more readable on darker backgrounds than the bitmap version is. =============== Diff against Graphics-topa.348 =============== Item was changed: ----- Method: StrikeFont class>>dejaVuSansBoldDark12Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBoldDark14Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBoldDark17Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBoldDark20Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBoldDark7Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBoldDark9Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBoldObliqueDark12Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBoldObliqueDark14Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBoldObliqueDark17Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBoldObliqueDark20Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBoldObliqueDark7Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBoldObliqueDark9Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBookDark12Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBookDark14Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBookDark17Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBookDark20Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBookDark7Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansBookDark9Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansObliqueDark12Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansObliqueDark14Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansObliqueDark17Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansObliqueDark20Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansObliqueDark7Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StrikeFont class>>dejaVuSansObliqueDark9Form (in category 'dejaVu font data') ----- (excessive size, no diff calculated) Item was changed: (PackageInfo named: 'Graphics') postscript: ' " Reset DejaVu to current version " + StrikeFont initialize.'! - [StrikeFont initialize] value.'!

1 0

The Trunk: Morphic-mt.1179.mcz
by commits＠source.squeak.org 15 Jun '16

15 Jun '16

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1179.mcz ==================== Summary ==================== Name: Morphic-mt.1179 Author: mt Time: 15 June 2016, 8:28:59.901896 am UUID: 798fffba-733f-3444-840e-84baabd04da4 Ancestors: Morphic-mt.1178 Add the world's Do-menu to the world main docking bar. Can be hidden via preferences. =============== Diff against Morphic-mt.1178 =============== Item was added: + ----- Method: TheWorldMainDockingBar class>>showDoMenuInWorldMainDockingBar (in category 'preferences') ----- + showDoMenuInWorldMainDockingBar + + <preference: 'Show ''Do'' menu in world main docking bar' + category: 'docking bars' + description: 'Whether world''s main docking bar should show the ''Do'' menu.' + type: #Boolean> + ^ self getMenuPreference: #showDoMenuInWorldMainDockingBar ifAbsent: [true] + ! Item was added: + ----- Method: TheWorldMainDockingBar class>>showDoMenuInWorldMainDockingBar: (in category 'preferences') ----- + showDoMenuInWorldMainDockingBar: aBoolean + + self + setMenuPreference: #showDoMenuInWorldMainDockingBar + to: aBoolean. + ! Item was added: + ----- Method: TheWorldMainDockingBar>>doMenuOn: (in category 'construction') ----- + doMenuOn: aDockingBar + + aDockingBar addItem: [ :item | + item + contents: 'Do' translated; + subMenuUpdater: self + selector: #listCommonRequestsOn: ]! Item was added: + ----- Method: TheWorldMainDockingBar>>listCommonRequestsOn: (in category 'submenu - do') ----- + listCommonRequestsOn: aMenu + + | strings | + strings := Utilities commonRequestStrings contents. + + strings asString linesDo: [:aString | + aString = '-' + ifTrue: [aMenu addLine] + ifFalse: [aMenu add: (aString ifEmpty: [' ']) target: Utilities selector: #eval: argument: aString]]. + + aMenu addLine. + aMenu add: 'edit this list' translated target: Utilities action: #editCommonRequestStrings.! Item was changed: ----- Method: TheWorldMainDockingBar>>menusOn: (in category 'construction') ----- menusOn: aDockingBar self class showMainMenuInWorldMainDockingBar ifTrue: [ self squeakMenuOn: aDockingBar]. self class showProjectsMenuInWorldMainDockingBar ifTrue: [ self projectsMenuOn: aDockingBar]. self class showToolsMenuInWorldMainDockingBar ifTrue: [ self toolsMenuOn: aDockingBar]. self class showAppsMenuInWorldMainDockingBar ifTrue: [ self appsMenuOn: aDockingBar]. + self class showDoMenuInWorldMainDockingBar ifTrue: [ + self doMenuOn: aDockingBar]. + self class showExtrasMenuInWorldMainDockingBar ifTrue: [ self extrasMenuOn: aDockingBar]. self class showWindowsMenuInWorldMainDockingBar ifTrue: [ self windowsMenuOn: aDockingBar]. self class showHelpMenuInWorldMainDockingBar ifTrue: [ self helpMenuOn: aDockingBar].! Item was changed: (PackageInfo named: 'Morphic') postscript: '"Fixes the event handling that occurs in the same control flow after loading this code." HandMorph allInstancesDo: [:ea | ea initForEvents]. "Deploy mouse-wheel event handling to existing scrollpanes and hands." Project allMorphicProjects do: [:morphicProject | morphicProject world handsDo: [:hand | hand addKeyboardCaptureFilter: hand]]. ScrollPane allSubInstancesDo: [:ea | + ea addKeyboardCaptureFilter: ea]. + + "Add Do-menu." + TheWorldMainDockingBar updateInstances.'! - ea addKeyboardCaptureFilter: ea].'!

1 0

The Trunk: System-mt.833.mcz
by commits＠source.squeak.org 15 Jun '16

15 Jun '16

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.833.mcz ==================== Summary ==================== Name: System-mt.833 Author: mt Time: 15 June 2016, 8:28:35.974896 am UUID: 16d33125-ba8d-6844-b266-b5a4556d16c2 Ancestors: System-mt.832 Make it possible to access the common request strings from other applications. =============== Diff against System-mt.832 =============== Item was added: + ----- Method: Utilities class>>commonRequestStrings (in category 'common requests') ----- + commonRequestStrings + + (CommonRequestStrings == nil or: [CommonRequestStrings isKindOf: Array]) + ifTrue: [self initializeCommonRequestStrings]. + ^ CommonRequestStrings!

1 0

The Trunk: ST80-mt.213.mcz
by commits＠source.squeak.org 15 Jun '16

15 Jun '16

Marcel Taeumel uploaded a new version of ST80 to project The Trunk: http://source.squeak.org/trunk/ST80-mt.213.mcz ==================== Summary ==================== Name: ST80-mt.213 Author: mt Time: 15 June 2016, 8:00:00.958664 am UUID: 6a865b4f-20e9-1147-b4b7-2dd6d08eca27 Ancestors: ST80-mt.212 Appendix to Kernel-mt.1028. =============== Diff against ST80-mt.212 =============== Item was changed: ----- Method: ParagraphEditor>>backspace: (in category 'typing/selecting keys') ----- backspace: characterStream "Backspace over the last character." | startIndex | sensor leftShiftDown ifTrue: [^ self backWord: characterStream]. startIndex := self markIndex + (self hasCaret ifTrue: [0] ifFalse: [1]). [sensor keyboardPressed and: + [sensor peekKeyboard asciiValue = 8]] whileTrue: [ - [sensor keyboardPeek asciiValue = 8]] whileTrue: [ "process multiple backspaces" sensor keyboard. startIndex := 1 max: startIndex - 1. ]. self backTo: startIndex. ^false! Item was changed: ----- Method: ParagraphEditor>>blinkPrevParen (in category 'parenblinking') ----- blinkPrevParen self deprecated: 'Use #blinkPrevParen:'. + self blinkPrevParen: sensor peekKeyboard! - self blinkPrevParen: sensor keyboardPeek! Item was changed: ----- Method: ParagraphEditor>>readKeyboard (in category 'typing support') ----- readKeyboard "Key struck on the keyboard. Find out which one and, if special, carry out the associated special action. Otherwise, add the character to the stream of characters. Undoer & Redoer: see closeTypeIn." | typeAhead char | typeAhead := WriteStream on: (String new: 128). [sensor keyboardPressed] whileTrue: [self deselect. sensor keyboardPressed ifTrue: + [char := sensor peekKeyboard. - [char := sensor keyboardPeek. (self dispatchOnCharacter: char with: typeAhead) ifTrue: [self doneTyping. self setEmphasisHere. ^self selectAndScroll; updateMarker]. self openTypeIn]. self hasSelection ifTrue: "save highlighted characters" [UndoSelection := self selection]. self zapSelectionWithCompositionWith: typeAhead contents. typeAhead reset. self unselect. sensor keyboardPressed ifFalse: [self selectAndScroll. sensor keyboardPressed ifFalse: [self updateMarker]]]! Item was changed: ----- Method: ScrollController>>scrollByKeyboard (in category 'scrolling') ----- scrollByKeyboard | keyEvent | + keyEvent := sensor peekKeyboard. - keyEvent := sensor keyboardPeek. keyEvent ifNil: [^ false]. (sensor controlKeyPressed or:[sensor commandKeyPressed]) ifFalse: [^ false]. keyEvent asciiValue = 30 ifTrue: [sensor keyboard. self scrollViewDown ifTrue: [self moveMarker]. ^ true]. keyEvent asciiValue = 31 ifTrue: [sensor keyboard. self scrollViewUp ifTrue: [self moveMarker]. ^ true]. ^ false!

1 0

The Trunk: Morphic-mt.1178.mcz
by commits＠source.squeak.org 15 Jun '16

15 Jun '16

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1178.mcz ==================== Summary ==================== Name: Morphic-mt.1178 Author: mt Time: 15 June 2016, 7:58:44.282664 am UUID: 2cf2827f-2599-f84c-a054-ea09942951c4 Ancestors: Morphic-mt.1177 Appendix to Kernel-mt.1028. Support #wheelDelta in MouseWheelEvent instances for fine-granular scrolling. Do only raise flags for, e.g., #isWheelUp and #isWheelDown if the delta is above 120 units. Accumulate this in MouseWheelState. Wheel-up is every +120 and wheel-down is every -120. =============== Diff against Morphic-mt.1177 =============== Item was changed: Morph subclass: #HandMorph + instanceVariableNames: 'mouseFocus keyboardFocus eventListeners mouseListeners keyboardListeners eventCaptureFilters mouseCaptureFilters keyboardCaptureFilters mouseClickState mouseOverHandler mouseWheelState lastMouseEvent targetOffset damageRecorder cacheCanvas cachedCanvasHasHoles temporaryCursor temporaryCursorOffset hardwareCursor hasChanged savedPatch userInitials lastEventBuffer genieGestureProcessor keyboardInterpreter' - instanceVariableNames: 'mouseFocus keyboardFocus eventListeners mouseListeners keyboardListeners eventCaptureFilters mouseCaptureFilters keyboardCaptureFilters mouseClickState mouseOverHandler lastMouseEvent targetOffset damageRecorder cacheCanvas cachedCanvasHasHoles temporaryCursor temporaryCursorOffset hardwareCursor hasChanged savedPatch userInitials lastEventBuffer genieGestureProcessor keyboardInterpreter' classVariableNames: 'CompositionWindowManager DoubleClickTime DragThreshold EventStats NewEventRules NormalCursor PasteBuffer SendMouseWheelToKeyboardFocus ShowEvents SynthesizeMouseWheelEvents' poolDictionaries: 'EventSensorConstants' category: 'Morphic-Kernel'! !HandMorph commentStamp: '<historical>' prior: 0! The cursor may be thought of as the HandMorph. The hand's submorphs hold anything being carried by dragging. There is some minimal support for multiple hands in the same world.! Item was changed: ----- Method: HandMorph>>filterEvent:for: (in category 'events-filtering') ----- filterEvent: aKeyboardEvent for: aMorphOrNil "Fixes VM behavior. Usually, there are no mouse wheel events generated by the VM but CTRL+UP/DOWN. Convert these into mouse wheel events. We installed ourself as keyboard filter only!! No need to check whether this is a keyboard event or not!! See HandMorph >> #initForEvents. Might be removed in the future if this mapping gets obsolete." HandMorph synthesizeMouseWheelEvents ifFalse: [^ aKeyboardEvent]. (aKeyboardEvent isKeystroke and: [aKeyboardEvent controlKeyPressed]) ifTrue: [ aKeyboardEvent keyCharacter caseOf: { + [Character arrowUp] -> [^ self generateMouseWheelEvent: aKeyboardEvent direction: 2r1000]. + [Character arrowDown] -> [^ self generateMouseWheelEvent: aKeyboardEvent direction: 2r0100]. - [Character arrowUp] -> [^ self generateMouseWheelEvent: aKeyboardEvent direction: #up]. - [Character arrowDown] -> [^ self generateMouseWheelEvent: aKeyboardEvent direction: #down]. } otherwise: [^ aKeyboardEvent]]. ^ aKeyboardEvent! Item was added: + ----- Method: HandMorph>>generateMouseWheelEvent: (in category 'private events') ----- + generateMouseWheelEvent: evtBuf + "Generate the appropriate mouse wheel event for the given raw event buffer" + + | buttons modifiers deltaX deltaY stamp | + stamp := evtBuf second. + stamp = 0 ifTrue: [stamp := Time eventMillisecondClock]. + deltaX := evtBuf third. + deltaY := evtBuf fourth. + modifiers := evtBuf fifth. + buttons := (modifiers bitShift: 3) bitOr: (lastMouseEvent buttons bitAnd: 7). + ^ MouseWheelEvent new + setType: #mouseWheel + position: self position + delta: deltaX@deltaY + direction: 2r0000 + buttons: buttons + hand: self + stamp: stamp! Item was changed: ----- Method: HandMorph>>generateMouseWheelEvent:direction: (in category 'private events') ----- + generateMouseWheelEvent: keystrokeEvent direction: direction + "Generate the appropriate mouse wheel event from the keystrokeEvent. Before calling this, ensure that the control key is pressed. - generateMouseWheelEvent: keystrokeEvent direction: directionSymbol - "Generate the appropriate mouse wheel event from the keystrokeEvent. Before calling this, ensure that the control key is pressed." + This method can be discarded once the VM produces real mouse wheel events." + ^ MouseWheelEvent new setType: #mouseWheel position: keystrokeEvent position + delta: 0 @ ((direction anyMask: 2r1000 "wheel up") ifTrue: [120] ifFalse: [-120]) + direction: direction - direction: directionSymbol buttons: (keystrokeEvent buttons bitAnd: 2r01111) "drop control key pressed for this conversion" hand: keystrokeEvent hand stamp: keystrokeEvent timeStamp! Item was changed: ----- Method: HandMorph>>handleEvent: (in category 'events-processing') ----- handleEvent: unfilteredEvent | filteredEvent | owner ifNil: [^ unfilteredEvent "not necessary but good style -- see Morph >> #handleEvent:"]. self logEvent: unfilteredEvent. "Mouse-over events occur really, really, really often. They are kind of the heart beat of the Morphic UI process." unfilteredEvent isMouseOver ifTrue: [^ self sendMouseEvent: unfilteredEvent]. self showEvent: unfilteredEvent. self sendListenEvents: unfilteredEvent. filteredEvent := self sendFilterEventCapture: unfilteredEvent for: nil. "filteredEvent := unfilteredEvent" " <-- use this to disable global capture filters" filteredEvent wasIgnored ifTrue: [ self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. filteredEvent isWindowEvent ifTrue: [ self sendEvent: filteredEvent focus: nil. self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. filteredEvent isKeyboard ifTrue:[ self sendKeyboardEvent: filteredEvent. self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. filteredEvent isDropEvent ifTrue:[ self sendEvent: filteredEvent focus: nil. self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. filteredEvent isMouse ifFalse: [ self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. " ********** MOUSE EVENT *********** " lastMouseEvent := filteredEvent. "Check for pending drag or double click operations." mouseClickState ifNotNil:[ (mouseClickState handleEvent: filteredEvent from: self) ifFalse:[ "Possibly dispatched #click: or something and will not re-establish otherwise" self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]]. + filteredEvent isMouseWheel ifTrue: [ + mouseWheelState ifNil: [mouseWheelState := MouseWheelState new]. + mouseWheelState handleEvent: filteredEvent from: self. + self mouseOverHandler processMouseOver: lastMouseEvent. + ^ filteredEvent]. + filteredEvent isMove ifTrue:[ self position: filteredEvent position. self sendMouseEvent: filteredEvent. self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. "Issue a synthetic move event if we're not at the position of the event" filteredEvent position = self position ifFalse: [self moveToEvent: filteredEvent]. "Drop submorphs on button events" self hasSubmorphs ifTrue:[self dropMorphs: filteredEvent] + ifFalse:[self sendMouseEvent: filteredEvent]. - ifFalse:[ - "This check is here and not in #sendMouseEvent: to avoid unnecessary comparisons for mouse-over events." - (HandMorph sendMouseWheelToKeyboardFocus and: [filteredEvent isMouseWheel]) - ifFalse: [self sendMouseEvent: filteredEvent] - ifTrue: [self sendEvent: filteredEvent focus: self keyboardFocus clear: [self keyboardFocus: nil]]]. self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent "not necessary but good style -- see Morph >> #handleEvent:" ! Item was changed: ----- Method: HandMorph>>processEvents (in category 'event handling') ----- processEvents "Process user input events from the local input devices." | evt evtBuf type hadAny | ActiveEvent ifNotNil: ["Meaning that we were invoked from within an event response. Make sure z-order is up to date" self mouseOverHandler processMouseOver: lastMouseEvent]. hadAny := false. [(evtBuf := Sensor nextEvent) isNil] whileFalse: [evt := nil. "for unknown event types" type := evtBuf first. + type = EventTypeMouse + ifTrue: [evt := self generateMouseEvent: evtBuf]. + type = EventTypeMouseWheel + ifTrue: [evt := self generateMouseWheelEvent: evtBuf]. - type = EventTypeMouse ifTrue: [evt := self generateMouseEvent: evtBuf]. type = EventTypeKeyboard ifTrue: [evt := self generateKeyboardEvent: evtBuf]. type = EventTypeDragDropFiles ifTrue: [evt := self generateDropFilesEvent: evtBuf]. type = EventTypeWindow ifTrue:[evt := self generateWindowEvent: evtBuf]. "All other events are ignored" (type ~= EventTypeDragDropFiles and: [evt isNil]) ifTrue: [^self]. evt isNil ifFalse: ["Finally, handle it" self handleEvent: evt. hadAny := true. "For better user feedback, return immediately after a mouse event has been processed." evt isMouse ifTrue: [^self]]]. "note: if we come here we didn't have any mouse events" mouseClickState notNil ifTrue: ["No mouse events during this cycle. Make sure click states time out accordingly" mouseClickState handleEvent: lastMouseEvent asMouseMove from: self]. hadAny ifFalse: ["No pending events. Make sure z-order is up to date" self mouseOverHandler processMouseOver: lastMouseEvent]! Item was changed: Object subclass: #MouseClickState instanceVariableNames: 'clickClient clickState firstClickDown firstClickUp firstClickTime clickSelector dblClickSelector dblClickTime dblClickTimeoutSelector dragSelector dragThreshold' classVariableNames: '' poolDictionaries: '' + category: 'Morphic-Events'! - category: 'Morphic-Kernel'! !MouseClickState commentStamp: '<historical>' prior: 0! MouseClickState is a simple class managing the distinction between clicks, double clicks, and drag operations. It has been factored out of HandMorph due to the many instVars. Instance variables: clickClient <Morph> The client wishing to receive #click:, #dblClick:, or #drag messages clickState <Symbol> The internal state of handling the last event (#firstClickDown, #firstClickUp, #firstClickTimedOut) firstClickDown <MorphicEvent> The #mouseDown event after which the client wished to receive #click: or similar messages firstClickUp <MorphicEvent> The first mouse up event which came in before the double click time out was exceeded (it is sent if there is a timout after the first mouse up event occured) firstClickTime <Integer> The millisecond clock value of the first event clickSelector <Symbol> The selector to use for sending #click: messages dblClickSelector <Symbol> The selector to use for sending #doubleClick: messages dblClickTime <Integer> Timout in milliseconds for a double click operation dragSelector <Symbol> The selector to use for sending #drag: messages dragThreshold <Integer> Threshold used for determining if a #drag: message is sent (pixels!!) ! Item was changed: MouseEvent subclass: #MouseWheelEvent + instanceVariableNames: 'delta direction' - instanceVariableNames: 'direction' classVariableNames: '' poolDictionaries: '' category: 'Morphic-Events'! Item was removed: - ----- Method: MouseWheelEvent>>direction (in category 'accessing') ----- - direction - ^ direction! Item was added: + ----- Method: MouseWheelEvent>>initialize (in category 'initialization') ----- + initialize + + super initialize. + direction := 2r0000. + delta := 0@0.! Item was changed: ----- Method: MouseWheelEvent>>isWheelDown (in category 'testing') ----- isWheelDown + ^ direction anyMask: 2r0100! - ^ self direction == #down! Item was changed: ----- Method: MouseWheelEvent>>isWheelLeft (in category 'testing') ----- isWheelLeft + ^ direction anyMask: 2r0010! - ^ self direction == #left! Item was changed: ----- Method: MouseWheelEvent>>isWheelRight (in category 'testing') ----- isWheelRight + ^ direction anyMask: 2r0001! - ^ self direction == #right! Item was changed: ----- Method: MouseWheelEvent>>isWheelUp (in category 'testing') ----- isWheelUp + ^ direction anyMask: 2r1000! - ^ self direction == #up! Item was changed: ----- Method: MouseWheelEvent>>printOn: (in category 'printing') ----- printOn: aStream aStream nextPut: $[. aStream nextPutAll: self cursorPoint printString; space. aStream nextPutAll: type; space. + aStream nextPutAll: self wheelString. + aStream nextPutAll: self wheelDelta printString; space. - aStream print: self direction; space. aStream nextPutAll: self modifierString. aStream nextPutAll: self buttonString. aStream nextPutAll: timeStamp printString; space. aStream nextPut: $].! Item was added: + ----- Method: MouseWheelEvent>>setType:position:delta:direction:buttons:hand:stamp: (in category 'private') ----- + setType: evtType position: evtPos delta: evtDelta direction: dirFlags buttons: evtButtons hand: evtHand stamp: stamp + type := evtType. + position := evtPos. + buttons := evtButtons. + source := evtHand. + wasHandled := false. + direction := dirFlags. + delta := evtDelta. + timeStamp := stamp.! Item was removed: - ----- Method: MouseWheelEvent>>setType:position:direction:buttons:hand:stamp: (in category 'private') ----- - setType: evtType position: evtPos direction: dirSymbol buttons: evtButtons hand: evtHand stamp: stamp - type := evtType. - position := evtPos. - buttons := evtButtons. - source := evtHand. - wasHandled := false. - direction := dirSymbol. - timeStamp := stamp.! Item was added: + ----- Method: MouseWheelEvent>>setWheelDown (in category 'initialization') ----- + setWheelDown + + direction := direction bitOr: 2r0100.! Item was added: + ----- Method: MouseWheelEvent>>setWheelLeft (in category 'initialization') ----- + setWheelLeft + + direction := direction bitOr: 2r0010.! Item was added: + ----- Method: MouseWheelEvent>>setWheelRight (in category 'initialization') ----- + setWheelRight + + direction := direction bitOr: 2r0001.! Item was added: + ----- Method: MouseWheelEvent>>setWheelUp (in category 'initialization') ----- + setWheelUp + + direction := direction bitOr: 2r1000.! Item was changed: ----- Method: MouseWheelEvent>>storeOn: (in category 'printing') ----- storeOn: aStream + "Note: We generate the same array as provided by the VM. BUT we are a subclass of MouseEvent now even if we cannot store the position right now. This is awkward. But we still store the position and the wheel delta. *sign*" + - super storeOn: aStream. aStream space. + delta x storeOn: aStream. + aStream space. + delta y storeOn: aStream. + aStream space. + direction storeOn: aStream. + ! - self direction storeOn: aStream.! Item was changed: ----- Method: MouseWheelEvent>>type:readFrom: (in category 'initialization') ----- type: eventType readFrom: aStream + | deltaX deltaY | super type: eventType readFrom: aStream. aStream skip: 1. + deltaX := Integer readFrom: aStream. + aStream skip: 1. + deltaY := Integer readFrom: aStream. + aStream skip: 1. + direction := Integer readFrom: aStream. + delta := deltaX @ deltaY. - direction := Symbol readFrom: aStream. ! Item was added: + ----- Method: MouseWheelEvent>>wheelDelta (in category 'accessing') ----- + wheelDelta + + ^ delta! Item was added: + ----- Method: MouseWheelEvent>>wheelString (in category 'printing') ----- + wheelString + "Return a string identifying the wheel state" + + ^ String streamContents: [:stream | + self isWheelUp ifTrue: [stream nextPutAll: 'up ']. + self isWheelDown ifTrue: [stream nextPutAll: 'down ']. + self isWheelLeft ifTrue: [stream nextPutAll: 'left ']. + self isWheelRight ifTrue: [stream nextPutAll: 'right ']]! Item was added: + Object subclass: #MouseWheelState + instanceVariableNames: 'currentDelta' + classVariableNames: '' + poolDictionaries: '' + category: 'Morphic-Events'! Item was added: + ----- Method: MouseWheelState>>handleEvent:from: (in category 'event processing') ----- + handleEvent: aMouseWheelEvent from: aHand + "Every 120 units, raise the wheel flags for convenient mouse wheel programming. We choose not to send multiple mouse-wheel events for multiples of 120 because applications can always react to the actual delta values if they want to do more scrolling or zooming." + + | sign | + currentDelta := currentDelta + aMouseWheelEvent wheelDelta. + + sign := currentDelta sign. + currentDelta := currentDelta abs. + + (currentDelta x // 120) > 0 ifTrue: [ + sign x = 1 + ifTrue: [aMouseWheelEvent setWheelRight] + ifFalse: [aMouseWheelEvent setWheelLeft]]. + + (currentDelta y // 120) > 0 ifTrue: [ + sign y = 1 + ifTrue: [aMouseWheelEvent setWheelUp] + ifFalse: [aMouseWheelEvent setWheelDown]]. + + currentDelta := currentDelta \\ 120. + currentDelta := currentDelta * sign. + + "Finally, send the event." + HandMorph sendMouseWheelToKeyboardFocus + ifFalse: [aHand sendMouseEvent: aMouseWheelEvent] + ifTrue: [aHand sendEvent: aMouseWheelEvent focus: aHand keyboardFocus clear: [aHand keyboardFocus: nil]]. + ! Item was added: + ----- Method: MouseWheelState>>initialize (in category 'initialize-release') ----- + initialize + + super initialize. + currentDelta := 0@0.!

1 0

The Trunk: Kernel-mt.1028.mcz
by commits＠source.squeak.org 15 Jun '16

15 Jun '16

Marcel Taeumel uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-mt.1028.mcz ==================== Summary ==================== Name: Kernel-mt.1028 Author: mt Time: 15 June 2016, 7:55:24.868664 am UUID: ef9df82a-545e-b44a-9084-8b608be6ce69 Ancestors: Kernel-mt.1027 Extends EventSensor to be prepared for VMs to really send mouse-wheel events. (Merges several peek* and prim* methods in EventSensor as a clean-up from the former InputSensor days.) =============== Diff against Kernel-mt.1027 =============== Item was changed: Object subclass: #EventSensor + instanceVariableNames: 'mouseButtons mousePosition mouseWheelDelta keyboardBuffer interruptKey interruptSemaphore eventQueue inputSemaphore lastEventPoll hasInputSemaphore' - 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 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>>anyButtonPressed (in category 'mouse') ----- anyButtonPressed "Answer whether at least one mouse button is currently being pressed." + ^ self peekButtons anyMask: 7 - ^ self primMouseButtons anyMask: 7 ! Item was changed: ----- Method: EventSensor>>anyModifierKeyPressed (in category 'modifier keys') ----- anyModifierKeyPressed "ignore, however, the shift keys 'cause that's not REALLY a command key" + ^ self peekButtons anyMask: 16r70 "cmd | opt | ctrl"! - ^ self primMouseButtons anyMask: 16r70 "cmd | opt | ctrl"! Item was changed: ----- 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 peekButtons bitAnd: 7) = 1 - ^ (self primMouseButtons bitAnd: 7) = 1 ! 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: 64! - ^ self primMouseButtons anyMask: 64! 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: 16! - ^ self primMouseButtons anyMask: 16! Item was changed: ----- Method: EventSensor>>createMouseEvent (in category 'mouse') ----- createMouseEvent "create and return a new mouse event from the current mouse position; this is useful for restarting normal event queue processing after manual polling" | buttons modifiers pos mapped eventBuffer | eventBuffer := Array new: 8. + buttons := self peekButtons. + pos := self peekPosition. - buttons := self primMouseButtons. - pos := self primMousePt. modifiers := buttons bitShift: -3. buttons := buttons bitAnd: 7. mapped := self mapButtons: buttons modifiers: modifiers. eventBuffer 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. ^ eventBuffer! Item was changed: ----- Method: EventSensor>>initialize (in category 'initialize') ----- initialize "Initialize the receiver" mouseButtons := 0. mousePosition := 0 @ 0. + mouseWheelDelta := 0 @ 0. keyboardBuffer := SharedQueue new. self setInterruptKey: (interruptKey ifNil: [$. asciiValue bitOr: 16r0800 ]). "cmd-." interruptSemaphore := (Smalltalk specialObjectsArray at: 31) ifNil: [Semaphore new]. self flushAllButDandDEvents. inputSemaphore := Semaphore new. hasInputSemaphore := false.! Item was changed: ----- 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 peekKeyboard. - 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: 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 changed: ----- Method: EventSensor>>keyboardPressed (in category 'keyboard') ----- keyboardPressed "Answer true if keystrokes are available." + ^self peekKeyboard notNil! - ^self primKbdPeek notNil! Item was changed: ----- 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 peekButtons anyMask: 8! - ^ self primMouseButtons anyMask: 8! Item was changed: ----- 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 peekButtons bitAnd: 7 - ^ self primMouseButtons bitAnd: 7 ! Item was changed: ----- Method: EventSensor>>nextEventSynthesized (in category 'private') ----- nextEventSynthesized "Return a synthesized event. This method is called if an event driven client wants to receive events but the primary user interface is not event-driven (e.g., the receiver does not have an event queue but only updates its state). This can, for instance, happen if a Morphic World is run in an MVC window. To simplify the clients work this method will always return all available keyboard events first, and then (repeatedly) the mouse events. Since mouse events come last, the client can assume that after one mouse event has been received there are no more to come. Note that it is impossible for EventSensor to determine if a mouse event has been issued before so the client must be aware of the possible problem of getting repeatedly the same mouse events. See HandMorph>>processEvents for an example on how to deal with this." | kbd array buttons pos modifiers mapped | "First check for keyboard" array := Array new: 8. kbd := self primKbdNext. kbd ifNotNil: ["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" ^ array]. "Then check for mouse" + pos := self peekPosition. - pos := self primMousePt. buttons := mouseButtons. modifiers := buttons bitShift: -3. buttons := buttons bitAnd: 7. mapped := self mapButtons: buttons modifiers: modifiers. 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. ^ array ! Item was changed: ----- Method: EventSensor>>peekButtons (in category 'accessing') ----- peekButtons self fetchMoreEvents. + self flushNonKbdEvents. + ^ mouseButtons! - ^mouseButtons! Item was added: + ----- Method: EventSensor>>peekKeyboard (in category 'keyboard') ----- + peekKeyboard + "Answer the next character in the keyboard buffer without removing it, or nil if it is empty." + + | char | + self fetchMoreEvents. + keyboardBuffer isEmpty ifFalse: [^ self characterForKeycode: keyboardBuffer peek]. + char := nil. + self eventQueue ifNotNil: [:queue | + queue nextOrNilSuchThat: "NOTE: must not return out of this block, so loop to end" + [:buf | (self isKbdEvent: buf) ifTrue: [char ifNil: [char := buf at: 3]]. + false "NOTE: block value must be false so Queue won't advance"]]. + ^ self characterForKeycode: char! Item was changed: ----- Method: EventSensor>>peekPosition (in category 'accessing') ----- peekPosition + self fetchMoreEvents. + "self flushNonKbdEvents. -- mt: Should not be necessary here." + ^ mousePosition! - ^ self primMousePt! Item was added: + ----- Method: EventSensor>>peekWheelDelta (in category 'accessing') ----- + peekWheelDelta + self fetchMoreEvents. + ^ mouseWheelDelta! Item was changed: ----- Method: EventSensor>>primKbdNext (in category 'private') ----- primKbdNext "Allows for use of old Sensor protocol to get at the keyboard, as when running kbdTest or the InterpreterSimulator in Morphic" | evtBuf | + + self flag: #refactor. "mt: Suspiciously similar to #peekKeyboardEvent" self fetchMoreEvents. keyboardBuffer isEmpty ifFalse:[^ keyboardBuffer next]. self eventQueue ifNotNil: [:queue | evtBuf := queue nextOrNilSuchThat: [:buf | self isKbdEvent: buf]. self flushNonKbdEvents]. ^ evtBuf ifNotNil: [evtBuf at: 3] ! Item was removed: - ----- Method: EventSensor>>primKbdPeek (in category 'private') ----- - primKbdPeek - "Allows for use of old Sensor protocol to get at the keyboard, - as when running kbdTest or the InterpreterSimulator in Morphic" - | char | - self fetchMoreEvents. - keyboardBuffer isEmpty ifFalse: [^ keyboardBuffer peek]. - char := nil. - self eventQueue ifNotNil: [:queue | - queue nextOrNilSuchThat: "NOTE: must not return out of this block, so loop to end" - [:buf | (self isKbdEvent: buf) ifTrue: [char ifNil: [char := buf at: 3]]. - false "NOTE: block value must be false so Queue won't advance"]]. - ^ char! Item was removed: - ----- Method: EventSensor>>primMouseButtons (in category 'private') ----- - primMouseButtons - self fetchMoreEvents. - self flushNonKbdEvents. - ^ mouseButtons! Item was removed: - ----- Method: EventSensor>>primMousePt (in category 'private') ----- - primMousePt - self fetchMoreEvents. - "self flushNonKbdEvents. -- mt: Should not be necessary here." - ^ mousePosition! Item was changed: ----- Method: EventSensor>>processEvent: (in category 'private-I/O') ----- processEvent: evt "Process a single event. This method is run at high priority." | type buttons window | type := evt at: 1. "Only process main window events, forward others to host window proxies" window := evt at: 8. (window isNil or: [window isZero]) ifTrue: [window := 1. evt at: 8 put: window]. window = 1 ifFalse: [ ^Smalltalk at: #HostWindowProxy ifPresent: [:w | w processEvent: evt]]. + "Tackle mouse events and mouse wheel events first" + (type = EventTypeMouse or: [type = EventTypeMouseWheel]) - "Tackle mouse events first" - type = EventTypeMouse ifTrue: [buttons := (ButtonDecodeTable at: (evt at: 5) + 1). evt at: 5 put: (Smalltalk platformName = 'Mac OS' ifTrue: [ buttons ] ifFalse: [ self mapButtons: buttons modifiers: (evt at: 6) ]). self queueEvent: evt. + type = EventTypeMouse ifTrue: [self processMouseEvent: evt]. + type = EventTypeMouseWheel ifTrue: [self processMouseWheelEvent: evt]. - self processMouseEvent: evt . ^self]. - "Store the event in the queue if there's any" type = EventTypeKeyboard ifTrue: [ "Check if the event is a user interrupt" ((evt at: 4) = 0 and: [((evt at: 3) bitOr: (((evt at: 5) bitAnd: 8) bitShift: 8)) = interruptKey]) ifTrue: ["interrupt key is meta - not reported as event" ^ interruptSemaphore signal]. "Else swap ctrl/alt keys if neeeded. Look at the Unicode char first, then ascii." KeyDecodeTable at: {evt at: 6. evt at: 5} ifPresent: [:a | evt at: 6 put: a first; at: 5 put: a second]. KeyDecodeTable at: {evt at: 3. evt at: 5} ifPresent: [:a | evt at: 3 put: a first; at: 5 put: a second]. self queueEvent: evt. self processKeyboardEvent: evt . ^self ]. "Handle all events other than Keyborad or Mouse." self queueEvent: evt. ! Item was added: + ----- Method: EventSensor>>processMouseWheelEvent: (in category 'private-I/O') ----- + processMouseWheelEvent: evt + "process a mouse wheel event, updating EventSensor state" + + | modifiers buttons mapped | + 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: 3).! Item was changed: ----- 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 peekButtons anyMask: 32! - ^ self primMouseButtons anyMask: 32! Item was changed: ----- 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 peekButtons bitAnd: 7) = 4 - ^ (self primMouseButtons bitAnd: 7) = 4 ! 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: 8 - ^ self primMouseButtons anyMask: 8 ! Item was changed: ----- 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 peekButtons bitAnd: 7) = 2 - ^ (self primMouseButtons bitAnd: 7) = 2 ! Item was changed: SharedPool subclass: #EventSensorConstants instanceVariableNames: '' + classVariableNames: 'BlueButtonBit CommandKeyBit CtrlKeyBit EventKeyChar EventKeyDown EventKeyUp EventTouchCancelled EventTouchDown EventTouchMoved EventTouchStationary EventTouchUp EventTypeComplex EventTypeDragDropFiles EventTypeKeyboard EventTypeMenu EventTypeMouse EventTypeMouseWheel EventTypeNone EventTypeWindow OptionKeyBit RedButtonBit ShiftKeyBit TouchPhaseBegan TouchPhaseCancelled TouchPhaseEnded TouchPhaseMoved TouchPhaseStationary WindowEventActivated WindowEventClose WindowEventIconise WindowEventMetricChange WindowEventPaint WindowEventStinks YellowButtonBit' - classVariableNames: 'BlueButtonBit CommandKeyBit CtrlKeyBit EventKeyChar EventKeyDown EventKeyUp EventTouchCancelled EventTouchDown EventTouchMoved EventTouchStationary EventTouchUp EventTypeComplex EventTypeDragDropFiles EventTypeKeyboard EventTypeMenu EventTypeMouse EventTypeNone EventTypeWindow OptionKeyBit RedButtonBit ShiftKeyBit TouchPhaseBegan TouchPhaseCancelled TouchPhaseEnded TouchPhaseMoved TouchPhaseStationary WindowEventActivated WindowEventClose WindowEventIconise WindowEventMetricChange WindowEventPaint WindowEventStinks YellowButtonBit' poolDictionaries: '' category: 'Kernel-Processes'! Item was changed: ----- Method: EventSensorConstants class>>initialize (in category 'pool initialization') ----- initialize "EventSensorConstants initialize" RedButtonBit := 4. BlueButtonBit := 2. YellowButtonBit := 1. ShiftKeyBit := 1. CtrlKeyBit := 2. OptionKeyBit := 4. CommandKeyBit := 8. "Types of events" EventTypeNone := 0. EventTypeMouse := 1. EventTypeKeyboard := 2. EventTypeDragDropFiles := 3. EventTypeMenu := 4. EventTypeWindow := 5. EventTypeComplex := 6. + EventTypeMouseWheel := 7. "Press codes for keyboard events" EventKeyChar := 0. EventKeyDown := 1. EventKeyUp := 2. "Host window events" WindowEventMetricChange := 1. WindowEventClose := 2. WindowEventIconise := 3. WindowEventActivated := 4. WindowEventPaint := 5. WindowEventStinks := 6. "types for touch events" EventTouchDown := 1. EventTouchUp := 2. EventTouchMoved := 3. EventTouchStationary := 4. EventTouchCancelled := 5. "iOS touch phase constants" TouchPhaseBegan := 0. TouchPhaseMoved := 1. TouchPhaseStationary := 2. TouchPhaseEnded := 3. TouchPhaseCancelled := 4. !

1 0

The Trunk: MorphicExtras-topa.176.mcz
by commits＠source.squeak.org 14 Jun '16

14 Jun '16

Tobias Pape uploaded a new version of MorphicExtras to project The Trunk: http://source.squeak.org/trunk/MorphicExtras-topa.176.mcz ==================== Summary ==================== Name: MorphicExtras-topa.176 Author: topa Time: 14 June 2016, 11:30:05.074834 am UUID: b32dc615-496b-4767-8ea0-3b3e8af40fc5 Ancestors: MorphicExtras-pre.175 Add a HistogramMorph similar to GraphMorph =============== Diff against MorphicExtras-pre.175 =============== Item was added: + RectangleMorph subclass: #HistogramMorph + instanceVariableNames: 'bag cachedForm values counts max sum limit labelBlock countLabelBlock' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicExtras-Widgets'! + + !HistogramMorph commentStamp: 'topa 6/14/2016 11:27' prior: 0! + I display bags as a histogram, that is a bar chart of the counts in the bag. + + Example: + HistogramMorph openOn: (Smalltalk allClasses gather: + [:class | class selectors collect: [:selector | class ]]) + + + Instance Variables + bag: <Bag> + cachedForm: <Form> + countLabelBlock: <BlockClosure> + counts: <SequencableCollection> + labelBlock: <BlockClosure> + limit: <Number> + max: <Number> + sum: <Number> + values: <SequencableCollection> + + bag + - The bag that forms the data basis for the histogram display + + cachedForm + - A form used to cache the historgram rendering. + + countLabelBlock + - Optional. Block that receives the count for the current bar and should return a String. + Leaving this nil is equivalent to [:count | count asString]. + + counts + - Cached collection of all counts in (value-)frequency-sorted order for rendering speed. + See values. + + labelBlock + - Optional. Block that receives the value for the current bar and should return a + String for the label. Leaving this nil is equivalent to [:value | value asString]. + + limit + - Maximum number of elements from values to consider. Defaults to 25. + + max + - Cached maximum value from values. + + sum + - Cached sum of all elements in values. Determines overall histogram height. + + values + - Cached collection of all values in frequency-sorted order for rendering speed. + See counts.! Item was added: + ----- Method: HistogramMorph class>>on: (in category 'instance creation') ----- + on: aCollection + + ^ self new + bag: aCollection asBag; + yourself! Item was added: + ----- Method: HistogramMorph class>>openOn: (in category 'instance creation') ----- + openOn: aCollection + + ^ (self on: aCollection) + openInHand! Item was added: + ----- Method: HistogramMorph>>bag (in category 'accessing') ----- + bag + + ^ bag! Item was added: + ----- Method: HistogramMorph>>bag: (in category 'accessing') ----- + bag: anObject + + self basicBag: anObject. + self flush. + self changed. + ! Item was added: + ----- Method: HistogramMorph>>basicBag: (in category 'accessing') ----- + basicBag: anObject + + bag := anObject.! Item was added: + ----- Method: HistogramMorph>>basicLimit: (in category 'accessing') ----- + basicLimit: anObject + + limit := anObject. + ! Item was added: + ----- Method: HistogramMorph>>cachedForm (in category 'accessing') ----- + cachedForm + + ^ cachedForm! Item was added: + ----- Method: HistogramMorph>>cachedForm: (in category 'accessing') ----- + cachedForm: anObject + + cachedForm := anObject.! Item was added: + ----- Method: HistogramMorph>>color: (in category 'accessing') ----- + color: aColor + + super color: aColor. + self flushCachedForm. + ! Item was added: + ----- Method: HistogramMorph>>countLabelBlock (in category 'accessing') ----- + countLabelBlock + + ^ countLabelBlock! Item was added: + ----- Method: HistogramMorph>>countLabelBlock: (in category 'accessing') ----- + countLabelBlock: anObject + + countLabelBlock := anObject.! Item was added: + ----- Method: HistogramMorph>>countLabelFor: (in category 'drawing') ----- + countLabelFor: aNumber + + ^ self countLabelBlock + ifNotNil: [:block | block value: aNumber] + ifNil: [aNumber asString] + ! Item was added: + ----- Method: HistogramMorph>>counts (in category 'accessing') ----- + counts + + ^ counts! Item was added: + ----- Method: HistogramMorph>>counts: (in category 'accessing') ----- + counts: anObject + + counts := anObject.! Item was added: + ----- Method: HistogramMorph>>defaultColor (in category 'initialization') ----- + defaultColor + ^ Color veryVeryLightGray! Item was added: + ----- Method: HistogramMorph>>drawBar:value:count:chartHeight:font:on: (in category 'drawing') ----- + drawBar: aRectangle value: anObject count: anInteger chartHeight: chartHeight font: aFont on: aCanvas + + | label countLabel labelWidth countWidth midX | + label := self labelFor: anObject. + countLabel := self countLabelFor: anInteger. + labelWidth := aFont widthOfString: label. + countWidth := aFont widthOfString: countLabel. + midX := aRectangle origin x + (aRectangle width // 2). + + aCanvas fillRectangle: aRectangle color: Color blue. + self drawLabel: label width: labelWidth at: (midX - (labelWidth // 2) @ chartHeight) barWidth: aRectangle width font: aFont on: aCanvas. + countWidth < aRectangle width + ifTrue: [aCanvas drawString: countLabel at: (midX - (countWidth // 2) @ (chartHeight - (3/2 * aFont height))) font: aFont color: Color lightGray]. + ! Item was added: + ----- Method: HistogramMorph>>drawDataOn: (in category 'drawing') ----- + drawDataOn: aCanvas + + | numX elementWidth offsetX font fontHeight offsetY maxY barWidth barRadius chartHeight | + font := TextStyle defaultFont. + fontHeight := font height. + numX := self limit. + maxY := self sum. + elementWidth := self width / (numX + 1). + barWidth := 2 max: (elementWidth * 0.9) floor. + barRadius := barWidth / 2. + offsetX := elementWidth / 2. + offsetY := fontHeight * 1.2 + max: (self values collect: [:value | font widthOfString: (self labelFor: value)]) max. + chartHeight := self height - offsetY. + + 0 to: (self height - offsetY) by: 20 do: [:i | + aCanvas + line: 0@i to: aCanvas clipRect width@i width: 1 color: (Color lightGray lighter alpha: 0.5)]. + + self valuesAndCountsWithIndexDo: + [:value :count :barIndex | | barMidX origin end | + barIndex <= self limit ifTrue: [ + barMidX := barIndex * elementWidth. + origin := barMidX - barRadius @ ((maxY - count) / maxY * chartHeight). + end := barMidX + barRadius @ chartHeight. + + self + drawBar: (origin corner: end) + value: value + count: count + chartHeight: chartHeight + font: font + on: aCanvas]]. + ! Item was added: + ----- Method: HistogramMorph>>drawLabel:width:at:barWidth:font:on: (in category 'drawing') ----- + drawLabel: aString width: aNumber at: aPoint barWidth: barWidth font: aFont on: aCanvas + + aNumber <= barWidth + ifTrue: [aCanvas drawString: aString at: aPoint font: aFont color: Color black] + ifFalse: [ + | c | + c := Display defaultCanvasClass extent: aNumber @ aFont height. + c drawString: aString at: 0 @ 0 font: aFont color: Color black. + aCanvas paintImage: (c form rotateBy: -90 smoothing: 3) at: aPoint].! Item was added: + ----- Method: HistogramMorph>>drawOn: (in category 'drawing') ----- + drawOn: aCanvas + | c | + self cachedForm + ifNil: + [c := Display defaultCanvasClass extent: self bounds extent. + c translateBy: self bounds origin negated + during: [:tempCanvas | super drawOn: tempCanvas]. + self drawDataOn: c. + self cachedForm: c form]. + aCanvas + cache: self bounds + using: self cachedForm + during: [:cachingCanvas | self drawDataOn: cachingCanvas]. + ! Item was added: + ----- Method: HistogramMorph>>flush (in category 'initialization') ----- + flush + + | valuesAndCounts | + self bag ifNil: [^self]. "nothing to do yet" + valuesAndCounts := self bag sortedCounts. + valuesAndCounts size < self limit + ifTrue: [self basicLimit: valuesAndCounts size]. + self values: ((valuesAndCounts collect: [:ea | ea value]) first: self limit). + self counts: ((valuesAndCounts collect: [:ea | ea key]) first: self limit). + self max: self counts max. + self sum: self counts sum. + + self flushCachedForm. + ! Item was added: + ----- Method: HistogramMorph>>flushCachedForm (in category 'initialization') ----- + flushCachedForm + + cachedForm := nil. + ! Item was added: + ----- Method: HistogramMorph>>initialize (in category 'initialization') ----- + initialize + + super initialize. + self + extent: 700 @ 400; + basicLimit: 25; + yourself.! Item was added: + ----- Method: HistogramMorph>>labelBlock (in category 'accessing') ----- + labelBlock + + ^ labelBlock! Item was added: + ----- Method: HistogramMorph>>labelBlock: (in category 'accessing') ----- + labelBlock: anObject + + labelBlock := anObject.! Item was added: + ----- Method: HistogramMorph>>labelFor: (in category 'drawing') ----- + labelFor: aValue + + ^ self labelBlock + ifNotNil: [:block | block value: aValue] + ifNil: [aValue asString] + ! Item was added: + ----- Method: HistogramMorph>>layoutChanged (in category 'layout') ----- + layoutChanged + + super layoutChanged. + cachedForm := nil. + ! Item was added: + ----- Method: HistogramMorph>>limit (in category 'accessing') ----- + limit + + ^ limit! Item was added: + ----- Method: HistogramMorph>>limit: (in category 'accessing') ----- + limit: anObject + + self basicLimit: anObject. + self flush. + self changed! Item was added: + ----- Method: HistogramMorph>>max (in category 'accessing') ----- + max + + ^ max! Item was added: + ----- Method: HistogramMorph>>max: (in category 'accessing') ----- + max: anObject + + max := anObject.! Item was added: + ----- Method: HistogramMorph>>sum (in category 'accessing') ----- + sum + + ^ sum! Item was added: + ----- Method: HistogramMorph>>sum: (in category 'accessing') ----- + sum: anObject + + sum := anObject! Item was added: + ----- Method: HistogramMorph>>values (in category 'accessing') ----- + values + + ^ values! Item was added: + ----- Method: HistogramMorph>>values: (in category 'accessing') ----- + values: anObject + + values := anObject.! Item was added: + ----- Method: HistogramMorph>>valuesAndCountsWithIndexDo: (in category 'enumeration') ----- + valuesAndCountsWithIndexDo: aBlock + + 1 to: self values size do: [:index | + aBlock + value: (self values at: index) + value: (self counts at: index) + value: index]. !

1 0

The Trunk: Graphics-topa.348.mcz
by commits＠source.squeak.org 13 Jun '16

13 Jun '16

Tobias Pape uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-topa.348.mcz ==================== Summary ==================== Name: Graphics-topa.348 Author: topa Time: 13 June 2016, 5:06:06.327909 pm UUID: c1b49cca-982f-4f98-998d-2f0df96fcdd8 Ancestors: Graphics-topa.347 Very Small fonts do no longer need descender adjustment =============== Diff against Graphics-topa.347 =============== Item was changed: ----- Method: StrikeFont>>descent (in category 'accessing') ----- descent "Answer the receiver's maximum extent of characters below the baseline." + ^descent! - ^pointSize < 9 - ifTrue: [descent-1] - ifFalse: [descent]! Item was changed: (PackageInfo named: 'Graphics') postscript: ' " Reset DejaVu to current version " + [StrikeFont initialize] value.'! - StrikeFont initialize'!

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages June 2016