hg/stx-libview: comparison XWorkstation.st

equal deleted inserted replaced

-:62e5a818d378
+:6ac2b6c8fbd8
 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
 ].
 %{
 OBJ      yA, t;
 int      i, num;
 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"
 !
 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
 !
 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
 !
 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
 !
 "
 (self
 	primDrawBits:bits
 	bitsPerPixel:bitsPerPixel
 	depth:imageDepth
+	msb:true
 	padding:padding
 	width:imageWidth height:imageHeight
 	x:srcx y:srcy
 	into:aDrawableId
 	x:dstx y:dsty
 %}.
 "badGC, badDrawable or coordinates not integer"
 self primitiveFailedOrClosedConnection
 !
-primDrawBits:imageBits bitsPerPixel:bitsPerPixel depth:imageDepth padding:bitPadding
+primDrawBits:imageBits bitsPerPixel:bitsPerPixel depth:imageDepth msb:msb padding:bitPadding
 			      width:imageWidth height:imageHeight
 				  x:srcx y:srcy
 			       into:aDrawableId
 				  x:dstx y:dsty
 			      width:w height:h
 	image.data = (char *)__ByteArrayInstPtr(imageBits)->ba_element;
 	image.width = imgWdth = __intVal(imageWidth);
 	image.height = __intVal(imageHeight);
 	image.xoffset = 0;
 	image.format = ZPixmap;
-	image.byte_order = MSBFirst;
+	image.byte_order = (msb == true) ? MSBFirst : LSBFirst;
 	image.bitmap_unit = 8;
 	image.bitmap_bit_order = MSBFirst;
 	image.bitmap_pad = pad;
 	image.depth = __intVal(imageDepth);
 	image.bits_per_pixel = __intVal(bitsPerPixel);
 configure:view x:x y:y width:w height:h above:above
 "forward a size-change event for some view"
 self configureX:x y:y width:w height:h view:view.
 above notNil ifTrue:[
-|aboveView|
+	|aboveView|
-aboveView := self viewFromId:above.
+	aboveView := self viewFromId:above.
-aboveView notNil ifTrue:[
+	aboveView notNil ifTrue:[
-self coveredBy:aboveView view:view.
+	    self coveredBy:aboveView view:view.
-].
+	].
 ].
 !
 configureRequest:view x:x y:y width:w height:h above:above detail:detail
 "ignored for now"
 %{
 XFontStruct *f;
 int len;
 if (ISCONNECTED) {
-if (__isExternalAddress(fontId)) {
+	if (__isExternalAddress(fontId)) {
-f = __FontVal(fontId);
+	    f = __FontVal(fontId);
-if (f) {
+	    if (f) {
-avgAscent = __MKSMALLINT(f->ascent);
+		avgAscent = __MKSMALLINT(f->ascent);
-avgDescent = __MKSMALLINT(f->descent);
+		avgDescent = __MKSMALLINT(f->descent);
-maxAscent = __MKSMALLINT(f->max_bounds.ascent);
+		maxAscent = __MKSMALLINT(f->max_bounds.ascent);
-maxDescent = __MKSMALLINT(f->max_bounds.descent);
+		maxDescent = __MKSMALLINT(f->max_bounds.descent);
-minWidth = __MKSMALLINT(f->min_bounds.width);
+		minWidth = __MKSMALLINT(f->min_bounds.width);
-maxWidth = __MKSMALLINT(f->max_bounds.width);
+		maxWidth = __MKSMALLINT(f->max_bounds.width);
-ENTER_XLIB();
+		ENTER_XLIB();
-len = XTextWidth(f, " ", 1);
+		len = XTextWidth(f, " ", 1);
-LEAVE_XLIB();
+		LEAVE_XLIB();
-avgWidth = __MKSMALLINT( len );
+		avgWidth = __MKSMALLINT( len );
-}
+	    }
-}
+	}
 }
 %}.
 avgAscent == nil ifTrue:[
-self primitiveFailedOrClosedConnection.
+	self primitiveFailedOrClosedConnection.
-^ nil
+	^ nil
 ].
 maxAscent == 0 ifTrue:[
-"DingBats font does not define this"
+	"DingBats font does not define this"
-maxAscent := avgAscent.
+	maxAscent := avgAscent.
 ].
 maxDescent == 0 ifTrue:[
-"DingBats font does not define this"
+	"DingBats font does not define this"
-maxDescent := avgDescent
+	maxDescent := avgDescent
 ].
 info := DeviceWorkstation::DeviceFontMetrics new.
 info
 ascent:avgAscent
 char **fonts;
 OBJ arr, str;
 int i;
 if (ISCONNECTED) {
-if (__isString(pattern)) {
+	if (__isString(pattern)) {
-for (;;) {
+	    for (;;) {
-ENTER_XLIB();
+		ENTER_XLIB();
-fonts = XListFonts(myDpy, __stringVal(pattern), nnames, &available);
+		fonts = XListFonts(myDpy, __stringVal(pattern), nnames, &available);
-LEAVE_XLIB();
+		LEAVE_XLIB();
-if (fonts == 0) RETURN(nil);
+		if (fonts == 0) RETURN(nil);
-if (available < nnames) break;
+		if (available < nnames) break;
-XFreeFontNames(fonts);
+		XFreeFontNames(fonts);
-nnames = available * 2;
+		nnames = available * 2;
-}
+	    }
-/*
+	    /*
-* now, that we know the number of font names,
+	     * now, that we know the number of font names,
-* create the array ...
+	     * create the array ...
-*/
+	     */
-arr = __ARRAY_NEW_INT(available);
+	    arr = __ARRAY_NEW_INT(available);
-if (arr != nil) {
+	    if (arr != nil) {
-/*
+		/*
-* ... and fill it
+		 * ... and fill it
-*/
+		 */
-for (i=0; i<available; i++) {
+		for (i=0; i<available; i++) {
-__PROTECT__(arr);
+		    __PROTECT__(arr);
-str = __MKSTRING(fonts[i]);
+		    str = __MKSTRING(fonts[i]);
-__UNPROTECT__(arr);
+		    __UNPROTECT__(arr);
-__ArrayInstPtr(arr)->a_element[i] = str; __STORE(arr, str);
+		    __ArrayInstPtr(arr)->a_element[i] = str; __STORE(arr, str);
-}
+		}
-}
+	    }
-XFreeFontNames(fonts);
+	    XFreeFontNames(fonts);
-RETURN (arr);
+	    RETURN (arr);
-}
+	}
 }
 %}.
 ^ nil
 !
 |sizes|
 sizes := super sizesInFamily:aFamilyName face:aFaceName style:aStyleName filtering:filter.
 (sizes notNil and:[sizes includes:0]) ifTrue:[
-"special: in X11R5 and above, size 0 means:
+	"special: in X11R5 and above, size 0 means:
-there are scaled versions in all sizes available"
+	 there are scaled versions in all sizes available"
-^ #(4 5 6 7 8 9 10 11 12 14 16 18 20 22 24 28 32 48 64 72 96 144 192 288)
+	^ #(4 5 6 7 8 9 10 11 12 14 16 18 20 22 24 28 32 48 64 72 96 144 192 288)
 ].
 ^ sizes
 "
 Display sizesInFamily:'courier' face:'bold' style:'roman'
 int nInstBytes;
 int directionReturn, fontAscentReturn, fontDescentReturn;
 XCharStruct overAllReturn;
 if (ISCONNECTED) {
-if (__bothSmallInteger(index1, index2)
+	if (__bothSmallInteger(index1, index2)
-&& __isExternalAddress(aFontId)
+	 && __isExternalAddress(aFontId)
-&& __isNonNilObject(aString)) {
+	 && __isNonNilObject(aString)) {
-int lMax = __intVal(@global(XWorkstation:MaxStringLength));
+	    int lMax = __intVal(@global(XWorkstation:MaxStringLength));
-f = __FontVal(aFontId);
+	    f = __FontVal(aFontId);
-if (! f) goto fail;
+	    if (! f) goto fail;
-i1 = __intVal(index1) - 1;
+	    i1 = __intVal(index1) - 1;
-cls = __qClass(aString);
+	    cls = __qClass(aString);
-if (i1 >= 0) {
+	    if (i1 >= 0) {
-i2 = __intVal(index2) - 1;
+		i2 = __intVal(index2) - 1;
-if (i2 < i1) {
+		if (i2 < i1) {
-RETURN ( __MKSMALLINT(0) );
+		    RETURN ( __MKSMALLINT(0) );
-}
+		}
-cp = (char *) __stringVal(aString);
+		cp = (char *) __stringVal(aString);
-l = i2 - i1 + 1;
+		l = i2 - i1 + 1;
-if ((cls == @global(String)) || (cls == @global(Symbol))) {
+		if ((cls == @global(String)) || (cls == @global(Symbol))) {
-n = __stringSize(aString);
+		    n = __stringSize(aString);
-if (i2 < n) {
+		    if (i2 < n) {
-cp += i1;
+			cp += i1;
 #if 0
-ENTER_XLIB();
+			ENTER_XLIB();
-len = XQueryTextExtents(myDpy, f->fid, cp, l,
+			len = XQueryTextExtents(myDpy, f->fid, cp, l,
-&directionReturn, &fontAscentReturn, &fontDescentReturn,
+						&directionReturn, &fontAscentReturn, &fontDescentReturn,
-&overAllReturn);
+						&overAllReturn);
-LEAVE_XLIB();
+			LEAVE_XLIB();
-printf("lBear:%d rBear:%d width:%d\n", overAllReturn.lbearing, overAllReturn.rbearing, overAllReturn.width);
+			printf("lBear:%d rBear:%d width:%d\n", overAllReturn.lbearing, overAllReturn.rbearing, overAllReturn.width);
 #endif
-ENTER_XLIB();
+			ENTER_XLIB();
-len = XTextWidth(f, cp, l);
+			len = XTextWidth(f, cp, l);
-LEAVE_XLIB();
+			LEAVE_XLIB();
-RETURN ( __MKSMALLINT(len) );
+			RETURN ( __MKSMALLINT(len) );
-}
+		    }
-}
+		}
-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;
+		    n = __byteArraySize(aString) - nInstBytes;
-if (i2 < n) {
+		    if (i2 < n) {
-cp += i1;
+			cp += i1;
-ENTER_XLIB();
+			ENTER_XLIB();
-len = XTextWidth(f, cp, l);
+			len = XTextWidth(f, cp, l);
-LEAVE_XLIB();
+			LEAVE_XLIB();
-RETURN ( __MKSMALLINT(len) );
+			RETURN ( __MKSMALLINT(len) );
-}
+		    }
-}
+		}
-/* 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;
-/*
+			/*
-* 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) {
-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;
-}
+			}
-ENTER_XLIB();
+			ENTER_XLIB();
-len = XTextWidth16(f, (XChar2b *)cp, l);
+			len = XTextWidth16(f, (XChar2b *)cp, l);
-LEAVE_XLIB();
+			LEAVE_XLIB();
-if (mustFree) {
+			if (mustFree) {
-free(cp2);
+			    free(cp2);
-}
+			}
-RETURN ( __MKSMALLINT(len) );
+			RETURN ( __MKSMALLINT(len) );
-}
+		    }
-}
+		}
-}
+	    }
-}
+	}
 }
 #undef NLOCALBUFFER
 fail: ;
 %}.
 self primitiveFailedOrClosedConnection.
 int nInstBytes;
 int directionReturn, fontAscentReturn, fontDescentReturn;
 XCharStruct overAllReturn;
 if (ISCONNECTED) {
-if (__isExternalAddress(aFontId)
+	if (__isExternalAddress(aFontId)
-&& __isNonNilObject(aString)) {
+	 && __isNonNilObject(aString)) {
-int lMax = __intVal(@global(XWorkstation:MaxStringLength));
+	    int lMax = __intVal(@global(XWorkstation:MaxStringLength));
-f = __FontVal(aFontId);
+	    f = __FontVal(aFontId);
-if (! f) goto fail;
+	    if (! f) goto fail;
-cls = __qClass(aString);
+	    cls = __qClass(aString);
-cp = (char *) __stringVal(aString);
+	    cp = (char *) __stringVal(aString);
-if ((cls == @global(String)) || (cls == @global(Symbol))) {
+	    if ((cls == @global(String)) || (cls == @global(Symbol))) {
-n = __stringSize(aString);
+		n = __stringSize(aString);
 #if 0
-ENTER_XLIB();
+		ENTER_XLIB();
-len = XQueryTextExtents(myDpy, f->fid, cp, n,
+		len = XQueryTextExtents(myDpy, f->fid, cp, n,
-&directionReturn, &fontAscentReturn, &fontDescentReturn,
+					&directionReturn, &fontAscentReturn, &fontDescentReturn,
-&overAllReturn);
+					&overAllReturn);
-LEAVE_XLIB();
+		LEAVE_XLIB();
-printf("lBear:%d rBear:%d width:%d\n", overAllReturn.lbearing, overAllReturn.rbearing, overAllReturn.width);
+		printf("lBear:%d rBear:%d width:%d\n", overAllReturn.lbearing, overAllReturn.rbearing, overAllReturn.width);
 #endif
-ENTER_XLIB();
+		ENTER_XLIB();
-len = XTextWidth(f, cp, n);
+		len = XTextWidth(f, cp, n);
-LEAVE_XLIB();
+		LEAVE_XLIB();
-RETURN ( __MKSMALLINT(len) );
+		RETURN ( __MKSMALLINT(len) );
-}
+	    }
-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;
+		n = __byteArraySize(aString) - nInstBytes;
-ENTER_XLIB();
+		ENTER_XLIB();
-len = XTextWidth(f, cp, n);
+		len = XTextWidth(f, cp, n);
-LEAVE_XLIB();
+		LEAVE_XLIB();
-RETURN ( __MKSMALLINT(len) );
+		RETURN ( __MKSMALLINT(len) );
-}
+	    }
-/* 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;
-/*
+		/*
-* 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) {
-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;
-}
+		}
-ENTER_XLIB();
+		ENTER_XLIB();
-len = XTextWidth16(f, (XChar2b *)cp, n);
+		len = XTextWidth16(f, (XChar2b *)cp, n);
-LEAVE_XLIB();
+		LEAVE_XLIB();
-if (mustFree) {
+		if (mustFree) {
-free(cp2);
+		    free(cp2);
-}
+		}
-RETURN ( __MKSMALLINT(len) );
+		RETURN ( __MKSMALLINT(len) );
-}
+	    }
-}
+	}
 }
 #undef NLOCALBUFFER
 fail: ;
 %}.
 ^ super widthOf:aString inFont:aFontId
 ungrabKeyboard
 "release the keyboard"
 activeKeyboardGrab notNil ifTrue:[
-activeKeyboardGrab := nil.
+	activeKeyboardGrab := nil.
-self primUngrabKeyboard.
+	self primUngrabKeyboard.
 ]
 !
 ungrabPointer
 "release the pointer"
 activePointerGrab notNil ifTrue:[
-activePointerGrab := nil.
+	activePointerGrab := nil.
-self primUngrabPointer.
+	self primUngrabPointer.
 ]
 ! !
 !XWorkstation methodsFor:'graphic context stuff'!
 ! !
 !XWorkstation class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.404 2002-02-26 12:18:52 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.405 2002-02-27 10:23:27 cg Exp $'
 ! !
 XWorkstation initialize!

changeset 3608	6ac2b6c8fbd8
parent 3603	3665199a413f
child 3609	5742cce8a004