hg/stx-libview: comparison XWorkstation.st

equal deleted inserted replaced

-:17d06f1e4ca6
+:d4e463e0c56c
 DeviceWorkstation subclass:#XWorkstation
 	instanceVariableNames:'hasShapeExtension hasShmExtension hasDPSExtension
 		hasMbufExtension hasXVideoExtension hasSaveUnder hasPEXExtension
 		hasImageExtension hasInputExtension hasXineramaExtension
-		ignoreBackingStore blackpixel whitepixel atoms protocolsAtom
+		hasRenderExtension hasXftLibrary ignoreBackingStore blackpixel whitepixel atoms protocolsAtom
 		deleteWindowAtom saveYourselfAtom quitAppAtom primaryAtom
 		clipboardAtom stringAtom wmStateAtom motifWMHintsAtom
 		listOfXFonts buttonsPressed eventRootX eventRootY displayName
 		eventTrace dispatchingExpose rgbVisual rgbaVisual virtualRootId
 		rootId altModifierMask metaModifierMask lastEventTime
 # include <X11/extensions/XIE.h>
 #endif
 #ifdef XINERAMA
 # include <X11/extensions/Xinerama.h>
+#endif
+/*
+* xft library (based on RENDER extension) - if available
+*/
+#ifdef XFT
+# include <X11/Xft/Xft.h>
 #endif
 /*
 * when I have more time to check it out, I will support display-PS
 */
 argument is not integer."
 <context: #return>
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 GC gc;
 Drawable source, dest;
 && __isExternalAddress(sourceId)
 && __isExternalAddress(destId)
 && __bothSmallInteger(w, h)
 && __bothSmallInteger(srcX, srcY)
 && __bothSmallInteger(dstX, dstY)) {
-int _sX, _sY, _w, _h, _dX, _dY;
+	int _sX, _sY, _w, _h, _dX, _dY;
-_sX = __intVal(srcX);
+	_sX = __intVal(srcX);
-_sY = __intVal(srcY);
+	_sY = __intVal(srcY);
-_w = __intVal(w);
+	_w = __intVal(w);
-_h = __intVal(h);
+	_h = __intVal(h);
-_dX = __intVal(dstX);
+	_dX = __intVal(dstX);
-_dY = __intVal(dstY);
+	_dY = __intVal(dstY);
-gc = __GCVal(dstGCId);
+	gc = __GCVal(dstGCId);
-source = __DrawableVal(sourceId);
+	source = __DrawableVal(sourceId);
-dest =   __DrawableVal(destId);
+	dest =   __DrawableVal(destId);
-ENTER_XLIB();
+	ENTER_XLIB();
-XCopyArea(myDpy, source, dest, gc, _sX, _sY, _w, _h, _dX, _dY);
+	XCopyArea(myDpy, source, dest, gc, _sX, _sY, _w, _h, _dX, _dY);
-LEAVE_XLIB();
+	LEAVE_XLIB();
-RETURN ( self );
+	RETURN ( self );
 }
 %}.
 "badGC, bad sourceDrawableId or destDrawableID
 or any non integer coordinate"
 This is basically the same as copyFromId:..., but does not generate expose events."
 <context: #return>
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 GC gc;
 Drawable source, dest;
 && __isExternalAddress(sourceId)
 && __isExternalAddress(destId)
 && __bothSmallInteger(w, h)
 && __bothSmallInteger(srcX, srcY)
 && __bothSmallInteger(dstX, dstY)) {
-Display *dpy = myDpy;
+	Display *dpy = myDpy;
-gc = __GCVal(dstGCId);
+	gc = __GCVal(dstGCId);
-source = __DrawableVal(sourceId);
+	source = __DrawableVal(sourceId);
-dest =   __DrawableVal(destId);
+	dest =   __DrawableVal(destId);
-ENTER_XLIB();
+	ENTER_XLIB();
-XSetGraphicsExposures(dpy, gc, 0);
+	XSetGraphicsExposures(dpy, gc, 0);
-XCopyArea(dpy, source, dest, gc,
+	XCopyArea(dpy, source, dest, gc,
-__intVal(srcX), __intVal(srcY),
+				__intVal(srcX), __intVal(srcY),
-__intVal(w), __intVal(h),
+				__intVal(w), __intVal(h),
-__intVal(dstX), __intVal(dstY));
+				__intVal(dstX), __intVal(dstY));
-XSetGraphicsExposures(dpy, gc, 1);
+	XSetGraphicsExposures(dpy, gc, 1);
-LEAVE_XLIB();
+	LEAVE_XLIB();
-RETURN ( self );
+	RETURN ( self );
 }
 %}.
 "badGC, bad sourceDrawableId or destDrawableID
 or any non integer coordinate"
 argument is not integer."
 <context: #return>
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 GC gc;
 Drawable source, dest;
 && __isExternalAddress(sourceId)
 && __isExternalAddress(destId)
 && __bothSmallInteger(w, h)
 && __bothSmallInteger(srcX, srcY)
 && __bothSmallInteger(dstX, dstY)) {
-gc = __GCVal(dstGCId);
+	gc = __GCVal(dstGCId);
-source = __DrawableVal(sourceId);
+	source = __DrawableVal(sourceId);
-dest =   __DrawableVal(destId);
+	dest =   __DrawableVal(destId);
-ENTER_XLIB();
+	ENTER_XLIB();
-XCopyPlane(myDpy, source, dest, gc,
+	XCopyPlane(myDpy, source, dest, gc,
-__intVal(srcX), __intVal(srcY),
+				 __intVal(srcX), __intVal(srcY),
-__intVal(w), __intVal(h),
+				 __intVal(w), __intVal(h),
-__intVal(dstX), __intVal(dstY), 1);
+				 __intVal(dstX), __intVal(dstY), 1);
-LEAVE_XLIB();
+	LEAVE_XLIB();
-RETURN ( self );
+	RETURN ( self );
 }
 %}.
 "badGC, bad sourceDrawableId or destDrawableID
 or any non integer coordinate"
 This is the same as copyPlaneFromId:..., but does not generate graphics exposes"
 <context: #return>
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 GC gc;
 Drawable source, dest;
 && __isExternalAddress(sourceId)
 && __isExternalAddress(destId)
 && __bothSmallInteger(w, h)
 && __bothSmallInteger(srcX, srcY)
 && __bothSmallInteger(dstX, dstY)) {
-Display *dpy = myDpy;
+	Display *dpy = myDpy;
-gc = __GCVal(dstGCId);
+	gc = __GCVal(dstGCId);
-source = __DrawableVal(sourceId);
+	source = __DrawableVal(sourceId);
-dest =   __DrawableVal(destId);
+	dest =   __DrawableVal(destId);
-ENTER_XLIB();
+	ENTER_XLIB();
-XSetGraphicsExposures(dpy, gc, 0);
+	XSetGraphicsExposures(dpy, gc, 0);
-XCopyPlane(dpy, source, dest, gc,
+	XCopyPlane(dpy, source, dest, gc,
-__intVal(srcX), __intVal(srcY),
+				 __intVal(srcX), __intVal(srcY),
-__intVal(w), __intVal(h),
+				 __intVal(w), __intVal(h),
-__intVal(dstX), __intVal(dstY), 1);
+				 __intVal(dstX), __intVal(dstY), 1);
-XSetGraphicsExposures(dpy, gc, 1);
+	XSetGraphicsExposures(dpy, gc, 1);
-LEAVE_XLIB();
+	LEAVE_XLIB();
-RETURN ( self );
+	RETURN ( self );
 }
 %}.
 "badGC, bad sourceDrawableId or destDrawableID
 or any non integer coordinate"
 The angles may be floats or integer - they are given in degrees."
 <context: #return>
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 GC gc;
 Window win;
 int w, h, angle1, angle2;
 double f;
 if (__isSmallInteger(startAngle))
-angle1 = __intVal(startAngle) * 64;
+	angle1 = __intVal(startAngle) * 64;
 else if (__isFloat(startAngle)) {
-f = __floatVal(startAngle);
+	f = __floatVal(startAngle);
-angle1 = f * 64;
+	angle1 = f * 64;
 } else if (__isShortFloat(startAngle)) {
-f = __shortFloatVal(startAngle);
+	f = __shortFloatVal(startAngle);
-angle1 = f * 64;
+	angle1 = f * 64;
 } else goto bad;
 if (__isSmallInteger(angle))
-angle2 = __intVal(angle) * 64;
+	angle2 = __intVal(angle) * 64;
 else if (__isFloat(angle)) {
-f = __floatVal(angle);
+	f = __floatVal(angle);
-angle2 = f * 64;
+	angle2 = f * 64;
 } else if (__isShortFloat(angle)) {
-f = __shortFloatVal(angle);
+	f = __shortFloatVal(angle);
-angle2 = f * 64;
+	angle2 = f * 64;
 } else goto bad;
 if (ISCONNECTED
 && __isExternalAddress(aGCId)
 && __isExternalAddress(aDrawableId)
 && __bothSmallInteger(x, y)
 && __bothSmallInteger(width, height)) {
-win = __WindowVal(aDrawableId);
+	win = __WindowVal(aDrawableId);
-gc = __GCVal(aGCId);
+	gc = __GCVal(aGCId);
-w = __intVal(width);
+	w = __intVal(width);
-h = __intVal(height);
+	h = __intVal(height);
-/*
+	/*
-* need this check here: some servers simply dump core with bad args
+	 * need this check here: some servers simply dump core with bad args
-*/
+	 */
-if ((w >= 0) && (h >= 0) && (angle1 >= 0) && (angle2 >= 0)) {
+	if ((w >= 0) && (h >= 0) && (angle1 >= 0) && (angle2 >= 0)) {
-ENTER_XLIB();
+	    ENTER_XLIB();
-XDrawArc(myDpy, win, gc, __intVal(x), __intVal(y),
+	    XDrawArc(myDpy, win, gc, __intVal(x), __intVal(y),
-w, h, angle1, angle2);
+				   w, h, angle1, angle2);
-LEAVE_XLIB();
+	    LEAVE_XLIB();
-}
+	}
-RETURN ( self );
+	RETURN ( self );
 }
 bad: ;
 %}.
 "badGC, badDrawable or coordinates not integer
 or angle(s) not integer or float."
 "draw a line. If the coordinates are not integers, an error is triggered."
 <context: #return>
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 GC gc;
 Window win;
 if (ISCONNECTED
 && __isExternalAddress(aGCId)
 && __isExternalAddress(aDrawableId)
 && __bothSmallInteger(x0, y0)
 && __bothSmallInteger(x1, y1)) {
-Display *dpy = myDpy;
+	Display *dpy = myDpy;
-int ix0, iy0, ix1, iy1;
+	int ix0, iy0, ix1, iy1;
-gc = __GCVal(aGCId);
+	gc = __GCVal(aGCId);
-win = __WindowVal(aDrawableId);
+	win = __WindowVal(aDrawableId);
-ix0 = __intVal(x0);
+	ix0 = __intVal(x0);
-iy0 = __intVal(y0);
+	iy0 = __intVal(y0);
-ix1 = __intVal(x1);
+	ix1 = __intVal(x1);
-iy1 = __intVal(y1);
+	iy1 = __intVal(y1);
-/* attention: coordinates in X are shorts and wrap; clamp here. */
+	/* attention: coordinates in X are shorts and wrap; clamp here. */
-if (ix0 > 0x7FFF) ix0 = 0x7FFF;
+	if (ix0 > 0x7FFF) ix0 = 0x7FFF;
-else if (ix0 < -0x8000) ix0 = -0x8000;
+	else if (ix0 < -0x8000) ix0 = -0x8000;
-if (iy0 > 0x7FFF) iy0 = 0x7FFF;
+	if (iy0 > 0x7FFF) iy0 = 0x7FFF;
-else if (iy0 < -0x8000) iy0 = -0x8000;
+	else if (iy0 < -0x8000) iy0 = -0x8000;
-if (ix1 > 0x7FFF) ix1 = 0x7FFF;
+	if (ix1 > 0x7FFF) ix1 = 0x7FFF;
-else if (ix1 < -0x8000) ix1 = -0x8000;
+	else if (ix1 < -0x8000) ix1 = -0x8000;
-if (iy1 > 0x7FFF) iy1 = 0x7FFF;
+	if (iy1 > 0x7FFF) iy1 = 0x7FFF;
-else if (iy1 < -0x8000) iy1 = -0x8000;
+	else if (iy1 < -0x8000) iy1 = -0x8000;
-ENTER_XLIB();
+	ENTER_XLIB();
-if ((ix0 == ix1) && (iy0 == iy1)) {
+	if ((ix0 == ix1) && (iy0 == iy1)) {
-/* little bit shorter X-lib message (better with slow connections...) */
+	    /* little bit shorter X-lib message (better with slow connections...) */
-XDrawPoint(dpy, win, gc, ix0, iy0);
+	    XDrawPoint(dpy, win, gc, ix0, iy0);
-} else {
+	} else {
-XDrawLine(dpy, win, gc, ix0, iy0, ix1, iy1);
+	    XDrawLine(dpy, win, gc, ix0, iy0, ix1, iy1);
-}
+	}
-LEAVE_XLIB();
+	LEAVE_XLIB();
-RETURN ( self );
+	RETURN ( self );
 }
 %}.
 "badGC, badDrawable or coordinates not integer"
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 |noY|
 (noY := yValues size) < 2 ifTrue:[
-^ self
+	^ self
 ].
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 OBJ      yA, t;
 int      i, num;
 float    y, x, sY, tY, step;
 Window win;
 if (ISCONNECTED
 && __isExternalAddress(aGCId)
 && __isExternalAddress(aDrawableId) ) {
-gc = __GCVal(aGCId);
+	gc = __GCVal(aGCId);
-win = __WindowVal(aDrawableId);
+	win = __WindowVal(aDrawableId);
-if( __isSmallInteger(scaleY) )
+	if( __isSmallInteger(scaleY) )
-sY = (float) __intVal( scaleY );
+	    sY = (float) __intVal( scaleY );
-else if (__isFloat(scaleY))
+	else if (__isFloat(scaleY))
-sY = __floatVal( scaleY );
+	    sY = __floatVal( scaleY );
-else if (__isShortFloat(scaleY))
+	else if (__isShortFloat(scaleY))
-sY = __shortFloatVal( scaleY );
+	    sY = __shortFloatVal( scaleY );
-else {
+	else {
-t = __SSEND0(scaleY, @symbol(asFloat), 0);
+	    t = __SSEND0(scaleY, @symbol(asFloat), 0);
-if (! __isFloat(t)) goto fail;
+	    if (! __isFloat(t)) goto fail;
-sY = __floatVal( t );
+	    sY = __floatVal( t );
-}
+	}
-if( __isSmallInteger(transY) )
+	if( __isSmallInteger(transY) )
-tY = (float) __intVal( transY );
+	    tY = (float) __intVal( transY );
-else if (__isFloat(transY))
+	else if (__isFloat(transY))
-tY = __floatVal( transY );
+	    tY = __floatVal( transY );
-else if (__isShortFloat(transY))
+	else if (__isShortFloat(transY))
-tY = __shortFloatVal( transY );
+	    tY = __shortFloatVal( transY );
-else {
+	else {
-t = __SSEND0(transY, @symbol(asFloat), 0);
+	    t = __SSEND0(transY, @symbol(asFloat), 0);
-if (! __isFloat(t)) goto fail;
+	    if (! __isFloat(t)) goto fail;
-tY = __floatVal( t );
+	    tY = __floatVal( t );
-}
+	}
-if( __isSmallInteger(startX) )
+	if( __isSmallInteger(startX) )
-x = (float) __intVal( startX );
+	    x = (float) __intVal( startX );
-else if (__isFloat(startX))
+	else if (__isFloat(startX))
-x = __floatVal( startX );
+	    x = __floatVal( startX );
-else if (__isShortFloat(startX))
+	else if (__isShortFloat(startX))
-x = __shortFloatVal( startX );
+	    x = __shortFloatVal( startX );
-else {
+	else {
-t = __SSEND0(startX, @symbol(asFloat), 0);
+	    t = __SSEND0(startX, @symbol(asFloat), 0);
-if (! __isFloat(t)) goto fail;
+	    if (! __isFloat(t)) goto fail;
-x = __floatVal( t );
+	    x = __floatVal( t );
-}
+	}
-if( __isSmallInteger(stepX) )
+	if( __isSmallInteger(stepX) )
-step = (float) __intVal( stepX );
+	    step = (float) __intVal( stepX );
-else if (__isFloat(stepX))
+	else if (__isFloat(stepX))
-step = __floatVal( stepX );
+	    step = __floatVal( stepX );
-else if (__isShortFloat(stepX))
+	else if (__isShortFloat(stepX))
-step = __shortFloatVal( stepX );
+	    step = __shortFloatVal( stepX );
-else {
+	else {
-t = __SSEND0(stepX, @symbol(asFloat), 0);
+	    t = __SSEND0(stepX, @symbol(asFloat), 0);
-if (! __isFloat(t)) goto fail;
+	    if (! __isFloat(t)) goto fail;
-step = __floatVal( t );
+	    step = __floatVal( t );
-}
+	}
-num = __intVal( noY );
+	num = __intVal( noY );
-if( num > 200 ) {
+	if( num > 200 ) {
-if( ! (points = (XPoint *) malloc ( sizeof(XPoint) * num )) )
+	    if( ! (points = (XPoint *) malloc ( sizeof(XPoint) * num )) )
-goto fail;
+		goto fail;
-mustFree = 1;
+	    mustFree = 1;
-} else {
+	} else {
-points = qPoints;
+	    points = qPoints;
-}
+	}
-for( i = 0; i < num; ++i ) {
+	for( i = 0; i < num; ++i ) {
-int px, py;
+	    int px, py;
-yA  = __AT_(yValues, __MKSMALLINT(i+1) );
+	    yA  = __AT_(yValues, __MKSMALLINT(i+1) );
-if( __isFloat(yA) )
+	    if( __isFloat(yA) )
-y = __floatVal( yA );
+		y = __floatVal( yA );
-else if( __isSmallInteger(yA) )
+	    else if( __isSmallInteger(yA) )
-y = (float) __intVal( yA );
+		y = (float) __intVal( yA );
-else if( __isShortFloat( yA) )
+	    else if( __isShortFloat( yA) )
-y = __shortFloatVal( yA );
+		y = __shortFloatVal( yA );
-else {
+	    else {
-t = __SSEND0(yA, @symbol(asFloat), 0);
+		t = __SSEND0(yA, @symbol(asFloat), 0);
-if (! __isFloat(t)) goto fail;
+		if (! __isFloat(t)) goto fail;
-y = __floatVal( t );
+		y = __floatVal( t );
-}
+	    }
-px = (int) (x + 0.5);
+	    px = (int) (x + 0.5);
-py = (int) ((y * sY) + tY + 0.5);
+	    py = (int) ((y * sY) + tY + 0.5);
-/* attention: coordinates in X are shorts and wrap; clamp here. */
+	    /* attention: coordinates in X are shorts and wrap; clamp here. */
-if (px > 0x7FFF) px = 0x7FFF;
+	    if (px > 0x7FFF) px = 0x7FFF;
-else if (px < -0x8000) px = -0x8000;
+	    else if (px < -0x8000) px = -0x8000;
-if (py > 0x7FFF) py = 0x7FFF;
+	    if (py > 0x7FFF) py = 0x7FFF;
-else if (py < -0x8000) py = -0x8000;
+	    else if (py < -0x8000) py = -0x8000;
-points[i].x = px;
+	    points[i].x = px;
-points[i].y = py;
+	    points[i].y = py;
-x = x + step;
+	    x = x + step;
-}
+	}
-ENTER_XLIB();
+	ENTER_XLIB();
-XDrawLines(myDpy, win, gc, points, num, CoordModeOrigin);
+	XDrawLines(myDpy, win, gc, points, num, CoordModeOrigin);
-LEAVE_XLIB();
+	LEAVE_XLIB();
-if( mustFree ) {
+	if( mustFree ) {
-free( points );
+	    free( points );
-}
+	}
-RETURN ( self );
+	RETURN ( self );
 }
 fail:
 if( mustFree )
-free( points );
+	free( points );
 %}.
 ^ super displayLinesFromX:startX step:stepX yValues:yValues scaleY:scaleY transY:transY in:aDrawableId with:aGCId
 "Modified: / 13.6.1998 / 13:51:39 / cg"
 !
 "draw a point. If x/y are not integers, an error is triggered."
 <context: #return>
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 GC gc;
 Window win;
 if (ISCONNECTED
 && __isExternalAddress(aGCId)
 && __isExternalAddress(aDrawableId)
 && __bothSmallInteger(x, y)) {
-int px, py;
+	int px, py;
-gc = __GCVal(aGCId);
+	gc = __GCVal(aGCId);
-win = __WindowVal(aDrawableId);
+	win = __WindowVal(aDrawableId);
-px = __intVal(x);
+	px = __intVal(x);
-py = __intVal(y);
+	py = __intVal(y);
-if (px > 0x7FFF) px = 0x7FFF;
+	if (px > 0x7FFF) px = 0x7FFF;
-else if (px < -0x8000) px = -0x8000;
+	else if (px < -0x8000) px = -0x8000;
-if (py > 0x7FFF) py = 0x7FFF;
+	if (py > 0x7FFF) py = 0x7FFF;
-else if (py < -0x8000) py = -0x8000;
+	else if (py < -0x8000) py = -0x8000;
-ENTER_XLIB();
+	ENTER_XLIB();
-XDrawPoint(myDpy, win, gc, px, py);
+	XDrawPoint(myDpy, win, gc, px, py);
-LEAVE_XLIB();
+	LEAVE_XLIB();
-RETURN ( self );
+	RETURN ( self );
 }
 %}.
 "badGC, badDrawable or x/y not integer"
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 |numberOfPoints newPoints|
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 numberOfPoints := aPolygon size.
 %{
 GC gc;
 Window win;
 if (ISCONNECTED
 && __isExternalAddress(aGCId)
 && __isExternalAddress(aDrawableId)
 && __isSmallInteger(numberOfPoints)) {
-gc = __GCVal(aGCId);
+	gc = __GCVal(aGCId);
-win = __WindowVal(aDrawableId);
+	win = __WindowVal(aDrawableId);
-num = __intVal(numberOfPoints);
+	num = __intVal(numberOfPoints);
-/*
+	/*
-* avoid a (slow) malloc, if the number of points is small
+	 * avoid a (slow) malloc, if the number of points is small
-*/
+	 */
-if (num > 100) {
+	if (num > 100) {
-points = (XPoint *)malloc(sizeof(XPoint) * num);
+	    points = (XPoint *)malloc(sizeof(XPoint) * num);
-if (! points) goto fail;
+	    if (! points) goto fail;
-mustFree = 1;
+	    mustFree = 1;
-} else
+	} else
-points = qPoints;
+	    points = qPoints;
-for (i=0; i<num; i++) {
+	for (i=0; i<num; i++) {
-int px, py;
+	    int px, py;
-point = __AT_(aPolygon, __MKSMALLINT(i+1));
+	    point = __AT_(aPolygon, __MKSMALLINT(i+1));
-if (! __isPoint(point)) goto fail;
+	    if (! __isPoint(point)) goto fail;
-x = _point_X(point);
+	    x = _point_X(point);
-y = _point_Y(point);
+	    y = _point_Y(point);
-if (! __bothSmallInteger(x, y))
+	    if (! __bothSmallInteger(x, y))
-goto fail;
+		goto fail;
-px = __intVal(x);
+	    px = __intVal(x);
-py = __intVal(y);
+	    py = __intVal(y);
-/* attention: coordinates in X are shorts and wrap; clamp here. */
+	    /* attention: coordinates in X are shorts and wrap; clamp here. */
-if (px > 0x7FFF) px = 0x7FFF;
+	    if (px > 0x7FFF) px = 0x7FFF;
-else if (px < -0x8000) px = -0x8000;
+	    else if (px < -0x8000) px = -0x8000;
-if (py > 0x7FFF) py = 0x7FFF;
+	    if (py > 0x7FFF) py = 0x7FFF;
-else if (py < -0x8000) py = -0x8000;
+	    else if (py < -0x8000) py = -0x8000;
-points[i].x = px;
+	    points[i].x = px;
-points[i].y = py;
+	    points[i].y = py;
-}
+	}
-ENTER_XLIB();
+	ENTER_XLIB();
-XDrawLines(myDpy, win, gc, points, num, CoordModeOrigin);
+	XDrawLines(myDpy, win, gc, points, num, CoordModeOrigin);
-LEAVE_XLIB();
+	LEAVE_XLIB();
-if (mustFree)
+	if (mustFree)
-free(points);
+	    free(points);
-RETURN ( self );
+	RETURN ( self );
 }
 fail: ;
 if (mustFree)
-free(points);
+	free(points);
 %}.
 "badGC, badDrawable or coordinates not integer"
 self primitiveFailedOrClosedConnection
 !
 "draw a rectangle. If the coordinates are not integers, an error is triggered."
 <context: #return>
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 GC gc;
 Window win;
 if (ISCONNECTED
 && __isExternalAddress(aGCId)
 && __isExternalAddress(aDrawableId)
 && __bothSmallInteger(x, y)
 && __bothSmallInteger(width, height)) {
-int px, py;
+	int px, py;
-gc = __GCVal(aGCId);
+	gc = __GCVal(aGCId);
-win = __WindowVal(aDrawableId);
+	win = __WindowVal(aDrawableId);
-w = __intVal(width);
+	w = __intVal(width);
-h = __intVal(height);
+	h = __intVal(height);
-/*
+	/*
-* need this check here: some servers simply dump core with bad args
+	 * need this check here: some servers simply dump core with bad args
-*/
+	 */
-if ((w >= 0) && (h >= 0)) {
+	if ((w >= 0) && (h >= 0)) {
-px = __intVal(x);
+	    px = __intVal(x);
-py = __intVal(y);
+	    py = __intVal(y);
-/* attention: coordinates in X are shorts and wrap; clamp here. */
+	    /* attention: coordinates in X are shorts and wrap; clamp here. */
-if (px > 0x7FFF) px = 0x7FFF;
+	    if (px > 0x7FFF) px = 0x7FFF;
-else if (px < -0x8000) px = -0x8000;
+	    else if (px < -0x8000) px = -0x8000;
-if (py > 0x7FFF) py = 0x7FFF;
+	    if (py > 0x7FFF) py = 0x7FFF;
-else if (py < -0x8000) py = -0x8000;
+	    else if (py < -0x8000) py = -0x8000;
-ENTER_XLIB();
+	    ENTER_XLIB();
-XDrawRectangle(myDpy, win, gc, px, py, w, h);
+	    XDrawRectangle(myDpy, win, gc, px, py, w, h);
-LEAVE_XLIB();
+	    LEAVE_XLIB();
-}
+	}
-RETURN ( self );
+	RETURN ( self );
 }
 %}.
 "badGC, badDrawable or coordinates not integer"
 self primitiveFailedOrClosedConnection
 !
 If the coordinates are not integers, an error is triggered."
 <context: #return>
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 GC gc;
 Window win;
 && __isExternalAddress(aGCId)
 && __isExternalAddress(aDrawableId)
 && __isNonNilObject(aString)
 && __bothSmallInteger(index1, index2)
 && __bothSmallInteger(x, y)) {
-int lMax = __intVal(@global(MaxStringLength));
+	int lMax = __intVal(@global(MaxStringLength));
-Display *dpy = myDpy;
+	Display *dpy = myDpy;
-gc = __GCVal(aGCId);
+	gc = __GCVal(aGCId);
-win = __WindowVal(aDrawableId);
+	win = __WindowVal(aDrawableId);
-i1 = __intVal(index1) - 1;
+	i1 = __intVal(index1) - 1;
-if (i1 >= 0) {
+	if (i1 >= 0) {
-OBJ cls;
+	    OBJ cls;
-i2 = __intVal(index2) - 1;
+	    i2 = __intVal(index2) - 1;
-if (i2 < i1) {
+	    if (i2 < i1) {
-RETURN (self);
+		RETURN (self);
-}
+	    }
-cp = (char *) __stringVal(aString);
+	    cp = (char *) __stringVal(aString);
-l = i2 - i1 + 1;
+	    l = i2 - i1 + 1;
-if (__isStringLike(aString)) {
+	    if (__isStringLike(aString)) {
-n = __stringSize(aString);
+		n = __stringSize(aString);
-if (i2 < n) {
+		if (i2 < n) {
-cp += i1;
+		    cp += i1;
-if (l > lMax) l = lMax;
+		    if (l > lMax) l = lMax;
-ENTER_XLIB();
+		    ENTER_XLIB();
-if (opaque == true)
+		    if (opaque == true)
-XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
+			XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
-else
+		    else
-XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
+			XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
-LEAVE_XLIB();
+		    LEAVE_XLIB();
-RETURN ( self );
+		    RETURN ( self );
-}
+		}
-}
+	    }
-cls = __qClass(aString);
+	    cls = __qClass(aString);
-nInstBytes = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
+	    nInstBytes = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
-cp += nInstBytes;
+	    cp += nInstBytes;
-if (__isBytes(aString)) {
+	    if (__isBytes(aString)) {
-n = __byteArraySize(aString) - nInstBytes - 1;
+		n = __byteArraySize(aString) - nInstBytes - 1;
-if (i2 < n) {
+		if (i2 < n) {
-cp += i1;
+		    cp += i1;
-if (l > lMax) l = lMax;
+		    if (l > lMax) l = lMax;
-ENTER_XLIB();
+		    ENTER_XLIB();
-if (opaque == true)
+		    if (opaque == true)
-XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
+			XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
-else
+		    else
-XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
+			XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
-LEAVE_XLIB();
+		    LEAVE_XLIB();
-RETURN ( self );
+		    RETURN ( self );
-}
+		}
-}
+	    }
-/* TWOBYTESTRINGS */
+	    /* TWOBYTESTRINGS */
-if (__isWords(aString)) {
+	    if (__isWords(aString)) {
-n = (__byteArraySize(aString) - nInstBytes) / 2;
+		n = (__byteArraySize(aString) - nInstBytes) / 2;
-if (i2 < n) {
+		if (i2 < n) {
-union {
+		    union {
-char b[2];
+			char b[2];
-unsigned short s;
+			unsigned short s;
-} u;
+		    } u;
-int i;
+		    int i;
-XChar2b *cp2 = (XChar2b *)0;
+		    XChar2b *cp2 = (XChar2b *)0;
-int mustFree = 0;
+		    int mustFree = 0;
-cp += (i1 * 2);
+		    cp += (i1 * 2);
-if (l > lMax) l = lMax;
+		    if (l > lMax) l = lMax;
 #if defined(MSBFIRST) || defined(__MSBFIRST)
-/*
+		    /*
-* chars already in correct order
+		     * chars already in correct order
-*/
+		     */
 #else
 # if ! (defined(LSBFIRST) || defined(__LSBFIRST))
-/*
+		    /*
-* ST/X TwoByteStrings store the asciiValue in native byteOrder;
+		     * ST/X TwoByteStrings store the asciiValue in native byteOrder;
-* X expects them MSB first
+		     * X expects them MSB first
-* convert as required
+		     * convert as required
-*/
+		     */
-u.s = 0x1234;
+		    u.s = 0x1234;
-if (u.b[0] != 0x12)
+		    if (u.b[0] != 0x12)
 # endif
-{
+		    {
-if (l <= NLOCALBUFFER) {
+			if (l <= NLOCALBUFFER) {
-cp2 = xlatebuffer;
+			    cp2 = xlatebuffer;
-} else {
+			} else {
-cp2 = (XChar2b *)(malloc(l * 2));
+			    cp2 = (XChar2b *)(malloc(l * 2));
-mustFree = 1;
+			    mustFree = 1;
-}
+			}
-for (i=0; i<l; i++) {
+			for (i=0; i<l; i++) {
-cp2[i].byte1 = (((XChar2b *)cp)[i]).byte2;
+			    cp2[i].byte1 = (((XChar2b *)cp)[i]).byte2;
-cp2[i].byte2 = (((XChar2b *)cp)[i]).byte1;
+			    cp2[i].byte2 = (((XChar2b *)cp)[i]).byte1;
-}
+			}
-cp = (char *) cp2;
+			cp = (char *) cp2;
-}
+		    }
 #endif
-ENTER_XLIB();
+		    ENTER_XLIB();
-if (opaque == true)
+		    if (opaque == true)
-XDrawImageString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
+			XDrawImageString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
-else
+		    else
-XDrawString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
+			XDrawString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
-LEAVE_XLIB();
+		    LEAVE_XLIB();
-if (mustFree) {
+		    if (mustFree) {
-free(cp2);
+			free(cp2);
-}
+		    }
-RETURN ( self );
+		    RETURN ( self );
-}
+		}
-}
+	    }
-/* FOURBYTESTRINGS */
+	    /* FOURBYTESTRINGS */
-if (__isLongs(aString)) {
+	    if (__isLongs(aString)) {
-n = (__byteArraySize(aString) - nInstBytes) / 4;
+		n = (__byteArraySize(aString) - nInstBytes) / 4;
-if (i2 < n) {
+		if (i2 < n) {
-union {
+		    union {
-char b[2];
+			char b[2];
-unsigned short s;
+			unsigned short s;
-} u;
+		    } u;
-int i;
+		    int i;
-XChar2b *cp2 = (XChar2b *)0;
+		    XChar2b *cp2 = (XChar2b *)0;
-int32 *ip;
+		    int32 *ip;
-int mustFree = 0;
+		    int mustFree = 0;
-cp += (i1 * 4);
+		    cp += (i1 * 4);
-if (l > lMax) l = lMax;
+		    if (l > lMax) l = lMax;
-/*
+		    /*
-* all codePoints <= 16rFFFF are draw; above 16bit range are drawn as 16rFFFF.
+		     * all codePoints <= 16rFFFF are draw; above 16bit range are drawn as 16rFFFF.
-*/
+		     */
-if (l <= NLOCALBUFFER) {
+		    if (l <= NLOCALBUFFER) {
-cp2 = xlatebuffer;
+			cp2 = xlatebuffer;
-} else {
+		    } else {
-cp2 = (XChar2b *)(malloc(l * 2));
+			cp2 = (XChar2b *)(malloc(l * 2));
-mustFree = 1;
+			mustFree = 1;
-}
+		    }
-for (i=0; i<l; i++) {
+		    for (i=0; i<l; i++) {
-int32 codePoint = ((int32 *)cp)[i];
+			int32 codePoint = ((int32 *)cp)[i];
-if (codePoint > 0xFFFF) {
+			if (codePoint > 0xFFFF) {
-codePoint = 0xFFFF;
+			    codePoint = 0xFFFF;
-}
+			}
-cp2[i].byte1 = (codePoint >> 8) & 0xFF;
+			cp2[i].byte1 = (codePoint >> 8) & 0xFF;
-cp2[i].byte2 = codePoint & 0xFF;
+			cp2[i].byte2 = codePoint & 0xFF;
-}
+		    }
-cp = (char *) cp2;
+		    cp = (char *) cp2;
-ENTER_XLIB();
+		    ENTER_XLIB();
-if (opaque == true)
+		    if (opaque == true)
-XDrawImageString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
+			XDrawImageString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
-else
+		    else
-XDrawString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
+			XDrawString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
-LEAVE_XLIB();
+		    LEAVE_XLIB();
-if (mustFree) {
+		    if (mustFree) {
-free(cp2);
+			free(cp2);
-}
+		    }
-RETURN ( self );
+		    RETURN ( self );
-}
+		}
-}
+	    }
-}
+	}
 }
 #undef NLOCALBUFFER
 %}.
 (aString isString and:[aString bitsPerCharacter > 16]) ifTrue:[
-self displayString:(TwoByteString new:aString size withAll:16rFFFF asCharacter)
+	self displayString:(TwoByteString new:aString size withAll:16rFFFF asCharacter)
-from:index1 to:index2 x:x y:y in:aDrawableId with:aGCId opaque:opaque.
+	     from:index1 to:index2 x:x y:y in:aDrawableId with:aGCId opaque:opaque.
-^ self.
+	^ self.
 ].
 "x/y not integer, badGC or drawable, or not a string"
 self primitiveFailedOrClosedConnection
 !
 If the coordinates are not integers, an error is triggered."
 <context: #return>
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 GC gc;
 Window win;
 if (ISCONNECTED
 && __isExternalAddress(aGCId)
 && __isExternalAddress(aDrawableId)
 && __isNonNilObject(aString)
 && __bothSmallInteger(x, y)) {
-int lMax = __intVal(@global(MaxStringLength));
+	int lMax = __intVal(@global(MaxStringLength));
-Display *dpy = myDpy;
+	Display *dpy = myDpy;
-gc = __GCVal(aGCId);
+	gc = __GCVal(aGCId);
-win = __WindowVal(aDrawableId);
+	win = __WindowVal(aDrawableId);
-cp = (char *) __stringVal(aString);
+	cp = (char *) __stringVal(aString);
-if (__isStringLike(aString)) {
+	if (__isStringLike(aString)) {
-n = __stringSize(aString);
+	    n = __stringSize(aString);
-if (n > lMax) n = lMax;
+	    if (n > lMax) n = lMax;
-ENTER_XLIB();
+	    ENTER_XLIB();
-if (opaque == true)
+	    if (opaque == true)
-XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
+		XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
-else
+	    else
-XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
+		XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
-LEAVE_XLIB();
+	    LEAVE_XLIB();
-RETURN ( self );
+	    RETURN ( self );
-}
+	}
-cls = __qClass(aString);
+	cls = __qClass(aString);
-nInstBytes = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
+	nInstBytes = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
-cp += nInstBytes;
+	cp += nInstBytes;
-if (__isBytes(aString)) {
+	if (__isBytes(aString)) {
-n = __byteArraySize(aString) - nInstBytes - 1;
+	    n = __byteArraySize(aString) - nInstBytes - 1;
-if (n > lMax) n = lMax;
+	    if (n > lMax) n = lMax;
-ENTER_XLIB();
+	    ENTER_XLIB();
-if (opaque == true)
+	    if (opaque == true)
-XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
+		XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
-else
+	    else
-XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
+		XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
-LEAVE_XLIB();
+	    LEAVE_XLIB();
-RETURN ( self );
+	    RETURN ( self );
-}
+	}
-/* TWOBYTESTRINGS */
+	/* TWOBYTESTRINGS */
-if (__isWords(aString)) {
+	if (__isWords(aString)) {
-union {
+	    union {
-char b[2];
+		char b[2];
-unsigned short s;
+		unsigned short s;
-} u;
+	    } u;
-int i;
+	    int i;
-XChar2b *cp2;
+	    XChar2b *cp2;
-int mustFree = 0;
+	    int mustFree = 0;
-n = (__byteArraySize(aString) - nInstBytes) / 2;
+	    n = (__byteArraySize(aString) - nInstBytes) / 2;
-if (n > lMax) n = lMax;
+	    if (n > lMax) n = lMax;
 #if defined(MSBFIRST) || defined(__MSBFIRST)
-/*
+	    /*
-* chars already in correct order
+	     * chars already in correct order
-*/
+	     */
 #else
 # if ! (defined(LSBFIRST) || defined(__LSBFIRST))
-/*
+	    /*
-* ST/X TwoByteStrings store the asciiValue in native byteOrder;
+	     * ST/X TwoByteStrings store the asciiValue in native byteOrder;
-* X expects them MSB first
+	     * X expects them MSB first
-* convert as required
+	     * convert as required
-*/
+	     */
-u.s = 0x1234;
+	    u.s = 0x1234;
-if (u.b[0] != 0x12)
+	    if (u.b[0] != 0x12)
 # endif
-{
+	    {
-if (n <= NLOCALBUFFER) {
+		if (n <= NLOCALBUFFER) {
-cp2 = xlatebuffer;
+		    cp2 = xlatebuffer;
-} else {
+		} else {
-cp2 = (XChar2b *)(malloc(n * 2));
+		    cp2 = (XChar2b *)(malloc(n * 2));
-mustFree = 1;
+		    mustFree = 1;
-}
+		}
-for (i=0; i<n; i++) {
+		for (i=0; i<n; i++) {
-cp2[i].byte1 = (((XChar2b *)cp)[i]).byte2;
+		    cp2[i].byte1 = (((XChar2b *)cp)[i]).byte2;
-cp2[i].byte2 = (((XChar2b *)cp)[i]).byte1;
+		    cp2[i].byte2 = (((XChar2b *)cp)[i]).byte1;
-}
+		}
-cp = (char *) cp2;
+		cp = (char *) cp2;
-}
+	    }
 #endif
-ENTER_XLIB();
+	    ENTER_XLIB();
-if (opaque == true)
+	    if (opaque == true)
-XDrawImageString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, n);
+		XDrawImageString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, n);
-else
+	    else
-XDrawString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, n);
+		XDrawString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, n);
-LEAVE_XLIB();
+	    LEAVE_XLIB();
-if (mustFree) {
+	    if (mustFree) {
-free(cp2);
+		free(cp2);
-}
+	    }
-RETURN ( self );
+	    RETURN ( self );
-}
+	}
 }
 #undef NLOCALBUFFER
 %}.
 ^ super displayString:aString x:x y:y in:aDrawableId with:aGCId opaque:opaque
 !
 drawBits:givenBits bitsPerPixel:bitsPerPixel depth:imageDepth padding:givenPadding
-width:imageWidth height:imageHeight
+	width:imageWidth height:imageHeight
-x:srcx y:srcy
+	x:srcx y:srcy
-into:aDrawableId
+	into:aDrawableId
-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.
 "/ 8-bit padded image. (it wants it 32bit padded).
 "/ as a workaround, repad it here (although, the server and/or Xlib should
 "/ care for that.
 ((imageDepth == 4) and:[depth == 4]) ifTrue:[
-fmt := self supportedImageFormatForDepth:4.
+	fmt := self supportedImageFormatForDepth:4.
-fmt isNil ifTrue:[
+	fmt isNil ifTrue:[
-self primitiveFailed. "/ cannot represent this image
+	    self primitiveFailed. "/ cannot represent this image
-^ nil
+	    ^ nil
-].
+	].
-wantedPadding := fmt at:#padding.
+	wantedPadding := fmt at:#padding.
-wantedPadding > givenPadding ifTrue:[
+	wantedPadding > givenPadding ifTrue:[
-bits := self
+	    bits := self
-repadBits:givenBits
+			    repadBits:givenBits
-width:imageWidth
+			    width:imageWidth
-height:imageHeight
+			    height:imageHeight
-depth:imageDepth
+			    depth:imageDepth
-from:givenPadding
+			    from:givenPadding
-to:wantedPadding.
+			    to:wantedPadding.
-padding := wantedPadding.
+	    padding := wantedPadding.
-]
+	]
 ].
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 "
 sorry; I had to separate it into 2 methods, since XPutImage needs
 an unlimited stack, and thus cannot send primitiveFailed
 "
 (self
-primDrawBits:bits
+	primDrawBits:bits
-bitsPerPixel:bitsPerPixel
+	bitsPerPixel:bitsPerPixel
-depth:imageDepth
+	depth:imageDepth
-msb:true
+	msb:true
-padding:padding
+	padding:padding
-width:imageWidth height:imageHeight
+	width:imageWidth height:imageHeight
-x:srcx y:srcy
+	x:srcx y:srcy
-into:aDrawableId
+	into:aDrawableId
-x:dstx y:dsty
+	x:dstx y:dsty
-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 primitiveFailedOrClosedConnection
+	self primitiveFailedOrClosedConnection
 ].
 !
 fillArcX:x y:y width:width height:height from:startAngle angle:angle
-in:aDrawableId with:aGCId
+	       in:aDrawableId with:aGCId
 "fill an arc. If any coordinate is not integer, an error is triggered.
 The angles may be floats or integer - they are given in degrees."
 <context: #return>
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 GC gc;
 Window win;
 int w, h, angle1, angle2;
 double f;
 if (__isSmallInteger(startAngle))
-angle1 = __intVal(startAngle) * 64;
+	angle1 = __intVal(startAngle) * 64;
 else if (__isFloat(startAngle)) {
-f = __floatVal(startAngle);
+	f = __floatVal(startAngle);
-angle1 = f * 64;
+	angle1 = f * 64;
 } else if (__isShortFloat(startAngle)) {
-f = __shortFloatVal(startAngle);
+	f = __shortFloatVal(startAngle);
-angle1 = f * 64;
+	angle1 = f * 64;
 } else goto bad;
 if (__isSmallInteger(angle))
-angle2 = __intVal(angle) * 64;
+	angle2 = __intVal(angle) * 64;
 else if (__isFloat(angle)) {
-f = __floatVal(angle);
+	f = __floatVal(angle);
-angle2 = f * 64;
+	angle2 = f * 64;
 } else if (__isShortFloat(angle)) {
-f = __shortFloatVal(angle);
+	f = __shortFloatVal(angle);
-angle2 = f * 64;
+	angle2 = f * 64;
 } else goto bad;
 if (ISCONNECTED
 && __isExternalAddress(aGCId)
 && __isExternalAddress(aDrawableId)
 && __bothSmallInteger(x, y)
 && __bothSmallInteger(width, height)) {
-gc = __GCVal(aGCId);
+	gc = __GCVal(aGCId);
-win = __WindowVal(aDrawableId);
+	win = __WindowVal(aDrawableId);
-w = __intVal(width);
+	w = __intVal(width);
-h = __intVal(height);
+	h = __intVal(height);
-/*
+	/*
-* need this check here: some servers simply dump core with bad args
+	 * need this check here: some servers simply dump core with bad args
-*/
+	 */
-if ((w >= 0) && (h >= 0) && (angle1 >= 0) && (angle2 >= 0)) {
+	if ((w >= 0) && (h >= 0) && (angle1 >= 0) && (angle2 >= 0)) {
-ENTER_XLIB();
+	    ENTER_XLIB();
-XFillArc(myDpy, win, gc, __intVal(x), __intVal(y),
+	    XFillArc(myDpy, win, gc, __intVal(x), __intVal(y),
-w, h, angle1, angle2);
+				   w, h, angle1, angle2);
-LEAVE_XLIB();
+	    LEAVE_XLIB();
-}
+	}
-RETURN ( self );
+	RETURN ( self );
 }
 bad: ;
 %}.
 "badGC, badDrawable or coordinates not integer
 or non float angle(s)"
 <context: #return>
 |numberOfPoints|
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 numberOfPoints := aPolygon size.
 %{
 GC gc;
 Window win;
 if (ISCONNECTED
 && __isExternalAddress(aGCId)
 && __isExternalAddress(aDrawableId)
 && __isSmallInteger(numberOfPoints)) {
-gc = __GCVal(aGCId);
+	gc = __GCVal(aGCId);
-win = __WindowVal(aDrawableId);
+	win = __WindowVal(aDrawableId);
-num = __intVal(numberOfPoints);
+	num = __intVal(numberOfPoints);
-if (num < 3) {
+	if (num < 3) {
-RETURN ( self );
+	    RETURN ( self );
-}
+	}
-/*
+	/*
-* avoid (slow) malloc, if not many points
+	 * avoid (slow) malloc, if not many points
-*/
+	 */
-if (num > 100) {
+	if (num > 100) {
-points = (XPoint *) malloc(sizeof(XPoint) * num);
+	    points = (XPoint *) malloc(sizeof(XPoint) * num);
-if (! points) goto fail;
+	    if (! points) goto fail;
-mustFree = 1;
+	    mustFree = 1;
-} else
+	} else
-points = qPoints;
+	    points = qPoints;
-for (i=0; i<num; i++) {
+	for (i=0; i<num; i++) {
-point = __AT_(aPolygon, __MKSMALLINT(i+1));
+	    point = __AT_(aPolygon, __MKSMALLINT(i+1));
-if (! __isPoint(point)) goto fail;
+	    if (! __isPoint(point)) goto fail;
-x = _point_X(point);
+	    x = _point_X(point);
-y = _point_Y(point);
+	    y = _point_Y(point);
-if (! __bothSmallInteger(x, y))
+	    if (! __bothSmallInteger(x, y))
-goto fail;
+		goto fail;
-points[i].x = __intVal(x);
+	    points[i].x = __intVal(x);
-points[i].y = __intVal(y);
+	    points[i].y = __intVal(y);
-}
+	}
-ENTER_XLIB();
+	ENTER_XLIB();
-XFillPolygon(myDpy, win, gc, points, num, Complex, CoordModeOrigin);
+	XFillPolygon(myDpy, win, gc, points, num, Complex, CoordModeOrigin);
-LEAVE_XLIB();
+	LEAVE_XLIB();
-if (mustFree)
+	if (mustFree)
-free(points);
+	    free(points);
-RETURN ( self );
+	RETURN ( self );
 fail: ;
-if (mustFree)
+	if (mustFree)
-free(points);
+	    free(points);
 }
 %}.
 "badGC, badDrawable or coordinates not integer"
 self primitiveFailedOrClosedConnection
 !
 "fill a rectangle. If any coordinate is not integer, an error is triggered."
 <context: #return>
 operationsUntilFlush notNil ifTrue:[
-operationsUntilFlush <= 0 ifTrue:[
+	operationsUntilFlush <= 0 ifTrue:[
-self flush.
+	    self flush.
-] ifFalse:[
+	] ifFalse:[
-operationsUntilFlush := operationsUntilFlush - 1.
+	    operationsUntilFlush := operationsUntilFlush - 1.
-].
+	].
 ].
 %{
 int w, h;
 if (ISCONNECTED
 && __isExternalAddress(aGCId)
 && __isExternalAddress(aDrawableId)
 && __bothSmallInteger(x, y)
 && __bothSmallInteger(width, height)) {
-w = __intVal(width);
+	w = __intVal(width);
-h = __intVal(height);
+	h = __intVal(height);
-/*
+	/*
-* need this check here: some servers simply dump core with bad args
+	 * need this check here: some servers simply dump core with bad args
-*/
+	 */
-if ((w >= 0) && (h >= 0)) {
+	if ((w >= 0) && (h >= 0)) {
-ENTER_XLIB();
+	    ENTER_XLIB();
-XFillRectangle(myDpy,
+	    XFillRectangle(myDpy,
-__DrawableVal(aDrawableId), __GCVal(aGCId),
+			   __DrawableVal(aDrawableId), __GCVal(aGCId),
-__intVal(x), __intVal(y), w, h);
+			   __intVal(x), __intVal(y), w, h);
-LEAVE_XLIB();
+	    LEAVE_XLIB();
-}
+	}
-RETURN ( self );
+	RETURN ( self );
 }
 %}.
 "badGC, badDrawable or coordinates not integer"
 self primitiveFailedOrClosedConnection
 !
 hasMbufExtension := self queryMBUFExtension.
 hasPEXExtension := self queryPEXExtension.
 hasImageExtension := self queryXIEExtension.
 hasInputExtension := self queryXIExtension.
 hasXineramaExtension := self queryXineramaExtension.
+hasRenderExtension := self queryRenderExtension.
+hasXftLibrary := self queryXftLibrary.
 primaryAtom := self atomIDOf:#PRIMARY.
 stringAtom := self atomIDOf:#STRING.
 clipboardAtom := self atomIDOf:#CLIPBOARD.
 "
 Display queryRGBMasks
 "
 !
+queryXftLibrary
+%{
+#ifndef XFT
+RETURN (false);
+#endif
+%}.
+^ self queryRenderExtension
+!
+queryRenderExtension
+%{  /* NOCONTEXT */
+#ifdef XRENDER
+if (ISCONNECTED) {
+	Display *dpy;
+	int dummy;
+	dpy = myDpy;
+	if (XRenderQueryExtension (dpy, &dummy, &dummy)) {
+	    RETURN ( true );
+	}
+}
+#endif
+%}.
+^ false
+"
+Display queryRenderExtension
+"
+!
 querySHMExtension
 %{  /* NOCONTEXT */
 #ifdef xxSHM
 if (ISCONNECTED) {
 See also #sync, which even waits until the request has been processed."
 <context: #return>
 %{
 if (ISCONNECTED) {
-ENTER_XLIB();
+	ENTER_XLIB();
-XFlush(myDpy);
+	XFlush(myDpy);
-LEAVE_XLIB();
+	LEAVE_XLIB();
 }
 %}.
 operationsUntilFlush := maxOperationsUntilFlush.
 !
 <context: #return>
 %{
 if (ISCONNECTED) {
-ENTER_XLIB();
+	ENTER_XLIB();
-XSync(myDpy, 0);
+	XSync(myDpy, 0);
-LEAVE_XLIB();
+	LEAVE_XLIB();
 }
 %}.
 operationsUntilFlush := maxOperationsUntilFlush.
 !
 ! !
 !XWorkstation class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.574 2013-11-20 19:08:19 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.575 2013-11-25 10:51:46 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.574 2013-11-20 19:08:19 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.575 2013-11-25 10:51:46 cg Exp $'
 !
 version_SVN
 ^ '$ Id $'
 ! !

changeset 6159	d4e463e0c56c
parent 6157	244e739e05e9
child 6160	3ea2f08308ae