hg/stx-libview2: comparison WinPrinterContext.st

equal deleted inserted replaced

-:cf7b3de4f3ef
+:78014f6a3c32
 %{  /* NOCONTEXT */
 if (__isExternalAddressLike(aDC)
 && __bothSmallInteger(x0, y0)
 && __bothSmallInteger(x1, y1)) {
-	HANDLE hDC = (HANDLE)(__externalAddressVal(aDC));
+HANDLE hDC = (HANDLE)(__externalAddressVal(aDC));
-	COLORREF fgColor;
+COLORREF fgColor;
-	HANDLE prevPen, hPen;
+HANDLE prevPen, hPen;
-	int __x1 = __intVal(x1), __y1 = __intVal(y1);
+int __x1 = __intVal(x1), __y1 = __intVal(y1);
-	int lStyleSymbol, lStyleInt;
+int lStyleSymbol, lStyleInt;
-	int lw;
+int lw;
 /*      DPRINTF(("displayLine: %d/%d -> %d/%d\n",
-		    __intVal(x0), __intVal(y0),
+__intVal(x0), __intVal(y0),
-		    __x1, __y1));
+__x1, __y1));
 */
-	lw= __intVal(__INST(lineWidth));
+lw= __intVal(__INST(lineWidth));
-	lStyleSymbol= __INST(lineStyle);
+lStyleSymbol= __INST(lineStyle);
-	/*  PS_DASH, PS_DOT, PS_DASHDOT, PS_DASHDOTDOT
+/*  PS_DASH, PS_DOT, PS_DASHDOT, PS_DASHDOTDOT
-	    only works with lineWidth = 1  */
+only works with lineWidth = 1  */
-	if (lStyleSymbol == @symbol(solid)) {
+if (lStyleSymbol == @symbol(solid)) {
-	    lStyleInt= PS_SOLID;
+lStyleInt= PS_SOLID;
-	} else if (lStyleSymbol == @symbol(dashed)) {
+} else if (lStyleSymbol == @symbol(dashed)) {
-	    lStyleInt= PS_DASH;
+lStyleInt= PS_DASH;
-	} else if (lStyleSymbol == @symbol(dotted)) {
+} else if (lStyleSymbol == @symbol(dotted)) {
-	    lStyleInt= PS_DOT;
+lStyleInt= PS_DOT;
-	} else if (lStyleSymbol == @symbol(dashDot)) {
+} else if (lStyleSymbol == @symbol(dashDot)) {
-	    lStyleInt= PS_DASHDOT;
+lStyleInt= PS_DASHDOT;
-	} else if (lStyleSymbol == @symbol(dashDotDot)) {
+} else if (lStyleSymbol == @symbol(dashDotDot)) {
-	    lStyleInt= PS_DASHDOTDOT;
+lStyleInt= PS_DASHDOTDOT;
-	} else if (lStyleSymbol == @symbol(insideFrame)) {
+} else if (lStyleSymbol == @symbol(insideFrame)) {
-	    lStyleInt= PS_INSIDEFRAME;
+lStyleInt= PS_INSIDEFRAME;
-	} else
+} else
-	    lStyleInt= PS_SOLID;
+lStyleInt= PS_SOLID;
-	fgColor = GetTextColor(hDC);
+fgColor = GetTextColor(hDC);
-	hPen = CreatePen(lStyleInt, lw, fgColor);
+hPen = CreatePen(lStyleInt, lw, fgColor);
-	prevPen = SelectObject(hDC, hPen);
+prevPen = SelectObject(hDC, hPen);
-	MoveToEx(hDC, __intVal(x0), __intVal(y0), NULL);
+MoveToEx(hDC, __intVal(x0), __intVal(y0), NULL);
-	LineTo(hDC, __x1, __y1);
+LineTo(hDC, __x1, __y1);
-	/*
+/*
-	 * end-point ...
+* end-point ...
-	 */
+*/
-	LineTo(hDC, __x1+1, __y1);
+// LineTo(hDC, __x1+1, __y1);
-	SelectObject(hDC, prevPen);
+SelectObject(hDC, prevPen);
-	DeleteObject(hPen);
+DeleteObject(hPen);
-	RETURN ( self );
+RETURN ( self );
 }
 %}
 !
 displayPointX:px y:py in:ignoredDrawableId with:aDC
 int xL, yT;
 if (__isExternalAddressLike(aDC)
 && __bothSmallInteger(x, y)
 && __bothSmallInteger(width, height)) {
-	xL = __intVal(x);
+xL = __intVal(x);
-	yT = __intVal(y);
+yT = __intVal(y);
-	w = __intVal(width);
+w = __intVal(width);
-	h = __intVal(height);
+h = __intVal(height);
-	DPRINTF(("displayRectangle: %d/%d -> %d/%d\n", xL, yT, w, h));
+DPRINTF(("displayRectangle: %d/%d -> %d/%d\n", xL, yT, w, h));
-	if ((w >= 0) && (h >= 0)) {
+if ((w >= 0) && (h >= 0)) {
-	    HANDLE hDC = (HANDLE)(__externalAddressVal(aDC));
+HANDLE hDC = (HANDLE)(__externalAddressVal(aDC));
-	    COLORREF fgColor;
+COLORREF fgColor;
-	    HANDLE prevPen, hPen;
+HANDLE prevPen, hPen;
-	    int lStyleSymbol, lStyleInt;
+int lStyleSymbol, lStyleInt;
-	    int lw;
+int lw;
-	    lw= __intVal(__INST(lineWidth));
+lw= __intVal(__INST(lineWidth));
-	    lStyleSymbol= __INST(lineStyle);
+lStyleSymbol= __INST(lineStyle);
-	    /*  PS_DASH, PS_DOT, PS_DASHDOT, PS_DASHDOTDOT
+/*  PS_DASH, PS_DOT, PS_DASHDOT, PS_DASHDOTDOT
-		only works with lineWidth = 1  */
+only works with lineWidth = 1  */
-	    if (lStyleSymbol == @symbol(solid)) {
+if (lStyleSymbol == @symbol(solid)) {
-		lStyleInt= PS_SOLID;
+lStyleInt= PS_SOLID;
-	    } else if (lStyleSymbol == @symbol(dashed)) {
+} else if (lStyleSymbol == @symbol(dashed)) {
-		lStyleInt= PS_DASH;
+lStyleInt= PS_DASH;
-	    } else if (lStyleSymbol == @symbol(dotted)) {
+} else if (lStyleSymbol == @symbol(dotted)) {
-		lStyleInt= PS_DOT;
+lStyleInt= PS_DOT;
-	    } else if (lStyleSymbol == @symbol(dashDot)) {
+} else if (lStyleSymbol == @symbol(dashDot)) {
-		lStyleInt= PS_DASHDOT;
+lStyleInt= PS_DASHDOT;
-	    } else if (lStyleSymbol == @symbol(dashDotDot)) {
+} else if (lStyleSymbol == @symbol(dashDotDot)) {
-		lStyleInt= PS_DASHDOTDOT;
+lStyleInt= PS_DASHDOTDOT;
-	    } else if (lStyleSymbol == @symbol(insideFrame)) {
+} else if (lStyleSymbol == @symbol(insideFrame)) {
-		lStyleInt= PS_INSIDEFRAME;
+lStyleInt= PS_INSIDEFRAME;
-	    } else
+} else
-		lStyleInt= PS_SOLID;
+lStyleInt= PS_SOLID;
-	    fgColor = GetTextColor(hDC);
+fgColor = GetTextColor(hDC);
-	    hPen = CreatePen(lStyleInt, lw, fgColor);
+hPen = CreatePen(lStyleInt, lw, fgColor);
-	    prevPen = SelectObject(hDC, hPen);
+prevPen = SelectObject(hDC, hPen);
-	    MoveToEx(hDC, xL, yT, NULL);
+MoveToEx(hDC, xL, yT, NULL);
-	    LineTo(hDC, xL+w, yT);       // to top-right
+LineTo(hDC, xL+w, yT);       // to top-right
-	    LineTo(hDC, xL+w, yT+h);     // to bot-right
+LineTo(hDC, xL+w, yT+h);     // to bot-right
-	    MoveToEx(hDC, xL, yT, NULL); // back to top-left
+MoveToEx(hDC, xL, yT, NULL); // back to top-left
-	    LineTo(hDC, xL, yT+h);       // to bot-left
+LineTo(hDC, xL, yT+h);       // to bot-left
-	    LineTo(hDC, xL+w+1, yT+h);   // move pen one pixel more
+// LineTo(hDC, xL+w+1, yT+h);   // move pen one pixel more
+LineTo(hDC, xL+w,   yT+h);   // move pen one pixel more
-	    SelectObject(hDC, prevPen);
-	    DeleteObject(hPen);
+SelectObject(hDC, prevPen);
+DeleteObject(hPen);
-	}
-	RETURN ( self );
+}
+RETURN ( self );
 }
 %}.
 self primitiveFailed
 "Created: / 28-07-2006 / 20:18:25 / fm"
 hBrush = CreateSolidBrush(fgColor);
 }
 rct.left = __intVal(x);
 rct.top  = __intVal(y);
-rct.right  = rct.left + w + 1;
+rct.right  = rct.left + w; // + 1;
-rct.bottom = rct.top  + h + 1;
+rct.bottom = rct.top  + h; // + 1;
 prevBrush = SelectObject(hDC, hBrush);
 FillRect(hDC, &rct, hBrush);
 SelectObject(hDC, prevBrush);
 DeleteObject(hBrush);
 height: sortedImage height
 with: gcId.
 !
 drawBits:imageBits bitsPerPixel:bitsPerPixel depth:imageDepth padding:padd
-			  width:imageWidth height:imageHeight
+width:imageWidth height:imageHeight
-			      x:srcx y:srcy
+x:srcx y:srcy
-			   into:ignoredDrawableId
+into:ignoredDrawableId
-			      x:dstx y:dsty
+x:dstx y:dsty
-			  width:w height:h
+width:w height:h
-			   with:aGCId
+with:aGCId
 "draw a bitImage which has depth id, width iw and height ih into
 the drawable. draw a region of w/h pixels from srcx/srcy to dstx/dsty.
 Individual source pixels have bitsPerPixel bits, allowing to draw
 depth and pixel-units to be different.
 "
 sorry; I had to separate it into 2 methods, since XPutImage needs
 an unlimited stack, and thus cannot send primitiveFailed
 "
 (self primDrawBits:imageBits bitsPerPixel:bitsPerPixel depth:imageDepth padding:padd
-					width:imageWidth height:imageHeight
+width:imageWidth height:imageHeight
-					     x:srcx y:srcy
+x:srcx y:srcy
-					  into:ignoredDrawableId
+into:ignoredDrawableId
-					     x:dstx y:dsty
+x:(dstx rounded) y:(dsty rounded)
-					 width:w height:h
+width:w height:h
-					  with:aGCId)
+with:aGCId)
 ifFalse:[
-	"
+"
-	 also happens, if a segmentation violation occurs in the
+also happens, if a segmentation violation occurs in the
-	 XPutImage ...
+XPutImage ...
-	"
+"
-	self primitiveFailed
+self primitiveFailed
 ].
 !
 drawBits:imageBits redVector:redVector greenVector:greenVector blueVector:blueVector bitsPerPixel:bitsPerPixel depth:imageDepth
 width:imageWidth height:imageHeight
 an unlimited stack, and thus cannot send primitiveFailed
 "
 (self primDrawBits:imageBits redVector:redVector greenVector:greenVector blueVector:blueVector bitsPerPixel:bitsPerPixel depth:imageDepth
 width:imageWidth height:imageHeight
 into:ignoredDrawableId
-x:dstx y:dsty
+x:(dstx rounded) y:(dsty rounded)
 width:w height:h
 with:aGCId)
 ifFalse:[
 "
 also happens, if a segmentation violation occurs in the
 ! !
 !WinPrinterContext class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libview2/WinPrinterContext.st,v 1.19 2007-10-19 15:25:52 fm Exp $'
+^ '$Header: /cvs/stx/stx/libview2/WinPrinterContext.st,v 1.20 2007-10-23 05:08:45 ca Exp $'
 ! !

changeset 2342	78014f6a3c32
parent 2341	cf7b3de4f3ef
child 2343	b7ef200fbfad