--- a/DSurface.st Fri Jan 10 19:00:38 1997 +0100
+++ b/DSurface.st Fri Jan 10 19:04:32 1997 +0100
@@ -132,7 +132,7 @@
a dithered color or bitmap or pixmap
"
bgPixmap isNil ifTrue:[
- 'DSURFACE: background not convertable - ignored' errorPrintNL.
+ 'DisplaySurface [warning]: background not convertable - ignored' errorPrintCR.
^ self
].
@@ -183,7 +183,7 @@
device setWindowBackgroundPixmap:(bgPixmap id) in:drawableId.
]
- "Modified: 12.12.1996 / 14:08:33 / cg"
+ "Modified: 10.1.1997 / 17:48:55 / cg"
!
viewBackground
@@ -285,7 +285,7 @@
cursor isNil ifTrue:[ ^ self].
id := cursor id.
id isNil ifTrue:[
- 'DSURFACE: nil cursorId ignored; shape=' errorPrint. cursor shape errorPrintNL.
+ 'DisplaySurface [warning]: nil cursorId ignored; shape=' errorPrint. cursor shape errorPrintCR.
^ self
].
device setCursor:id in:drawableId.
@@ -313,7 +313,7 @@
"
"Created: 14.12.1995 / 21:28:00 / cg"
- "Modified: 12.12.1996 / 14:08:22 / cg"
+ "Modified: 10.1.1997 / 17:48:22 / cg"
!
withCursor:aCursor do:aBlock
@@ -1700,10 +1700,10 @@
device setLastCopyBuffer:nil.
device setCopyBuffer:something.
(device setSelection:something owner:drawableId) ifFalse:[
- 'DSURFACE: selection failed' errorPrintNL
+ 'DisplaySurface [warning]: selection failed' errorPrintCR
]
- "Modified: 12.12.1996 / 14:09:17 / cg"
+ "Modified: 10.1.1997 / 17:48:34 / cg"
!
setTextSelection:something
@@ -1719,10 +1719,10 @@
s := s asStringWithCRsFrom:1 to:(s size) compressTabs:false withCR:false
].
(device setTextSelection:s owner:drawableId) ifFalse:[
- 'DSURFACE: selection failed' errorPrintNL
+ 'DisplaySurface [warning]: selection failed' errorPrintCR
]
- "Modified: 12.12.1996 / 14:08:38 / cg"
+ "Modified: 10.1.1997 / 17:48:43 / cg"
! !
!DisplaySurface methodsFor:'user notification'!
@@ -1748,5 +1748,5 @@
!DisplaySurface class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/DSurface.st,v 1.14 1996-12-12 13:09:37 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/DSurface.st,v 1.15 1997-01-10 18:02:17 cg Exp $'
! !
--- a/Depth24Image.st Fri Jan 10 19:00:38 1997 +0100
+++ b/Depth24Image.st Fri Jan 10 19:04:32 1997 +0100
@@ -520,7 +520,7 @@
blueArray at:b put:1.
nColors := nColors + 1.
(nColors > nColorCells) ifTrue:[
- 'D24IMAGE: more than ' infoPrint. nColorCells infoPrint. ' colors' infoPrintNL.
+ 'Depth24Image [info]: more than ' infoPrint. nColorCells infoPrint. ' colors' infoPrintCR.
srcIndex := dataSize + 1
]
]
@@ -923,7 +923,7 @@
form := Form width:width height:height depth:usedDeviceDepth on:aDevice.
form isNil ifTrue:[
- 'IMAGE: display bitmap creation failed' errorPrintNL.
+ 'Depth24Image [warning]: display bitmap creation failed' errorPrintCR.
^ nil
].
form initGC.
@@ -1711,5 +1711,5 @@
!Depth24Image class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.38 1997-01-10 15:10:12 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.39 1997-01-10 18:04:32 cg Exp $'
! !
--- a/Depth8Image.st Fri Jan 10 19:00:38 1997 +0100
+++ b/Depth8Image.st Fri Jan 10 19:04:32 1997 +0100
@@ -259,7 +259,7 @@
devColor isNil ifTrue:[
gcRound == 1 ifTrue:[
CollectGarbageWhenRunningOutOfColors ifTrue:[
- 'Depth24Image [info]: force GC for possible color reclamation.' infoPrintCR.
+ 'Depth8Image [info]: force GC for possible color reclamation.' infoPrintCR.
ObjectMemory incrementalGC; finalize.
devColor := color exactOn:aDevice.
].
@@ -297,7 +297,7 @@
"/ ].
fit ifFalse:[
- ('Depth24Image [info]: got %1 exact colors (out of %2)' bindWith:lastOK with:usedColors size) infoPrintCR.
+ ('Depth8Image [info]: got %1 exact colors (out of %2)' bindWith:lastOK with:usedColors size) infoPrintCR.
DitherAlgorithm == #floydSteinberg ifTrue:[
dColors := colorMap asArray collect:[:clr | clr isNil ifTrue:[clr]
ifFalse:[clr nearestOn:aDevice]].
@@ -367,7 +367,7 @@
devColor isNil ifTrue:[
gcRound == 1 ifTrue:[
CollectGarbageWhenRunningOutOfColors ifTrue:[
- 'Depth24Image [info]: force GC for possible color reclamation.' infoPrintNL.
+ 'Depth8Image [info]: force GC for possible color reclamation.' infoPrintCR.
ObjectMemory incrementalGC; finalize.
devColor := color nearestOn:aDevice.
(devColor notNil and:[(devColor deltaFrom:color) > error]) ifTrue:[
@@ -389,7 +389,7 @@
].
fit ifTrue:[
- ('Depth24Image [info]: remaining colors with error <= %1' bindWith:error) infoPrintCR.
+ ('Depth8Image [info]: remaining colors with error <= %1' bindWith:error) infoPrintCR.
].
error := error * 2.
@@ -397,7 +397,7 @@
"
break out, if the error becomes too big.
"
- 'Depth24Image [info]: hard color allocation problem - revert to b&w for remaining colors' infoPrintNL.
+ 'Depth8Image [info]: hard color allocation problem - revert to b&w for remaining colors' infoPrintNL.
"
map to b&w as a last fallback.
(should really do a dither here)
@@ -420,9 +420,9 @@
].
error > 10 ifTrue:[
- 'Depth24Image [info]: not enough colors for a reasonable image' infoPrintNL
+ 'Depth8Image [info]: not enough colors for a reasonable image' infoPrintNL
] ifFalse:[
- 'Depth24Image [info]: not enough colors for exact picture' infoPrintNL.
+ 'Depth8Image [info]: not enough colors for exact picture' infoPrintNL.
]
].
@@ -508,7 +508,7 @@
^ f
- "Modified: 10.1.1997 / 15:39:47 / cg"
+ "Modified: 10.1.1997 / 17:45:21 / cg"
! !
!Depth8Image methodsFor:'dither helpers'!
@@ -1344,5 +1344,5 @@
!Depth8Image class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.59 1997-01-10 15:09:39 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.60 1997-01-10 18:04:08 cg Exp $'
! !
--- a/DevGC.st Fri Jan 10 19:00:38 1997 +0100
+++ b/DevGC.st Fri Jan 10 19:04:32 1997 +0100
@@ -852,9 +852,9 @@
|deviceDrawable id srcGCId|
aDrawable graphicsDevice ~~ device ifTrue:[
- deviceDrawable := aDrawable asFormOn:device.
+ deviceDrawable := aDrawable asFormOn:device.
] ifFalse:[
- deviceDrawable := aDrawable
+ deviceDrawable := aDrawable
].
id := deviceDrawable id.
@@ -866,33 +866,33 @@
This will be fixed soon (no longer use device>>bitmapFromFile:).
"
id isNil ifTrue:[
- 'DEVGC: invalid bitmap copy - ignored' errorPrintNL.
- ^ self
+ 'DeviceGraphicsContext [warning]: invalid bitmap copy - ignored' errorPrintCR.
+ ^ self
].
gcId isNil ifTrue:[
- self initGC
+ self initGC
].
srcGCId := deviceDrawable gcId.
((deviceDrawable depth == 1) and:[device depth ~~ 1]) ifTrue:[
- device
- copyPlaneFromId:id
- x:srcX y:srcY gc:srcGCId
- to:drawableId
- x:dstX y:dstY gc:gcId
- width:w height:h
+ device
+ copyPlaneFromId:id
+ x:srcX y:srcY gc:srcGCId
+ to:drawableId
+ x:dstX y:dstY gc:gcId
+ width:w height:h
] ifFalse:[
- device
- copyFromId:id
- x:srcX y:srcY gc:srcGCId
- to:drawableId
- x:dstX y:dstY gc:gcId
- width:w height:h
+ device
+ copyFromId:id
+ x:srcX y:srcY gc:srcGCId
+ to:drawableId
+ x:dstX y:dstY gc:gcId
+ width:w height:h
]
- "Modified: 15.6.1996 / 15:36:38 / cg"
+ "Modified: 10.1.1997 / 17:45:52 / cg"
!
copyPlaneFrom:aDrawable x:srcX y:srcY toX:dstX y:dstY width:w height:h
@@ -905,9 +905,9 @@
|deviceDrawable id|
aDrawable graphicsDevice ~~ device ifTrue:[
- deviceDrawable := aDrawable asFormOn:device.
+ deviceDrawable := aDrawable asFormOn:device.
] ifFalse:[
- deviceDrawable := aDrawable
+ deviceDrawable := aDrawable
].
id := deviceDrawable id.
@@ -919,22 +919,22 @@
This will be fixed soon (no longer use device>>bitmapFromFile:).
"
id isNil ifTrue:[
- 'DEVGC: invalid copyPlane - ignored' errorPrintNL.
- ^ self
+ 'DeviceGraphicsContext [warning]: invalid copyPlane - ignored' errorPrintCR.
+ ^ self
].
gcId isNil ifTrue:[
- self initGC
+ self initGC
].
device
- copyPlaneFromId:id
- x:srcX y:srcY gc:(deviceDrawable gcId)
- to:drawableId
- x:dstX y:dstY gc:gcId
- width:w height:h
-
- "Modified: 15.6.1996 / 15:36:42 / cg"
+ copyPlaneFromId:id
+ x:srcX y:srcY gc:(deviceDrawable gcId)
+ to:drawableId
+ x:dstX y:dstY gc:gcId
+ width:w height:h
+
+ "Modified: 10.1.1997 / 17:46:04 / cg"
! !
!DeviceGraphicsContext methodsFor:'copying'!
@@ -1066,52 +1066,52 @@
|pX0 pY0 pX1 pY1 easy fgId bgId|
gcId isNil ifTrue:[
- self initGC
+ self initGC
].
lineStyle == #doubleDashed ifTrue:[
- "
- if bgPaint or paint is not a real color, we have to do it the hard way ...
- "
- easy := true.
- paint isColor ifFalse:[
- easy := false
- ] ifTrue:[
- fgId := paint colorId.
- fgId isNil ifTrue:[
- easy := false
- ]
- ].
- bgPaint isColor ifFalse:[
- easy := false
- ] ifTrue:[
- bgId := bgPaint colorId.
- bgId isNil ifTrue:[
- easy := false
- ]
- ].
-
- easy ifTrue:[
- ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
- device setForeground:fgId background:bgId in:gcId.
- foreground := paint.
- background := bgPaint.
- ].
- ] ifFalse:[
- 'DEVDRAW: cannot draw dashes with dithered colors' errorPrintNL
- ].
+ "
+ if bgPaint or paint is not a real color, we have to do it the hard way ...
+ "
+ easy := true.
+ paint isColor ifFalse:[
+ easy := false
+ ] ifTrue:[
+ fgId := paint colorId.
+ fgId isNil ifTrue:[
+ easy := false
+ ]
+ ].
+ bgPaint isColor ifFalse:[
+ easy := false
+ ] ifTrue:[
+ bgId := bgPaint colorId.
+ bgId isNil ifTrue:[
+ easy := false
+ ]
+ ].
+
+ easy ifTrue:[
+ ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
+ device setForeground:fgId background:bgId in:gcId.
+ foreground := paint.
+ background := bgPaint.
+ ].
+ ] ifFalse:[
+ 'DeviceGraphicsContext [warning]: cannot draw dashes with dithered colors' errorPrintCR
+ ].
].
transformation notNil ifTrue:[
- pX0 := transformation applyToX:x0.
- pY0 := transformation applyToY:y0.
- pX1 := transformation applyToX:x1.
- pY1 := transformation applyToY:y1.
+ pX0 := transformation applyToX:x0.
+ pY0 := transformation applyToY:y0.
+ pX1 := transformation applyToX:x1.
+ pY1 := transformation applyToY:y1.
] ifFalse:[
- pX0 := x0.
- pY0 := y0.
- pX1 := x1.
- pY1 := y1
+ pX0 := x0.
+ pY0 := y0.
+ pX1 := x1.
+ pY1 := y1
].
pX0 := pX0 rounded.
@@ -1121,7 +1121,7 @@
device displayLineFromX:pX0 y:pY0 toX:pX1 y:pY1 in:drawableId with:gcId
- "Modified: 13.4.1996 / 20:31:19 / cg"
+ "Modified: 10.1.1997 / 17:46:32 / cg"
!
displayOpaqueForm:formToDraw x:x y:y
@@ -1505,60 +1505,60 @@
|pX pY nW nH easy fgId bgId|
gcId isNil ifTrue:[
- self initGC
+ self initGC
].
lineStyle == #doubleDashed ifTrue:[
- "
- if bgPaint or paint is not a real color, we have to do it the hard way ...
- "
- easy := true.
- paint isColor ifFalse:[
- easy := false
- ] ifTrue:[
- fgId := paint colorId.
- fgId isNil ifTrue:[
- easy := false
- ]
- ].
- bgPaint isColor ifFalse:[
- easy := false
- ] ifTrue:[
- bgId := bgPaint colorId.
- bgId isNil ifTrue:[
- easy := false
- ]
- ].
-
- easy ifTrue:[
- ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
- device setForeground:fgId background:bgId in:gcId.
- foreground := paint.
- background := bgPaint.
- ].
- ] ifFalse:[
- 'DEVDRAW: cannot draw dashes with dithered colors' errorPrintNL
- ].
+ "
+ if bgPaint or paint is not a real color, we have to do it the hard way ...
+ "
+ easy := true.
+ paint isColor ifFalse:[
+ easy := false
+ ] ifTrue:[
+ fgId := paint colorId.
+ fgId isNil ifTrue:[
+ easy := false
+ ]
+ ].
+ bgPaint isColor ifFalse:[
+ easy := false
+ ] ifTrue:[
+ bgId := bgPaint colorId.
+ bgId isNil ifTrue:[
+ easy := false
+ ]
+ ].
+
+ easy ifTrue:[
+ ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
+ device setForeground:fgId background:bgId in:gcId.
+ foreground := paint.
+ background := bgPaint.
+ ].
+ ] ifFalse:[
+ 'DeviceGraphicsContext [warning]: cannot draw dashes with dithered colors' errorPrintCR
+ ].
].
transformation notNil ifTrue:[
- pX := transformation applyToX:x.
- pY := transformation applyToY:y.
- nW := transformation applyScaleX:w.
- nH := transformation applyScaleY:h.
- nW < 0 ifTrue:[
- nW := nW abs.
- pX := pX - nW.
- ].
- nH < 0 ifTrue:[
- nH := nH abs.
- pY := pY - nH.
- ].
+ pX := transformation applyToX:x.
+ pY := transformation applyToY:y.
+ nW := transformation applyScaleX:w.
+ nH := transformation applyScaleY:h.
+ nW < 0 ifTrue:[
+ nW := nW abs.
+ pX := pX - nW.
+ ].
+ nH < 0 ifTrue:[
+ nH := nH abs.
+ pY := pY - nH.
+ ].
] ifFalse:[
- pX := x.
- pY := y.
- nW := w.
- nH := h
+ pX := x.
+ pY := y.
+ nW := w.
+ nH := h
].
pX := pX rounded.
@@ -1572,12 +1572,12 @@
I'm not certain if is the right thing to do ...
"
device displayRectangleX:pX
- y:pY
- width:(nW - 1)
- height:(nH - 1)
- in:drawableId with:gcId
-
- "Modified: 4.6.1996 / 18:00:03 / cg"
+ y:pY
+ width:(nW - 1)
+ height:(nH - 1)
+ in:drawableId with:gcId
+
+ "Modified: 10.1.1997 / 17:46:41 / cg"
!
displayString:aString from:index1 to:index2 x:x y:y
@@ -1845,15 +1845,15 @@
id := deviceForm id.
id isNil ifTrue:[
- deviceForm := aForm asFormOn:device.
- id := deviceForm id.
- id isNil ifTrue:[
- 'DEVGC: invalid form draw - ignored' errorPrintNL.
- ^ self
- ].
+ deviceForm := aForm asFormOn:device.
+ id := deviceForm id.
+ id isNil ifTrue:[
+ 'DeviceGraphicsContext [warning]: invalid form draw - ignored' errorPrintCR.
+ ^ self
+ ].
].
gcId isNil ifTrue:[
- self initGC
+ self initGC
].
"
@@ -1863,102 +1863,102 @@
((aForm depth ~~ 1)
or:[mask notNil]) ifTrue:[
- mask notNil ifTrue:[
- mask depth == 1 ifFalse:[
- 'DEVGC: alpha channel not yet supported' errorPrintCR.
- ] ifTrue:[
- deviceMask := mask asFormOn:device.
- maskId := deviceMask id.
- maskId notNil ifTrue:[
- "
- create temp-form;
- "
- tmpForm := Form width:w height:h depth:device depth on:device.
- tmpForm initGC.
-
- "
- fill tempform with image
- "
- aForm depth == 1 ifTrue:[
- aForm colorMap notNil ifTrue:[
- device
- setForeground:((aForm colorMap at:2) on:device) colorId
- background:((aForm colorMap at:1) on:device) colorId
- in:tmpForm gcId.
- ].
- device
- copyPlaneFromId:id
- x:0 y:0 gc:gcId
- to:tmpForm id
- x:0 y:0 gc:tmpForm gcId
- width:w height:h.
- ] ifFalse:[
- device
- copyFromId:id
- x:0 y:0 gc:gcId
- to:tmpForm id
- x:0 y:0 gc:(tmpForm gcId)
- width:w height:h.
- ].
-
- allColor := Color allColor.
- allBits := allColor colorId.
-
- "
- stamp out mask in temp form
- "
- device setForeground:allBits background:0 in:tmpForm gcId.
- device setFunction:#and in:tmpForm gcId.
- device
- copyPlaneFromId:maskId
- x:0 y:0 gc:(deviceMask gcId)
- to:tmpForm id
- x:0 y:0 gc:tmpForm gcId
- width:w height:h.
-
-
- "
- stamp out mask in destination
- "
- device setForeground:0 background:allBits in:gcId.
- device setFunction:#and in:gcId.
- device
- copyPlaneFromId:maskId
- x:0 y:0 gc:(deviceMask gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
+ mask notNil ifTrue:[
+ mask depth == 1 ifFalse:[
+ 'DEVGC: alpha channel not yet supported' errorPrintCR.
+ ] ifTrue:[
+ deviceMask := mask asFormOn:device.
+ maskId := deviceMask id.
+ maskId notNil ifTrue:[
+ "
+ create temp-form;
+ "
+ tmpForm := Form width:w height:h depth:device depth on:device.
+ tmpForm initGC.
+
+ "
+ fill tempform with image
+ "
+ aForm depth == 1 ifTrue:[
+ aForm colorMap notNil ifTrue:[
+ device
+ setForeground:((aForm colorMap at:2) on:device) colorId
+ background:((aForm colorMap at:1) on:device) colorId
+ in:tmpForm gcId.
+ ].
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:gcId
+ to:tmpForm id
+ x:0 y:0 gc:tmpForm gcId
+ width:w height:h.
+ ] ifFalse:[
+ device
+ copyFromId:id
+ x:0 y:0 gc:gcId
+ to:tmpForm id
+ x:0 y:0 gc:(tmpForm gcId)
+ width:w height:h.
+ ].
+
+ allColor := Color allColor.
+ allBits := allColor colorId.
+
+ "
+ stamp out mask in temp form
+ "
+ device setForeground:allBits background:0 in:tmpForm gcId.
+ device setFunction:#and in:tmpForm gcId.
+ device
+ copyPlaneFromId:maskId
+ x:0 y:0 gc:(deviceMask gcId)
+ to:tmpForm id
+ x:0 y:0 gc:tmpForm gcId
+ width:w height:h.
+
+
+ "
+ stamp out mask in destination
+ "
+ device setForeground:0 background:allBits in:gcId.
+ device setFunction:#and in:gcId.
+ device
+ copyPlaneFromId:maskId
+ x:0 y:0 gc:(deviceMask gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
"/ Delay waitForSeconds:3.
- "
- or-in tempform-bits ...
- "
- device setFunction:#or in:gcId.
- device
- copyFromId:tmpForm id
- x:0 y:0 gc:tmpForm gcId
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
-
- foreground notNil ifTrue:[
- device setForeground:foreground colorId in:gcId.
- ].
- background notNil ifTrue:[
- device setBackground:background colorId in:gcId.
- ].
- device setFunction:function in:gcId.
- ^ self
- ]
- ]
- ].
-
- device
- copyFromId:id
- x:0 y:0 gc:deviceForm gcId
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
- ^ self
+ "
+ or-in tempform-bits ...
+ "
+ device setFunction:#or in:gcId.
+ device
+ copyFromId:tmpForm id
+ x:0 y:0 gc:tmpForm gcId
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
+
+ foreground notNil ifTrue:[
+ device setForeground:foreground colorId in:gcId.
+ ].
+ background notNil ifTrue:[
+ device setBackground:background colorId in:gcId.
+ ].
+ device setFunction:function in:gcId.
+ ^ self
+ ]
+ ]
+ ].
+
+ device
+ copyFromId:id
+ x:0 y:0 gc:deviceForm gcId
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
+ ^ self
].
"
@@ -1973,66 +1973,66 @@
"
easy := (function == #copy).
easy ifTrue:[
- paint isColor ifFalse:[
- paintDither := paint.
- easy := false
- ] ifTrue:[
- paintDither := paint ditherForm.
- paintDither notNil ifTrue:[
- easy := false.
- ]
- ].
+ paint isColor ifFalse:[
+ paintDither := paint.
+ easy := false
+ ] ifTrue:[
+ paintDither := paint ditherForm.
+ paintDither notNil ifTrue:[
+ easy := false.
+ ]
+ ].
].
allColor := Color allColor.
allBits := allColor colorId.
easy ifTrue:[
- "
- paint is a real color
- "
-
- "
- if paint color is all-0 or all-1's, we can do it in one
- operation ...
- "
- fgId := paint colorId.
-
- ((fgId ~~ ((1 bitShift:device depth)-1))
- and:[fgId ~~ allBits]) ifTrue:[
- "
- clear fg-bits ...
- "
- device setForeground:0 background:allBits in:gcId.
- device setFunction:#and in:gcId.
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
- ].
-
- fgId ~~ 0 ifTrue:[
- "
- or-in fg-bits ...
- "
- device setForeground:fgId background:0 in:gcId.
- device setFunction:#or in:gcId.
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h
- ].
- "
- flush foreground/background cache
- "
- foreground := nil.
- background := nil.
- device setFunction:function in:gcId.
- ^ self
+ "
+ paint is a real color
+ "
+
+ "
+ if paint color is all-0 or all-1's, we can do it in one
+ operation ...
+ "
+ fgId := paint colorId.
+
+ ((fgId ~~ ((1 bitShift:device depth)-1))
+ and:[fgId ~~ allBits]) ifTrue:[
+ "
+ clear fg-bits ...
+ "
+ device setForeground:0 background:allBits in:gcId.
+ device setFunction:#and in:gcId.
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
+ ].
+
+ fgId ~~ 0 ifTrue:[
+ "
+ or-in fg-bits ...
+ "
+ device setForeground:fgId background:0 in:gcId.
+ device setFunction:#or in:gcId.
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h
+ ].
+ "
+ flush foreground/background cache
+ "
+ foreground := nil.
+ background := nil.
+ device setFunction:function in:gcId.
+ ^ self
].
@@ -2063,11 +2063,11 @@
device setForeground:0 background:allBits in:gcId.
device setFunction:#and in:gcId.
device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
"
or-in temp into destination
"
@@ -2075,11 +2075,11 @@
device setFunction:#or in:gcId.
device
- copyFromId:tmpForm id
- x:0 y:0 gc:tmpForm gcId
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
+ copyFromId:tmpForm id
+ x:0 y:0 gc:tmpForm gcId
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
"
flush foreground/background cache
"
@@ -2087,7 +2087,7 @@
background := nil.
device setFunction:function in:gcId.
- "Modified: 22.10.1996 / 16:55:29 / cg"
+ "Modified: 10.1.1997 / 17:46:15 / cg"
!
displayDeviceLineFromX:x0 y:y0 toX:x1 y:y1
@@ -2127,16 +2127,16 @@
"temporary ..."
(id isNil
or:[aForm graphicsDevice ~~ device]) ifTrue:[
- deviceForm := deviceForm asFormOn:device.
- id := deviceForm id.
- id isNil ifTrue:[
- 'DEVGC: invalid form draw - ignored' errorPrintNL.
- ^ self
- ].
+ deviceForm := deviceForm asFormOn:device.
+ id := deviceForm id.
+ id isNil ifTrue:[
+ 'DeviceGraphicsContext [warning]: invalid form draw - ignored' errorPrintCR.
+ ^ self
+ ].
].
gcId isNil ifTrue:[
- self initGC
+ self initGC
].
"
@@ -2144,20 +2144,20 @@
and is always drawn opaque.
"
(aForm depth ~~ 1) ifTrue:[
- device
- copyFromId:id
- x:0 y:0 gc:deviceForm gcId
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
- ^ self
+ device
+ copyFromId:id
+ x:0 y:0 gc:deviceForm gcId
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
+ ^ self
].
"/ if no bgPaint is set, this is a non-opaque draw
bgPaint isNil ifTrue:[
- self displayDeviceForm:aForm x:x y:y.
- ^ self
+ self displayDeviceForm:aForm x:x y:y.
+ ^ self
].
"the following code is somewhat complicated, since it has to deal
@@ -2171,38 +2171,38 @@
"
easy := true.
paint isColor ifFalse:[
- easy := false
+ easy := false
] ifTrue:[
- fgId := paint colorId.
- fgId isNil ifTrue:[
- easy := false
- ]
+ fgId := paint colorId.
+ fgId isNil ifTrue:[
+ easy := false
+ ]
].
bgPaint isColor ifFalse:[
- easy := false
+ easy := false
] ifTrue:[
- bgId := bgPaint colorId.
- bgId isNil ifTrue:[
- easy := false
- ]
+ bgId := bgPaint colorId.
+ bgId isNil ifTrue:[
+ easy := false
+ ]
].
easy ifTrue:[
- "
- easy: both paint and bgPaint are real colors
- "
- ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
- device setForeground:fgId background:bgId in:gcId.
- foreground := paint.
- background := bgPaint.
- ].
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
- ^ self
+ "
+ easy: both paint and bgPaint are real colors
+ "
+ ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
+ device setForeground:fgId background:bgId in:gcId.
+ foreground := paint.
+ background := bgPaint.
+ ].
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
+ ^ self
].
"
@@ -2213,100 +2213,100 @@
deviceDepth := device depth.
(fgId notNil and:[function == #copy]) ifTrue:[
- "
- only bg is dithered; fill with bg first ...
- "
- savedPaint := paint.
- self paint:bgPaint.
- self fillDeviceRectangleX:pX y:pY width:w height:h.
- self paint:savedPaint.
-
- "
- if paint color is all-0 or all-1's, we can do it in one
- operation ...
- "
- ((fgId ~~ ((1 bitShift:deviceDepth)-1))
- and:[fgId ~~ allBits]) ifTrue:[
- "
- clear fg-bits ...
- "
- device setForeground:0 background:allBits in:gcId.
- device setFunction:#and in:gcId.
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h
- ].
-
- fgId ~~ 0 ifTrue:[
- "
- or-in fg-bits ...
- "
- device setForeground:fgId background:0 in:gcId.
- device setFunction:#or in:gcId.
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h
- ].
- "
- flush foreground/background cache
- "
- foreground := nil.
- background := nil.
- device setFunction:function in:gcId.
- ^ self
+ "
+ only bg is dithered; fill with bg first ...
+ "
+ savedPaint := paint.
+ self paint:bgPaint.
+ self fillDeviceRectangleX:pX y:pY width:w height:h.
+ self paint:savedPaint.
+
+ "
+ if paint color is all-0 or all-1's, we can do it in one
+ operation ...
+ "
+ ((fgId ~~ ((1 bitShift:deviceDepth)-1))
+ and:[fgId ~~ allBits]) ifTrue:[
+ "
+ clear fg-bits ...
+ "
+ device setForeground:0 background:allBits in:gcId.
+ device setFunction:#and in:gcId.
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h
+ ].
+
+ fgId ~~ 0 ifTrue:[
+ "
+ or-in fg-bits ...
+ "
+ device setForeground:fgId background:0 in:gcId.
+ device setFunction:#or in:gcId.
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h
+ ].
+ "
+ flush foreground/background cache
+ "
+ foreground := nil.
+ background := nil.
+ device setFunction:function in:gcId.
+ ^ self
].
(bgId notNil and:[function == #copy]) ifTrue:[
- "
- only fg is dithered; fill with fg first ...
- "
- self fillDeviceRectangleX:pX y:pY width:w height:h.
-
- "
- if paint color is all-0 or all-1's, we can do it in one
- operation ...
- "
- ((bgId ~~ ((1 bitShift:deviceDepth)-1))
- and:[bgId ~~ allBits]) ifTrue:[
- "
- clear bg-bits ...
- "
- device setForeground:allBits background:0 in:gcId.
- device setFunction:#and in:gcId.
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h
- ].
-
- "
- or-in bg-bits ...
- "
- bgId ~~ 0 ifTrue:[
- device setForeground:0 background:bgId in:gcId.
- device setFunction:#or in:gcId.
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h
- ].
- "
- flush foreground/background cache
- "
- foreground := nil.
- background := nil.
- device setFunction:function in:gcId.
- ^ self
+ "
+ only fg is dithered; fill with fg first ...
+ "
+ self fillDeviceRectangleX:pX y:pY width:w height:h.
+
+ "
+ if paint color is all-0 or all-1's, we can do it in one
+ operation ...
+ "
+ ((bgId ~~ ((1 bitShift:deviceDepth)-1))
+ and:[bgId ~~ allBits]) ifTrue:[
+ "
+ clear bg-bits ...
+ "
+ device setForeground:allBits background:0 in:gcId.
+ device setFunction:#and in:gcId.
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h
+ ].
+
+ "
+ or-in bg-bits ...
+ "
+ bgId ~~ 0 ifTrue:[
+ device setForeground:0 background:bgId in:gcId.
+ device setFunction:#or in:gcId.
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h
+ ].
+ "
+ flush foreground/background cache
+ "
+ foreground := nil.
+ background := nil.
+ device setFunction:function in:gcId.
+ ^ self
].
"
@@ -2326,8 +2326,8 @@
"
dx := dy := 0.
maskOrigin notNil ifTrue:[
- dx := maskOrigin x.
- dy := maskOrigin y
+ dx := maskOrigin x.
+ dy := maskOrigin y
].
bgForm paint:bgPaint.
@@ -2370,18 +2370,18 @@
"
device setForeground:0 background:allBits in:gcId.
device
- copyFromId:tmpForm id
- x:0 y:0 gc:tmpForm gcId
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
+ copyFromId:tmpForm id
+ x:0 y:0 gc:tmpForm gcId
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
"
flush foreground/background cache
"
foreground := nil.
background := nil.
- "Modified: 22.10.1996 / 16:48:32 / cg"
+ "Modified: 10.1.1997 / 17:46:23 / cg"
!
displayDeviceOpaqueString:aString from:index1 to:index2 in:font x:x y:y
@@ -3134,8 +3134,8 @@
"make certain Workstation is initialized - just a check - will vanish soon"
Display isNil ifTrue:[
- 'DEVDRAW: Display not initialized when first DeviceGraphicsContext created' errorPrintNL.
- Workstation initialize
+ 'DeviceGraphicsContext [warning]: Display not initialized when first DeviceGraphicsContext created' errorPrintCR.
+ Workstation initialize
].
super initialize.
@@ -3143,7 +3143,7 @@
foreground isNil ifTrue:[foreground := Black].
background isNil ifTrue:[background := White].
- "Modified: 17.7.1996 / 12:59:47 / cg"
+ "Modified: 10.1.1997 / 17:46:51 / cg"
!
prepareForReinit
@@ -3179,8 +3179,10 @@
!
reinitialize
- 'reinit of ' errorPrint. self classNameWithArticle errorPrint.
- ' failed' errorPrintNL
+ 'DeviceGraphicsContext [warning]: reinit of ' errorPrint. self classNameWithArticle errorPrint.
+ ' failed' errorPrintCR
+
+ "Modified: 10.1.1997 / 17:47:06 / cg"
!
releaseGC
@@ -3347,6 +3349,6 @@
!DeviceGraphicsContext class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/DevGC.st,v 1.23 1996-12-17 19:41:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/DevGC.st,v 1.24 1997-01-10 18:03:35 cg Exp $'
! !
DeviceGraphicsContext initialize!
--- a/DevWorkst.st Fri Jan 10 19:00:38 1997 +0100
+++ b/DevWorkst.st Fri Jan 10 19:04:32 1997 +0100
@@ -344,7 +344,7 @@
"an error in the devices low level code (typically Xlib or XtLib)
This is invoked via
- XError->errorInterrupt:#DisplayError->registeredErrorInterruptHandlers
+ XError->errorInterrupt:#DisplayError->registeredErrorInterruptHandlers
looks if a signal handler for DeviceErrorSignal is present,
and - if so raises the signal. If the signal not handled, simply output a
@@ -356,20 +356,22 @@
badId := self resourceIdOfLastError.
badId ~~ 0 ifTrue:[
- badResource := self resourceOfId:badId.
+ badResource := self resourceOfId:badId.
].
msg := 'Display error: ' , (self lastErrorString).
DeviceErrorSignal isHandled ifFalse:[
- ErrorPrinting ifTrue:[msg errorPrintNL].
- ^ self
+ ErrorPrinting ifTrue:[
+ ('DeviceWorkstation [error]: ' , msg) errorPrintCR
+ ].
+ ^ self
].
^ DeviceErrorSignal
- raiseRequestWith:badResource
- errorString:msg
-
- "Modified: 24.4.1996 / 19:35:12 / cg"
+ raiseRequestWith:badResource
+ errorString:msg
+
+ "Modified: 10.1.1997 / 17:48:06 / cg"
!
errorPrinting
@@ -4821,6 +4823,6 @@
!DeviceWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/DevWorkst.st,v 1.147 1997-01-10 15:14:48 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/DevWorkst.st,v 1.148 1997-01-10 18:02:52 cg Exp $'
! !
DeviceWorkstation initialize!
--- a/DeviceGraphicsContext.st Fri Jan 10 19:00:38 1997 +0100
+++ b/DeviceGraphicsContext.st Fri Jan 10 19:04:32 1997 +0100
@@ -852,9 +852,9 @@
|deviceDrawable id srcGCId|
aDrawable graphicsDevice ~~ device ifTrue:[
- deviceDrawable := aDrawable asFormOn:device.
+ deviceDrawable := aDrawable asFormOn:device.
] ifFalse:[
- deviceDrawable := aDrawable
+ deviceDrawable := aDrawable
].
id := deviceDrawable id.
@@ -866,33 +866,33 @@
This will be fixed soon (no longer use device>>bitmapFromFile:).
"
id isNil ifTrue:[
- 'DEVGC: invalid bitmap copy - ignored' errorPrintNL.
- ^ self
+ 'DeviceGraphicsContext [warning]: invalid bitmap copy - ignored' errorPrintCR.
+ ^ self
].
gcId isNil ifTrue:[
- self initGC
+ self initGC
].
srcGCId := deviceDrawable gcId.
((deviceDrawable depth == 1) and:[device depth ~~ 1]) ifTrue:[
- device
- copyPlaneFromId:id
- x:srcX y:srcY gc:srcGCId
- to:drawableId
- x:dstX y:dstY gc:gcId
- width:w height:h
+ device
+ copyPlaneFromId:id
+ x:srcX y:srcY gc:srcGCId
+ to:drawableId
+ x:dstX y:dstY gc:gcId
+ width:w height:h
] ifFalse:[
- device
- copyFromId:id
- x:srcX y:srcY gc:srcGCId
- to:drawableId
- x:dstX y:dstY gc:gcId
- width:w height:h
+ device
+ copyFromId:id
+ x:srcX y:srcY gc:srcGCId
+ to:drawableId
+ x:dstX y:dstY gc:gcId
+ width:w height:h
]
- "Modified: 15.6.1996 / 15:36:38 / cg"
+ "Modified: 10.1.1997 / 17:45:52 / cg"
!
copyPlaneFrom:aDrawable x:srcX y:srcY toX:dstX y:dstY width:w height:h
@@ -905,9 +905,9 @@
|deviceDrawable id|
aDrawable graphicsDevice ~~ device ifTrue:[
- deviceDrawable := aDrawable asFormOn:device.
+ deviceDrawable := aDrawable asFormOn:device.
] ifFalse:[
- deviceDrawable := aDrawable
+ deviceDrawable := aDrawable
].
id := deviceDrawable id.
@@ -919,22 +919,22 @@
This will be fixed soon (no longer use device>>bitmapFromFile:).
"
id isNil ifTrue:[
- 'DEVGC: invalid copyPlane - ignored' errorPrintNL.
- ^ self
+ 'DeviceGraphicsContext [warning]: invalid copyPlane - ignored' errorPrintCR.
+ ^ self
].
gcId isNil ifTrue:[
- self initGC
+ self initGC
].
device
- copyPlaneFromId:id
- x:srcX y:srcY gc:(deviceDrawable gcId)
- to:drawableId
- x:dstX y:dstY gc:gcId
- width:w height:h
-
- "Modified: 15.6.1996 / 15:36:42 / cg"
+ copyPlaneFromId:id
+ x:srcX y:srcY gc:(deviceDrawable gcId)
+ to:drawableId
+ x:dstX y:dstY gc:gcId
+ width:w height:h
+
+ "Modified: 10.1.1997 / 17:46:04 / cg"
! !
!DeviceGraphicsContext methodsFor:'copying'!
@@ -1066,52 +1066,52 @@
|pX0 pY0 pX1 pY1 easy fgId bgId|
gcId isNil ifTrue:[
- self initGC
+ self initGC
].
lineStyle == #doubleDashed ifTrue:[
- "
- if bgPaint or paint is not a real color, we have to do it the hard way ...
- "
- easy := true.
- paint isColor ifFalse:[
- easy := false
- ] ifTrue:[
- fgId := paint colorId.
- fgId isNil ifTrue:[
- easy := false
- ]
- ].
- bgPaint isColor ifFalse:[
- easy := false
- ] ifTrue:[
- bgId := bgPaint colorId.
- bgId isNil ifTrue:[
- easy := false
- ]
- ].
-
- easy ifTrue:[
- ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
- device setForeground:fgId background:bgId in:gcId.
- foreground := paint.
- background := bgPaint.
- ].
- ] ifFalse:[
- 'DEVDRAW: cannot draw dashes with dithered colors' errorPrintNL
- ].
+ "
+ if bgPaint or paint is not a real color, we have to do it the hard way ...
+ "
+ easy := true.
+ paint isColor ifFalse:[
+ easy := false
+ ] ifTrue:[
+ fgId := paint colorId.
+ fgId isNil ifTrue:[
+ easy := false
+ ]
+ ].
+ bgPaint isColor ifFalse:[
+ easy := false
+ ] ifTrue:[
+ bgId := bgPaint colorId.
+ bgId isNil ifTrue:[
+ easy := false
+ ]
+ ].
+
+ easy ifTrue:[
+ ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
+ device setForeground:fgId background:bgId in:gcId.
+ foreground := paint.
+ background := bgPaint.
+ ].
+ ] ifFalse:[
+ 'DeviceGraphicsContext [warning]: cannot draw dashes with dithered colors' errorPrintCR
+ ].
].
transformation notNil ifTrue:[
- pX0 := transformation applyToX:x0.
- pY0 := transformation applyToY:y0.
- pX1 := transformation applyToX:x1.
- pY1 := transformation applyToY:y1.
+ pX0 := transformation applyToX:x0.
+ pY0 := transformation applyToY:y0.
+ pX1 := transformation applyToX:x1.
+ pY1 := transformation applyToY:y1.
] ifFalse:[
- pX0 := x0.
- pY0 := y0.
- pX1 := x1.
- pY1 := y1
+ pX0 := x0.
+ pY0 := y0.
+ pX1 := x1.
+ pY1 := y1
].
pX0 := pX0 rounded.
@@ -1121,7 +1121,7 @@
device displayLineFromX:pX0 y:pY0 toX:pX1 y:pY1 in:drawableId with:gcId
- "Modified: 13.4.1996 / 20:31:19 / cg"
+ "Modified: 10.1.1997 / 17:46:32 / cg"
!
displayOpaqueForm:formToDraw x:x y:y
@@ -1505,60 +1505,60 @@
|pX pY nW nH easy fgId bgId|
gcId isNil ifTrue:[
- self initGC
+ self initGC
].
lineStyle == #doubleDashed ifTrue:[
- "
- if bgPaint or paint is not a real color, we have to do it the hard way ...
- "
- easy := true.
- paint isColor ifFalse:[
- easy := false
- ] ifTrue:[
- fgId := paint colorId.
- fgId isNil ifTrue:[
- easy := false
- ]
- ].
- bgPaint isColor ifFalse:[
- easy := false
- ] ifTrue:[
- bgId := bgPaint colorId.
- bgId isNil ifTrue:[
- easy := false
- ]
- ].
-
- easy ifTrue:[
- ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
- device setForeground:fgId background:bgId in:gcId.
- foreground := paint.
- background := bgPaint.
- ].
- ] ifFalse:[
- 'DEVDRAW: cannot draw dashes with dithered colors' errorPrintNL
- ].
+ "
+ if bgPaint or paint is not a real color, we have to do it the hard way ...
+ "
+ easy := true.
+ paint isColor ifFalse:[
+ easy := false
+ ] ifTrue:[
+ fgId := paint colorId.
+ fgId isNil ifTrue:[
+ easy := false
+ ]
+ ].
+ bgPaint isColor ifFalse:[
+ easy := false
+ ] ifTrue:[
+ bgId := bgPaint colorId.
+ bgId isNil ifTrue:[
+ easy := false
+ ]
+ ].
+
+ easy ifTrue:[
+ ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
+ device setForeground:fgId background:bgId in:gcId.
+ foreground := paint.
+ background := bgPaint.
+ ].
+ ] ifFalse:[
+ 'DeviceGraphicsContext [warning]: cannot draw dashes with dithered colors' errorPrintCR
+ ].
].
transformation notNil ifTrue:[
- pX := transformation applyToX:x.
- pY := transformation applyToY:y.
- nW := transformation applyScaleX:w.
- nH := transformation applyScaleY:h.
- nW < 0 ifTrue:[
- nW := nW abs.
- pX := pX - nW.
- ].
- nH < 0 ifTrue:[
- nH := nH abs.
- pY := pY - nH.
- ].
+ pX := transformation applyToX:x.
+ pY := transformation applyToY:y.
+ nW := transformation applyScaleX:w.
+ nH := transformation applyScaleY:h.
+ nW < 0 ifTrue:[
+ nW := nW abs.
+ pX := pX - nW.
+ ].
+ nH < 0 ifTrue:[
+ nH := nH abs.
+ pY := pY - nH.
+ ].
] ifFalse:[
- pX := x.
- pY := y.
- nW := w.
- nH := h
+ pX := x.
+ pY := y.
+ nW := w.
+ nH := h
].
pX := pX rounded.
@@ -1572,12 +1572,12 @@
I'm not certain if is the right thing to do ...
"
device displayRectangleX:pX
- y:pY
- width:(nW - 1)
- height:(nH - 1)
- in:drawableId with:gcId
-
- "Modified: 4.6.1996 / 18:00:03 / cg"
+ y:pY
+ width:(nW - 1)
+ height:(nH - 1)
+ in:drawableId with:gcId
+
+ "Modified: 10.1.1997 / 17:46:41 / cg"
!
displayString:aString from:index1 to:index2 x:x y:y
@@ -1845,15 +1845,15 @@
id := deviceForm id.
id isNil ifTrue:[
- deviceForm := aForm asFormOn:device.
- id := deviceForm id.
- id isNil ifTrue:[
- 'DEVGC: invalid form draw - ignored' errorPrintNL.
- ^ self
- ].
+ deviceForm := aForm asFormOn:device.
+ id := deviceForm id.
+ id isNil ifTrue:[
+ 'DeviceGraphicsContext [warning]: invalid form draw - ignored' errorPrintCR.
+ ^ self
+ ].
].
gcId isNil ifTrue:[
- self initGC
+ self initGC
].
"
@@ -1863,102 +1863,102 @@
((aForm depth ~~ 1)
or:[mask notNil]) ifTrue:[
- mask notNil ifTrue:[
- mask depth == 1 ifFalse:[
- 'DEVGC: alpha channel not yet supported' errorPrintCR.
- ] ifTrue:[
- deviceMask := mask asFormOn:device.
- maskId := deviceMask id.
- maskId notNil ifTrue:[
- "
- create temp-form;
- "
- tmpForm := Form width:w height:h depth:device depth on:device.
- tmpForm initGC.
-
- "
- fill tempform with image
- "
- aForm depth == 1 ifTrue:[
- aForm colorMap notNil ifTrue:[
- device
- setForeground:((aForm colorMap at:2) on:device) colorId
- background:((aForm colorMap at:1) on:device) colorId
- in:tmpForm gcId.
- ].
- device
- copyPlaneFromId:id
- x:0 y:0 gc:gcId
- to:tmpForm id
- x:0 y:0 gc:tmpForm gcId
- width:w height:h.
- ] ifFalse:[
- device
- copyFromId:id
- x:0 y:0 gc:gcId
- to:tmpForm id
- x:0 y:0 gc:(tmpForm gcId)
- width:w height:h.
- ].
-
- allColor := Color allColor.
- allBits := allColor colorId.
-
- "
- stamp out mask in temp form
- "
- device setForeground:allBits background:0 in:tmpForm gcId.
- device setFunction:#and in:tmpForm gcId.
- device
- copyPlaneFromId:maskId
- x:0 y:0 gc:(deviceMask gcId)
- to:tmpForm id
- x:0 y:0 gc:tmpForm gcId
- width:w height:h.
-
-
- "
- stamp out mask in destination
- "
- device setForeground:0 background:allBits in:gcId.
- device setFunction:#and in:gcId.
- device
- copyPlaneFromId:maskId
- x:0 y:0 gc:(deviceMask gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
+ mask notNil ifTrue:[
+ mask depth == 1 ifFalse:[
+ 'DEVGC: alpha channel not yet supported' errorPrintCR.
+ ] ifTrue:[
+ deviceMask := mask asFormOn:device.
+ maskId := deviceMask id.
+ maskId notNil ifTrue:[
+ "
+ create temp-form;
+ "
+ tmpForm := Form width:w height:h depth:device depth on:device.
+ tmpForm initGC.
+
+ "
+ fill tempform with image
+ "
+ aForm depth == 1 ifTrue:[
+ aForm colorMap notNil ifTrue:[
+ device
+ setForeground:((aForm colorMap at:2) on:device) colorId
+ background:((aForm colorMap at:1) on:device) colorId
+ in:tmpForm gcId.
+ ].
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:gcId
+ to:tmpForm id
+ x:0 y:0 gc:tmpForm gcId
+ width:w height:h.
+ ] ifFalse:[
+ device
+ copyFromId:id
+ x:0 y:0 gc:gcId
+ to:tmpForm id
+ x:0 y:0 gc:(tmpForm gcId)
+ width:w height:h.
+ ].
+
+ allColor := Color allColor.
+ allBits := allColor colorId.
+
+ "
+ stamp out mask in temp form
+ "
+ device setForeground:allBits background:0 in:tmpForm gcId.
+ device setFunction:#and in:tmpForm gcId.
+ device
+ copyPlaneFromId:maskId
+ x:0 y:0 gc:(deviceMask gcId)
+ to:tmpForm id
+ x:0 y:0 gc:tmpForm gcId
+ width:w height:h.
+
+
+ "
+ stamp out mask in destination
+ "
+ device setForeground:0 background:allBits in:gcId.
+ device setFunction:#and in:gcId.
+ device
+ copyPlaneFromId:maskId
+ x:0 y:0 gc:(deviceMask gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
"/ Delay waitForSeconds:3.
- "
- or-in tempform-bits ...
- "
- device setFunction:#or in:gcId.
- device
- copyFromId:tmpForm id
- x:0 y:0 gc:tmpForm gcId
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
-
- foreground notNil ifTrue:[
- device setForeground:foreground colorId in:gcId.
- ].
- background notNil ifTrue:[
- device setBackground:background colorId in:gcId.
- ].
- device setFunction:function in:gcId.
- ^ self
- ]
- ]
- ].
-
- device
- copyFromId:id
- x:0 y:0 gc:deviceForm gcId
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
- ^ self
+ "
+ or-in tempform-bits ...
+ "
+ device setFunction:#or in:gcId.
+ device
+ copyFromId:tmpForm id
+ x:0 y:0 gc:tmpForm gcId
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
+
+ foreground notNil ifTrue:[
+ device setForeground:foreground colorId in:gcId.
+ ].
+ background notNil ifTrue:[
+ device setBackground:background colorId in:gcId.
+ ].
+ device setFunction:function in:gcId.
+ ^ self
+ ]
+ ]
+ ].
+
+ device
+ copyFromId:id
+ x:0 y:0 gc:deviceForm gcId
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
+ ^ self
].
"
@@ -1973,66 +1973,66 @@
"
easy := (function == #copy).
easy ifTrue:[
- paint isColor ifFalse:[
- paintDither := paint.
- easy := false
- ] ifTrue:[
- paintDither := paint ditherForm.
- paintDither notNil ifTrue:[
- easy := false.
- ]
- ].
+ paint isColor ifFalse:[
+ paintDither := paint.
+ easy := false
+ ] ifTrue:[
+ paintDither := paint ditherForm.
+ paintDither notNil ifTrue:[
+ easy := false.
+ ]
+ ].
].
allColor := Color allColor.
allBits := allColor colorId.
easy ifTrue:[
- "
- paint is a real color
- "
-
- "
- if paint color is all-0 or all-1's, we can do it in one
- operation ...
- "
- fgId := paint colorId.
-
- ((fgId ~~ ((1 bitShift:device depth)-1))
- and:[fgId ~~ allBits]) ifTrue:[
- "
- clear fg-bits ...
- "
- device setForeground:0 background:allBits in:gcId.
- device setFunction:#and in:gcId.
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
- ].
-
- fgId ~~ 0 ifTrue:[
- "
- or-in fg-bits ...
- "
- device setForeground:fgId background:0 in:gcId.
- device setFunction:#or in:gcId.
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h
- ].
- "
- flush foreground/background cache
- "
- foreground := nil.
- background := nil.
- device setFunction:function in:gcId.
- ^ self
+ "
+ paint is a real color
+ "
+
+ "
+ if paint color is all-0 or all-1's, we can do it in one
+ operation ...
+ "
+ fgId := paint colorId.
+
+ ((fgId ~~ ((1 bitShift:device depth)-1))
+ and:[fgId ~~ allBits]) ifTrue:[
+ "
+ clear fg-bits ...
+ "
+ device setForeground:0 background:allBits in:gcId.
+ device setFunction:#and in:gcId.
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
+ ].
+
+ fgId ~~ 0 ifTrue:[
+ "
+ or-in fg-bits ...
+ "
+ device setForeground:fgId background:0 in:gcId.
+ device setFunction:#or in:gcId.
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h
+ ].
+ "
+ flush foreground/background cache
+ "
+ foreground := nil.
+ background := nil.
+ device setFunction:function in:gcId.
+ ^ self
].
@@ -2063,11 +2063,11 @@
device setForeground:0 background:allBits in:gcId.
device setFunction:#and in:gcId.
device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
"
or-in temp into destination
"
@@ -2075,11 +2075,11 @@
device setFunction:#or in:gcId.
device
- copyFromId:tmpForm id
- x:0 y:0 gc:tmpForm gcId
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
+ copyFromId:tmpForm id
+ x:0 y:0 gc:tmpForm gcId
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
"
flush foreground/background cache
"
@@ -2087,7 +2087,7 @@
background := nil.
device setFunction:function in:gcId.
- "Modified: 22.10.1996 / 16:55:29 / cg"
+ "Modified: 10.1.1997 / 17:46:15 / cg"
!
displayDeviceLineFromX:x0 y:y0 toX:x1 y:y1
@@ -2127,16 +2127,16 @@
"temporary ..."
(id isNil
or:[aForm graphicsDevice ~~ device]) ifTrue:[
- deviceForm := deviceForm asFormOn:device.
- id := deviceForm id.
- id isNil ifTrue:[
- 'DEVGC: invalid form draw - ignored' errorPrintNL.
- ^ self
- ].
+ deviceForm := deviceForm asFormOn:device.
+ id := deviceForm id.
+ id isNil ifTrue:[
+ 'DeviceGraphicsContext [warning]: invalid form draw - ignored' errorPrintCR.
+ ^ self
+ ].
].
gcId isNil ifTrue:[
- self initGC
+ self initGC
].
"
@@ -2144,20 +2144,20 @@
and is always drawn opaque.
"
(aForm depth ~~ 1) ifTrue:[
- device
- copyFromId:id
- x:0 y:0 gc:deviceForm gcId
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
- ^ self
+ device
+ copyFromId:id
+ x:0 y:0 gc:deviceForm gcId
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
+ ^ self
].
"/ if no bgPaint is set, this is a non-opaque draw
bgPaint isNil ifTrue:[
- self displayDeviceForm:aForm x:x y:y.
- ^ self
+ self displayDeviceForm:aForm x:x y:y.
+ ^ self
].
"the following code is somewhat complicated, since it has to deal
@@ -2171,38 +2171,38 @@
"
easy := true.
paint isColor ifFalse:[
- easy := false
+ easy := false
] ifTrue:[
- fgId := paint colorId.
- fgId isNil ifTrue:[
- easy := false
- ]
+ fgId := paint colorId.
+ fgId isNil ifTrue:[
+ easy := false
+ ]
].
bgPaint isColor ifFalse:[
- easy := false
+ easy := false
] ifTrue:[
- bgId := bgPaint colorId.
- bgId isNil ifTrue:[
- easy := false
- ]
+ bgId := bgPaint colorId.
+ bgId isNil ifTrue:[
+ easy := false
+ ]
].
easy ifTrue:[
- "
- easy: both paint and bgPaint are real colors
- "
- ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
- device setForeground:fgId background:bgId in:gcId.
- foreground := paint.
- background := bgPaint.
- ].
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
- ^ self
+ "
+ easy: both paint and bgPaint are real colors
+ "
+ ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
+ device setForeground:fgId background:bgId in:gcId.
+ foreground := paint.
+ background := bgPaint.
+ ].
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
+ ^ self
].
"
@@ -2213,100 +2213,100 @@
deviceDepth := device depth.
(fgId notNil and:[function == #copy]) ifTrue:[
- "
- only bg is dithered; fill with bg first ...
- "
- savedPaint := paint.
- self paint:bgPaint.
- self fillDeviceRectangleX:pX y:pY width:w height:h.
- self paint:savedPaint.
-
- "
- if paint color is all-0 or all-1's, we can do it in one
- operation ...
- "
- ((fgId ~~ ((1 bitShift:deviceDepth)-1))
- and:[fgId ~~ allBits]) ifTrue:[
- "
- clear fg-bits ...
- "
- device setForeground:0 background:allBits in:gcId.
- device setFunction:#and in:gcId.
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h
- ].
-
- fgId ~~ 0 ifTrue:[
- "
- or-in fg-bits ...
- "
- device setForeground:fgId background:0 in:gcId.
- device setFunction:#or in:gcId.
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h
- ].
- "
- flush foreground/background cache
- "
- foreground := nil.
- background := nil.
- device setFunction:function in:gcId.
- ^ self
+ "
+ only bg is dithered; fill with bg first ...
+ "
+ savedPaint := paint.
+ self paint:bgPaint.
+ self fillDeviceRectangleX:pX y:pY width:w height:h.
+ self paint:savedPaint.
+
+ "
+ if paint color is all-0 or all-1's, we can do it in one
+ operation ...
+ "
+ ((fgId ~~ ((1 bitShift:deviceDepth)-1))
+ and:[fgId ~~ allBits]) ifTrue:[
+ "
+ clear fg-bits ...
+ "
+ device setForeground:0 background:allBits in:gcId.
+ device setFunction:#and in:gcId.
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h
+ ].
+
+ fgId ~~ 0 ifTrue:[
+ "
+ or-in fg-bits ...
+ "
+ device setForeground:fgId background:0 in:gcId.
+ device setFunction:#or in:gcId.
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h
+ ].
+ "
+ flush foreground/background cache
+ "
+ foreground := nil.
+ background := nil.
+ device setFunction:function in:gcId.
+ ^ self
].
(bgId notNil and:[function == #copy]) ifTrue:[
- "
- only fg is dithered; fill with fg first ...
- "
- self fillDeviceRectangleX:pX y:pY width:w height:h.
-
- "
- if paint color is all-0 or all-1's, we can do it in one
- operation ...
- "
- ((bgId ~~ ((1 bitShift:deviceDepth)-1))
- and:[bgId ~~ allBits]) ifTrue:[
- "
- clear bg-bits ...
- "
- device setForeground:allBits background:0 in:gcId.
- device setFunction:#and in:gcId.
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h
- ].
-
- "
- or-in bg-bits ...
- "
- bgId ~~ 0 ifTrue:[
- device setForeground:0 background:bgId in:gcId.
- device setFunction:#or in:gcId.
- device
- copyPlaneFromId:id
- x:0 y:0 gc:(deviceForm gcId)
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h
- ].
- "
- flush foreground/background cache
- "
- foreground := nil.
- background := nil.
- device setFunction:function in:gcId.
- ^ self
+ "
+ only fg is dithered; fill with fg first ...
+ "
+ self fillDeviceRectangleX:pX y:pY width:w height:h.
+
+ "
+ if paint color is all-0 or all-1's, we can do it in one
+ operation ...
+ "
+ ((bgId ~~ ((1 bitShift:deviceDepth)-1))
+ and:[bgId ~~ allBits]) ifTrue:[
+ "
+ clear bg-bits ...
+ "
+ device setForeground:allBits background:0 in:gcId.
+ device setFunction:#and in:gcId.
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h
+ ].
+
+ "
+ or-in bg-bits ...
+ "
+ bgId ~~ 0 ifTrue:[
+ device setForeground:0 background:bgId in:gcId.
+ device setFunction:#or in:gcId.
+ device
+ copyPlaneFromId:id
+ x:0 y:0 gc:(deviceForm gcId)
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h
+ ].
+ "
+ flush foreground/background cache
+ "
+ foreground := nil.
+ background := nil.
+ device setFunction:function in:gcId.
+ ^ self
].
"
@@ -2326,8 +2326,8 @@
"
dx := dy := 0.
maskOrigin notNil ifTrue:[
- dx := maskOrigin x.
- dy := maskOrigin y
+ dx := maskOrigin x.
+ dy := maskOrigin y
].
bgForm paint:bgPaint.
@@ -2370,18 +2370,18 @@
"
device setForeground:0 background:allBits in:gcId.
device
- copyFromId:tmpForm id
- x:0 y:0 gc:tmpForm gcId
- to:drawableId
- x:pX y:pY gc:gcId
- width:w height:h.
+ copyFromId:tmpForm id
+ x:0 y:0 gc:tmpForm gcId
+ to:drawableId
+ x:pX y:pY gc:gcId
+ width:w height:h.
"
flush foreground/background cache
"
foreground := nil.
background := nil.
- "Modified: 22.10.1996 / 16:48:32 / cg"
+ "Modified: 10.1.1997 / 17:46:23 / cg"
!
displayDeviceOpaqueString:aString from:index1 to:index2 in:font x:x y:y
@@ -3134,8 +3134,8 @@
"make certain Workstation is initialized - just a check - will vanish soon"
Display isNil ifTrue:[
- 'DEVDRAW: Display not initialized when first DeviceGraphicsContext created' errorPrintNL.
- Workstation initialize
+ 'DeviceGraphicsContext [warning]: Display not initialized when first DeviceGraphicsContext created' errorPrintCR.
+ Workstation initialize
].
super initialize.
@@ -3143,7 +3143,7 @@
foreground isNil ifTrue:[foreground := Black].
background isNil ifTrue:[background := White].
- "Modified: 17.7.1996 / 12:59:47 / cg"
+ "Modified: 10.1.1997 / 17:46:51 / cg"
!
prepareForReinit
@@ -3179,8 +3179,10 @@
!
reinitialize
- 'reinit of ' errorPrint. self classNameWithArticle errorPrint.
- ' failed' errorPrintNL
+ 'DeviceGraphicsContext [warning]: reinit of ' errorPrint. self classNameWithArticle errorPrint.
+ ' failed' errorPrintCR
+
+ "Modified: 10.1.1997 / 17:47:06 / cg"
!
releaseGC
@@ -3347,6 +3349,6 @@
!DeviceGraphicsContext class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/DeviceGraphicsContext.st,v 1.23 1996-12-17 19:41:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/DeviceGraphicsContext.st,v 1.24 1997-01-10 18:03:35 cg Exp $'
! !
DeviceGraphicsContext initialize!
--- a/DeviceWorkstation.st Fri Jan 10 19:00:38 1997 +0100
+++ b/DeviceWorkstation.st Fri Jan 10 19:04:32 1997 +0100
@@ -344,7 +344,7 @@
"an error in the devices low level code (typically Xlib or XtLib)
This is invoked via
- XError->errorInterrupt:#DisplayError->registeredErrorInterruptHandlers
+ XError->errorInterrupt:#DisplayError->registeredErrorInterruptHandlers
looks if a signal handler for DeviceErrorSignal is present,
and - if so raises the signal. If the signal not handled, simply output a
@@ -356,20 +356,22 @@
badId := self resourceIdOfLastError.
badId ~~ 0 ifTrue:[
- badResource := self resourceOfId:badId.
+ badResource := self resourceOfId:badId.
].
msg := 'Display error: ' , (self lastErrorString).
DeviceErrorSignal isHandled ifFalse:[
- ErrorPrinting ifTrue:[msg errorPrintNL].
- ^ self
+ ErrorPrinting ifTrue:[
+ ('DeviceWorkstation [error]: ' , msg) errorPrintCR
+ ].
+ ^ self
].
^ DeviceErrorSignal
- raiseRequestWith:badResource
- errorString:msg
-
- "Modified: 24.4.1996 / 19:35:12 / cg"
+ raiseRequestWith:badResource
+ errorString:msg
+
+ "Modified: 10.1.1997 / 17:48:06 / cg"
!
errorPrinting
@@ -4821,6 +4823,6 @@
!DeviceWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.147 1997-01-10 15:14:48 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.148 1997-01-10 18:02:52 cg Exp $'
! !
DeviceWorkstation initialize!
--- a/DisplaySurface.st Fri Jan 10 19:00:38 1997 +0100
+++ b/DisplaySurface.st Fri Jan 10 19:04:32 1997 +0100
@@ -132,7 +132,7 @@
a dithered color or bitmap or pixmap
"
bgPixmap isNil ifTrue:[
- 'DSURFACE: background not convertable - ignored' errorPrintNL.
+ 'DisplaySurface [warning]: background not convertable - ignored' errorPrintCR.
^ self
].
@@ -183,7 +183,7 @@
device setWindowBackgroundPixmap:(bgPixmap id) in:drawableId.
]
- "Modified: 12.12.1996 / 14:08:33 / cg"
+ "Modified: 10.1.1997 / 17:48:55 / cg"
!
viewBackground
@@ -285,7 +285,7 @@
cursor isNil ifTrue:[ ^ self].
id := cursor id.
id isNil ifTrue:[
- 'DSURFACE: nil cursorId ignored; shape=' errorPrint. cursor shape errorPrintNL.
+ 'DisplaySurface [warning]: nil cursorId ignored; shape=' errorPrint. cursor shape errorPrintCR.
^ self
].
device setCursor:id in:drawableId.
@@ -313,7 +313,7 @@
"
"Created: 14.12.1995 / 21:28:00 / cg"
- "Modified: 12.12.1996 / 14:08:22 / cg"
+ "Modified: 10.1.1997 / 17:48:22 / cg"
!
withCursor:aCursor do:aBlock
@@ -1700,10 +1700,10 @@
device setLastCopyBuffer:nil.
device setCopyBuffer:something.
(device setSelection:something owner:drawableId) ifFalse:[
- 'DSURFACE: selection failed' errorPrintNL
+ 'DisplaySurface [warning]: selection failed' errorPrintCR
]
- "Modified: 12.12.1996 / 14:09:17 / cg"
+ "Modified: 10.1.1997 / 17:48:34 / cg"
!
setTextSelection:something
@@ -1719,10 +1719,10 @@
s := s asStringWithCRsFrom:1 to:(s size) compressTabs:false withCR:false
].
(device setTextSelection:s owner:drawableId) ifFalse:[
- 'DSURFACE: selection failed' errorPrintNL
+ 'DisplaySurface [warning]: selection failed' errorPrintCR
]
- "Modified: 12.12.1996 / 14:08:38 / cg"
+ "Modified: 10.1.1997 / 17:48:43 / cg"
! !
!DisplaySurface methodsFor:'user notification'!
@@ -1748,5 +1748,5 @@
!DisplaySurface class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/DisplaySurface.st,v 1.14 1996-12-12 13:09:37 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/DisplaySurface.st,v 1.15 1997-01-10 18:02:17 cg Exp $'
! !