hg/stx-libview: comparison XEmbedContainerView.st

equal deleted inserted replaced

-:08a809f9180a
+:c31ad6485bb1
 topView open.
 Delay waitForMilliseconds:5.
 topView
 label:(self classResources string:'XEmbedContainerView '
-, xembed embeddingWindowId address printString).
+, xembed embeddingWindowId printString).
 self == XEmbedContainerView
 ifTrue:
 [ Transcript
-show:'XEmbed Socket WID: ' , xembed embeddingWindowId address printString;
+show:'XEmbed Socket WID: ' , xembed embeddingWindowId printString;
 cr ].
 ^ xembed
 "
-Workspace open"
+Workspace open
+"
 "Modified: / 16-05-1998 / 16:53:53 / cg"
 "Created: / 30-05-2011 / 23:05:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 06-06-2011 / 18:40:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !XEmbedContainerView methodsFor:'accessing'!
 embeddingWindowId
-^ drawableId address
+^ self drawableId address
 "Created: / 06-06-2011 / 10:27:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 workarounds
 !
 createWindowX:x y:y width:w height:h
 |childWindowIds|
-childWindowIds := device childIdsOf:drawableId.
+childWindowIds := self graphicsDevice childIdsOf:self drawableId.
 childWindowIds size == 1
 ifFalse:[ self error:'I should have exactly one child'. ].
 clientViewId := childWindowIds first.
 clientView := ClientView new setContainer: self id: clientViewId.
 self sendXEmbeddedNotify.
 "Created: / 01-06-2011 / 12:56:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 02-06-2011 / 18:11:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 destroyed
 "A client just destroyed its window"
 | childWindowIds |
-childWindowIds := device childIdsOf: drawableId.
+childWindowIds := self graphicsDevice childIdsOf: self drawableId.
 childWindowIds size == 0 ifTrue:[
 device removeKnownView: clientView withId: clientViewId.
 clientViewId := nil.
 clientView := nil.
 ].
 sendXEmbedEvent: message detail: detail data1: data1 data2: data2
 clientViewId ifNil:[^self].
-(device
+(self graphicsDevice
 sendClientEvent: (device atomIDOf:'_XEMBED')
 format:32
 to:clientViewId
 propagate:false
 eventMask:nil
 "Created: / 30-05-2011 / 19:40:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 01-06-2011 / 13:04:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 sendXEmbeddedNotify
 self
 sendXEmbedEvent: XEMBED_EMBEDDED_NOTIFY
 detail: nil
-data1: drawableId
+data1: self drawableId
 data2: 0
 "Created: / 30-05-2011 / 19:42:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 "Created: / 03-04-2012 / 10:10:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 propertyChange:propertyId state:state
-propertyId == (device atomIDOf:'_XEMBED_INFO') ifTrue:[
+propertyId == (self graphicsDevice atomIDOf:'_XEMBED_INFO') ifTrue:[
 self mapUnmapAccordingToXEmbedInfo.
 ^self.
 ].
 (superView notNil and:[superView hasWorkaround: #uzbl]) ifTrue:[
-propertyId == (device atomIDOf:'WM_NORMAL_HINTS') ifTrue:[
+propertyId == (self graphicsDevice atomIDOf:'WM_NORMAL_HINTS') ifTrue:[
-device
+self graphicsDevice
-resizeWindow:drawableId
+resizeWindow:self drawableId
 width: 0  height: 0.
-device
+self graphicsDevice
-resizeWindow:drawableId
+resizeWindow:self drawableId
 width: self width - 1  height: self height - 1.
 ]
 ]
 "Created: / 01-06-2011 / 13:43:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 10-06-2011 / 23:29:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !XEmbedContainerView::ClientView methodsFor:'initialization & release'!
 destroy
 superView notNil ifTrue:[
 superView clientUnplugged: false.
 superView removeSubView:self.
 ].
-drawableId ifNotNil:[
+self drawableId notNil ifTrue:[
-device
+self graphicsDevice
-reparentWindow: drawableId to: device rootWindowId;
+reparentWindow: self drawableId to: self graphicsDevice rootWindowId;
-removeKnownView:self withId:drawableId.
+removeKnownView:self withId:self drawableId.
 ]
 "Created: / 02-06-2011 / 17:39:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 11-02-2012 / 17:56:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 initEvents
+|graphicsDevice|
-device
+graphicsDevice := self graphicsDevice.
+graphicsDevice
 setEventMask:
-((device eventMaskFor:#structureNotify) bitOr:
+((graphicsDevice eventMaskFor:#structureNotify) bitOr:
-((device eventMaskFor:#propertyChange) bitOr:
+((graphicsDevice eventMaskFor:#propertyChange) bitOr:
-(device eventMaskFor:#focusChange)))
+(graphicsDevice eventMaskFor:#focusChange)))
+in:self drawableId.
-in:drawableId.
 "Created: / 02-06-2011 / 17:37:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 setContainer: container id: wid
+self setDevice:container device id:wid gcId:nil.
-drawableId := wid.
 superView := container.
-device := container device.
 windowGroup := container windowGroup.
-device addKnownView: self withId: wid.
+self graphicsDevice addKnownView: self withId: wid.
 container add: self.
 self initEvents.
 self origin: 0.0@0.0 corner: 1.0@1.0.
 "Created: / 02-06-2011 / 17:33:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !XEmbedContainerView::ClientView methodsFor:'private'!
 mapUnmapAccordingToXEmbedInfo
 |val|
-val := device
+val := self graphicsDevice
 getProperty:(device atomIDOf:'_XEMBED_INFO')
-from:drawableId
+from:self drawableId
 delete:false.
 val ifNil:
 [ self map.
 ^ self ].
 val key == 0 ifTrue:
 ! !
 !XEmbedContainerView class methodsFor:'documentation'!
 version_CVS
-^ '$Header: /cvs/stx/stx/libview/XEmbedContainerView.st,v 1.4 2014-02-05 18:59:59 cg Exp $'
+^ '$Header: /cvs/stx/stx/libview/XEmbedContainerView.st,v 1.5 2014-02-18 17:20:21 stefan Exp $'
 !
 version_SVN
 ^ '$ Id $'
 ! !

changeset 6277	c31ad6485bb1
parent 6241	08a125ba42d2
child 6340	78263ccba8d0