hg/stx-libview2: comparison WinPrinterContext.st

equal deleted inserted replaced

-:f97405cc78a3
+:dcc643202507
 getLogicalPixelSizeY
 ^ printerInfo printQuality ? 600
 !
 numberOfColorBitsPerPixel
-^ OperatingSystem getDeviceCaps:gcId index:12 "Bitspixel"
+^ OperatingSystem getDeviceCaps:self gcId index:12 "Bitspixel"
 "Created: / 03-08-2006 / 09:58:18 / fm"
 "Modified: / 10-10-2006 / 18:15:40 / cg"
 !
 physicalOffsetX
-^ OperatingSystem getDeviceCaps:gcId index:112 "PhysicalOffsetX"
+^ OperatingSystem getDeviceCaps:self gcId index:112 "PhysicalOffsetX"
 "Created: / 01-08-2006 / 16:28:34 / fm"
 "Modified: / 16-04-2007 / 12:52:06 / cg"
 !
 physicalOffsetY
-^ OperatingSystem getDeviceCaps:gcId index:113 "PhysicalOffsetY"
+^ OperatingSystem getDeviceCaps:self gcId index:113 "PhysicalOffsetY"
 "Created: / 01-08-2006 / 16:28:34 / fm"
 "Modified: / 16-04-2007 / 12:52:01 / cg"
 !
 pixelsPerInchOfScreenHeight
-^ OperatingSystem getDeviceCaps:gcId index:90 "Logpixelsy"
+^ OperatingSystem getDeviceCaps:self gcId index:90 "Logpixelsy"
 "Created: / 01-08-2006 / 16:29:16 / fm"
 !
 pixelsPerInchOfScreenWidth
-^ OperatingSystem getDeviceCaps:gcId index:88 "Logpixelsx"
+^ OperatingSystem getDeviceCaps:self gcId index:88 "Logpixelsx"
 "Created: / 01-08-2006 / 16:28:34 / fm"
 !
 printerHeightArea
-^ (OperatingSystem getDeviceCaps:gcId index:10)
+^ (OperatingSystem getDeviceCaps:self gcId index:10)
 "Modified: / 10-10-2006 / 18:18:31 / cg"
 !
 printerPhysicalHeight
-^ OperatingSystem getDeviceCaps:gcId "deviceContext" index:111 "PhysicalHeight"
+^ OperatingSystem getDeviceCaps:self gcId "deviceContext" index:111 "PhysicalHeight"
 "Created: / 01-08-2006 / 16:14:08 / fm"
 !
 printerPhysicalWidth
-^ OperatingSystem getDeviceCaps:gcId "deviceContext" index:110 "PhysicalWidth"
+^ OperatingSystem getDeviceCaps:self gcId "deviceContext" index:110 "PhysicalWidth"
 "Created: / 01-08-2006 / 16:14:08 / fm"
 !
 printerWidthArea
-^ OperatingSystem getDeviceCaps:gcId "deviceContext" index:8 "Horzres"
+^ OperatingSystem getDeviceCaps:self gcId "deviceContext" index:8 "Horzres"
 "Created: / 01-08-2006 / 16:14:08 / fm"
 !
 supportedImageFormats
 !WinPrinterContext methodsFor:'context stuff'!
 getPenFor:aDC
 "set line attributes"
+| lineWidthObj lineStyleObj capStyleObj joinStyleObj |
+	lineWidthObj := self lineWidth.
+	lineStyleObj := self lineStyle.
+	 capStyleObj := self capStyle.
+	joinStyleObj := self joinStyle.
 %{  /* NOCONTEXT */
 if (__isExternalAddressLike(aDC)
-&& __isSmallInteger(__INST(lineWidth))) {
+&& __isSmallInteger(lineWidthObj)) {
 	HANDLE hDC = (HANDLE)(__externalAddressVal(aDC));
 	COLORREF fgColor;
 	HANDLE hPen, prevPen;
 	int lineStyleInt, capStyleInt, joinStyleInt, lineWidth;
-	lineWidth= __intVal(__INST(lineWidth));
+	lineWidth= __intVal(lineWidthObj);
-	if (__INST(lineStyle) == @symbol(solid)) {
+	if (lineStyleObj == @symbol(solid)) {
 	    lineStyleInt= PS_SOLID;
-	} else if (__INST(lineStyle) == @symbol(dashed)) {
+	} else if (lineStyleObj == @symbol(dashed)) {
 	    lineStyleInt= PS_DASH;
-	} else if (__INST(lineStyle) == @symbol(dotted)) {
+	} else if (lineStyleObj == @symbol(dotted)) {
 	    lineStyleInt= PS_DOT;
-	} else if (__INST(lineStyle) == @symbol(dashDot)) {
+	} else if (lineStyleObj == @symbol(dashDot)) {
 	    lineStyleInt= PS_DASHDOT;
-	} else if (__INST(lineStyle) == @symbol(dashDotDot)) {
+	} else if (lineStyleObj == @symbol(dashDotDot)) {
 	    lineStyleInt= PS_DASHDOTDOT;
 	} else
 	    lineStyleInt= PS_SOLID;
-	if (__INST(capStyle) == @symbol(round)) {
+	if (capStyleObj == @symbol(round)) {
 	    capStyleInt= PS_ENDCAP_ROUND;
-	} else if (__INST(capStyle) == @symbol(square)) {
+	} else if (capStyleObj == @symbol(square)) {
 	    capStyleInt= PS_ENDCAP_SQUARE;
-	} else if (__INST(capStyle) == @symbol(flat)) {
+	} else if (capStyleObj == @symbol(flat)) {
 	    capStyleInt= PS_ENDCAP_FLAT;
 	} else
 	    capStyleInt= PS_ENDCAP_FLAT;
-	if (__INST(joinStyle) == @symbol(bevel)) {
+	if (joinStyleObj == @symbol(bevel)) {
 	    joinStyleInt= PS_JOIN_BEVEL;
-	} else if (__INST(joinStyle) == @symbol(miter)) {
+	} else if (joinStyleObj== @symbol(miter)) {
 	    joinStyleInt= PS_JOIN_MITER;
-	} else if (__INST(joinStyle) == @symbol(round)) {
+	} else if (joinStyleObj == @symbol(round)) {
 	    joinStyleInt= PS_JOIN_ROUND;
 	} else
 	    joinStyleInt= PS_JOIN_MITER;
 !
 getPenForContext
 "set line attributes"
+| gcId  lineWidthObj lineStyleObj capStyleObj joinStyleObj |
+gcId := self gcId.
+	lineWidthObj := self lineWidth.
+	lineStyleObj := self lineStyle.
+	 capStyleObj := self capStyle.
+	joinStyleObj := self joinStyle.
 %{  /* NOCONTEXT */
-if (__isExternalAddressLike(__INST(gcId))
+if (__isExternalAddressLike(gcId)
-&& __isSmallInteger(__INST(lineWidth))) {
+&& __isSmallInteger(lineWidthObj) ) {
-	HANDLE hDC = (HANDLE)(__externalAddressVal(__INST(gcId)));
+	HANDLE hDC = (HANDLE)(__externalAddressVal(gcId));
 	COLORREF fgColor;
 	HANDLE hPen;
 	int lineStyleInt, capStyleInt, joinStyleInt, lineWidth;
-	lineWidth= __INST(lineWidth);
+	lineWidth= lineWidthObj;
-	if (__INST(lineStyle) == @symbol(solid)) {
+	if (lineStyleObj == @symbol(solid)) {
 	    lineStyleInt= PS_SOLID;
-	} else if (__INST(lineStyle) == @symbol(dashed)) {
+	} else if (lineStyleObj == @symbol(dashed)) {
 	    lineStyleInt= PS_DASH;
-	} else if (__INST(lineStyle) == @symbol(dotted)) {
+	} else if (lineStyleObj == @symbol(dotted)) {
 	    lineStyleInt= PS_DOT;
-	} else if (__INST(lineStyle) == @symbol(dashDot)) {
+	} else if (lineStyleObj == @symbol(dashDot)) {
 	    lineStyleInt= PS_DASHDOT;
-	} else if (__INST(lineStyle) == @symbol(dashDotDot)) {
+	} else if (lineStyleObj == @symbol(dashDotDot)) {
 	    lineStyleInt= PS_DASHDOTDOT;
 	} else
 	    lineStyleInt= PS_SOLID;
-	if (__INST(capStyle) == @symbol(round)) {
+	if (capStyleObj == @symbol(round)) {
 	    capStyleInt= PS_ENDCAP_ROUND;
-	} else if (__INST(capStyle) == @symbol(square)) {
+	} else if (capStyleObj == @symbol(square)) {
 	    capStyleInt= PS_ENDCAP_SQUARE;
-	} else if (__INST(capStyle) == @symbol(flat)) {
+	} else if (capStyleObj == @symbol(flat)) {
 	    capStyleInt= PS_ENDCAP_FLAT;
 	} else
 	    capStyleInt= PS_ENDCAP_FLAT;
-	if (__INST(joinStyle) == @symbol(bevel)) {
+	if (joinStyleObj == @symbol(bevel)) {
 	    joinStyleInt= PS_JOIN_BEVEL;
-	} else if (__INST(joinStyle) == @symbol(miter)) {
+	} else if (joinStyleObj == @symbol(miter)) {
 	    joinStyleInt= PS_JOIN_MITER;
-	} else if (__INST(joinStyle) == @symbol(round)) {
+	} else if (joinStyleObj== @symbol(round)) {
 	    joinStyleInt= PS_JOIN_ROUND;
 	} else
 	    joinStyleInt= PS_JOIN_MITER;
 setViewportOrg: aPoint
 "Sets the viewport origin (LOGICAL point (0,0)) of the device context"
 ^ OperatingSystem
-	    setViewportOrg: gcId "deviceContext"
+	    setViewportOrg: self gcId "deviceContext"
 	    x: aPoint x
 	    y: aPoint y
 	    oldOrigin: nil
 "Created: / 01-08-2006 / 16:14:08 / fm"
 displayArcX:x y:y width:width height:height from:startAngle angle:angle in:ignoredDrawableId with:aDC
 "draw an arc. If any of x,y, w or h is not an integer, an error is triggered.
 The angles may be floats or integer - they are given in degrees."
+| lineWidthObj lineStyleObj |
+lineWidthObj := self lineWidth.
+lineStyleObj := self lineStyle.
 %{
 int __x, __y, w, h;
 float angle1, angle2;
 double f;
 	COLORREF fgColor;
 	OBJ lStyleSymbol;
 	int lStyleInt;
 	int lw;
-	lw= __intVal(__INST(lineWidth));
+	lw= __intVal(lineWidthObj);
-	lStyleSymbol= __INST(lineStyle);
+	lStyleSymbol= lineStyleObj;
 	/*  PS_DASH, PS_DOT, PS_DASHDOT, PS_DASHDOTDOT
 	    only works with lineWidth = 1  */
 	if (lStyleSymbol == @symbol(solid)) {
 !
 displayLineFromX:x0 y:y0 toX:x1 y:y1 in:ignoredDrawableId with:aDC
 "draw a line. If the coordinates are not integers, an error is triggered."
-%{  /* NOCONTEXT */
+| lineWidthObj lineStyleObj |
+lineWidthObj := self lineWidth.
+lineStyleObj := self lineStyle.
+%{
 if (__isExternalAddressLike(aDC)
 && __bothSmallInteger(x0, y0)
 && __bothSmallInteger(x1, y1)) {
 	HANDLE hDC = (HANDLE)(__externalAddressVal(aDC));
 	COLORREF fgColor;
 /*      DPRINTF(("displayLine: %d/%d -> %d/%d\n",
 		    __intVal(x0), __intVal(y0),
 		    __x1, __y1));
 */
-	lw= __intVal(__INST(lineWidth));
+	lw= __intVal(lineWidthObj);
-	lStyleSymbol= __INST(lineStyle);
+	lStyleSymbol= lineStyleObj;
 	/*  PS_DASH, PS_DOT, PS_DASHDOT, PS_DASHDOTDOT
 	    only works with lineWidth = 1  */
 	if (lStyleSymbol == @symbol(solid)) {
 displayPolygon:aPolygon in:aDrawableId with:aDC
 "draw a polygon, the argument aPolygon is a Collection of individual points,
 which define the polygon.
 If any coordinate is not integer, an error is triggered."
-|numberOfPoints|
+| numberOfPoints lineWidthObj lineStyleObj |
+lineWidthObj := self lineWidth.
+lineStyleObj := self lineStyle.
 numberOfPoints := aPolygon size.
 %{
 OBJ point, px, py;
 int i, num;
 	int lw;
 	COLORREF fgColor;
 	OBJ lStyleSymbol;
 	int lStyleInt;
-	lw= __intVal(__INST(lineWidth));
+	lw= __intVal(lineWidthObj);
-	lStyleSymbol= __INST(lineStyle);
+	lStyleSymbol= lineStyleObj;
 	/*  PS_DASH, PS_DOT, PS_DASHDOT, PS_DASHDOTDOT
 	    only works with lineWidth = 1  */
 	if (lStyleSymbol == @symbol(solid)) {
 "Created: / 07-08-2006 / 14:46:55 / fm"
 !
 displayPolylines:arrayOfPoints
-device displayPolylines:arrayOfPoints in:nil with:gcId
+self device displayPolylines:arrayOfPoints in:nil with:self gcId
 !
 displayPolylines:aPolyline in:ignoredDrawableId with:aDC
 "draw a polyline, the argument aPolyline is a collection of individual points,
 which define the lines (p1/p2 pairs); must be even in size.
 If any coordinate is not integer, an error is triggered."
-|numberOfPoints|
+|numberOfPoints lineWidthObj lineStyleObj capStyleObj joinStyleObj |
 numberOfPoints := aPolyline size.
+	lineWidthObj := self lineWidth.
+	lineStyleObj := self lineStyle.
 %{
 OBJ point, px, py;
 int i, num;
 if (__isExternalAddressLike(aDC)
 	COLORREF fgColor;
 	int lw;
 	OBJ lStyleSymbol;
 	int lStyleInt;
-	lw= __intVal(__INST(lineWidth));
+	lw= __intVal(lineWidthObj);
-	lStyleSymbol= __INST(lineStyle);
+	lStyleSymbol= lineStyleObj;
 	/*  PS_DASH, PS_DOT, PS_DASHDOT, PS_DASHDOTDOT
 	    only works with lineWidth = 1  */
 	if (lStyleSymbol == @symbol(solid)) {
 !
 displayRectangleX:x y:y width:width height:height in:ignoredDrawableId with:aDC
 "draw a rectangle. If the coordinates are not integers, an error is triggered."
+| lineWidthObj lineStyleObj |
+lineWidthObj := self lineWidth.
+	lineStyleObj := self lineStyle.
 %{
 int w, h;
 int xL, yT;
 if (__isExternalAddressLike(aDC)
 && __bothSmallInteger(x, y)
 	    HANDLE prevPen, hPen;
 	    OBJ lStyleSymbol;
 	    int lStyleInt;
 	    int lw;
-	    lw= __intVal(__INST(lineWidth));
+	    lw= __intVal(lineWidthObj);
-	    lStyleSymbol= __INST(lineStyle);
+	    lStyleSymbol= lineStyleObj;
 	    /*  PS_DASH, PS_DOT, PS_DASHDOT, PS_DASHDOTDOT
 		only works with lineWidth = 1  */
 	    if (lStyleSymbol == @symbol(solid)) {
 (aString isString not
 or:[aString isText]) ifTrue:[
 	^ aString displayOn:self x:x y:y
 ].
-gcId isNil ifTrue:[
+self gcId isNil ifTrue:[
 	self initGC
 ].
-fontUsed := font.
+fontUsed := self font.
-transformation notNil ifTrue:[
+self transformation notNil ifTrue:[
-	pX := transformation applyToX:x.
+	pX := self transformation applyToX:x.
-	pY := transformation applyToY:y.
+	pY := self transformation applyToY:y.
-	transformation noScale ifFalse:[
+	self transformation noScale ifFalse:[
-	    sz := font size.
+	    sz := self font size.
 	    sz isNil ifTrue:[
 		"/ oops - not a real font; use original font
-		fontUsed := font
+		fontUsed := self font.
 	    ] ifFalse:[ |yS|
 		yS := self pixelsPerInchOfScreenHeight / Screen current verticalPixelPerInch.
 		yS := self scale y / yS.
-		fontUsed := font size:(sz * yS) rounded.
+		fontUsed := self font size:(sz * yS) rounded.
 	    ]
 	]
 ] ifFalse:[
 	pX := x.
 	pY := y.
 ].
 pX := pX rounded.
 pY := pY rounded.
 s := aString.
-fontUsed := fontUsed onDevice:device.
+fontUsed := fontUsed onDevice:self device.
 fontsEncoding := fontUsed encoding.
-(characterEncoding ~~ fontsEncoding) ifTrue:[
+(self characterEncoding ~~ fontsEncoding) ifTrue:[
 	[
-	    s := CharacterEncoder encodeString:s from:characterEncoding into:fontsEncoding.
+	    s := CharacterEncoder encodeString:s from:self characterEncoding into:fontsEncoding.
 	] on:CharacterEncoderError do:[:ex|
 	    "substitute a default value for codes that cannot be represented
 	     in the new character set"
 	    ex proceedWith:ex defaultValue.
 	].
 id := fontUsed fontId.
 id isNil ifTrue:[
 	"hook for alien fonts"
 	fontUsed displayString:s x:x y:y in:self
 ] ifFalse:[
-	deviceFont ~~ fontUsed ifTrue:[
+	self deviceFont ~~ fontUsed ifTrue:[
-	    device setFont:id in:gcId.
+	    self device setFont:id in:self gcId.
-	    deviceFont := fontUsed
+	    self deviceFont: fontUsed
 	].
-	device displayString:s x:pX y:pY in:drawableId with:gcId
+	self device displayString:s x:pX y:pY in:self drawableId with:self gcId
 ]
 "Modified: 1.7.1997 / 17:08:35 / cg"
 ! !
 "do a bit-blt; copy bits from the rectangle defined by
 srcX/srcY and w/h from the sourceId drawable to the rectangle
 below dstX/dstY in the destId drawable. Trigger an error if any
 argument is not integer."
+| function |
+function := self function.
 %{
 int     dstGcOwnerThreadID;
 HWND    dstGcHWIN;
 HBITMAP dstGcHBITMAP;
 	int src_fg, src_bg, dst_fg, dst_bg;
 	char buf[5];
 //          fun = dstGcData->bitbltrop2;
-	aFunctionSymbol= __INST(function);
+	aFunctionSymbol= function;
 	if (aFunctionSymbol == @symbol(copy)) {
 	    fun = SRCCOPY /* R2_COPYPEN */ ;
 /*            bfun = BITBLT_COPY;                                          */
 	} else if (aFunctionSymbol == @symbol(copyInverted)) {
 	     into: self id
 		x: x
 		y: y
 	    width: sortedImage width
 	   height: sortedImage height
-	     with: gcId.
+	     with: self gcId.
 !
 drawBits:imageBits bitsPerPixel:bitsPerPixel depth:imageDepth padding:padd
 			  width:imageWidth height:imageHeight
 			      x:srcx y:srcy
 			       with:aGCId
 "since XPutImage may allocate huge amount of stack space
 (some implementations use alloca), this must run with unlimited stack."
+| drawableId |
+drawableId := self drawableId.
 %{
 unsigned char fastBits[10000];
 unsigned char *b_bits = 0;
 unsigned char *allocatedBits = 0;
 unsigned char *__imageBits = 0;
 	  DWORD g;
 	  DWORD b;
 	} bitmap;
 	HANDLE hDC = (HANDLE)(__externalAddressVal(aGCId));
-	HBITMAP hBitmap = _HBITMAPVAL(__INST(drawableId));
+	HBITMAP hBitmap = _HBITMAPVAL(drawableId);
 /*
 	DDPRINTF(("hDC = %x\n", hDC));
 */
 	if (__intVal(padd) != WIN32PADDING) {
 			       with:aGCId
 "since XPutImage may allocate huge amount of stack space
 (some implementations use alloca), this must run with unlimited stack."
+| drawableId |
+drawableId := self drawableId.
 %{
 unsigned char fastBits[10000];
 unsigned char *b_bits = 0;
 unsigned char *allocatedBits = 0;
 unsigned char *__imageBits = 0;
 	  BITMAPINFOHEADER bmiHeader;
 	  RGBQUAD bmiColors[256];
 	} bitmap;
 	HANDLE hDC = (HANDLE)(__externalAddressVal(aGCId));
-	HBITMAP hBitmap = _HBITMAPVAL(__INST(drawableId));
+	HBITMAP hBitmap = _HBITMAPVAL(drawableId);
 	int col;
 /*
 	DDPRINTF(("hDC = %x\n", hDC));
 */
 setFunction:aFunctionSymbol in:aGCId
 "set alu function to be drawn with"
 Transcript showCR: aFunctionSymbol printString.
-function := aFunctionSymbol.
+self function: aFunctionSymbol.
 "/%{  /* NOCONTEXT */
 "/
 "/    if (__isExternalAddress(aGCId)) {
 "/        struct gcData *gcData = _GCDATA(aGCId);
 			       with:aGCId
 "since XPutImage may allocate huge amount of stack space
 (some implementations use alloca), this must run with unlimited stack."
+| drawableId |
+drawableId := self drawableId.
 %{
 unsigned char fastBits[10000];
 unsigned char *b_bits = 0;
 unsigned char *allocatedBits = 0;
 unsigned char *__imageBits = 0;
 	  BITMAPINFOHEADER bmiHeader;
 	  RGBQUAD bmiColors[256];
 	} bitmap;
 	HANDLE hDC = (HANDLE)(__externalAddressVal(aGCId));
-	HBITMAP hBitmap = _HBITMAPVAL(__INST(drawableId));
+	HBITMAP hBitmap = _HBITMAPVAL(drawableId);
 	int col;
 /*
 	DDPRINTF(("hDC = %x\n", hDC));
 */
 "return a fonts metrics info object"
 |rawData info|
 rawData := Array new:15.
-(self primFontMetricsOf:fontId hdc:gcId intoArray:rawData) isNil ifTrue:[
+(self primFontMetricsOf:fontId hdc:self gcId intoArray:rawData) isNil ifTrue:[
 	self primitiveFailed.
 	^ self
 ].
 rawData at:11 put:#'ms-ansi'.
 "Created: / 04-08-2006 / 12:32:53 / fm"
 !
 widthOf:aString from:index1 to:index2 inFont:aFontId
+| gcId |
+gcId :=self gcId.
 %{  /* NOCONTEXT */
 unsigned char *cp;
 int len, n, i1, i2, l;
 OBJ cls;
 int nInstBytes;
 if (__bothSmallInteger(index1, index2)
 && __isExternalAddress(aFontId)
-&& __isExternalAddressLike(__INST(gcId))
+&& __isExternalAddressLike(gcId)
 && __isNonNilObject(aString)) {
 	HGDIOBJ hFont,prevFont;
 	HANDLE hDC;
 	SIZE tsize;
 	int mustFree = 0;
 	int i;
 #endif
 	hFont = _HGDIOBJVal(aFontId);
-	hDC = (HANDLE)(__externalAddressVal(__INST(gcId)));
+	hDC = (HANDLE)(__externalAddressVal(gcId));
 	prevFont = SelectObject(hDC, hFont);
 	i1 = __intVal(index1) - 1;
 	cls = __qClass(aString);
 !WinPrinterContext methodsFor:'initialization & release'!
 createDC
 "Private - Create a device context for the receiver"
-gcId := printerInfo createDC
+self gcId: printerInfo createDC
 "Created: / 27-07-2006 / 10:21:05 / fm"
 "Modified: / 02-08-2006 / 17:30:47 / fm"
 "Modified: / 10-10-2006 / 18:14:28 / cg"
 !
 deleteDC
 "Private - Delete a device context for the receiver"
-OperatingSystem deletePrinterDC: gcId.
+OperatingSystem deletePrinterDC: self gcId.
 !
 destroy
 "Destroy the GC."
 |id|
-id := gcId.
+id := self gcId.
 id notNil ifTrue:[
-	gcId := nil.
+	self gcId: nil.
 	self deleteDC.
 ].
 "/    Lobby unregister:self.
 !
 executor
 |aCopy|
 aCopy := WinWorkstation::PrinterDeviceContextHandle basicNew.
-aCopy setDevice:device id:nil gcId:gcId.
+aCopy setDevice:self device id:nil gcId:self gcId.
 ^ aCopy
 "Created: / 16-04-2007 / 12:39:02 / cg"
 !
 releaseDC
 "Private - Delete and clear the device context of the receiver."
 self deleteDC.
 "/    device close.
-gcId := nil.
+self gcId: nil.
 self releaseDeviceFonts
 !
 releaseDeviceFonts
 deviceFonts isEmptyOrNil ifFalse:[
 true "self font isNil" ifTrue:[
 	"if font not set yet, calculate based on default font"
 	"/            extString := str asExternalString.
 	size := Win32OperatingSystem::WinPointStructure new.
 	(OperatingSystem
-	    getTextExtentPoint:gcId
+	    getTextExtentPoint:self gcId
 	    string:str
 	    size:size) ifFalse:[ ^ self error ].
 	answer := size x.
 "/        Transcript showCR: 'FROM PRIM ******* ', str, '   ',  answer printString.
 "/        Transcript showCR: 'FROM DEVICE ***** ', str, '   ',(self font widthOf:str on:self device) printString.
 displayAdvanceLineFromX:x0 y:y0 toX:x1 y:y1
 "draw a line (with current paint-color); apply transformation if nonNil"
 |pX0 pY0 pX1 pY1 easy fgId bgId|
-gcId isNil ifTrue:[
+self gcId isNil ifTrue:[
 	self initGC
 ].
-lineStyle == #doubleDashed ifTrue:[
+self 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:[
+	self paint isColor ifFalse:[
 	    easy := false
 	] ifTrue:[
-	    fgId := paint colorId.
+	    fgId := self paint colorId.
 	    fgId isNil ifTrue:[
 		easy := false
 	    ]
 	].
-	bgPaint isColor ifFalse:[
+	self bgPaint isColor ifFalse:[
 	    easy := false
 	] ifTrue:[
-	    bgId := bgPaint colorId.
+	    bgId := self bgPaint colorId.
 	    bgId isNil ifTrue:[
 		easy := false
 	    ]
 	].
 	easy ifTrue:[
-	    ((foreground ~~ paint) or:[background ~~ bgPaint]) ifTrue:[
+	    ((self foreground ~~ self paint) or:[self background ~~ self bgPaint]) ifTrue:[
-		device setForeground:fgId background:bgId in:gcId.
+		self device setForeground:fgId background:bgId in:self gcId.
-		foreground := paint.
+		self foreground: self paint.
-		background := bgPaint.
+		self background: self bgPaint.
 	    ].
 	] ifFalse:[
 	    'DeviceGraphicsContext [warning]: cannot draw dashes with dithered colors' errorPrintCR
 	].
 ].
-transformation notNil ifTrue:[
+self transformation notNil ifTrue:[
-	pX0 := transformation applyToX:x0.
+	pX0 := self transformation applyToX:x0.
-	pY0 := transformation applyToY:y0.
+	pY0 := self transformation applyToY:y0.
-	pX1 := transformation applyToX:x1.
+	pX1 := self transformation applyToX:x1.
-	pY1 := transformation applyToY:y1.
+	pY1 := self transformation applyToY:y1.
 ] ifFalse:[
 	pX0 := x0.
 	pY0 := y0.
 	pX1 := x1.
 	pY1 := y1
 pX0 := pX0 rounded.
 pY0 := pY0 rounded.
 pX1 := pX1 rounded.
 pY1 := pY1 rounded.
-device displayAdvanceLineFromX:pX0 y:pY0 toX:pX1 y:pY1 in:drawableId with:gcId
+self device displayAdvanceLineFromX:pX0 y:pY0 toX:pX1 y:pY1 in:self drawableId with:self gcId
 "Modified: 10.1.1997 / 17:46:32 / cg"
 !
 displayAdvanceLineFromX:x0 y:y0 toX:x1 y:y1 in:ignoredDrawableId with:aDC
 !
 getPenForMyContext
 "Get a pen for my context"
-|maskOriginX maskOriginY|
+|maskOriginX maskOriginY gcId lineWidthObj lineStyleObj capStyleObj joinStyleObj maskObj |
 self maskOrigin isNil ifFalse:[
 	maskOriginX := self maskOrigin x.
 	maskOriginY := self maskOrigin y.
 ].
+		gcId := self gcId.
+	lineWidthObj := self lineWidth.
+	lineStyleObj := self lineStyle.
+	 capStyleObj := self capStyle.
+	joinStyleObj := self joinStyle.
+maskObj := self mask.
 %{
 HPEN hPen = 0;
 HPEN prevPen;
 LOGBRUSH Brush;
 COLORREF fgColor;
-HANDLE hDC = (HANDLE)(__externalAddressVal(__INST(gcId)));
+HANDLE hDC = (HANDLE)(__externalAddressVal(gcId));
 int lStyle, bkMode, hMask, maskOrgX, maskOrgY;
 OBJ lineStyle, capStyle, joinStyle;
 int style;
 int lw;
 int BK_TRANSPARENT;
 BK_TRANSPARENT = 1;
-lw= __intVal(__INST(lineWidth));
+lw= __intVal(lineWidthObj);
 /*    fgColor = __intVal(__INST(foreground)) & 0xffffff;     */
 fgColor = GetTextColor(hDC);
-lineStyle=__INST(lineStyle);
+lineStyle=lineStyleObj;
-capStyle=__INST(capStyle);
+capStyle=capStyleObj;
-joinStyle=__INST(joinStyle);
+joinStyle=joinStyleObj;
-hMask= __intVal(__INST(mask));
+hMask= __intVal(maskObj);
 maskOrgX=__intVal(maskOriginX);
 maskOrgY=__intVal(maskOriginY);
 if (lineStyle == @symbol(solid)) {
 	style = PS_SOLID;
 !WinPrinterContext methodsFor:'printing process'!
 endPage
 "Informs device that we are finished writing to a page."
-(OperatingSystem endPage:gcId) > 0 ifFalse:[
+(OperatingSystem endPage:self gcId) > 0 ifFalse:[
 	self error
 ]
 "Created: / 27-07-2006 / 18:20:48 / fm"
 "Modified: / 01-08-2006 / 16:01:34 / fm"
 and endPrintJob will become one entry in the print queue."
 |result|
 self endPage.
-result := OperatingSystem endDoc:gcId.
+result := OperatingSystem endDoc:self gcId.
 jobid := nil.
 result >= 0 ifFalse:[ self error ]
 "Created: / 27-07-2006 / 18:21:04 / fm"
 "Modified: / 01-08-2006 / 16:01:38 / fm"
 !
 startPage
 "Starts a page."
-(OperatingSystem startPage:gcId) > 0 ifFalse:[
+(OperatingSystem startPage:self gcId) > 0 ifFalse:[
 	^ self error
 ].
 "Created: / 27-07-2006 / 18:25:55 / fm"
 "Modified: / 28-07-2006 / 18:19:04 / fm"
 drawn between startPrintJob and endPrintJob will become
 one entry in the print queue."
 |docInfoStruct nameAddress title fileNameAddress|
-gcId isNil ifTrue:[
+self gcId isNil ifTrue:[
 	self buildPrinter
 ].
 abort := false.
 title := aString ? 'Smalltalk/X'.
 nameAddress := title asExternalBytes unprotectFromGC.
 	cbSize:docInfoStruct sizeInBytes;
 	lpszDocName:nameAddress address.
 fileNameAddress isNil ifFalse:[
 	docInfoStruct lpszOutput:fileNameAddress address
 ].
-jobid := OperatingSystem startDoc:gcId docInfo:docInfoStruct.
+jobid := OperatingSystem startDoc:self gcId docInfo:docInfoStruct.
 jobid > 0 ifFalse:[
 	jobid = -1 ifTrue:[
 	    abort := true.
 	    ^ nil
 	].
 ^ true
 !
 isOpen
-^ gcId notNil
+^ self gcId notNil
 !
 isPersistentInSnapshot
 "return true, if resources on this device are to be made
 persistent in a snapshot image."
 supportsColor isNil ifTrue:[supportsColor := self getSupportsColor].
 ^supportsColor
 !
 supportsGraphics
-^(OperatingSystem getDeviceCaps: gcId index: 2 "Technology") ~= 4
+^(OperatingSystem getDeviceCaps: self gcId index: 2 "Technology") ~= 4
 "Created: / 03-08-2006 / 10:07:43 / fm"
 "Modified: / 16-04-2007 / 12:44:03 / cg"
 !
 |tscale fscale yFont xFont|
 index2 < index1 ifTrue:[^ self].
-transformation isNil ifTrue:[
+self transformation isNil ifTrue:[
 	self initTransformation.
 ].
-tscale := transformation scale.
+tscale := self transformation scale.
 fscale := tscale / fontScale.
 xFont := x * fontScale x.
-yFont := (y - font ascent) * fontScale y.    "/ MM_TEXT - Ursprung liegt oben links
+yFont := (y - self font ascent) * fontScale y.    "/ MM_TEXT - Ursprung liegt oben links
-transformation scale:fscale.
+self transformation scale:fscale.
 super displayString:aString from:index1 to:index2
 		x:xFont truncated
 		y:yFont truncated.
-transformation scale:tscale.
+self transformation scale:tscale.
 !
 displayString:aString x:x y:y
 |end|
 !
 initTransformation
 |margin|
-transformation isNil ifTrue:[
+self transformation isNil ifTrue:[
 	margin := Point x:(self leftMargin) y:(self topMargin).
-	transformation := WindowingTransformation scale:fontScale
+	self transformation: (WindowingTransformation scale:fontScale
-					    translation:(margin * fontScale).
+					    translation:(margin * fontScale)).
 ].
 !
 initialize
 super initialize.
 displayTitleDo:aNoneArgAction
 |oldClip oldTrans oldFont|
-oldClip := clipRect.
+oldClip := gc clipingRectangleOrNil.
 oldClip notNil ifTrue:[ self deviceClippingRectangle:nil ].
 oldTrans := self translation.
-oldFont  := font.
+oldFont  := self font.
 self  font:(self titleFont).
 self  translation:0.
 aNoneArgAction value.
 printPageNumbers == true ifTrue:[
 	self displayTitleDo:[
 	    s := pageNumberFormat bindWith:pageCounter.
 	    self displayString:s
-			     x:(self extent x - (font widthOf:s))
+			     x:(self extent x - (self font widthOf:s))
-			     y:(self extent y + (font ascent)).
+			     y:(self extent y + (self font ascent)).
 	]
 ].
 super endPage.
 !
 ! !
 !WinPrinterContext class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libview2/WinPrinterContext.st,v 1.44 2013-07-04 10:57:17 mb Exp $'
+^ '$Header: /cvs/stx/stx/libview2/WinPrinterContext.st,v 1.44 2013/07/04 10:57:17 mb Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libview2/WinPrinterContext.st,v 1.44 2013-07-04 10:57:17 mb Exp $'
+^ '$Header: /cvs/stx/stx/libview2/WinPrinterContext.st,v 1.44 2013/07/04 10:57:17 mb Exp $'
 ! !

branch	jv
changeset 3457	dcc643202507
parent 3190	437b1425507e
child 3478	45ad75b68d16