hg/stx-libview: comparison DeviceGraphicsContext.st

equal deleted inserted replaced

-:b264b5ca7e35
+:81c84fab0aac
 (i.e. only 1-bits are drawn from the form).
 If its a deep form (i.e. a pixmap) the current paint
 settings are ignored and the form is drawn as-is;
 however, the mask is applied if present.
-The form should must have been allocated on the same device,
+The form should have been allocated on the same device,
 otherwise its converted here, which slows down the draw.
 No transformation or scaling is done.
 Care must be taken, that the paint color is correctly allocated
 (by sending #on: to the color) before doing so.
 Using functions other than #copy only makes sense if you are
 certain, that the colors are real colors (actually, only for
 noColor or allColor)."
 |id w h easy paintDither depth tmpForm tmpId tmpGCId
 fgId noColor allColor allBits pX pY
-mask maskId deviceForm deviceFormGCId deviceMask colorMap|
+mask maskId deviceForm deviceFormGCId deviceMask deviceMaskGcId colorMap|
 w := aForm width.
 h := aForm height.
 (w = 0 or:[h = 0]) ifTrue:[^ self].
 deviceForm isNil ifTrue:[
 Logger warning:'cannot create device-form'.
 ^self
 ].
 id := deviceForm drawableId.
-"temporary ..."
+"temporary ... what the heck is this??"
 (id isNil
 or:[aForm graphicsDevice ~~ device]) ifTrue:[
 deviceForm := deviceForm asFormOn:device.
 id := deviceForm drawableId.
 id isNil ifTrue:[
 'DeviceGraphicsContext [warning]: cannot create device-mask' errorPrintCR.
 ^self
 ].
 maskId := deviceMask drawableId.
 maskId notNil ifTrue:[
-deviceMask gcId isNil ifTrue:[deviceMask initGC].
+deviceMaskGcId := deviceMask initGC.
 allColor := Color allColor.
 allBits := allColor colorId.
 (aForm maskedPixelsAre0
 and:[depth == 1 or:[deviceForm depth == device depth]]) ifTrue:[
 setForeground:0 background:allBits in:gcId;
 setFunction:#and in:gcId;
 copyPlaneFromPixmapId:maskId
 x:0
 y:0
-gc:(deviceMask gcId)
+gc:deviceMaskGcId
 to:drawableId
 x:pX
 y:pY
 gc:gcId
 width:w
 tmpForm := Form width:w height:h depth:device depth onDevice:device.
 tmpForm isNil ifTrue:[
 'DeviceGraphicsContext [warning]: cannot create temp form' errorPrintCR.
 ^ self
 ].
-tmpForm initGC.
 tmpId := tmpForm drawableId.
-tmpGCId := tmpForm gcId.
+tmpGCId := tmpForm initGC.
 "
 fill tempform with image
 "
 depth == 1 ifTrue:[
 setForeground:allBits background:0 in:tmpGCId;
 setFunction:#and in:tmpGCId;
 copyPlaneFromPixmapId:maskId
 x:0
 y:0
-gc:(deviceMask gcId)
+gc:deviceMaskGcId
 to:tmpId
 x:0
 y:0
 gc:tmpGCId
 width:w
 setForeground:0 background:allBits in:gcId;
 setFunction:#and in:gcId;
 copyPlaneFromPixmapId:maskId
 x:0
 y:0
-gc:(deviceMask gcId)
+gc:deviceMaskGcId
 to:drawableId
 x:pX
 y:pY
 gc:gcId
 width:w
 device
 copyFromPixmapId:id
 x:0
 y:0
-gc:deviceForm gcId
+gc:deviceFormGCId
 to:drawableId
 x:pX
 y:pY
 gc:gcId
 width:w
 !DeviceGraphicsContext methodsFor:'finalization'!
 executor
 drawableType == #window ifTrue:[
-	^ DeviceWindowGCHandle basicNew
+^ DeviceWindowGCHandle basicNew
-	    setDevice:self graphicsDevice id:self drawableId gcId:self gcId parentId:parentId.
+setDevice:device id:drawableId gcId:gcId parentId:parentId.
 ] ifFalse:[
-	^ DevicePixmapGCHandle basicNew
+^ DevicePixmapGCHandle basicNew
-	    setDevice:self graphicsDevice id:self drawableId gcId:self gcId.
+setDevice:device id:drawableId gcId:gcId.
 ].
 !
 finalizationLobby
 "answer the registry used for finalization.

changeset 7752	81c84fab0aac
parent 7749	f4ad7601ae41
child 7759	45386945d6d7
child 7765	b8189ae681df