hg/stx-libview: comparison XWorkstation.st

equal deleted inserted replaced

-:d4e463e0c56c
+:3ea2f08308ae
 "
 COPYRIGHT (c) 1989 by Claus Gittinger
-	      All Rights Reserved
+All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 hereby transferred.
 "
 "{ Package: 'stx:libview' }"
 DeviceWorkstation subclass:#XWorkstation
-	instanceVariableNames:'hasShapeExtension hasShmExtension hasDPSExtension
+instanceVariableNames:'hasShapeExtension hasShmExtension hasDPSExtension
-		hasMbufExtension hasXVideoExtension hasSaveUnder hasPEXExtension
+hasMbufExtension hasXVideoExtension hasSaveUnder hasPEXExtension
-		hasImageExtension hasInputExtension hasXineramaExtension
+hasImageExtension hasInputExtension hasXineramaExtension
-		hasRenderExtension hasXftLibrary ignoreBackingStore blackpixel whitepixel atoms protocolsAtom
+hasRenderExtension hasXftLibrary ignoreBackingStore blackpixel whitepixel atoms protocolsAtom
-		deleteWindowAtom saveYourselfAtom quitAppAtom primaryAtom
+deleteWindowAtom saveYourselfAtom quitAppAtom primaryAtom
-		clipboardAtom stringAtom wmStateAtom motifWMHintsAtom
+clipboardAtom stringAtom wmStateAtom motifWMHintsAtom
-		listOfXFonts buttonsPressed eventRootX eventRootY displayName
+listOfXFonts buttonsPressed eventRootX eventRootY displayName
-		eventTrace dispatchingExpose rgbVisual rgbaVisual virtualRootId
+eventTrace dispatchingExpose rgbVisual rgbaVisual virtualRootId
-		rootId altModifierMask metaModifierMask lastEventTime
+rootId altModifierMask metaModifierMask lastEventTime
-		rawMonitorBounds monitorBounds lastButtonPressTime
+rawMonitorBounds monitorBounds lastButtonPressTime
-		deviceIOTimeoutErrorSignal activateOnClick rawKeySymTranslation
+deviceIOTimeoutErrorSignal activateOnClick rawKeySymTranslation
-		selectionOwner selectionTime selectionFetchers selectionHandlers
+selectionOwner clipboardSelectionTime primarySelectionTime
-		preWaitAction xlibTimeout xlibTimeoutForWindowCreation
+selectionFetchers selectionHandlers preWaitAction xlibTimeout
-		hasConnectionBroken uniqueDeviceID stxDeviceAtom uuidAtom
+xlibTimeoutForWindowCreation hasConnectionBroken uniqueDeviceID
-		primaryBuffer windowGroupWindow maxOperationsUntilFlush
+stxDeviceAtom uuidAtom primaryBuffer windowGroupWindow
-		operationsUntilFlush'
+maxOperationsUntilFlush operationsUntilFlush'
-	classVariableNames:'RawKeySymTranslation ConservativeSync MaxStringLength
+classVariableNames:'RawKeySymTranslation ConservativeSync MaxStringLength
-		DefaultXLibTimeout DefaultXLibTimeoutForWindowCreation'
+DefaultXLibTimeout DefaultXLibTimeoutForWindowCreation'
-	poolDictionaries:''
+poolDictionaries:''
-	category:'Interface-Graphics'
+category:'Interface-Graphics'
 !
 Object subclass:#SelectionFetcher
-	instanceVariableNames:'sema message display drawableID selectionID propertyID targetID
+instanceVariableNames:'sema message display drawableID selectionID propertyID targetID
-		buffer done incremental'
+buffer done incremental'
-	classVariableNames:''
+classVariableNames:''
-	poolDictionaries:''
+poolDictionaries:''
-	privateIn:XWorkstation
+privateIn:XWorkstation
 !
 SimpleView subclass:#WindowGroupWindow
-	instanceVariableNames:''
+instanceVariableNames:''
-	classVariableNames:''
+classVariableNames:''
-	poolDictionaries:''
+poolDictionaries:''
-	privateIn:XWorkstation
+privateIn:XWorkstation
 !
 !XWorkstation primitiveDefinitions!
 %{
 * This exception will shutDown the connection.
 * Q: is this a good idea for the local display ?
 */
 #define __ENTER_XLIB(whichTimeout)   \
 { \
-	__blockingPrimitiveTimoutHandler__ = (VOIDFUNC)__XTimeoutErrorHandler; \
+__blockingPrimitiveTimoutHandler__ = (VOIDFUNC)__XTimeoutErrorHandler; \
-	__blockingPrimitiveTimeoutArg__ = self; \
+__blockingPrimitiveTimeoutArg__ = self; \
-	__blockingPrimitiveTimeout__ = __intVal(__INST(whichTimeout)) * 1000; \
+__blockingPrimitiveTimeout__ = __intVal(__INST(whichTimeout)) * 1000; \
 } {
 #define LEAVE_XLIB()   \
 { \
-	__blockingPrimitiveTimoutHandler__ = (VOIDFUNC)0; \
+__blockingPrimitiveTimoutHandler__ = (VOIDFUNC)0; \
-	__blockingPrimitiveTimeoutArg__ = nil; \
+__blockingPrimitiveTimeoutArg__ = nil; \
-	__blockingPrimitiveTimeout__ = 0; \
+__blockingPrimitiveTimeout__ = 0; \
 } }
 #define ENTER_XLIB()   __ENTER_XLIB(xlibTimeout)
 #define ENTER_XLIB2()  __ENTER_XLIB(xlibTimeoutForWindowCreation)
 # ifdef __GNUC__
 VOLATILE
 # endif
 static
 dummyToForceLoading() {
-	XCreateSimpleWindow(0, 0, 0, 0, 0, 0, 0, 0, 0);
+XCreateSimpleWindow(0, 0, 0, 0, 0, 0, 0, 0, 0);
-	XCloseDisplay(0);
+XCloseDisplay(0);
-	XCreateImage(0, 0, 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0);
+XCreateImage(0, 0, 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0);
-	XSetWindowColormap(0, 0, 0);
+XSetWindowColormap(0, 0, 0);
-	XQueryColors(0,0,0,0);
+XQueryColors(0,0,0,0);
 # ifdef SHM
-	XShmAttach(0, 0);
+XShmAttach(0, 0);
-	XShmCreateImage(0, 0, 0, 0, 0, 0, 0 ,0);
+XShmCreateImage(0, 0, 0, 0, 0, 0, 0 ,0);
-	XShmDetach(0, 0);
+XShmDetach(0, 0);
-	XShmPutImage(0, 0, 0, 0 , 0,0,0,0,0,0,0);
+XShmPutImage(0, 0, 0, 0 , 0,0,0,0,0,0,0);
-	shmctl(0,0,0);
+shmctl(0,0,0);
-	fgetc(0);
+fgetc(0);
 # endif
 }
 #endif
 #undef __myInstPtr
 {
 XGetErrorText(dpy, event->error_code, lastErrorMsg, 127);
 lastErrorMsg[127] = '\0';
 if (lastErrorMsg[0] == '\0') {
-	sprintf(lastErrorMsg, "code: %d", event->error_code);
+sprintf(lastErrorMsg, "code: %d", event->error_code);
 }
 lastRequestCode = event->request_code;
 lastMinorCode = event->minor_code;
 lastResource = event->resourceid;
 if ((event->error_code == BadWindow) && (lastRequestCode == 4) && (lastMinorCode == 0)) {
-	/*
+/*
-	 * this is a BadWindow error for X_DestroyWindow.
+* this is a BadWindow error for X_DestroyWindow.
-	 * ignore it here, since it results from the GC freeing windows
+* ignore it here, since it results from the GC freeing windows
-	 * in non bottom-up window order.
+* in non bottom-up window order.
-	 */
+*/
-	return 0;
+return 0;
 }
 if (@global(DeviceWorkstation:ErrorPrinting) == true) {
-	console_fprintf(stderr, "XWorkstation [error]: x-error caught maj=%d (0x%x) min=%d (0x%x) resource=%"_lx_"\n",
+console_fprintf(stderr, "XWorkstation [error]: x-error caught maj=%d (0x%x) min=%d (0x%x) resource=%"_lx_"\n",
-			event->request_code, event->request_code,
+event->request_code, event->request_code,
-			event->minor_code, event->minor_code, (INT)(event->resourceid));
+event->minor_code, event->minor_code, (INT)(event->resourceid));
-	console_fprintf(stderr, "XWorkstation [error]: x-error message is [%d] '%s'\n",
+console_fprintf(stderr, "XWorkstation [error]: x-error message is [%d] '%s'\n",
-			event->error_code, lastErrorMsg);
+event->error_code, lastErrorMsg);
 }
 __errorInterruptWithIDAndParameter__(@symbol(DisplayError), __MKEXTERNALADDRESS(dpy));
 return 0;
 }
 int
 __XIOErrorHandler__(dpy)
 Display *dpy;
 {
 if (@global(DeviceWorkstation:ErrorPrinting) == true) {
-	console_fprintf(stderr, "XWorkstation [error]: I/O error\n");
+console_fprintf(stderr, "XWorkstation [error]: I/O error\n");
 }
 __immediateErrorInterruptWithIDAndParameter__(@symbol(DisplayIOError),
-						  __MKEXTERNALADDRESS(dpy));
+__MKEXTERNALADDRESS(dpy));
 #if 0
 /*
 * don't do this.
 * This error is called asynchronously, and the wrong process may be terminated
 void
 __XTimeoutErrorHandler(displayDeviceInst)
 OBJ displayDeviceInst;
 {
 if ((displayDeviceInst == @global(MainDisplay))
-	|| (displayDeviceInst == @global(DeviceWorkstation:DefaultScreen))) {
+|| (displayDeviceInst == @global(DeviceWorkstation:DefaultScreen))) {
-	console_fprintf(stderr, "XWorkstation [error]: keep display connection for master display after X11 timeout (no shutdown)\n");
+console_fprintf(stderr, "XWorkstation [error]: keep display connection for master display after X11 timeout (no shutdown)\n");
-	return;
+return;
 }
 if (@global(DeviceWorkstation:ErrorPrinting) == true) {
-	console_fprintf(stderr, "XWorkstation [error]: X11 request timeout dpy=%"_lx_"\n", (INT)displayDeviceInst);
+console_fprintf(stderr, "XWorkstation [error]: X11 request timeout dpy=%"_lx_"\n", (INT)displayDeviceInst);
 }
 __OINST(displayDeviceInst, hasConnectionBroken) = true;
 __PROTECT__(displayDeviceInst);
 __immediateErrorInterruptWithIDAndParameter__(@symbol(DisplayIOTimeoutError), displayDeviceInst);
 /*
 * if we return from the error interrupt ...
 */
 if (__OINST(displayDeviceInst, displayId) != nil) {
-	__internalError("unhandled X11 display timeout error");
+__internalError("unhandled X11 display timeout error");
-	/*
+/*
-	 * the current process failed to do an X11 request.
+* the current process failed to do an X11 request.
-	 * Terminate it!
+* Terminate it!
-	 */
+*/
-	__terminateProcess(0);      /* soft terminate */
+__terminateProcess(0);      /* soft terminate */
-	__terminateProcess(1);      /* hard terminate */
+__terminateProcess(1);      /* hard terminate */
 }
 }
 %}
 ! !
 !XWorkstation class methodsFor:'documentation'!
 copyright
 "
 COPYRIGHT (c) 1989 by Claus Gittinger
-	      All Rights Reserved
+All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 the other device to the currentScreen query.
 Therefore, 'normal' applications do not have to care for all of this, as the currentScreen
 query is answered by the launcher when opening its applications.
 Timeouts:
-	sometimes, X-connections are lost and, as the Xlib is blocking and synchronous by
+sometimes, X-connections are lost and, as the Xlib is blocking and synchronous by
-	default, this would lead to a locked ST/X system.
+default, this would lead to a locked ST/X system.
-	Therefore, this class defines a timeOut, whenever doing an Xlib call.
+Therefore, this class defines a timeOut, whenever doing an Xlib call.
-	The default for this timeout is 30seconds.
+The default for this timeout is 30seconds.
-	This may be a problem with windowmanagers which show a rubber-band rectangle
+This may be a problem with windowmanagers which show a rubber-band rectangle
-	when creating windows.
+when creating windows.
-	If the user does not specify the rectangle within 30 seconds, the device assumes
+If the user does not specify the rectangle within 30 seconds, the device assumes
-	a timeout and closes the connection.
+a timeout and closes the connection.
-	As a (kludgy) workaround, a second timeout value is used for window-creation.
+As a (kludgy) workaround, a second timeout value is used for window-creation.
-	This secondary timeout value defaults to 60*5 seconds (5 minutes).
+This secondary timeout value defaults to 60*5 seconds (5 minutes).
 See more documentation in my superclass, DeviceWorkstation.
 [author:]
-	Claus Gittinger
+Claus Gittinger
 "
 ! !
 !XWorkstation class methodsFor:'initialization'!
 "/ shutdown the X-connection, when no response is received after that many seconds.
 DefaultXLibTimeout := 30.
 DefaultXLibTimeoutForWindowCreation := 5*60.
 RawKeySymTranslation isNil ifTrue:[
-	"/ the following table maps X-keyevents to ST/X
+"/ the following table maps X-keyevents to ST/X
-	"/ device independend events.
+"/ device independend events.
-	"/ It is NOT meant as a keyboardMap replacement.
+"/ It is NOT meant as a keyboardMap replacement.
-	RawKeySymTranslation := Dictionary new:6.
+RawKeySymTranslation := Dictionary new:6.
-	RawKeySymTranslation
+RawKeySymTranslation
-	    at:#'Delete_line' put:#DeleteLine;
+at:#'Delete_line' put:#DeleteLine;
-	    at:#'Delete_word' put:#DeleteWord;
+at:#'Delete_word' put:#DeleteWord;
-	    at:#Down put:#CursorDown;
+at:#Down put:#CursorDown;
-	    at:#Up put:#CursorUp;
+at:#Up put:#CursorUp;
-	    at:#Left put:#CursorLeft;
+at:#Left put:#CursorLeft;
-	    at:#Right put:#CursorRight.
+at:#Right put:#CursorRight.
 ]
 "Modified: / 27.4.1999 / 17:21:30 / cg"
 ! !
 debugResources
 %{
 #ifdef COUNT_RESOURCES
 console_fprintf(stderr, "colors:%d bitmaps:%d views:%d gc:%d cursors:%d fonts:%d\n",
-	    __cnt_color, __cnt_bitmap,
+__cnt_color, __cnt_bitmap,
-	    __cnt_view, __cnt_gc, __cnt_cursor, __cnt_font);
+__cnt_view, __cnt_gc, __cnt_cursor, __cnt_font);
 #endif
 %}
 "
 XWorkstation debugResources
 and append the name of the corresponding X-request
 "
 match := 'XRequest.' , self requestCodeOfLastError printString.
 s := '/usr/lib/X11/XErrorDB' asFilename readStreamOrNil.
 s notNil ifTrue:[
-	line := s peekForLineStartingWith:match.
+line := s peekForLineStartingWith:match.
-	s close.
+s close.
 ].
 line isNil ifTrue:[
-	string := string, ' in ', match
+string := string, ' in ', match
 ] ifFalse:[
-	string := string , ' in ' , (line copyFrom:(line indexOf:$:)+1)
+string := string , ' in ' , (line copyFrom:(line indexOf:$:)+1)
 ].
 ^ string
 !
 minorCodeOfLastError
 resourceIdOfLastError
 %{  /* NOCONTEXT */
 if (lastResource != 0) {
-	 RETURN ( __MKEXTERNALADDRESS(lastResource) );
+RETURN ( __MKEXTERNALADDRESS(lastResource) );
 }
 %}.
 ^ nil
 "
-	 Screen resourceIdOfLastError
+Screen resourceIdOfLastError
 "
 !
 setConnectionTimeOut:seconds
 "set the default connection timeout (seconds)"
 |prev|
 prev := activateOnClick ? false.
 aBoolean notNil ifTrue:[
-	activateOnClick := aBoolean.
+activateOnClick := aBoolean.
 ].
 ^ prev
 "
 Display class activateOnClick:true
 "return the state-mask for button1 in motion events state-field.
 This is the devices mask."
 %{  /* NOCONTEXT */
 if (aButton == __MKSMALLINT(1)) {
-	RETURN (__MKSMALLINT(Button1MotionMask));
+RETURN (__MKSMALLINT(Button1MotionMask));
 }
 if (aButton == __MKSMALLINT(2)) {
-	RETURN (__MKSMALLINT(Button2MotionMask));
+RETURN (__MKSMALLINT(Button2MotionMask));
 }
 if (aButton == __MKSMALLINT(3)) {
-	RETURN (__MKSMALLINT(Button3MotionMask));
+RETURN (__MKSMALLINT(Button3MotionMask));
 }
 %}.
 ^ nil
 !
 "return the displays fileNumber - for select"
 %{  /* NOCONTEXT */
 #ifndef WIN32
 if (ISCONNECTED) {
-	RETURN ( __MKSMALLINT(ConnectionNumber(myDpy)) );
+RETURN ( __MKSMALLINT(ConnectionNumber(myDpy)) );
 }
 #endif
 RETURN (nil);
 %}
 !
 "return the X-servers protocol version - should normally not be of
 any interest"
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	RETURN ( __MKSMALLINT(XProtocolVersion(myDpy)) );
+RETURN ( __MKSMALLINT(XProtocolVersion(myDpy)) );
 }
 RETURN (nil);
 %}
 "
 "return the X-server vendor string - this should normally not be of
 any interest, but can be for special cases
 (to avoid bugs in certain implementations)"
 %{
 if (ISCONNECTED) {
-	RETURN ( __MKSTRING(XServerVendor(myDpy)) );
+RETURN ( __MKSTRING(XServerVendor(myDpy)) );
 }
 RETURN (nil);
 %}
 "
 if (ISCONNECTED
 && __isExternalAddress(windowId1)
 && __isExternalAddress(windowId2)
 && __bothSmallInteger(x1, y1)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	Window rootWin;
+Window rootWin;
-	w1 = __WindowVal(windowId1);
+w1 = __WindowVal(windowId1);
-	w2 = __WindowVal(windowId2);
+w2 = __WindowVal(windowId2);
-	rootWin = RootWindow(dpy, screen);
+rootWin = RootWindow(dpy, screen);
-	if (w1 == rootWin) {
+if (w1 == rootWin) {
-	    w1 = (Window)__externalAddressVal(rootWindowId);
+w1 = (Window)__externalAddressVal(rootWindowId);
-	}
+}
-	if (w2 == rootWin) {
+if (w2 == rootWin) {
-	    w2 = (Window)__externalAddressVal(rootWindowId);
+w2 = (Window)__externalAddressVal(rootWindowId);
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	XTranslateCoordinates(dpy, w1, w2,
+XTranslateCoordinates(dpy, w1, w2,
-			      __intVal(x1), __intVal(y1),
+__intVal(x1), __intVal(y1),
-			      &xpos, &ypos, &child_ret);
+&xpos, &ypos, &child_ret);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	x2 = __MKSMALLINT(xpos);
+x2 = __MKSMALLINT(xpos);
-	y2 = __MKSMALLINT(ypos);
+y2 = __MKSMALLINT(ypos);
 }
 %}.
 ^ (x2 @ y2)
 !
 any interest, but can be for special cases.
 (to avoid bugs in certain implementations)"
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	RETURN ( __MKSMALLINT(XVendorRelease(myDpy)) );
+RETURN ( __MKSMALLINT(XVendorRelease(myDpy)) );
 }
 RETURN (nil);
 %}
 "
 Window child_ret;
 if (ISCONNECTED
 && __isExternalAddress(windowId)
 && __isPoint(aPoint)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	xp = _point_X(aPoint);
+xp = _point_X(aPoint);
-	yp = _point_Y(aPoint);
+yp = _point_Y(aPoint);
-	if (__bothSmallInteger(xp, yp)) {
+if (__bothSmallInteger(xp, yp)) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XTranslateCoordinates(dpy,
+XTranslateCoordinates(dpy,
-				  RootWindow(dpy, screen),
+RootWindow(dpy, screen),
-				  __WindowVal(windowId),
+__WindowVal(windowId),
-				  __intVal(xp), __intVal(yp),
+__intVal(xp), __intVal(yp),
-				  &xpos, &ypos, &child_ret);
+&xpos, &ypos, &child_ret);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    if (child_ret) {
+if (child_ret) {
-		RETURN ( __MKEXTERNALADDRESS(child_ret) );
+RETURN ( __MKEXTERNALADDRESS(child_ret) );
-	    }
+}
-	    RETURN ( nil );
+RETURN ( nil );
-	}
+}
 }
 %}.
 windowId notNil ifTrue:[
-	aPoint isPoint ifTrue:[
+aPoint isPoint ifTrue:[
-	    ^ self viewIdFromPoint:aPoint asPoint truncated in:windowId
+^ self viewIdFromPoint:aPoint asPoint truncated in:windowId
-	]
+]
 ].
 ^ nil
 "
 %{
 if (ISCONNECTED
 && (__INST(rootId) != __INST(virtualRootId))
 && __isExternalAddress(__INST(virtualRootId))) {
-	Window vRootWin;
+Window vRootWin;
-	Window root;
+Window root;
-	int x, y;
+int x, y;
-	unsigned int width, height;
+unsigned int width, height;
-	unsigned int dummy;
+unsigned int dummy;
-	int ret;
+int ret;
-	vRootWin = __WindowVal(__INST(virtualRootId));
+vRootWin = __WindowVal(__INST(virtualRootId));
-	ENTER_XLIB();
+ENTER_XLIB();
-	ret = XGetGeometry(myDpy, vRootWin, &root, &x, &y, &width, &height,
+ret = XGetGeometry(myDpy, vRootWin, &root, &x, &y, &width, &height,
-					  &dummy, &dummy);
+&dummy, &dummy);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if (ret) {
+if (ret) {
-	    RETURN ( __MKPOINT_INT(width, height) );
+RETURN ( __MKPOINT_INT(width, height) );
-	}
+}
 }
 %}.
 ^ width @ height
 "
 Display virtualExtent
 0@0 is returned for systems which locate the resize handles outside the client area.
 This may be used by the UI painter or programmatically to reserve some client area.
 This method must be redefined for displays which need it (i.e. X11 on osx)"
 OperatingSystem getOSType == #osx ifTrue:[
-	"/ should check for local display here - sigh, osx's Xserver does not give
+"/ should check for local display here - sigh, osx's Xserver does not give
-	"/ us a hint through the server vendor...
+"/ us a hint through the server vendor...
-	^ 16@16
+^ 16@16
 ].
 ^ 0@0
 !
 hasDPS
 int dummy;
 OBJ rslt = false;
 if (ISCONNECTED
 && __isStringLike(extensionString)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	if (XQueryExtension(myDpy, __stringVal(extensionString), &dummy, &dummy, &dummy)) {
+if (XQueryExtension(myDpy, __stringVal(extensionString), &dummy, &dummy, &dummy)) {
-	    rslt = true;
+rslt = true;
-	}
+}
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 RETURN (rslt);
 %}
 "
 int screen = __intVal(__INST(screen));
 XIconSize *sizeList;
 int cnt;
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	int status;
+int status;
-	ENTER_XLIB();
+ENTER_XLIB();
-	status = XGetIconSizes(dpy, RootWindow(dpy, screen), &sizeList, &cnt);
+status = XGetIconSizes(dpy, RootWindow(dpy, screen), &sizeList, &cnt);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if (status > 0) {
+if (status > 0) {
-	   xIconSizes = __MKEXTERNALBYTES(sizeList);
+xIconSizes = __MKEXTERNALBYTES(sizeList);
-	   count = __MKSMALLINT(cnt);
+count = __MKSMALLINT(cnt);
-	}
+}
 }
 %}.
 xIconSizes isNil ifTrue:[^ nil].
 ret := OrderedCollection new:count.
 1 to:count do:[ :i |
-	|minWidth minHeight maxWidth maxHeight widthStep heightStep d|
+|minWidth minHeight maxWidth maxHeight widthStep heightStep d|
 %{
-	XIconSize *slp;
+XIconSize *slp;
-	slp = &((XIconSize *)__externalAddressVal(xIconSizes))[__intVal(i)-1];
+slp = &((XIconSize *)__externalAddressVal(xIconSizes))[__intVal(i)-1];
-	minWidth = __MKSMALLINT(slp->min_width);
+minWidth = __MKSMALLINT(slp->min_width);
-	minHeight = __MKSMALLINT(slp->min_height);
+minHeight = __MKSMALLINT(slp->min_height);
-	maxWidth = __MKSMALLINT(slp->max_width);
+maxWidth = __MKSMALLINT(slp->max_width);
-	maxHeight = __MKSMALLINT(slp->max_height);
+maxHeight = __MKSMALLINT(slp->max_height);
-	widthStep = __MKSMALLINT(slp->width_inc);
+widthStep = __MKSMALLINT(slp->width_inc);
-	heightStep = __MKSMALLINT(slp->height_inc);
+heightStep = __MKSMALLINT(slp->height_inc);
 %}.
-	d := IdentityDictionary new.
+d := IdentityDictionary new.
-	d at:#minWidth put:minWidth.
+d at:#minWidth put:minWidth.
-	d at:#maxWidth put:maxWidth.
+d at:#maxWidth put:maxWidth.
-	d at:#widthStep put:widthStep.
+d at:#widthStep put:widthStep.
-	d at:#minHeight put:minHeight.
+d at:#minHeight put:minHeight.
-	d at:#maxHeight put:maxHeight.
+d at:#maxHeight put:maxHeight.
-	d at:#heightStep put:heightStep.
+d at:#heightStep put:heightStep.
-	ret add:d
+ret add:d
 ].
 xIconSizes free.
 ^ ret
 |numberOfMonitors resultArray bounds|
 %{
 #ifdef XINERAMA
 if (ISCONNECTED && __INST(hasXineramaExtension) == true) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	XineramaScreenInfo *screenInfo;
+XineramaScreenInfo *screenInfo;
-	int numDisplays;
+int numDisplays;
-	OBJ *cResultArray;
+OBJ *cResultArray;
-	int i, ci;
+int i, ci;
-	screenInfo = XineramaQueryScreens (dpy, &numDisplays);
+screenInfo = XineramaQueryScreens (dpy, &numDisplays);
-	if (screenInfo == 0) {
+if (screenInfo == 0) {
-	    goto out;
+goto out;
-	}
+}
-	numberOfMonitors = __mkSmallInteger(numDisplays);
+numberOfMonitors = __mkSmallInteger(numDisplays);
-	resultArray = __ARRAY_NEW_INT(numDisplays * 5);
+resultArray = __ARRAY_NEW_INT(numDisplays * 5);
-	cResultArray = __ArrayInstPtr(resultArray)->a_element;
+cResultArray = __ArrayInstPtr(resultArray)->a_element;
-	for (i=0, ci=0; i < numDisplays; i++, ci+=5) {
+for (i=0, ci=0; i < numDisplays; i++, ci+=5) {
-	    cResultArray[ci] = __mkSmallInteger(screenInfo[i].screen_number);
+cResultArray[ci] = __mkSmallInteger(screenInfo[i].screen_number);
-	    cResultArray[ci+1] = __mkSmallInteger(screenInfo[i].x_org);
+cResultArray[ci+1] = __mkSmallInteger(screenInfo[i].x_org);
-	    cResultArray[ci+2] = __mkSmallInteger(screenInfo[i].y_org);
+cResultArray[ci+2] = __mkSmallInteger(screenInfo[i].y_org);
-	    cResultArray[ci+3] = __mkSmallInteger(screenInfo[i].width);
+cResultArray[ci+3] = __mkSmallInteger(screenInfo[i].width);
-	    cResultArray[ci+4] = __mkSmallInteger(screenInfo[i].height);
+cResultArray[ci+4] = __mkSmallInteger(screenInfo[i].height);
-	}
+}
-	XFree(screenInfo);
+XFree(screenInfo);
 }
 #endif
 out:;
 %}.
 numberOfMonitors isNil ifTrue:[
-	"no xinerama - the display is the only monitor"
+"no xinerama - the display is the only monitor"
-	^ Array with:self bounds.
+^ Array with:self bounds.
 ].
 rawMonitorBounds = resultArray ifTrue:[
-	^ monitorBounds.
+^ monitorBounds.
 ].
 bounds := Array new:numberOfMonitors.
 1 to:numberOfMonitors do:[:idx|
-	|rect baseIdx|
+|rect baseIdx|
-	baseIdx := (idx-1) * 5.
+baseIdx := (idx-1) * 5.
-	rect := Rectangle
+rect := Rectangle
-		    left:(resultArray at:baseIdx+2)
+left:(resultArray at:baseIdx+2)
-		    top:(resultArray at:baseIdx+3)
+top:(resultArray at:baseIdx+3)
-		    width:(resultArray at:baseIdx+4)
+width:(resultArray at:baseIdx+4)
-		    height:(resultArray at:baseIdx+5).
+height:(resultArray at:baseIdx+5).
-	bounds at:idx put:rect.
+bounds at:idx put:rect.
 ].
 rawMonitorBounds := resultArray.
 monitorBounds := bounds.
 monitorBoundsAt:aPoint
 |bounds|
 bounds := self monitorBounds.
 ^ bounds
-	detect:[:eachRectangle| eachRectangle containsPoint:aPoint]
+detect:[:eachRectangle| eachRectangle containsPoint:aPoint]
-	ifNone:[super monitorBoundsAt:aPoint].
+ifNone:[super monitorBoundsAt:aPoint].
 "
 Screen current monitorBoundsAt:(0@0)
 Screen current monitorBoundsAt:(1500@0)
 Screen current monitorBoundsAt:(3000@0)
 numberOfMonitors
 ^ self monitorBounds size
 "
-	Display numberOfMonitors
+Display numberOfMonitors
 "
 !
 pointIsVisible:aPoint
 "is the point visible?"
 preferredIconSize
 "return the displays preferred size for icons.
 Redefined to return a special value on SGI servers."
 self serverVendor = 'Silicon Graphics' ifTrue:[
-	^ 86@68
+^ 86@68
 ].
 ^ super preferredIconSize
 "Created: 10.6.1996 / 21:06:48 / cg"
 !
 |minH|
 minH := self usableHeight.
 self monitorBounds do:[:eachBounds |
-	minH := minH min: eachBounds height.
+minH := minH min: eachBounds height.
 ].
 ^ minH
 "
-	Display smallestMonitorHeight
+Display smallestMonitorHeight
 "
 !
 supportedImageFormats
 "return an array with supported image formats;
 formatArray|
 %{
 Display *dpy;
 if (! ISCONNECTED) {
-	RETURN (nil);
+RETURN (nil);
 }
 dpy = myDpy;
 #ifdef NO_PRIVATE_DISPLAY_ACCESS
 nFormats = __MKSMALLINT(1);
 nFormats = __MKSMALLINT(DISPLAYACCESS(dpy)->nformats);
 #endif
 %}.
 formatArray := Array new:nFormats.
 1 to:nFormats do:[:index |
-	|info bitsPerPixelInfo depthInfo paddingInfo i|
+|info bitsPerPixelInfo depthInfo paddingInfo i|
-	i := index.
+i := index.
 %{
-	ScreenFormat *format;
+ScreenFormat *format;
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
 #ifdef NO_PRIVATE_DISPLAY_ACCESS
-	depthInfo = __MKSMALLINT(1);
+depthInfo = __MKSMALLINT(1);
-	bitsPerPixelInfo = __MKSMALLINT(1);
+bitsPerPixelInfo = __MKSMALLINT(1);
-	paddingInfo = __MKSMALLINT(8);
+paddingInfo = __MKSMALLINT(8);
 #else
-	format = DISPLAYACCESS(dpy)->pixmap_format;
+format = DISPLAYACCESS(dpy)->pixmap_format;
-	format += (__intVal(i)-1);
+format += (__intVal(i)-1);
-	bitsPerPixelInfo = __MKSMALLINT(format->bits_per_pixel);
+bitsPerPixelInfo = __MKSMALLINT(format->bits_per_pixel);
-	depthInfo = __MKSMALLINT(format->depth);
+depthInfo = __MKSMALLINT(format->depth);
-	paddingInfo = __MKSMALLINT(format->scanline_pad);
+paddingInfo = __MKSMALLINT(format->scanline_pad);
 #endif
 %}.
-	info := IdentityDictionary new.
+info := IdentityDictionary new.
-	info at:#depth put:depthInfo.
+info at:#depth put:depthInfo.
-	info at:#bitsPerPixel put:bitsPerPixelInfo.
+info at:#bitsPerPixel put:bitsPerPixelInfo.
-	info at:#padding put:paddingInfo.
+info at:#padding put:paddingInfo.
-	formatArray at:index put:info.
+formatArray at:index put:info.
 ].
 ^ formatArray
 "
 Display supportedImageFormats
 |h|
 h := (self monitorBoundsAt:aPoint) height.
 OperatingSystem isOSXlike ifTrue:[
-	"/ take away some space for the icon-panel at the bottom.
+"/ take away some space for the icon-panel at the bottom.
-	^ h - 50
+^ h - 50
 ].
 ^ h
 "
 Screen current usableHeightAt:(0@0)
 |bitmapId|
 bitmapId := self primCreateBitmapFromArray:anArray width:w height:h.
 bitmapId isNil ifTrue:[
-	self primitiveFailedOrClosedConnection
+self primitiveFailedOrClosedConnection
 ].
 ^ bitmapId
 !
 createBitmapFromFile:aString for:aForm
 %{
 int screen = __intVal(__INST(screen));
 if (ISCONNECTED
 && __isStringLike(aString)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	char *filename;
+char *filename;
-	int status;
+int status;
-	Pixmap newBitmap;
+Pixmap newBitmap;
-	unsigned b_width, b_height;
+unsigned b_width, b_height;
-	int b_x_hot, b_y_hot;
+int b_x_hot, b_y_hot;
-	filename = (char *) __stringVal(aString);
+filename = (char *) __stringVal(aString);
-	ENTER_XLIB();
+ENTER_XLIB();
-	status = XReadBitmapFile(dpy, RootWindow(dpy, screen),
+status = XReadBitmapFile(dpy, RootWindow(dpy, screen),
-				 filename, &b_width, &b_height, &newBitmap,
+filename, &b_width, &b_height, &newBitmap,
-				 &b_x_hot, &b_y_hot);
+&b_x_hot, &b_y_hot);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if ((status == BitmapSuccess)  && newBitmap) {
+if ((status == BitmapSuccess)  && newBitmap) {
 #ifdef COUNT_RESOURCES
-	    __cnt_bitmap++;
+__cnt_bitmap++;
 #endif
-	    w = __MKSMALLINT(b_width);
+w = __MKSMALLINT(b_width);
-	    h = __MKSMALLINT(b_height);
+h = __MKSMALLINT(b_height);
-	    id = __MKEXTERNALADDRESS(newBitmap);
+id = __MKEXTERNALADDRESS(newBitmap);
-	}
+}
 }
 %}.
 id notNil ifTrue:[
-	aForm setWidth:w height:h
+aForm setWidth:w height:h
 ].
 ^ id
 !
 createBitmapWidth:w height:h
 %{
 int screen = __intVal(__INST(screen));
 Pixmap newBitmap;
 if (__bothSmallInteger(w, h) && ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	ENTER_XLIB();
+ENTER_XLIB();
-	newBitmap = XCreatePixmap(dpy, RootWindow(dpy, screen),
+newBitmap = XCreatePixmap(dpy, RootWindow(dpy, screen),
-				       __intVal(w), __intVal(h), 1);
+__intVal(w), __intVal(h), 1);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	if (newBitmap)
+if (newBitmap)
-	    __cnt_bitmap++;
+__cnt_bitmap++;
 #endif
-	RETURN ( (newBitmap != (Pixmap)0) ? __MKEXTERNALADDRESS(newBitmap) : nil );
+RETURN ( (newBitmap != (Pixmap)0) ? __MKEXTERNALADDRESS(newBitmap) : nil );
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ nil
 !
 int screen = __intVal(__INST(screen));
 Pixmap newBitmap;
 if (__bothSmallInteger(w, h) && ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	ENTER_XLIB();
+ENTER_XLIB();
-	newBitmap = XCreatePixmap(dpy, RootWindow(dpy, screen),
+newBitmap = XCreatePixmap(dpy, RootWindow(dpy, screen),
-				       __intVal(w), __intVal(h), __intVal(d));
+__intVal(w), __intVal(h), __intVal(d));
-	LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	if (newBitmap)
+if (newBitmap)
-	    __cnt_bitmap++;
+__cnt_bitmap++;
 #endif
-	RETURN ( (newBitmap != (Pixmap)0) ? __MKEXTERNALADDRESS(newBitmap) : nil );
+RETURN ( (newBitmap != (Pixmap)0) ? __MKEXTERNALADDRESS(newBitmap) : nil );
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ nil
 !
 createWindowFor:aView type:typeSymbol
-		 origin:origin
+origin:origin
-		 extent:extent
+extent:extent
-		 minExtent:minExt
+minExtent:minExt
-		 maxExtent:maxExt
+maxExtent:maxExt
-		 borderWidth:bWidth
+borderWidth:bWidth
-		 subViewOf:wsuperView
+subViewOf:wsuperView
-		 style:wStyle
+style:wStyle
-		 inputOnly:winputOnly
+inputOnly:winputOnly
-		 label:wlabel
+label:wlabel
-		 owner:wowner
+owner:wowner
-		 icon:wicon iconMask:wiconMask
+icon:wicon iconMask:wiconMask
-		 iconView:wiconView
+iconView:wiconView
 <context: #return>
 |xpos ypos wwidth wheight minWidth minHeight maxWidth maxHeight
 bColorId wsuperViewId windowId isTopWindow
 weventMask bitGravity viewGravity vBgColor
 vBgForm deepForm preferredVisual preferredDepth
 wiconId wiconMaskId wiconViewId windowGroupWindowId|
 displayId isNil ifTrue:[
-	self primitiveFailedOrClosedConnection.
+self primitiveFailedOrClosedConnection.
-	^ nil
+^ nil
 ].
 origin notNil ifTrue:[
-	xpos := origin x.
+xpos := origin x.
-	ypos := origin y.
+ypos := origin y.
 ] ifFalse:[
-	xpos := ypos := 0.
+xpos := ypos := 0.
 ].
 extent notNil ifTrue:[
-	wwidth := extent x.
+wwidth := extent x.
-	wheight := extent y.
+wheight := extent y.
 ] ifFalse:[
-	wwidth := wheight := 100.
+wwidth := wheight := 100.
 ].
 minExt notNil ifTrue:[
-	minWidth := minExt x.
+minWidth := minExt x.
-	minHeight := minExt y
+minHeight := minExt y
 ].
 maxExt notNil ifTrue:[
-	maxWidth := maxExt x.
+maxWidth := maxExt x.
-	maxHeight := maxExt y
+maxHeight := maxExt y
 ].
 wsuperView notNil ifTrue:[
-	wsuperViewId := wsuperView id
+wsuperViewId := wsuperView id
 ] ifFalse:[
-	isTopWindow := true.
+isTopWindow := true.
-	aView class ~~ WindowGroupWindow ifTrue:[
+aView class ~~ WindowGroupWindow ifTrue:[
-	    windowGroupWindow isNil ifTrue:[
+windowGroupWindow isNil ifTrue:[
-		self getWindowGroupWindow.
+self getWindowGroupWindow.
-	    ].
+].
-	    windowGroupWindowId := windowGroupWindow id.
+windowGroupWindowId := windowGroupWindow id.
-	].
+].
-	wicon notNil ifTrue:[
+wicon notNil ifTrue:[
-	    wiconId := wicon id.
+wiconId := wicon id.
-	    wiconMask notNil ifTrue:[
+wiconMask notNil ifTrue:[
-		wiconMaskId := wiconMask id
+wiconMaskId := wiconMask id
-	    ]
+]
-	].
+].
-	wiconView notNil ifTrue:[
+wiconView notNil ifTrue:[
-	    wiconViewId := wiconView id
+wiconViewId := wiconView id
-	].
+].
 ].
 weventMask := aView eventMask.
 preferredVisual := aView preferredVisual.
 sizehints.height = 100;
 sizehints.x = 0;
 sizehints.y = 0;
 if (__bothSmallInteger(wwidth, wheight)) {
-	sizehints.flags |= PSize;
+sizehints.flags |= PSize;
-	sizehints.width = __intVal(wwidth);
+sizehints.width = __intVal(wwidth);
-	sizehints.height = __intVal(wheight);
+sizehints.height = __intVal(wheight);
 }
 if (__bothSmallInteger(xpos, ypos)) {
-	sizehints.flags |= PPosition;
+sizehints.flags |= PPosition;
-	sizehints.x = __intVal(xpos);
+sizehints.x = __intVal(xpos);
-	sizehints.y = __intVal(ypos);
+sizehints.y = __intVal(ypos);
 }
 if (__bothSmallInteger(minWidth, minHeight)) {
-	sizehints.flags |= PMinSize;
+sizehints.flags |= PMinSize;
-	sizehints.min_width = __intVal(minWidth);
+sizehints.min_width = __intVal(minWidth);
-	sizehints.min_height = __intVal(minHeight);
+sizehints.min_height = __intVal(minHeight);
 }
 if (__bothSmallInteger(maxWidth, maxHeight)) {
-	sizehints.flags |= PMaxSize;
+sizehints.flags |= PMaxSize;
-	sizehints.max_width = __intVal(maxWidth);
+sizehints.max_width = __intVal(maxWidth);
-	sizehints.max_height = __intVal(maxHeight);
+sizehints.max_height = __intVal(maxHeight);
 }
 bg = WhitePixel(dpy, screen);
 if (__isSmallInteger(bWidth)) {
-	bw = __intVal(bWidth);
+bw = __intVal(bWidth);
 } else {
-	bw = 0;
+bw = 0;
 }
 bd = BlackPixel(dpy, screen);
 if (__isExternalAddress(wsuperViewId)) {
-	parentWindow = __WindowVal(wsuperViewId);
+parentWindow = __WindowVal(wsuperViewId);
 } else {
-	parentWindow = RootWindow(dpy, screen);
+parentWindow = RootWindow(dpy, screen);
 }
 if (wStyle == @symbol(popUp))
-	xswa.override_redirect = 1;
+xswa.override_redirect = 1;
 else
-	xswa.override_redirect = 0;
+xswa.override_redirect = 0;
 if (winputOnly == true)
-	ioClass = InputOnly;
+ioClass = InputOnly;
 else
-	ioClass = InputOutput;
+ioClass = InputOutput;
 if (__isSmallInteger(weventMask)) {
-	xswa.event_mask = __intVal(weventMask);
+xswa.event_mask = __intVal(weventMask);
 } else {
-	xswa.event_mask = 0;
+xswa.event_mask = 0;
 }
 if (ioClass == InputOnly) {
-	bw = 0;
+bw = 0;
-	depth = 0;
+depth = 0;
-	flags |= CWEventMask;
+flags |= CWEventMask;
 } else {
-	depth = DefaultDepth(dpy,screen);
+depth = DefaultDepth(dpy,screen);
-	flags |= CWEventMask | CWBorderPixel | CWOverrideRedirect;
+flags |= CWEventMask | CWBorderPixel | CWOverrideRedirect;
-	if (backPixmap != (Pixmap)0) {
+if (backPixmap != (Pixmap)0) {
-	    xswa.background_pixmap = backPixmap;
+xswa.background_pixmap = backPixmap;
-	    flags |= CWBackPixmap;
+flags |= CWBackPixmap;
-	} else {
+} else {
-	    xswa.background_pixel = bg;
+xswa.background_pixel = bg;
-	    flags |= CWBackPixel;
+flags |= CWBackPixel;
-	}
+}
-	xswa.border_pixel = bd;
+xswa.border_pixel = bd;
 }
 visual.visualid = CopyFromParent;
 if (__isSmallInteger(preferredDepth)) {
-	depth = __intVal(preferredDepth);
+depth = __intVal(preferredDepth);
 }
 if (preferredVisual != nil) {
-	XVisualInfo vi;
+XVisualInfo vi;
-	int cls;
+int cls;
-	if (preferredVisual == @symbol(StaticGray))
+if (preferredVisual == @symbol(StaticGray))
-	    cls = StaticGray;
+cls = StaticGray;
-	else if (preferredVisual == @symbol(GrayScale))
+else if (preferredVisual == @symbol(GrayScale))
-	    cls = GrayScale;
+cls = GrayScale;
-	else if (preferredVisual == @symbol(StaticColor))
+else if (preferredVisual == @symbol(StaticColor))
-	    cls = StaticColor;
+cls = StaticColor;
-	else if (preferredVisual == @symbol(PseudoColor))
+else if (preferredVisual == @symbol(PseudoColor))
-	    cls = PseudoColor;
+cls = PseudoColor;
-	else if (preferredVisual == @symbol(TrueColor))
+else if (preferredVisual == @symbol(TrueColor))
-	    cls = TrueColor;
+cls = TrueColor;
-	else if (preferredVisual == @symbol(DirectColor))
+else if (preferredVisual == @symbol(DirectColor))
-	    cls = DirectColor;
+cls = DirectColor;
-	else
+else
-	    cls = PseudoColor;
+cls = PseudoColor;
-	ENTER_XLIB();
+ENTER_XLIB();
-	if (XMatchVisualInfo(dpy, screen, depth, cls, &vi)) {
+if (XMatchVisualInfo(dpy, screen, depth, cls, &vi)) {
-	    visual.visualid = vi.visualid;
+visual.visualid = vi.visualid;
 /*
-	    console_fprintf(stderr, "visualId=%x\n", vi.visualid);
+console_fprintf(stderr, "visualId=%x\n", vi.visualid);
 */
-	}
+}
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 ENTER_XLIB2();
 newWindow = XCreateWindow(dpy, parentWindow,
-			   sizehints.x, sizehints.y,
+sizehints.x, sizehints.y,
-			   sizehints.width, sizehints.height,
+sizehints.width, sizehints.height,
-			   bw, depth, ioClass, &visual,
+bw, depth, ioClass, &visual,
-			   flags, &xswa);
+flags, &xswa);
 LEAVE_XLIB();
 if (! newWindow) {
-	RETURN ( nil );
+RETURN ( nil );
 }
 #ifdef COUNT_RESOURCES
 __cnt_view++;
 #endif
 /*
 * define its icon and name
 * (only makes sense for topWindows)
 */
 if (isTopWindow == true) {
-	XWMHints wmhints;
+XWMHints wmhints;
-	wmhints.flags = 0;
+wmhints.flags = 0;
-	if (__isExternalAddress(wiconId)) {
+if (__isExternalAddress(wiconId)) {
-	    wmhints.icon_pixmap = __PixmapVal(wiconId);
+wmhints.icon_pixmap = __PixmapVal(wiconId);
-	    wmhints.flags = IconPixmapHint;
+wmhints.flags = IconPixmapHint;
-	    if (__isExternalAddress(wiconMaskId)) {
+if (__isExternalAddress(wiconMaskId)) {
-		wmhints.icon_mask = __PixmapVal(wiconMaskId);
+wmhints.icon_mask = __PixmapVal(wiconMaskId);
-		wmhints.flags |= IconMaskHint;
+wmhints.flags |= IconMaskHint;
-	    }
+}
-	}
+}
-	if (__isExternalAddress(windowGroupWindowId)) {
+if (__isExternalAddress(windowGroupWindowId)) {
-	    wmhints.window_group = __WindowVal(windowGroupWindowId);
+wmhints.window_group = __WindowVal(windowGroupWindowId);
-	    wmhints.flags |= WindowGroupHint;
+wmhints.flags |= WindowGroupHint;
-	}
+}
-	if (__isExternalAddress(wiconViewId)) {
+if (__isExternalAddress(wiconViewId)) {
-	    wmhints.flags |= IconWindowHint;
+wmhints.flags |= IconWindowHint;
-	    wmhints.icon_window = __WindowVal(wiconViewId);
+wmhints.icon_window = __WindowVal(wiconViewId);
-	};
+};
 /*
-	wmhints.flags |= InputHint;
+wmhints.flags |= InputHint;
-	wmhints.input = True;
+wmhints.input = True;
 */
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetWMHints(dpy, newWindow, &wmhints);
+XSetWMHints(dpy, newWindow, &wmhints);
-	XSetWMNormalHints(dpy, newWindow, &sizehints);
+XSetWMNormalHints(dpy, newWindow, &sizehints);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	/*
+/*
-	 * get atoms first (if not already known)
+* get atoms first (if not already known)
-	 */
+*/
-	if (__INST(protocolsAtom) == nil) {
+if (__INST(protocolsAtom) == nil) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    WmProtocolsAtom = XInternAtom(dpy, "WM_PROTOCOLS", False);
+WmProtocolsAtom = XInternAtom(dpy, "WM_PROTOCOLS", False);
-	    __INST(protocolsAtom) = __MKATOMOBJ(WmProtocolsAtom);
+__INST(protocolsAtom) = __MKATOMOBJ(WmProtocolsAtom);
 #ifdef USE_SAVEYOURSELF_ATOM
-	    WmSaveYourselfAtom = XInternAtom(dpy, "WM_SAVE_YOURSELF", False);
+WmSaveYourselfAtom = XInternAtom(dpy, "WM_SAVE_YOURSELF", False);
-	    __INST(saveYourselfAtom) = __MKATOMOBJ(WmSaveYourselfAtom);
+__INST(saveYourselfAtom) = __MKATOMOBJ(WmSaveYourselfAtom);
 #endif
 #ifdef USE_QUIT_APP_ATOM
-	    WmQuitAppAtom = XInternAtom(dpy, "_WM_QUIT_APP", False);
+WmQuitAppAtom = XInternAtom(dpy, "_WM_QUIT_APP", False);
-	    __INST(quitAppAtom) = __MKATOMOBJ(WmQuitAppAtom);
+__INST(quitAppAtom) = __MKATOMOBJ(WmQuitAppAtom);
 #endif
-	    WmDeleteWindowAtom = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
+WmDeleteWindowAtom = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
-	    __INST(deleteWindowAtom) = __MKATOMOBJ(WmDeleteWindowAtom);
+__INST(deleteWindowAtom) = __MKATOMOBJ(WmDeleteWindowAtom);
-	    UUIDAtom = XInternAtom(dpy, "UUID", False);
+UUIDAtom = XInternAtom(dpy, "UUID", False);
-	    __INST(uuidAtom) = __MKATOMOBJ(UUIDAtom);
+__INST(uuidAtom) = __MKATOMOBJ(UUIDAtom);
-	    STXDeviceAtom = XInternAtom(dpy, "STX_DEVICE_ID", False);
+STXDeviceAtom = XInternAtom(dpy, "STX_DEVICE_ID", False);
-	    __INST(stxDeviceAtom) = __MKATOMOBJ(STXDeviceAtom);
+__INST(stxDeviceAtom) = __MKATOMOBJ(STXDeviceAtom);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	} else {
+} else {
 #ifdef USE_QUIT_APP_ATOM
-	    WmQuitAppAtom = __AtomVal(__INST(quitAppAtom));
+WmQuitAppAtom = __AtomVal(__INST(quitAppAtom));
 #else
-	    WmQuitAppAtom = 0;
+WmQuitAppAtom = 0;
 #endif
-	    WmProtocolsAtom = __AtomVal(__INST(protocolsAtom));
+WmProtocolsAtom = __AtomVal(__INST(protocolsAtom));
-	    WmDeleteWindowAtom = __AtomVal(__INST(deleteWindowAtom));
+WmDeleteWindowAtom = __AtomVal(__INST(deleteWindowAtom));
 #ifdef USE_SAVEYOURSELF_ATOM
-	    WmSaveYourselfAtom = __AtomVal(__INST(saveYourselfAtom));
+WmSaveYourselfAtom = __AtomVal(__INST(saveYourselfAtom));
 #else
-	    WmSaveYourselfAtom = 0;
+WmSaveYourselfAtom = 0;
 #endif
-	    UUIDAtom = __AtomVal(__INST(uuidAtom));;
+UUIDAtom = __AtomVal(__INST(uuidAtom));;
-	    STXDeviceAtom = __AtomVal(__INST(stxDeviceAtom));;
+STXDeviceAtom = __AtomVal(__INST(stxDeviceAtom));;
-	}
+}
-	/*
+/*
-	 * tell window manager to not kill us but send an event instead
+* tell window manager to not kill us but send an event instead
-	 */
+*/
-	atoms[0] = WmDeleteWindowAtom; atomCount++;
+atoms[0] = WmDeleteWindowAtom; atomCount++;
 #ifdef USE_SAVEYOURSELF_ATOM
-	atoms[atomCount] = WmSaveYourselfAtom; atomCount++;
+atoms[atomCount] = WmSaveYourselfAtom; atomCount++;
 #endif
 #ifdef USE_QUIT_APP_ATOM
-	atoms[atomCount] = WmQuitAppAtom; atomCount++;
+atoms[atomCount] = WmQuitAppAtom; atomCount++;
 #endif
-	ENTER_XLIB();
+ENTER_XLIB();
-	XChangeProperty(dpy, newWindow, WmProtocolsAtom, XA_ATOM,
+XChangeProperty(dpy, newWindow, WmProtocolsAtom, XA_ATOM,
-			32, PropModeReplace, (unsigned char *)atoms, atomCount);
+32, PropModeReplace, (unsigned char *)atoms, atomCount);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	/*
+/*
-	 * an optional unique id (to mark stx-windows)
+* an optional unique id (to mark stx-windows)
-	 */
+*/
-	if (__isBytes(__INST(uniqueDeviceID))) {
+if (__isBytes(__INST(uniqueDeviceID))) {
-	    int numUUIDBytes = __byteArraySize(__INST(uniqueDeviceID));
+int numUUIDBytes = __byteArraySize(__INST(uniqueDeviceID));
-	    unsigned char uuidBytes[32];
+unsigned char uuidBytes[32];
-	    if (numUUIDBytes <= sizeof(uuidBytes)) {
+if (numUUIDBytes <= sizeof(uuidBytes)) {
-		Atom uuidAtom;
+Atom uuidAtom;
-		bcopy(__byteArrayVal(__INST(uniqueDeviceID)), uuidBytes, numUUIDBytes);
+bcopy(__byteArrayVal(__INST(uniqueDeviceID)), uuidBytes, numUUIDBytes);
-		ENTER_XLIB();
+ENTER_XLIB();
-		XChangeProperty (dpy, newWindow, STXDeviceAtom, UUIDAtom, 8, PropModeReplace,
+XChangeProperty (dpy, newWindow, STXDeviceAtom, UUIDAtom, 8, PropModeReplace,
-				 uuidBytes, numUUIDBytes );
+uuidBytes, numUUIDBytes );
-		LEAVE_XLIB();
+LEAVE_XLIB();
-	    }
+}
-	}
+}
 #ifdef SUPPORT_MOTIF_WM_HINTS
-	/*
+/*
-	 * less decoration
+* less decoration
-	 */
+*/
-	if ((wStyle == @symbol(undecorated))
+if ((wStyle == @symbol(undecorated))
-	 || (wStyle == @symbol(dialog2))
+|| (wStyle == @symbol(dialog2))
-	 || (wStyle == @symbol(notitle))
+|| (wStyle == @symbol(notitle))
-	) {
+) {
-	    if (__INST(motifWMHintsAtom) == nil) {
+if (__INST(motifWMHintsAtom) == nil) {
-		ENTER_XLIB();
+ENTER_XLIB();
-		MotifWMHintsAtom = XInternAtom(dpy, "_MOTIF_WM_HINTS", False);
+MotifWMHintsAtom = XInternAtom(dpy, "_MOTIF_WM_HINTS", False);
-		__INST(motifWMHintsAtom) = __MKATOMOBJ(MotifWMHintsAtom);
+__INST(motifWMHintsAtom) = __MKATOMOBJ(MotifWMHintsAtom);
-		LEAVE_XLIB();
+LEAVE_XLIB();
-	    } else {
+} else {
-		MotifWMHintsAtom = __AtomVal(__INST(motifWMHintsAtom));
+MotifWMHintsAtom = __AtomVal(__INST(motifWMHintsAtom));
-	    }
+}
-	    {
+{
-		struct hints {
+struct hints {
-		    unsigned long flags;
+unsigned long flags;
-		    unsigned long functions;
+unsigned long functions;
-		    unsigned long decorations;
+unsigned long decorations;
-		    long input_mode;
+long input_mode;
-		    unsigned long status;
+unsigned long status;
-		} mvm_hints;
+} mvm_hints;
-		if (wStyle == @symbol(undecorated)) {
+if (wStyle == @symbol(undecorated)) {
-		    mvm_hints.decorations = MWM_DECOR_NONE;
+mvm_hints.decorations = MWM_DECOR_NONE;
-		}
+}
-		if (wStyle == @symbol(dialog2)) {
+if (wStyle == @symbol(dialog2)) {
-		    mvm_hints.decorations = MWM_DECOR_BORDER
+mvm_hints.decorations = MWM_DECOR_BORDER
-					    | MWM_DECOR_RESIZEH
+| MWM_DECOR_RESIZEH
-					    | MWM_DECOR_TITLE
+| MWM_DECOR_TITLE
-					    /* | MWM_DECOR_MENU */
+/* | MWM_DECOR_MENU */
-					    /* | MWM_DECOR_MINIMIZE */
+/* | MWM_DECOR_MINIMIZE */
-					    /* | MWM_DECOR_MAXIMIZE */
+/* | MWM_DECOR_MAXIMIZE */
-					    ;
+;
-		}
+}
-		if (wStyle == @symbol(notitle)) {
+if (wStyle == @symbol(notitle)) {
-		    mvm_hints.decorations = MWM_DECOR_BORDER
+mvm_hints.decorations = MWM_DECOR_BORDER
-					    /* | MWM_DECOR_RESIZEH  */
+/* | MWM_DECOR_RESIZEH  */
-					    /* | MWM_DECOR_TITLE    */
+/* | MWM_DECOR_TITLE    */
-					    /* | MWM_DECOR_MENU     */
+/* | MWM_DECOR_MENU     */
-					    /* | MWM_DECOR_MINIMIZE */
+/* | MWM_DECOR_MINIMIZE */
-					    /* | MWM_DECOR_MAXIMIZE */
+/* | MWM_DECOR_MAXIMIZE */
-					    ;
+;
-		}
+}
-		mvm_hints.flags =  MWM_HINTS_DECORATIONS;
+mvm_hints.flags =  MWM_HINTS_DECORATIONS;
-		ENTER_XLIB();
+ENTER_XLIB();
-		XChangeProperty (dpy, newWindow, MotifWMHintsAtom,
+XChangeProperty (dpy, newWindow, MotifWMHintsAtom,
-				     MotifWMHintsAtom, 32, PropModeReplace,
+MotifWMHintsAtom, 32, PropModeReplace,
-				     (unsigned char*)&mvm_hints, 5 );
+(unsigned char*)&mvm_hints, 5 );
-		LEAVE_XLIB();
+LEAVE_XLIB();
-	    }
+}
-	}
+}
 #endif /* SUPPORT_MOTIF_WM_HINTS */
 }
 windowId = __MKEXTERNALADDRESS(newWindow);
 %}.
 "/        self setWindowType:wStyle in:windowId.
 "/    ].
 (wsuperView isNil "this is a topwindow"
 and:[wlabel notEmptyOrNil]) ifTrue:[
-	self
+self
-	    setIconName:wlabel in:windowId;
+setIconName:wlabel in:windowId;
-	    setWindowName:wlabel in:windowId.
+setWindowName:wlabel in:windowId.
 ].
 self addKnownView:aView withId:windowId.
 ^ windowId
 %{
 /*
 * ignore closed connection
 */
 if (! ISCONNECTED) {
-	RETURN ( self );
+RETURN ( self );
 }
 if (__isExternalAddress(aGCId)) {
-	GC gc = __GCVal(aGCId);
+GC gc = __GCVal(aGCId);
-	if (gc) {
+if (gc) {
-	    __ExternalAddressInstPtr(aGCId)->e_address = NULL;
+__ExternalAddressInstPtr(aGCId)->e_address = NULL;
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XFreeGC(myDpy, gc);
+XFreeGC(myDpy, gc);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	    __cnt_gc--;
+__cnt_gc--;
 #endif
-	} else {
+} else {
-	    console_fprintf(stderr, "XWorkstation [warning]: trying to destroy GC twice\n");
+console_fprintf(stderr, "XWorkstation [warning]: trying to destroy GC twice\n");
-	}
+}
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailed
 !
 %{
 /*
 * ignore closed connection
 */
 if (! ISCONNECTED) {
-	RETURN ( self );
+RETURN ( self );
 }
 if (__isExternalAddress(aDrawableId)) {
-	Pixmap pix = __PixmapVal(aDrawableId);
+Pixmap pix = __PixmapVal(aDrawableId);
-	if (pix) {
+if (pix) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XFreePixmap(myDpy, pix);
+XFreePixmap(myDpy, pix);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	    __cnt_bitmap--;
+__cnt_bitmap--;
 #endif
-	}
+}
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailed
 !
 if (__isExternalAddress(aDrawableId)
 && __isExternalAddress(aGCId)
 && ISCONNECTED) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	dps = XDPSCreateContext(myDpy, __DrawableVal(aDrawableId),
+dps = XDPSCreateContext(myDpy, __DrawableVal(aDrawableId),
-				       __GCVal(aGCId),
+__GCVal(aGCId),
-				       0, height, 0, colormap, NULL, 0,
+0, height, 0, colormap, NULL, 0,
-				       XDPSDefaultTextBackstop,
+XDPSDefaultTextBackstop,
-				       XDPSDefaultErrorProc,
+XDPSDefaultErrorProc,
-				       NULL);
+NULL);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( dps ? __MKEXTERNALADDRESS(dps) : nil );
+RETURN ( dps ? __MKEXTERNALADDRESS(dps) : nil );
 }
 #endif
 %}.
 self primitiveFailedOrClosedConnection.
 ^ nil
 int screen = __intVal(__INST(screen));
 GC gc;
 if (__isExternalAddress(aDrawableId) && ISCONNECTED) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	gc = XCreateGC(myDpy, __DrawableVal(aDrawableId), 0L, (XGCValues *)0);
+gc = XCreateGC(myDpy, __DrawableVal(aDrawableId), 0L, (XGCValues *)0);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	if (gc)
+if (gc)
-	    __cnt_gc++;
+__cnt_gc++;
 #endif
-	RETURN ( gc ? __MKEXTERNALADDRESS(gc) : nil );
+RETURN ( gc ? __MKEXTERNALADDRESS(gc) : nil );
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ nil
 !
 unsigned char fastBits[10000];
 OBJ num, *op;
 int bytesPerRow;
 if (! ISCONNECTED) {
-	RETURN (nil);
+RETURN (nil);
 }
 dpy = myDpy;
 if (firstCall) {
-	for (index=0; index < 256; index++) {
+for (index=0; index < 256; index++) {
-	    int t = 0;
+int t = 0;
-	    if (index & 128) t |=   1;
+if (index & 128) t |=   1;
-	    if (index &  64) t |=   2;
+if (index &  64) t |=   2;
-	    if (index &  32) t |=   4;
+if (index &  32) t |=   4;
-	    if (index &  16) t |=   8;
+if (index &  16) t |=   8;
-	    if (index &   8) t |=  16;
+if (index &   8) t |=  16;
-	    if (index &   4) t |=  32;
+if (index &   4) t |=  32;
-	    if (index &   2) t |=  64;
+if (index &   2) t |=  64;
-	    if (index &   1) t |= 128;
+if (index &   1) t |= 128;
-	    reverseBitTable[index] = t;
+reverseBitTable[index] = t;
-	}
+}
-	firstCall = 0;
+firstCall = 0;
 }
 if (__bothSmallInteger(w, h) && _isNonNilObject(anArray)) {
-	newBitmap = (Pixmap)0;
+newBitmap = (Pixmap)0;
-	b_width = __intVal(w);
+b_width = __intVal(w);
-	b_height = __intVal(h);
+b_height = __intVal(h);
-	bytesPerRow = (b_width + 7) / 8;
+bytesPerRow = (b_width + 7) / 8;
-	nBytes = b_height * bytesPerRow;
+nBytes = b_height * bytesPerRow;
-	if (nBytes < sizeof(fastBits)) {
+if (nBytes < sizeof(fastBits)) {
-	    cp = b_bits = fastBits;
+cp = b_bits = fastBits;
-	    allocatedBits = 0;
+allocatedBits = 0;
-	} else {
+} else {
-	    cp = b_bits = allocatedBits = (unsigned char *) malloc(nBytes);
+cp = b_bits = allocatedBits = (unsigned char *) malloc(nBytes);
-	    if (! cp) goto fail;
+if (! cp) goto fail;
-	}
+}
-	if (__isArrayLike(anArray)) {
+if (__isArrayLike(anArray)) {
-	    index = 1;
+index = 1;
-	    op = &(__ArrayInstPtr(anArray)->a_element[index - 1]);
+op = &(__ArrayInstPtr(anArray)->a_element[index - 1]);
-	    for (row = b_height; row; row--) {
+for (row = b_height; row; row--) {
-		for (col = bytesPerRow; col; col--) {
+for (col = bytesPerRow; col; col--) {
-		    num = *op++;
+num = *op++;
-		    if (__isSmallInteger(num)) {
+if (__isSmallInteger(num)) {
-			bits = __intVal(num);
+bits = __intVal(num);
-		    } else {
+} else {
-			bits = __longIntVal(num);
+bits = __longIntVal(num);
-			if (bits == 0) {
+if (bits == 0) {
-			    goto fail;
+goto fail;
-			}
+}
-		    }
+}
-		    *cp++ = reverseBitTable[bits & 0xFF];
+*cp++ = reverseBitTable[bits & 0xFF];
-		}
+}
-	    }
+}
-	} else {
+} else {
-	    if (__isByteArrayLike(anArray)) {
+if (__isByteArrayLike(anArray)) {
-		pBits = __ByteArrayInstPtr(anArray)->ba_element;
+pBits = __ByteArrayInstPtr(anArray)->ba_element;
-		for (col = b_height*bytesPerRow; col; col--) {
+for (col = b_height*bytesPerRow; col; col--) {
-		    *cp++ = reverseBitTable[*pBits++];
+*cp++ = reverseBitTable[*pBits++];
-		}
+}
-	    } else {
+} else {
-		goto fail;
+goto fail;
-	    }
+}
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	newBitmap = XCreateBitmapFromData(dpy, RootWindow(dpy, screen),
+newBitmap = XCreateBitmapFromData(dpy, RootWindow(dpy, screen),
-					       (char *)b_bits,
+(char *)b_bits,
-					       b_width, b_height);
+b_width, b_height);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	if (newBitmap)
+if (newBitmap)
-	    __cnt_bitmap++;
+__cnt_bitmap++;
 #endif
 fail: ;
-	if (allocatedBits)
+if (allocatedBits)
-	    free(allocatedBits);
+free(allocatedBits);
-	RETURN ( newBitmap ? __MKEXTERNALADDRESS(newBitmap) : nil );
+RETURN ( newBitmap ? __MKEXTERNALADDRESS(newBitmap) : nil );
 }
 %}.
 ^ nil
 !
 primDestroyView:aView withId:aWindowId
 <context: #return>
 %{
 if (! ISCONNECTED) {
-	RETURN ( self );
+RETURN ( self );
 }
 if (__isExternalAddress(aWindowId)) {
-	Window win = __WindowVal(aWindowId);
+Window win = __WindowVal(aWindowId);
-	if (win) {
+if (win) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XDestroyWindow(myDpy, win);
+XDestroyWindow(myDpy, win);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	    __cnt_view--;
+__cnt_view--;
 #endif
-	}
+}
 }
 %}
 ! !
 !XWorkstation methodsFor:'clipboard'!
 self setPrimaryBuffer:aString.
 s := aString ? ''.
 s isString ifFalse:[
-	s := s asStringWithCRsFrom:1 to:(s size) compressTabs:false withCR:false
+s := s asStringWithCRsFrom:1 to:(s size) compressTabs:false withCR:false
 ].
 viewID := aView id.
 viewID notNil ifTrue:[ "/ if the view is not already closed
-	"/ for now - should add support to pass emphasis information too
+"/ for now - should add support to pass emphasis information too
-	s := s string.
+s := s string.
-	self setPrimaryText:s owner:viewID.
+self setPrimaryText:s owner:viewID.
 ]
 "Created: / 27-03-2012 / 14:46:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 XColor color;
 unsigned long dummy;
 Status ok;
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	ENTER_XLIB();
+ENTER_XLIB();
-	ok = XAllocColorCells(dpy, DefaultColormap(dpy, screen), (Bool)0,
+ok = XAllocColorCells(dpy, DefaultColormap(dpy, screen), (Bool)0,
-				   &dummy, 0, &color.pixel, 1);
+&dummy, 0, &color.pixel, 1);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if (ok) {
+if (ok) {
 #ifdef COUNT_RESOURCES
-	    __cnt_color++;
+__cnt_color++;
 #endif
-	    RETURN ( __MKSMALLINT(color.pixel) );
+RETURN ( __MKSMALLINT(color.pixel) );
-	}
+}
 }
 %}.
 ^ nil
 !
 int id;
 Status ok;
 if (ISCONNECTED
 && __isStringLike(aString)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	colorname = (char *) __stringVal(aString);
+colorname = (char *) __stringVal(aString);
-	ENTER_XLIB();
+ENTER_XLIB();
-	ok = XParseColor(dpy, DefaultColormap(dpy, screen), colorname, &ecolor);
+ok = XParseColor(dpy, DefaultColormap(dpy, screen), colorname, &ecolor);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if (ok) {
+if (ok) {
 #ifdef QUICK_TRUE_COLORS
-	    if (__INST(visualType) == @symbol(TrueColor)) {
+if (__INST(visualType) == @symbol(TrueColor)) {
-		id = ((ecolor.red >> (16 - __intVal(__INST(bitsRed)))) << __intVal(__INST(redShift))) & __intVal(__INST(redMask));
+id = ((ecolor.red >> (16 - __intVal(__INST(bitsRed)))) << __intVal(__INST(redShift))) & __intVal(__INST(redMask));
-		id += ((ecolor.green >> (16 - __intVal(__INST(bitsGreen)))) << __intVal(__INST(greenShift))) & __intVal(__INST(greenMask));
+id += ((ecolor.green >> (16 - __intVal(__INST(bitsGreen)))) << __intVal(__INST(greenShift))) & __intVal(__INST(greenMask));
-		id += ((ecolor.blue >> (16 - __intVal(__INST(bitsBlue)))) << __intVal(__INST(blueShift))) & __intVal(__INST(blueMask));
+id += ((ecolor.blue >> (16 - __intVal(__INST(bitsBlue)))) << __intVal(__INST(blueShift))) & __intVal(__INST(blueMask));
-		RETURN ( __MKSMALLINT(id) );
+RETURN ( __MKSMALLINT(id) );
-	    }
+}
 #endif
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    ok = XAllocColor(dpy, DefaultColormap(dpy, screen), &ecolor);
+ok = XAllocColor(dpy, DefaultColormap(dpy, screen), &ecolor);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	}
+}
-	if (! ok) {
+if (! ok) {
-	    RETURN ( nil );
+RETURN ( nil );
-	}
+}
 #ifdef COUNT_RESOURCES
-	__cnt_color++;
+__cnt_color++;
 #endif
-	RETURN ( __MKSMALLINT(ecolor.pixel) );
+RETURN ( __MKSMALLINT(ecolor.pixel) );
 }
 %}.
 ^ super colorNamed:aString
 !
 int id;
 if (__bothSmallInteger(r, g)
 && __isSmallInteger(b)
 && ISCONNECTED) {
-	ecolor.red = __intVal(r);
+ecolor.red = __intVal(r);
-	ecolor.green= __intVal(g);
+ecolor.green= __intVal(g);
-	ecolor.blue = __intVal(b);
+ecolor.blue = __intVal(b);
 #ifdef QUICK_TRUE_COLORS
-	if (__INST(visualType) == @symbol(TrueColor)) {
+if (__INST(visualType) == @symbol(TrueColor)) {
-	    id = ((ecolor.red >> (16 - __intVal(__INST(bitsRed)))) << __intVal(__INST(redShift))) & __intVal(__INST(redMask));
+id = ((ecolor.red >> (16 - __intVal(__INST(bitsRed)))) << __intVal(__INST(redShift))) & __intVal(__INST(redMask));
-	    id += ((ecolor.green >> (16 - __intVal(__INST(bitsGreen)))) << __intVal(__INST(greenShift))) & __intVal(__INST(greenMask));
+id += ((ecolor.green >> (16 - __intVal(__INST(bitsGreen)))) << __intVal(__INST(greenShift))) & __intVal(__INST(greenMask));
-	    id += ((ecolor.blue >> (16 - __intVal(__INST(bitsBlue)))) << __intVal(__INST(blueShift))) & __intVal(__INST(blueMask));
+id += ((ecolor.blue >> (16 - __intVal(__INST(bitsBlue)))) << __intVal(__INST(blueShift))) & __intVal(__INST(blueMask));
-	    RETURN ( __MKSMALLINT(id) );
+RETURN ( __MKSMALLINT(id) );
-	}
+}
 #endif
-	dpy = myDpy;
+dpy = myDpy;
-	ENTER_XLIB();
+ENTER_XLIB();
-	ok = XAllocColor(dpy, DefaultColormap(dpy, screen), &ecolor);
+ok = XAllocColor(dpy, DefaultColormap(dpy, screen), &ecolor);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if (! ok) {
+if (! ok) {
-	    RETURN ( nil );
+RETURN ( nil );
-	}
+}
 #ifdef COUNT_RESOURCES
-	__cnt_color++;
+__cnt_color++;
 #endif
-	RETURN ( __MKSMALLINT(ecolor.pixel) );
+RETURN ( __MKSMALLINT(ecolor.pixel) );
 }
 %}.
 ^ super colorScaledRed:r scaledGreen:g scaledBlue:b
 !
 unsigned long color;
 int screen = __intVal(__INST(screen));
 #ifdef QUICK_TRUE_COLORS
 if (__INST(visualType) == @symbol(TrueColor)) {
-	/* no need to do anything on TrueColor displays ... */
+/* no need to do anything on TrueColor displays ... */
-	RETURN (self);
+RETURN (self);
 }
 #endif
 /*
 * ignore closed connection
 */
 if (! ISCONNECTED) {
-	RETURN (self);
+RETURN (self);
 }
 if (__isSmallInteger(colorIndex)) {
-	dpy = myDpy;
+dpy = myDpy;
-	color = (long) __intVal(colorIndex);
+color = (long) __intVal(colorIndex);
-	ENTER_XLIB();
+ENTER_XLIB();
-	XFreeColors(dpy, DefaultColormap(dpy, screen), &color, 1, 0L);
+XFreeColors(dpy, DefaultColormap(dpy, screen), &color, 1, 0L);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	__cnt_color--;
+__cnt_color--;
 #endif
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailed
 !
 int sr, sg, sb;
 int bits, scale, shift;
 if (ISCONNECTED
 && __isSmallInteger(index)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	color.pixel = __intVal(index);
+color.pixel = __intVal(index);
-	ENTER_XLIB();
+ENTER_XLIB();
-	XQueryColor(dpy, DefaultColormap(dpy, screen), &color);
+XQueryColor(dpy, DefaultColormap(dpy, screen), &color);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	/*
+/*
-	 * have to compensate for an error in X ?, which does not scale
+* have to compensate for an error in X ?, which does not scale
-	 * colors correctly if lesser than 16bits are valid in a color,
+* colors correctly if lesser than 16bits are valid in a color,
-	 * (for example, color white on a 4bitsPerRGB server will Return
+* (for example, color white on a 4bitsPerRGB server will Return
-	 * (16rF000 16rF000 16rF000) instead of (16rFFFF 16rFFFF 16rFFFF)
+* (16rF000 16rF000 16rF000) instead of (16rFFFF 16rFFFF 16rFFFF)
-	 */
+*/
-	bits = __intVal(__INST(bitsPerRGB));
+bits = __intVal(__INST(bitsPerRGB));
-	scale = (1<<bits) - 1;
+scale = (1<<bits) - 1;
-	shift = 16 - bits;
+shift = 16 - bits;
-	sr = ((double)(color.red>>shift) / scale) * 0xFFFF;
+sr = ((double)(color.red>>shift) / scale) * 0xFFFF;
-	sg = ((double)(color.green>>shift) / scale) * 0xFFFF;
+sg = ((double)(color.green>>shift) / scale) * 0xFFFF;
-	sb = ((double)(color.blue>>shift) / scale) * 0xFFFF;
+sb = ((double)(color.blue>>shift) / scale) * 0xFFFF;
-	RETURN ( __ARRAY_WITH3(__MKSMALLINT(sr), __MKSMALLINT(sg), __MKSMALLINT(sb)));
+RETURN ( __ARRAY_WITH3(__MKSMALLINT(sr), __MKSMALLINT(sg), __MKSMALLINT(sb)));
 }
 %}.
 ^ super getScaledRGBFrom:index
 !
 int sr, sg, sb;
 int bits, scale, shift;
 if (ISCONNECTED
 && __isStringLike(colorName)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	if (XParseColor(dpy, DefaultColormap(dpy, screen),
+if (XParseColor(dpy, DefaultColormap(dpy, screen),
-			     (char *) __stringVal(colorName), &color)) {
+(char *) __stringVal(colorName), &color)) {
-	    /*
+/*
-	     * have to compensate for an error in X ?, which does not scale
+* have to compensate for an error in X ?, which does not scale
-	     * colors correctly if lesser than 16bits are valid in a color,
+* colors correctly if lesser than 16bits are valid in a color,
-	     * (for example, color white on a 4bitsPerRGB server will Return
+* (for example, color white on a 4bitsPerRGB server will Return
-	     * (16rF000 16rF000 16rF000) instead of (16rFFFF 16rFFFF 16rFFFF)
+* (16rF000 16rF000 16rF000) instead of (16rFFFF 16rFFFF 16rFFFF)
-	     */
+*/
-	    bits = __intVal(__INST(bitsPerRGB));
+bits = __intVal(__INST(bitsPerRGB));
-	    scale = (1<<bits) - 1;
+scale = (1<<bits) - 1;
-	    shift = 16 - bits;
+shift = 16 - bits;
-	    /* do assignment to doubles (no cast) - avoid alignment problems in HPPA */
+/* do assignment to doubles (no cast) - avoid alignment problems in HPPA */
-	    dr = color.red>>shift;
+dr = color.red>>shift;
-	    dg = color.green>>shift;
+dg = color.green>>shift;
-	    db = color.blue>>shift;
+db = color.blue>>shift;
-	    sr = (dr / scale) * 0xFFFF;
+sr = (dr / scale) * 0xFFFF;
-	    sg = (dg / scale) * 0xFFFF;
+sg = (dg / scale) * 0xFFFF;
-	    sb = (db / scale) * 0xFFFF;
+sb = (db / scale) * 0xFFFF;
-	    RETURN ( __ARRAY_WITH3(__MKSMALLINT(sr), __MKSMALLINT(sg), __MKSMALLINT(sb)));
+RETURN ( __ARRAY_WITH3(__MKSMALLINT(sr), __MKSMALLINT(sg), __MKSMALLINT(sb)));
-	}
+}
 }
 %}.
 ^ super getScaledRGBFromName:colorName
 "
-	Screen current getScaledRGBFromName:'red'
+Screen current getScaledRGBFromName:'red'
-	Screen current getScaledRGBFromName:'orange'
+Screen current getScaledRGBFromName:'orange'
 "
 !
 listOfAvailableColors
 "return a list of all available colornames.
 aStream := '/usr/lib/X11/rgb.txt' asFilename readStreamOrNil.
 aStream isNil ifTrue:[^ nil].
 list := OrderedCollection new.
 [aStream atEnd] whileFalse:[
-	line := aStream nextLine.
+line := aStream nextLine.
-	line notNil ifTrue:[
+line notNil ifTrue:[
-	    "skip the r/g/b numbers"
+"skip the r/g/b numbers"
-	    index := 1.
+index := 1.
-	    [(line at:index) isSeparator] whileTrue:[index := index + 1].
+[(line at:index) isSeparator] whileTrue:[index := index + 1].
-	    [(line at:index) isDigit] whileTrue:[index := index + 1].
+[(line at:index) isDigit] whileTrue:[index := index + 1].
-	    [(line at:index) isSeparator] whileTrue:[index := index + 1].
+[(line at:index) isSeparator] whileTrue:[index := index + 1].
-	    [(line at:index) isDigit] whileTrue:[index := index + 1].
+[(line at:index) isDigit] whileTrue:[index := index + 1].
-	    [(line at:index) isSeparator] whileTrue:[index := index + 1].
+[(line at:index) isSeparator] whileTrue:[index := index + 1].
-	    [(line at:index) isDigit] whileTrue:[index := index + 1].
+[(line at:index) isDigit] whileTrue:[index := index + 1].
-	    [(line at:index) isSeparator] whileTrue:[index := index + 1].
+[(line at:index) isSeparator] whileTrue:[index := index + 1].
-	    colorName := line copyFrom:index.
+colorName := line copyFrom:index.
-	    ((colorName occurrencesOf:(Character space)) == 0) ifTrue:[
+((colorName occurrencesOf:(Character space)) == 0) ifTrue:[
-		list add:colorName
+list add:colorName
-	    ]
+]
-	]
+]
 ].
 aStream close.
 ^ list sort
 "
 %{  /* NOCONTEXT */
 if (__isSmallInteger(aPercentage)) {
-	RETURN ( __MKSMALLINT(0xFFFF * __intVal(aPercentage) / 100) );
+RETURN ( __MKSMALLINT(0xFFFF * __intVal(aPercentage) / 100) );
 }
 if (__isFloat(aPercentage)) {
-	RETURN ( __MKSMALLINT(0xFFFF * (int)(__floatVal(aPercentage)) / 100) );
+RETURN ( __MKSMALLINT(0xFFFF * (int)(__floatVal(aPercentage)) / 100) );
 }
 %}.
 ^ (16rFFFF * aPercentage / 100) rounded
 !
 int screen = __intVal(__INST(screen));
 int r, g, b;
 int ok = 1;
 if (__isSmallInteger(sred))
-	r = __intVal(sred);
+r = __intVal(sred);
 else ok = 0;
 if (__isSmallInteger(sgreen))
-	g = __intVal(sgreen);
+g = __intVal(sgreen);
 else ok = 0;
 if (__isSmallInteger(sblue))
-	b = __intVal(sblue);
+b = __intVal(sblue);
 else ok = 0;
 if (ISCONNECTED
 && __isSmallInteger(index) && ok) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	color.pixel = __intVal(index);
+color.pixel = __intVal(index);
-	color.red = r;
+color.red = r;
-	color.green = g;
+color.green = g;
-	color.blue = b;
+color.blue = b;
-	color.flags = DoRed | DoGreen | DoBlue;
+color.flags = DoRed | DoGreen | DoBlue;
-	ENTER_XLIB();
+ENTER_XLIB();
-	XStoreColor(dpy, DefaultColormap(dpy, screen), &color);
+XStoreColor(dpy, DefaultColormap(dpy, screen), &color);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 ! !
 (actually, there are more than those below ...)"
 "/ if you add something here, also add to #shapeNumberFromCursor ...
 ^ #(
-	#upLeftArrow            "/ XC_top_left_arrow
+#upLeftArrow            "/ XC_top_left_arrow
-	#upRightHand            "/ XC_hand1
+#upRightHand            "/ XC_hand1
-	#upDownArrow            "/ XC_sb_v_double_arrow
+#upDownArrow            "/ XC_sb_v_double_arrow
-	#leftRightArrow         "/ XC_sb_h_double_arrow
+#leftRightArrow         "/ XC_sb_h_double_arrow
-	#upLimitArrow           "/ XC_top_side
+#upLimitArrow           "/ XC_top_side
-	#downLimitArrow         "/ XC_bottom_side
+#downLimitArrow         "/ XC_bottom_side
-	#leftLimitArrow         "/ XC_left_side
+#leftLimitArrow         "/ XC_left_side
-	#rightLimitArrow        "/ XC_right_side
+#rightLimitArrow        "/ XC_right_side
-	#text                   "/ XC_xterm
+#text                   "/ XC_xterm
-	#upRightArrow           "/ XC_draft_large
+#upRightArrow           "/ XC_draft_large
-	#leftHand               "/ XC_hand2
+#leftHand               "/ XC_hand2
-	#questionMark           "/ XC_question_arrow
+#questionMark           "/ XC_question_arrow
-	#cross                  "/ XC_X_cursor
+#cross                  "/ XC_X_cursor
-	#wait                   "/ XC_watch
+#wait                   "/ XC_watch
-	#crossHair              "/ XC_tcross
+#crossHair              "/ XC_tcross
-	#origin                 "/ XC_ul_angle
+#origin                 "/ XC_ul_angle
-	#topLeft                "/ XC_ul_angle
+#topLeft                "/ XC_ul_angle
-	#corner                 "/ XC_lr_angle
+#corner                 "/ XC_lr_angle
-	#bottomRight            "/ XC_lr_angle
+#bottomRight            "/ XC_lr_angle
-	#topRight               "/ XC_ur_angle
+#topRight               "/ XC_ur_angle
-	#bottomLeft             "/ XC_ll_angle
+#bottomLeft             "/ XC_ll_angle
-	#square                 "/ XC_dotbox
+#square                 "/ XC_dotbox
-	#fourWay                "/ XC_fleur
+#fourWay                "/ XC_fleur
-	#crossCursor            "/ XC_X_cursor
+#crossCursor            "/ XC_X_cursor
 )
 "Created: 8.4.1997 / 10:12:30 / cg"
 "Modified: 8.4.1997 / 10:31:46 / cg"
 !
 && __isExternalAddress(aCursorId)
 && __bothSmallInteger(fgG, fgB)
 && __bothSmallInteger(bgR, bgG)
 && __bothSmallInteger(bgB, fgR)) {
-	fgcolor.red = __intVal(fgR);
+fgcolor.red = __intVal(fgR);
-	fgcolor.green= __intVal(fgG);
+fgcolor.green= __intVal(fgG);
-	fgcolor.blue = __intVal(fgB);
+fgcolor.blue = __intVal(fgB);
-	bgcolor.red = __intVal(bgR);
+bgcolor.red = __intVal(bgR);
-	bgcolor.green= __intVal(bgG);
+bgcolor.green= __intVal(bgG);
-	bgcolor.blue = __intVal(bgB);
+bgcolor.blue = __intVal(bgB);
-	ENTER_XLIB();
+ENTER_XLIB();
-	XRecolorCursor(myDpy, __CursorVal(aCursorId), &fgcolor, &bgcolor);
+XRecolorCursor(myDpy, __CursorVal(aCursorId), &fgcolor, &bgcolor);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 createCursorSourceForm:sourceForm maskForm:maskForm hotX:hx hotY:hy width:w height:h
 "create a cursor given 2 bitmaps (source, mask) and a hotspot"
 ^ self
-	primCreateCursorSourceFormId:sourceForm id
+primCreateCursorSourceFormId:sourceForm id
-	maskFormId:maskForm id
+maskFormId:maskForm id
-	hotX:hx hotY:hy
+hotX:hx hotY:hy
-	width:w height:h
+width:w height:h
 !
 destroyCursor:aCursorId
 "release a cursor - frees any device resources"
 %{
 /*
 * ignore closed connection
 */
 if (! ISCONNECTED) {
-	RETURN ( self );
+RETURN ( self );
 }
 if (__isExternalAddress(aCursorId)) {
-	Cursor curs = __CursorVal(aCursorId);
+Cursor curs = __CursorVal(aCursorId);
-	if (curs) {
+if (curs) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XFreeCursor(myDpy, curs);
+XFreeCursor(myDpy, curs);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	    __cnt_cursor--;
+__cnt_cursor--;
 #endif
-	}
+}
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailed
 !
 Cursor newCursor;
 if (ISCONNECTED
 && __isSmallInteger(aShapeNumber)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	newCursor = XCreateFontCursor(myDpy, __intVal(aShapeNumber));
+newCursor = XCreateFontCursor(myDpy, __intVal(aShapeNumber));
-	LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	if (newCursor)
+if (newCursor)
-	    __cnt_cursor++;
+__cnt_cursor++;
 #endif
-	if (newCursor != (Cursor)0) {
+if (newCursor != (Cursor)0) {
-	    RETURN (__MKEXTERNALADDRESS(newCursor));
+RETURN (__MKEXTERNALADDRESS(newCursor));
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ nil
 !
 if (ISCONNECTED
 && __isExternalAddress(sourceId)
 && __isExternalAddress(maskId)
 && __bothSmallInteger(hx, hy)) {
-	fgColor.red = 0;        /* fg is black */
+fgColor.red = 0;        /* fg is black */
-	fgColor.green = 0;
+fgColor.green = 0;
-	fgColor.blue = 0;
+fgColor.blue = 0;
-	bgColor.red = 0xFFFF;   /* bg is white */
+bgColor.red = 0xFFFF;   /* bg is white */
-	bgColor.green = 0xFFFF;
+bgColor.green = 0xFFFF;
-	bgColor.blue = 0xFFFF;
+bgColor.blue = 0xFFFF;
-	ENTER_XLIB();
+ENTER_XLIB();
-	newCursor = XCreatePixmapCursor(myDpy,
+newCursor = XCreatePixmapCursor(myDpy,
-				__PixmapVal(sourceId),
+__PixmapVal(sourceId),
-				__PixmapVal(maskId),
+__PixmapVal(maskId),
-				&fgColor, &bgColor, __intVal(hx), __intVal(hy));
+&fgColor, &bgColor, __intVal(hx), __intVal(hy));
-	LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	if (newCursor)
+if (newCursor)
-	    __cnt_cursor++;
+__cnt_cursor++;
 #endif
-	if (newCursor != (Cursor)0) {
+if (newCursor != (Cursor)0) {
-	    RETURN (__MKEXTERNALADDRESS(newCursor));
+RETURN (__MKEXTERNALADDRESS(newCursor));
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ nil
 !
 |msgType dropColl dropCollSize anyFile anyDir anyText anyOther
 dropType dropTypeCode strings sz idx val|
 (msgType := self atomIDOf:#DndProtocol) notNil ifTrue:[
-	"/ DND can drop files, file, dir, links, dirLink and text
+"/ DND can drop files, file, dir, links, dirLink and text
-	"/ check for this.
+"/ check for this.
-	dropObjects isCollection ifFalse:[
+dropObjects isCollection ifFalse:[
-	    dropColl := Array with:dropObjects
+dropColl := Array with:dropObjects
-	] ifTrue:[
+] ifTrue:[
-	    dropColl := dropObjects
+dropColl := dropObjects
-	].
+].
-	anyFile := anyDir := anyText := anyOther := false.
+anyFile := anyDir := anyText := anyOther := false.
-	dropColl do:[:aDropObject |
+dropColl do:[:aDropObject |
-	    aDropObject isFileObject ifTrue:[
+aDropObject isFileObject ifTrue:[
-		aDropObject theObject isDirectory ifTrue:[
+aDropObject theObject isDirectory ifTrue:[
-		    anyDir := true
+anyDir := true
-		] ifFalse:[
+] ifFalse:[
-		    anyFile := true
+anyFile := true
-		]
+]
-	    ] ifFalse:[
+] ifFalse:[
-		aDropObject isTextObject ifTrue:[
+aDropObject isTextObject ifTrue:[
-		    anyText := true
+anyText := true
-		] ifFalse:[
+] ifFalse:[
-		    anyOther := true
+anyOther := true
-		]
+]
-	    ]
+]
-	].
+].
-	anyOther ifTrue:[
+anyOther ifTrue:[
-	    "/ DND does not support this ...
+"/ DND does not support this ...
-	    'XWorkstation [info]: DND can only drop files or text' infoPrintCR.
+'XWorkstation [info]: DND can only drop files or text' infoPrintCR.
-	    ^ false
+^ false
-	].
+].
-	anyText ifTrue:[
+anyText ifTrue:[
-	    (anyFile or:[anyDir]) ifTrue:[
+(anyFile or:[anyDir]) ifTrue:[
-		"/ DND does not support mixed types
+"/ DND does not support mixed types
-		'XWorkstation [info]: DND cannot drop both files and text' infoPrintCR.
+'XWorkstation [info]: DND cannot drop both files and text' infoPrintCR.
-		^ false
+^ false
-	    ]
+]
-	].
+].
-	dropCollSize := dropColl size.
+dropCollSize := dropColl size.
-	anyFile ifTrue:[
+anyFile ifTrue:[
-	    dropType := #DndFiles.
+dropType := #DndFiles.
-	    dropCollSize == 1 ifTrue:[
+dropCollSize == 1 ifTrue:[
-		dropType := #DndFile
+dropType := #DndFile
-	    ]
+]
-	] ifFalse:[
+] ifFalse:[
-	    anyDir ifTrue:[
+anyDir ifTrue:[
-		dropType := #DndFiles.
+dropType := #DndFiles.
-		dropCollSize == 1 ifTrue:[
+dropCollSize == 1 ifTrue:[
-		    dropType := #DndDir
+dropType := #DndDir
-		]
+]
-	    ] ifFalse:[
+] ifFalse:[
-		anyText ifTrue:[
+anyText ifTrue:[
-		    dropCollSize == 1 ifTrue:[
+dropCollSize == 1 ifTrue:[
-			dropType := #DndText
+dropType := #DndText
-		    ] ifFalse:[
+] ifFalse:[
-			"/ can only drop a single text object
+"/ can only drop a single text object
-			'XWorkstation [info]: DND can only drop a single text' infoPrintCR.
+'XWorkstation [info]: DND can only drop a single text' infoPrintCR.
-			^ false
+^ false
-		    ]
+]
-		] ifFalse:[
+] ifFalse:[
-		    "/ mhmh ...
+"/ mhmh ...
-		    'XWorkstation [info]: DND cannot drop this' infoPrintCR.
+'XWorkstation [info]: DND cannot drop this' infoPrintCR.
-		    ^ false
+^ false
-		]
+]
-	    ]
+]
-	].
+].
-	dropTypeCode := self dndDropTypes indexOf:dropType.
+dropTypeCode := self dndDropTypes indexOf:dropType.
-	dropTypeCode == 0 ifTrue:[
+dropTypeCode == 0 ifTrue:[
-	    'XWorkstation [info]: DND cannot drop this' infoPrintCR.
+'XWorkstation [info]: DND cannot drop this' infoPrintCR.
-	    ^ false
+^ false
-	].
+].
-	dropTypeCode := dropTypeCode - 1.
+dropTypeCode := dropTypeCode - 1.
-	"/ place the selection inTo the DndSelection property
+"/ place the selection inTo the DndSelection property
-	"/ of the rootView ...
+"/ of the rootView ...
-	"/ ... need a single string, with 0-terminated parts.
+"/ ... need a single string, with 0-terminated parts.
-	strings := OrderedCollection new.
+strings := OrderedCollection new.
-	sz := 0.
+sz := 0.
-	dropColl do:[:anObject |
+dropColl do:[:anObject |
-	    |s o|
+|s o|
-	    o := anObject theObject.
+o := anObject theObject.
-	    anObject isFileObject ifTrue:[
+anObject isFileObject ifTrue:[
-		o := o pathName
+o := o pathName
-	    ].
+].
-	    s := o asString.
+s := o asString.
-	    strings add:s.
+strings add:s.
-	    sz := sz + (s size) + 1.
+sz := sz + (s size) + 1.
-	].
+].
-	val := String new:sz.
+val := String new:sz.
-	idx := 1.
+idx := 1.
-	strings do:[:aString |
+strings do:[:aString |
-	    |sz|
+|sz|
-	    sz := aString size.
+sz := aString size.
-	    val replaceFrom:idx to:(idx + sz - 1) with:aString startingAt:1.
+val replaceFrom:idx to:(idx + sz - 1) with:aString startingAt:1.
-	    idx := idx + sz.
+idx := idx + sz.
-	    val at:idx put:(Character value:0).
+val at:idx put:(Character value:0).
-	    idx := idx + 1
+idx := idx + 1
-	].
+].
-	self
+self
-	    setProperty:(self atomIDOf:#DndSelection)
+setProperty:(self atomIDOf:#DndSelection)
-	    type:(self atomIDOf:#STRING)
+type:(self atomIDOf:#STRING)
-	    value:val
+value:val
-	    for:rootId.
+for:rootId.
-	^ self
+^ self
-	    sendClientEvent:msgType
+sendClientEvent:msgType
-	    format:32
+format:32
-	    to:destinationId
+to:destinationId
-	    propagate:true
+propagate:true
-	    eventMask:nil
+eventMask:nil
-	    window:destinationId
+window:destinationId
-	    data1:dropTypeCode
+data1:dropTypeCode
-	    data2:0
+data2:0
-	    data3:destinationId
+data3:destinationId
-	    data4:nil
+data4:nil
-	    data5:nil.
+data5:nil.
 ].
 ^ false
 "Created: 6.4.1997 / 13:39:37 / cg"
 dndDropTypes
 "return the dropTypes as supported by DND"
 ^ #(
-	    DndUnknown      "/ 0
+DndUnknown      "/ 0
-	    DndRawData      "/ 1
+DndRawData      "/ 1
-	    DndFile         "/ 2
+DndFile         "/ 2
-	    DndFiles        "/ 3
+DndFiles        "/ 3
-	    DndText         "/ 4
+DndText         "/ 4
-	    DndDir          "/ 5
+DndDir          "/ 5
-	    DndLink         "/ 6
+DndLink         "/ 6
-	    DndExe          "/ 7
+DndExe          "/ 7
 )
 "Created: 6.4.1997 / 12:57:56 / cg"
 "Modified: 6.4.1997 / 13:38:52 / cg"
 !
 "/
 "/ see, if the display supports the DND protocol ...
 "/
 (self atomIDOf:#DndProtocol) notNil ifTrue:[
-	^ self
+^ self
-	    dndDrop:aCollectionOfDropObjects
+dndDrop:aCollectionOfDropObjects
-	    inWindowID:destinationId
+inWindowID:destinationId
-	    position:destinationPoint
+position:destinationPoint
-	    rootPosition:rootPoint
+rootPosition:rootPoint
 ].
 "/ add more drag&drop protocols here.
 ^ false
 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();
+XDrawPoint(myDpy, win, gc, px, py);
-	ENTER_XLIB();
+LEAVE_XLIB();
-	XDrawPoint(myDpy, win, gc, px, py);
+RETURN ( self );
-	LEAVE_XLIB();
-	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
 !
 primDrawBits:imageBits bitsPerPixel:bitsPerPixel depth:imageDepth msb:msb masks:maskArray padding:bitPadding
-			     extent:imageExtent sourceOrigin:srcOrg
+extent:imageExtent sourceOrigin:srcOrg
-			       into:aDrawableId
+into:aDrawableId
-		  destinationOrigin:dstOrg extent:dstExtent
+destinationOrigin:dstOrg extent:dstExtent
-			       with:aGCId
+with:aGCId
 <context: #return>
 |imageWidth imageHeight rm gm bm srcx srcy dstx dsty w h|
 && __bothSmallInteger(imageDepth, bitsPerPixel)
 && __isSmallInteger(bitPadding)
 && __bothSmallInteger(rm, gm)
 && __isSmallInteger(bm)
 && __isByteArrayLike(imageBits)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	int pad = __intVal(bitPadding);
+int pad = __intVal(bitPadding);
-	gc = __GCVal(aGCId);
+gc = __GCVal(aGCId);
-	win = __WindowVal(aDrawableId);
+win = __WindowVal(aDrawableId);
-	if (! gc || !win)
+if (! gc || !win)
-	    goto fail;
+goto fail;
 #ifdef ARGDEBUG
-	console_printf("args ok\n");
+console_printf("args ok\n");
 #endif
-	image.data = (char *)__ByteArrayInstPtr(imageBits)->ba_element;
+image.data = (char *)__ByteArrayInstPtr(imageBits)->ba_element;
-	image.width = imgWdth = __intVal(imageWidth);
+image.width = imgWdth = __intVal(imageWidth);
-	image.height = __intVal(imageHeight);
+image.height = __intVal(imageHeight);
-	image.xoffset = 0;
+image.xoffset = 0;
-	image.format = ZPixmap;
+image.format = ZPixmap;
-	image.byte_order = (msb == true) ? MSBFirst : LSBFirst;
+image.byte_order = (msb == true) ? MSBFirst : LSBFirst;
-	image.bitmap_unit = 8;
+image.bitmap_unit = 8;
-	image.bitmap_bit_order = MSBFirst;
+image.bitmap_bit_order = MSBFirst;
-	image.bitmap_pad = pad;
+image.bitmap_pad = pad;
-	image.depth = __intVal(imageDepth);
+image.depth = __intVal(imageDepth);
-	image.bits_per_pixel = __intVal(bitsPerPixel);
+image.bits_per_pixel = __intVal(bitsPerPixel);
-	image.red_mask = __intVal(rm);
+image.red_mask = __intVal(rm);
-	image.green_mask = __intVal(gm);
+image.green_mask = __intVal(gm);
-	image.blue_mask = __intVal(bm);
+image.blue_mask = __intVal(bm);
-	image.bytes_per_line = ((((imgWdth * image.bits_per_pixel) + (pad-1)) / pad) * pad) / 8;
+image.bytes_per_line = ((((imgWdth * image.bits_per_pixel) + (pad-1)) / pad) * pad) / 8;
-	switch (image.bits_per_pixel) {
+switch (image.bits_per_pixel) {
-	    case 1:
+case 1:
-	    case 2:
+case 2:
-	    case 4:
+case 4:
-	    case 8:
+case 8:
-	    case 16:
+case 16:
-	    case 24:
+case 24:
-	    case 32:
+case 32:
-		break;
+break;
-	    default:
+default:
 #ifdef ARGDEBUG
-		console_printf("bits_per_pixel=%d\n",image.bits_per_pixel);
+console_printf("bits_per_pixel=%d\n",image.bits_per_pixel);
 #endif
-		goto fail;
+goto fail;
-	}
+}
-	/* ENTER_XLIB(); */
+/* ENTER_XLIB(); */
-	XPutImage(dpy, win, gc, &image, __intVal(srcx), __intVal(srcy),
+XPutImage(dpy, win, gc, &image, __intVal(srcx), __intVal(srcy),
-					__intVal(dstx), __intVal(dsty),
+__intVal(dstx), __intVal(dsty),
-					__intVal(w), __intVal(h));
+__intVal(w), __intVal(h));
-	/* LEAVE_XLIB(); */
+/* LEAVE_XLIB(); */
-	RETURN ( true );
+RETURN ( true );
 }
 #ifdef ARGDEBUG
 if (!! __isExternalAddress(aGCId)) console_printf("GC\n");
 if (!! __isExternalAddress(aDrawableId)) console_printf("aDrawableId\n");
 if (!! __isSmallInteger(srcx)) console_printf("srcx\n");
 .
 ^ false
 !
 primDrawBits:imageBits bitsPerPixel:bitsPerPixel depth:imageDepth msb:msb padding:bitPadding
-			      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
 <context: #return>
 "since XPutImage may allocate huge amount of stack space
 (some implementations use alloca), this must run with unlimited stack."
 && __bothSmallInteger(w, h)
 && __bothSmallInteger(imageWidth, imageHeight)
 && __bothSmallInteger(imageDepth, bitsPerPixel)
 && __isSmallInteger(bitPadding)
 && __isByteArrayLike(imageBits)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	int pad = __intVal(bitPadding);
+int pad = __intVal(bitPadding);
-	gc = __GCVal(aGCId);
+gc = __GCVal(aGCId);
-	win = __WindowVal(aDrawableId);
+win = __WindowVal(aDrawableId);
-	if (! gc || !win)
+if (! gc || !win)
-	    goto fail;
+goto fail;
 #ifdef ARGDEBUG
-	console_printf("args ok\n");
+console_printf("args ok\n");
 #endif
-	image.data = (char *)__ByteArrayInstPtr(imageBits)->ba_element;
+image.data = (char *)__ByteArrayInstPtr(imageBits)->ba_element;
-	image.width = imgWdth = __intVal(imageWidth);
+image.width = imgWdth = __intVal(imageWidth);
-	image.height = __intVal(imageHeight);
+image.height = __intVal(imageHeight);
-	image.xoffset = 0;
+image.xoffset = 0;
-	image.format = ZPixmap;
+image.format = ZPixmap;
-	image.byte_order = (msb == true) ? MSBFirst : LSBFirst;
+image.byte_order = (msb == true) ? MSBFirst : LSBFirst;
-	image.bitmap_unit = 8;
+image.bitmap_unit = 8;
-	image.bitmap_bit_order = MSBFirst;
+image.bitmap_bit_order = MSBFirst;
-	image.bitmap_pad = pad;
+image.bitmap_pad = pad;
-	image.depth = __intVal(imageDepth);
+image.depth = __intVal(imageDepth);
-	image.bits_per_pixel = __intVal(bitsPerPixel);
+image.bits_per_pixel = __intVal(bitsPerPixel);
-	/*
+/*
-	image.bytes_per_line = ((((imgWdth * image.depth) + (pad-1)) / pad) * pad) / 8;
+image.bytes_per_line = ((((imgWdth * image.depth) + (pad-1)) / pad) * pad) / 8;
-	*/
+*/
-	image.bytes_per_line = ((((imgWdth * image.bits_per_pixel) + (pad-1)) / pad) * pad) / 8;
+image.bytes_per_line = ((((imgWdth * image.bits_per_pixel) + (pad-1)) / pad) * pad) / 8;
-	switch (image.bits_per_pixel) {
+switch (image.bits_per_pixel) {
-	    case 1:
+case 1:
-	    case 2:
+case 2:
-	    case 4:
+case 4:
-	    case 8:
+case 8:
-	    case 16:
+case 16:
-	    case 24:
+case 24:
-	    case 32:
+case 32:
-		break;
+break;
-	    default:
+default:
 #ifdef ARGDEBUG
-		console_printf("bits_per_pixel=%d\n",image.bits_per_pixel);
+console_printf("bits_per_pixel=%d\n",image.bits_per_pixel);
 #endif
-		goto fail;
+goto fail;
-	}
+}
-	image.red_mask = 0xFFFF;
+image.red_mask = 0xFFFF;
-	image.green_mask = 0xFFFF;
+image.green_mask = 0xFFFF;
-	image.blue_mask = 0xFFFF;
+image.blue_mask = 0xFFFF;
-	/* ENTER_XLIB(); */
+/* ENTER_XLIB(); */
-	XPutImage(dpy, win, gc, &image, __intVal(srcx), __intVal(srcy),
+XPutImage(dpy, win, gc, &image, __intVal(srcx), __intVal(srcy),
-					__intVal(dstx), __intVal(dsty),
+__intVal(dstx), __intVal(dsty),
-					__intVal(w), __intVal(h));
+__intVal(w), __intVal(h));
-	/* LEAVE_XLIB(); */
+/* LEAVE_XLIB(); */
-	RETURN ( true );
+RETURN ( true );
 }
 #ifdef ARGDEBUG
 if (!! __isExternalAddress(aGCId)) console_printf("GC\n");
 if (!! __isExternalAddress(aDrawableId)) console_printf("aDrawableId\n");
 if (!! __isSmallInteger(srcx)) console_printf("srcx\n");
 self mouseWheelMotion:state x:x y:y amount:(logicalButton == #wheelFwd ifTrue:[10] ifFalse:[-10]) deltaTime:10 view:view.
 ^ self.
 ].
 logicalButton isInteger ifTrue:[
-	buttonsPressed := buttonsPressed bitOr:(1 bitShift:logicalButton-1).
+buttonsPressed := buttonsPressed bitOr:(1 bitShift:logicalButton-1).
 ].
 (multiClickTimeDelta notNil and:[lastButtonPressTime notNil]) ifTrue:[
-	time < (lastButtonPressTime + multiClickTimeDelta) ifTrue:[
+time < (lastButtonPressTime + multiClickTimeDelta) ifTrue:[
-	    lastButtonPressTime := time.
+lastButtonPressTime := time.
-	    self buttonMultiPress:logicalButton x:x y:y view:view.
+self buttonMultiPress:logicalButton x:x y:y view:view.
-	    ^ self.
+^ self.
-	].
+].
 ].
 lastButtonPressTime := time.
 view isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
+"/ event arrived, after I destroyed it myself
-	^ self
+^ self
 ].
 logicalButton == 1 ifTrue:[
-	activateOnClick == true ifTrue:[
+activateOnClick == true ifTrue:[
-	    "/ dont raise above an active popup view.
+"/ dont raise above an active popup view.
-	    (activeKeyboardGrab isNil and:[activePointerGrab isNil]) ifTrue:[
+(activeKeyboardGrab isNil and:[activePointerGrab isNil]) ifTrue:[
-		view topView raise.
+view topView raise.
-	    ]
+]
-	].
+].
 ].
 super buttonPress:logicalButton x:x y:y view:view
 !
 buttonRelease:view button:button state:state x:x y:y rootX:rX rootY:rY time:time
 (logicalButton == #wheelFwd or:[logicalButton == #wheelBwd]) ifTrue:[
 ^ self
 ].
 logicalButton isInteger ifTrue:[
-	buttonsPressed := buttonsPressed bitClear:(1 bitShift:logicalButton-1).
+buttonsPressed := buttonsPressed bitClear:(1 bitShift:logicalButton-1).
 ].
 self buttonRelease:logicalButton x:x y:y view:view
 !
 clientMessage:targetView type:typeAtom format:format data:data
 |sensor|
 targetView isNil ifTrue:[
-	"targetView is gone? Anyway, cannot do anything with this event..."
+"targetView is gone? Anyway, cannot do anything with this event..."
-	^ self.
+^ self.
 ].
 "DND drag&drop protocol"
 (format == 32 and:[typeAtom == (self atomIDOf:#DndProtocol)]) ifTrue:[
-	self dndMessage:nil data:data view:targetView.
+self dndMessage:nil data:data view:targetView.
-	^ self.
+^ self.
 ].
 sensor := targetView sensor.
 "not posted, if there is no sensor ..."
 sensor notNil ifTrue:[
-	sensor clientMessage:typeAtom format:format eventData:data view:targetView
+sensor clientMessage:typeAtom format:format eventData:data view:targetView
 ].
 "Created: 4.4.1997 / 17:49:26 / cg"
 !
 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:[
-	    "view is now on the top of the window stack"
+"view is now on the top of the window stack"
-	    self coveredBy:view view:aboveView.
+self coveredBy:view view:aboveView.
-	].
+].
 ].
 !
 createWindow:view x:x y:y width:w height:h
 view isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
+"/ event arrived, after I destroyed it myself
-	^ self
+^ self
 ].
 view sensor createWindow:view x:x y:y width:w height:h
 "Created: / 30-05-2011 / 16:05:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 30-05-2011 / 19:00:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "/ see def's in DragAndDropTypes.h
 dropType := (self dndDropTypes) at:dropType+1 ifAbsent:#DndNotDnd.
 property := self
-	getProperty:(self atomIDOf:#DndSelection)
+getProperty:(self atomIDOf:#DndSelection)
-	from:rootId
+from:rootId
-	delete:false.
+delete:false.
 propertyType := property key.
 dropValue := property value.
 "/ preconvert into a collection
 "/ redefined dropMessage methods in applications.
 "/ Conversion is done for some well known types
 "/ in the default dropMessage handling of SimpleView.
 dropType == #DndFiles ifTrue:[
-	"/ actually, a list of fileNames
+"/ actually, a list of fileNames
-	propertyType ~~ stringAtom ifTrue:[
+propertyType ~~ stringAtom ifTrue:[
-	    'XWorkstation [info]: expected a string propertyValue in drop' infoPrintCR.
+'XWorkstation [info]: expected a string propertyValue in drop' infoPrintCR.
-	    ^ self
+^ self
-	].
+].
-	names := OrderedCollection new.
+names := OrderedCollection new.
-	i1 := 1.
+i1 := 1.
-	[i1 ~~ 0] whileTrue:[
+[i1 ~~ 0] whileTrue:[
-	    i2 := dropValue indexOf:(Character value:0) startingAt:i1.
+i2 := dropValue indexOf:(Character value:0) startingAt:i1.
-	    i2 ~~ 0 ifTrue:[
+i2 ~~ 0 ifTrue:[
-		names add:(dropValue copyFrom:i1 to:(i2-1)).
+names add:(dropValue copyFrom:i1 to:(i2-1)).
-		i1 := i2 + 1.
+i1 := i2 + 1.
-	    ] ifFalse:[
+] ifFalse:[
-		i1 := i2
+i1 := i2
-	    ].
+].
-	].
+].
-	dropValue := names.
+dropValue := names.
-	dropValue := dropValue collect:[:nm | nm asFilename].
+dropValue := dropValue collect:[:nm | nm asFilename].
-	dropType := #files.
+dropType := #files.
 ] ifFalse:[ (dropType == #DndFile) ifTrue:[
-	propertyType ~~ stringAtom ifTrue:[
+propertyType ~~ stringAtom ifTrue:[
-	    'XWorkstation [info]: expected a string propertyValue in drop' infoPrintCR.
+'XWorkstation [info]: expected a string propertyValue in drop' infoPrintCR.
-	    ^ self
+^ self
-	].
+].
-	dropValue := dropValue asFilename.
+dropValue := dropValue asFilename.
-	dropType := #file.
+dropType := #file.
 ] ifFalse:[ (dropType == #DndDir) ifTrue:[
-	propertyType ~~ stringAtom ifTrue:[
+propertyType ~~ stringAtom ifTrue:[
-	    'XWorkstation [info]: expected a string propertyValue in drop' infoPrintCR.
+'XWorkstation [info]: expected a string propertyValue in drop' infoPrintCR.
-	    ^ self
+^ self
-	].
+].
-	dropValue := dropValue asFilename.
+dropValue := dropValue asFilename.
-	dropType := #directory.
+dropType := #directory.
 ] ifFalse:[ (dropType == #DndText) ifTrue:[
-	propertyType ~~ stringAtom ifTrue:[
+propertyType ~~ stringAtom ifTrue:[
-	    'XWorkstation [info]: expected a string propertyValue in drop' infoPrintCR.
+'XWorkstation [info]: expected a string propertyValue in drop' infoPrintCR.
-	    ^ self
+^ self
-	].
+].
-	dropType := #text.
+dropType := #text.
 ] ifFalse:[ (dropType == #DndExe) ifTrue:[
-	propertyType ~~ stringAtom ifTrue:[
+propertyType ~~ stringAtom ifTrue:[
-	    'XWorkstation [info]: expected a string propertyValue in drop' infoPrintCR.
+'XWorkstation [info]: expected a string propertyValue in drop' infoPrintCR.
-	    ^ self
+^ self
-	].
+].
-	dropType := #executable.
+dropType := #executable.
 ] ifFalse:[ (dropType == #DndLink) ifTrue:[
-	propertyType ~~ stringAtom ifTrue:[
+propertyType ~~ stringAtom ifTrue:[
-	    'XWorkstation [info]: expected a string propertyValue in drop' infoPrintCR.
+'XWorkstation [info]: expected a string propertyValue in drop' infoPrintCR.
-	    ^ self
+^ self
-	].
+].
-	dropType := #link.
+dropType := #link.
 ] ifFalse:[ (dropType == #DndRawData) ifTrue:[
-	dropType := #rawData.
+dropType := #rawData.
 ] ifFalse:[
-	'XWorkstation [info]: unsupported dropType: ' infoPrint. dropType infoPrintCR.
+'XWorkstation [info]: unsupported dropType: ' infoPrint. dropType infoPrintCR.
-	'XWorkstation [info]: data: ' infoPrint. dropValue infoPrintCR.
+'XWorkstation [info]: data: ' infoPrint. dropValue infoPrintCR.
-	dropType := #unknown.
+dropType := #unknown.
 ]]]]]]].
 sensor := targetView sensor.
 "not posted, if there is no sensor ..."
 sensor notNil ifTrue:[
-	sensor dropMessage:dropType data:dropValue view:targetView position:nil handle:nil
+sensor dropMessage:dropType data:dropValue view:targetView position:nil handle:nil
 ].
 "Created: 4.4.1997 / 17:59:37 / cg"
 !
 focusIn:view mode:mode detail:detail
 "a view got the keyboard focus"
 mode ~~ 1 "NotifyGrab" ifTrue:[
-	"mode NotifyGrab is set for pseudo-focus-changes, when a view grabs the keyboard"
+"mode NotifyGrab is set for pseudo-focus-changes, when a view grabs the keyboard"
-	self focusInView:view
+self focusInView:view
 ].
 !
 focusOut:view mode:mode detail:detail
 "a view lost the keyboard focus"
 mode ~~ 1 "NotifyGrab" ifTrue:[
-	"mode NotifyGrab is set for pseudo-focus-changes, when a view grabs the keyboard"
+"mode NotifyGrab is set for pseudo-focus-changes, when a view grabs the keyboard"
-	self focusOutView:view
+self focusOutView:view
 ].
 !
 graphicsExpose:view x:x y:y width:w height:h count:count
 "forward a graphics-expose event for some view"
 altDown := state bitTest:altModifierMask.
 metaDown := state bitTest:metaModifierMask.
 shiftDown := state bitTest:(self shiftModifierMask).
 ctrlDown := state bitTest:(self ctrlModifierMask).
 key isNil ifTrue:[
-	"/ happens sometimes on some systems
+"/ happens sometimes on some systems
-	"/ (alt-graph on sun has no keysym)
+"/ (alt-graph on sun has no keysym)
-	^ self
+^ self
 ].
 eventRootX := rX.
 eventRootY := rY.
 "very low-level mapping of X11 event symbols to common ST/X event symbols"
 metaDown := state bitTest:metaModifierMask.
 shiftDown := state bitTest:(self shiftModifierMask).
 ctrlDown := state bitTest:(self ctrlModifierMask).
 key isNil ifTrue:[
-	"/ happens sometimes on some systems
+"/ happens sometimes on some systems
-	"/ (alt-graph on sun has no keysym)
+"/ (alt-graph on sun has no keysym)
-	^ self
+^ self
 ].
 eventRootX := rX.
 eventRootY := rY.
 "very low-level mapping of X11 event symbols to common ST/X event symbols"
 mappingNotify:view request:what event:eB
 "One of Keyboard-, Modifier- or PointerMap has changed, probably by xmodmap.
 Tell xlib about the fact."
 (what == #mappingKeyboard or:[what == #mappingModifier]) ifTrue:[
-	self refreshKeyboardMapping:eB.
+self refreshKeyboardMapping:eB.
-	"Maybe some of our modifiers have been changed"
+"Maybe some of our modifiers have been changed"
-	self initializeModifierMappings.
+self initializeModifierMappings.
 ].
 !
 pointerEnter:view x:x y:y rootX:rX rootY:rY state:state mode:mode detail:detail time:time
 |selectionFetcher|
 lastEventTime := time.
 aView isNil ifTrue:[
-	"event arrived, after aView has been destroyed"
+"event arrived, after aView has been destroyed"
-	^ self
+^ self
 ].
 "/    'propertyChange ' infoPrint. (self atomName:propertyId) print. ': ' print. aSymbol printCR.
 "/    aView propertyChange:atom state:aSymbol.
 be interested (for now, only XEmbedSiteView is)"
 aView sensor propertyChange:aView property:propertyId state:aSymbol time:time.
 aSymbol ~~ #newValue ifTrue:[
-	"I am not interested in delete notifications"
+"I am not interested in delete notifications"
-	^ self.
+^ self.
 ].
 selectionFetcher := self findSelectionFetcher:aView id.
 selectionFetcher notNil ifTrue:[
-	selectionFetcher message:thisContext message.
+selectionFetcher message:thisContext message.
 ].
 "Modified: / 01-06-2011 / 13:40:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 "/    Transcript endEntry.
 lastEventTime := time.
 aView isNil ifTrue:[
-	"event arrived, after aView has been destroyed"
+"event arrived, after aView has been destroyed"
-	^ self
+^ self
 ].
 selectionFetcher := self findSelectionFetcher:aView id.
 selectionFetcher notNil ifTrue:[
-	selectionFetcher message:thisContext message.
+selectionFetcher message:thisContext message.
 ].
 !
 selectionRequest:aView requestor:requestorID selection:selectionID target:targetID property:propertyID time:time
 "sent by some other X-client to ask for the selection.
 This is a very X-specific mechanism."
-|selection property|
+|selection property bufferGetSelector responseTargetID selectionTime|
-'Selection: ' print. (self atomName:selectionID) printCR. ' TargetId: ' print. (self atomName:targetID) printCR.
+"/'Selection: ' print. (self atomName:selectionID) printCR. ' TargetId: ' print. (self atomName:targetID) printCR.
-' Property: ' print. (self atomName:propertyID) printCR. ' Requestor: ' print. requestorID printCR.
+"/' Property: ' print. (self atomName:propertyID) printCR. ' Requestor: ' print. requestorID printCR.
 lastEventTime := time.
 "JV@2012-03-27: Support both PRIMARY and CLIPBOARD selections"
 selectionID == primaryAtom ifTrue:[
-selection := self primaryBufferAs:targetID.
+bufferGetSelector := #getPrimaryBuffer.
+selectionTime := primarySelectionTime.
 ] ifFalse:[
-selection := self copyBufferAs:targetID.
+bufferGetSelector := #getCopyBuffer.
-].
+selectionTime := clipboardSelectionTime.
+].
+(targetID == (self atomIDOf:#TIMESTAMP)) ifTrue:[
+"the other view wants to know when we acquired ownership of the selection"
+responseTargetID := self atomIDOf:#INTEGER.
+selection := selectionTime.
+] ifFalse:[(targetID == (self atomIDOf:#TARGETS)) ifTrue:[
+"the other view wants to know which targets we support"
+responseTargetID := self atomIDOf:#ATOM.
+selection := self supportedTargetAtoms.
+] ifFalse:[
+selection := self selectionBuffer:bufferGetSelector as:targetID.
+responseTargetID := selection key.
+selection := selection value.
+]].
 "/'Send selection: ' print. selection printCR.
 property := propertyID.
 property := nil.
 ] ifFalse:[
 property == 0 ifTrue:[
 "Support old (obsolete) clients requesting a None property.
 Set the propertyID to the targetID"
-property := targetID.
+property := responseTargetID.
 ].
 self setProperty:property
-type:targetID
+type:responseTargetID
 value:selection
 for:requestorID.
 ].
 self sendNotifySelection:selectionID
 property:property
-target:targetID
+target:responseTargetID
 time:time
 to:requestorID.
 "Modified: / 27-03-2012 / 15:22:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 visibilityNotify:aView state:how
 aView notNil ifTrue:[
-	aView visibilityChange:how
+aView visibilityChange:how
 ]
 ! !
 !XWorkstation methodsFor:'event forwarding-ignored events'!
 colorMapNotify:aView state:aBoolean
 "sent, when another colormap is installed.
 This is a very X-specific mechanism."
 aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
+"/ event arrived, after I destroyed it myself
-	^ self
+^ self
 ].
 "/ not yet implemented
 "/ aView colorMapChange
 !
 defaultEventMask
 "return a mask to enable some events by default."
 %{  /* NOCONTEXT */
 RETURN (__MKSMALLINT( ExposureMask | StructureNotifyMask |
-			 KeyPressMask | KeyReleaseMask |
+KeyPressMask | KeyReleaseMask |
-			 PointerMotionMask |
+PointerMotionMask |
-			 EnterWindowMask | LeaveWindowMask |
+EnterWindowMask | LeaveWindowMask |
-			 ButtonPressMask | ButtonMotionMask | ButtonReleaseMask |
+ButtonPressMask | ButtonMotionMask | ButtonReleaseMask |
-			 PropertyChangeMask ));
+PropertyChangeMask ));
 %}
 !
 dispatchEvent:evArray
 |viewId view evType arguments|
 viewId := evArray at:1.
 viewId notNil ifTrue:[
-	viewId = lastId ifTrue:[
+viewId = lastId ifTrue:[
-	    view := lastView
+view := lastView
-	] ifFalse:[
+] ifFalse:[
-	    view := self viewFromId:viewId
+view := self viewFromId:viewId
-	].
+].
 ].
 evType := evArray at:3.
 (self respondsTo:evType) ifTrue:[
-	arguments := evArray copyFrom:3 to:(3 + evType numArgs - 1).
+arguments := evArray copyFrom:3 to:(3 + evType numArgs - 1).
-	arguments at:1 put:view.
+arguments at:1 put:view.
-	self perform:evType withArguments:arguments.
+self perform:evType withArguments:arguments.
-	^ true.
+^ true.
 ].
 '********** unhandled event:' errorPrintCR.
 evType errorPrintCR. (evArray at:2) errorPrintCR.
 '********** see dispatchEvent' errorPrintCR.
 ^ false
 If the argument aViewIdOrNil is nil, events for any view are processed,
 otherwise only events for the view with given id are processed.
 If the argument aMask is nonNil, only events for this eventMask are
 handled.
 WARNING: this may block to wait for an event - you better check for a
-	      pending event before calling this."
+pending event before calling this."
 |eventArray|
 eventArray := Array new:13.
 (self getEventFor:aViewIdOrNil withMask:eventMask into:eventArray) ifTrue:[
-	AbortOperationRequest handle:[:ex |
+AbortOperationRequest handle:[:ex |
-	    ex return
+ex return
-	] do:[
+] do:[
-	    self dispatchEvent:eventArray.
+self dispatchEvent:eventArray.
-	]
+]
 ].
 "Modified: 19.8.1997 / 17:10:42 / cg"
 !
 dispatchExposeEventFor:aViewIdOrNil
 "get next expose event and send appropriate message to the sensor or view.
 If the argument aViewIdOrNil is nil, events for any view are processed,
 otherwise only events for the view with given id are processed.
 WARNING: this may block to wait for an event - you better check for a
-	      pending event before calling this."
+pending event before calling this."
 self dispatchEventFor:aViewIdOrNil withMask:(self eventMaskFor:#expose)
 "Modified: 19.8.1997 / 17:10:26 / cg"
 !
 dispatchLoop
 preWaitAction := [self flush].
 Processor addPreWaitAction:preWaitAction.
 [
-	super dispatchLoop
+super dispatchLoop
 ] ensure:[
-	Processor removePreWaitAction:preWaitAction.
+Processor removePreWaitAction:preWaitAction.
-	preWaitAction := nil.
+preWaitAction := nil.
 ].
 !
 dispatchPendingEvents
 "central event handling method for modal operation.
 "interested in exposes only ?"
 |eventArray|
 dispatchingExpose notNil ifTrue:[
-	[self exposeEventPendingFor:dispatchingExpose withSync:false] whileTrue:[
+[self exposeEventPendingFor:dispatchingExpose withSync:false] whileTrue:[
-	    self dispatchExposeEventFor:dispatchingExpose
+self dispatchExposeEventFor:dispatchingExpose
-	].
+].
-	^ self
+^ self
 ].
 [self eventPendingWithSync:false] whileTrue:[
-	eventArray isNil ifTrue:[
+eventArray isNil ifTrue:[
-	    eventArray := Array new:13.
+eventArray := Array new:13.
-	].
+].
-	(self getEventFor:nil withMask:nil into:eventArray) ifTrue:[
+(self getEventFor:nil withMask:nil into:eventArray) ifTrue:[
-	    AbortOperationRequest handle:[:ex |
+AbortOperationRequest handle:[:ex |
-		ex return
+ex return
-	    ] do:[
+] do:[
-		self dispatchEvent:eventArray.
+self dispatchEvent:eventArray.
-		"/ multi-screen config: give others a chance
+"/ multi-screen config: give others a chance
-		"/ (needed because we run at high (non-timesliced) prio)
+"/ (needed because we run at high (non-timesliced) prio)
-		Processor yield.
+Processor yield.
-	    ]
+]
-	].
+].
 ]
 "Modified: 19.8.1997 / 17:11:18 / cg"
 !
 XEvent ev;
 Window win;
 if (ISCONNECTED
 && __isSmallInteger(aMask)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	ENTER_XLIB();
+ENTER_XLIB();
-	if (__isExternalAddress(aWindowIdOrNil)) {
+if (__isExternalAddress(aWindowIdOrNil)) {
-	    win = __WindowVal(aWindowIdOrNil);
+win = __WindowVal(aWindowIdOrNil);
-	    while (XCheckWindowEvent(dpy, win, __intVal(aMask), &ev)) ;;
+while (XCheckWindowEvent(dpy, win, __intVal(aMask), &ev)) ;;
-	} else {
+} else {
-	    while (XCheckMaskEvent(dpy, __intVal(aMask), &ev)) ;;
+while (XCheckMaskEvent(dpy, __intVal(aMask), &ev)) ;;
-	}
+}
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 "/ (especially Win32 & Xlib)
 ConservativeSync == true ifTrue:[self sync].
 dispatchingExpose notNil ifTrue:[
-	^ self exposeEventPendingFor:dispatchingExpose withSync:false
+^ self exposeEventPendingFor:dispatchingExpose withSync:false
 ].
 ^ self eventPendingWithSync:false
 "Modified: / 28.4.1999 / 11:08:12 / cg"
 !
 Window win;
 int thereIsOne;
 OBJ rslt = false;
 if (ISCONNECTED && __isSmallInteger(anEventMask)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	ENTER_XLIB();
+ENTER_XLIB();
-	if (doSync == true) {
+if (doSync == true) {
-	    XSync(dpy, 0);      /* make certain everything is flushed */
+XSync(dpy, 0);      /* make certain everything is flushed */
-	}
+}
-	if (__isExternalAddress(aWindowIdOrNil)) {
+if (__isExternalAddress(aWindowIdOrNil)) {
-	    win = __WindowVal(aWindowIdOrNil);
+win = __WindowVal(aWindowIdOrNil);
-	    thereIsOne = XCheckWindowEvent(dpy, win, __intVal(anEventMask), &ev);
+thereIsOne = XCheckWindowEvent(dpy, win, __intVal(anEventMask), &ev);
-	} else {
+} else {
-	    thereIsOne = XCheckMaskEvent(dpy, __intVal(anEventMask), &ev);
+thereIsOne = XCheckMaskEvent(dpy, __intVal(anEventMask), &ev);
-	}
+}
-	if (thereIsOne) {
+if (thereIsOne) {
-	    XPutBackEvent(dpy, &ev);
+XPutBackEvent(dpy, &ev);
-	    rslt = true;
+rslt = true;
-	}
+}
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 RETURN ( rslt );
 %}
 !
 <context: #return>
 %{  /* UNLIMITEDSTACK */
 OBJ rslt = false;
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	if (XEventsQueued(dpy, QueuedAlready)) {
+if (XEventsQueued(dpy, QueuedAlready)) {
-	    RETURN (true);
+RETURN (true);
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	if (doSync == true) {
+if (doSync == true) {
-	    XSync(dpy, 0);      /* make certain everything is flushed */
+XSync(dpy, 0);      /* make certain everything is flushed */
-	}
+}
-	if (XPending(dpy)) {
+if (XPending(dpy)) {
-	    rslt = true;
+rslt = true;
-	}
+}
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 RETURN ( rslt );
 %}
 !
 eventQueued
 "return true, if any event is queued"
 dispatchingExpose notNil ifTrue:[
-	^ self exposeEventPendingFor:dispatchingExpose withSync:false
+^ self exposeEventPendingFor:dispatchingExpose withSync:false
 ].
 ^ self eventQueuedAlready
 "Created: 12.12.1995 / 21:43:00 / stefan"
 !
 %{  /* UNLIMITEDSTACK */
 OBJ rslt = false;
 if (ISCONNECTED) {
-	/* ENTER ... LEAVE not needed; XEventsQueued will not block */
+/* ENTER ... LEAVE not needed; XEventsQueued will not block */
-	/* ENTER_XLIB(); */
+/* ENTER_XLIB(); */
-	if (XEventsQueued(myDpy, QueuedAlready)) {
+if (XEventsQueued(myDpy, QueuedAlready)) {
-	    rslt = true;
+rslt = true;
-	}
+}
-	/* LEAVE_XLIB(); */
+/* LEAVE_XLIB(); */
 }
 RETURN ( rslt );
 %}
 !
 Window win;
 int thereIsOne;
 OBJ rslt = false;
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	ENTER_XLIB();
+ENTER_XLIB();
-	if (doSync == true) {
+if (doSync == true) {
-	    XSync(dpy, 0);      /* make certain everything is flushed */
+XSync(dpy, 0);      /* make certain everything is flushed */
-	}
+}
-	if (__isExternalAddress(aWindowIdOrNil)) {
+if (__isExternalAddress(aWindowIdOrNil)) {
-	    win = __WindowVal(aWindowIdOrNil);
+win = __WindowVal(aWindowIdOrNil);
-	    thereIsOne = XCheckWindowEvent(dpy, win, ExposureMask, &ev);
+thereIsOne = XCheckWindowEvent(dpy, win, ExposureMask, &ev);
-	} else {
+} else {
-	    thereIsOne = XCheckMaskEvent(dpy, ExposureMask, &ev);
+thereIsOne = XCheckMaskEvent(dpy, ExposureMask, &ev);
-	}
+}
-	if (thereIsOne) {
+if (thereIsOne) {
-	    XPutBackEvent(dpy, &ev);
+XPutBackEvent(dpy, &ev);
-	    rslt = true;
+rslt = true;
-	}
+}
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 RETURN ( rslt );
 %}
 !
 This method may block - so you better check for pending events
 before calling for it.
 The event fields are placed them into anEventArray (must be at least size 13):
 the fields are:
-	1:      windowID
+1:      windowID
-	2:      eventType-ID
+2:      eventType-ID
-	3:      eventTypeSymbol
+3:      eventTypeSymbol
-	4..     args
+4..     args
 Sorry I had to split dispatch into this fetch method and a separate
 handler method to allow UNLIMITEDSTACK here.
 (some Xlibs do a big alloca there which cannot be done in
 #dispatchEvent:, since it dispatches out into ST-methods).
 int i, nchars;
 char *keySymString;
 OBJ arg, sym, t, windowID;
 if (! ISCONNECTED) {
-	RETURN (false);
+RETURN (false);
 }
 dpy = myDpy;
 ev.type = 0;
 if (__isSmallInteger(eventMask)) {
-	evMask = __intVal(eventMask);
+evMask = __intVal(eventMask);
 } else {
-	evMask = ~0;
+evMask = ~0;
 }
 if (__isExternalAddress(aViewIdOrNil)) {
-	wWanted = __WindowVal(aViewIdOrNil);
+wWanted = __WindowVal(aViewIdOrNil);
-	returnValue = XCheckWindowEvent(dpy, wWanted, evMask, &ev);
+returnValue = XCheckWindowEvent(dpy, wWanted, evMask, &ev);
 } else {
-	if (evMask == ~0) {
+if (evMask == ~0) {
-	    XNextEvent(dpy, &ev);
+XNextEvent(dpy, &ev);
-	    returnValue = 1;
+returnValue = 1;
-	} else {
+} else {
-	    returnValue = XCheckMaskEvent(dpy, evMask, &ev);
+returnValue = XCheckMaskEvent(dpy, evMask, &ev);
-	}
+}
 }
 if (!returnValue) {
-	/* there is no event */
+/* there is no event */
-	RETURN (false);
+RETURN (false);
 }
 if (anEventArray == nil) {
-	/* sender is not interested in the event */
+/* sender is not interested in the event */
-	RETURN(true);
+RETURN(true);
 }
 if (!__isArray(anEventArray)) {
-	console_fprintf(stderr, "XWorkstation: bad argument [%d]\n", __LINE__);
+console_fprintf(stderr, "XWorkstation: bad argument [%d]\n", __LINE__);
-	RETURN (false);
+RETURN (false);
 }
 if (__arraySize(anEventArray) < 11) {
-	console_fprintf(stderr, "XWorkstation: bad argument [%d]\n", __LINE__);
+console_fprintf(stderr, "XWorkstation: bad argument [%d]\n", __LINE__);
-	RETURN (false);
+RETURN (false);
 }
 #   define ANYBUTTON   (Button1MotionMask | Button2MotionMask | Button3MotionMask)
 #   define ae ((XAnyEvent *)&ev)
 #   define pe ((XPropertyEvent *)&ev)
 #   define sce ((XSelectionClearEvent *)&ev)
 #   define cme ((XColormapEvent *)&ev)
 if (((t = __INST(lastId)) != nil)
-	 && __isExternalAddress(t)
+&& __isExternalAddress(t)
-	 && (__WindowVal(t) == ae->window)) {
+&& (__WindowVal(t) == ae->window)) {
-	windowID = t;
+windowID = t;
 } else {
-	windowID = __MKEXTERNALADDRESS(ae->window);
+windowID = __MKEXTERNALADDRESS(ae->window);
 }
 __ArrayInstPtr(anEventArray)->a_element[0] = windowID; __STORE(anEventArray, windowID);
 __ArrayInstPtr(anEventArray)->a_element[1] = __MKSMALLINT(ev.type);
 switch (ev.type) {
-	case KeyRelease:
+case KeyRelease:
-	    sym = @symbol(keyRelease:key:code:state:x:y:rootX:rootY:time:);
+sym = @symbol(keyRelease:key:code:state:x:y:rootX:rootY:time:);
-	    goto keyPressAndRelease;
+goto keyPressAndRelease;
-	case KeyPress:
+case KeyPress:
-	    sym = @symbol(keyPress:key:code:state:x:y:rootX:rootY:time:);
+sym = @symbol(keyPress:key:code:state:x:y:rootX:rootY:time:);
-	    /* FALL INTO */
+/* FALL INTO */
-	keyPressAndRelease:
+keyPressAndRelease:
-	    arg = nil;
+arg = nil;
-	    nchars = XLookupString(ke, (char *)buffer, sizeof(buffer), &keySym, NULL);
+nchars = XLookupString(ke, (char *)buffer, sizeof(buffer), &keySym, NULL);
-	    if (nchars == 1 && (((buffer[0] >= ' ') && (buffer[0] <= '~'))
+if (nchars == 1 && (((buffer[0] >= ' ') && (buffer[0] <= '~'))
-		|| (buffer[0] >= 0x80))) {
+|| (buffer[0] >= 0x80))) {
-		arg = __MKCHARACTER(buffer[0]);
+arg = __MKCHARACTER(buffer[0]);
 //            } else if (nchars > 2) {
 //                arg = __MKSTRING_L(buffer, nchars);
-	    } else {
+} else {
-		keySymString = XKeysymToString(keySym);
+keySymString = XKeysymToString(keySym);
-		if (keySymString) {
+if (keySymString) {
-		    arg = __MKSYMBOL(keySymString, 0);
+arg = __MKSYMBOL(keySymString, 0);
-		}
+}
-	    }
+}
 #ifdef IGNORE_UNKNOWN_KEYCODES
-	    if (arg == nil) {
+if (arg == nil) {
-		/* happens sometimes (alt-graph on sun has no keysym) */
+/* happens sometimes (alt-graph on sun has no keysym) */
-		RETURN (false);
+RETURN (false);
-	    }
+}
 #endif
-	    __ArrayInstPtr(anEventArray)->a_element[2] = sym;
+__ArrayInstPtr(anEventArray)->a_element[2] = sym;
-	    __ArrayInstPtr(anEventArray)->a_element[3] = arg; __STORE(anEventArray, arg);
+__ArrayInstPtr(anEventArray)->a_element[3] = arg; __STORE(anEventArray, arg);
-	    t = __MKUINT(ke->keycode); __ArrayInstPtr(anEventArray)->a_element[4] = t; __STORE(anEventArray, t);
+t = __MKUINT(ke->keycode); __ArrayInstPtr(anEventArray)->a_element[4] = t; __STORE(anEventArray, t);
-	    __ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(ke->state);
+__ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(ke->state);
-	    __ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(ke->x);
+__ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(ke->x);
-	    __ArrayInstPtr(anEventArray)->a_element[7] = __mkSmallInteger(ke->y);
+__ArrayInstPtr(anEventArray)->a_element[7] = __mkSmallInteger(ke->y);
-	    __ArrayInstPtr(anEventArray)->a_element[8] = __mkSmallInteger(ke->x_root);
+__ArrayInstPtr(anEventArray)->a_element[8] = __mkSmallInteger(ke->x_root);
-	    __ArrayInstPtr(anEventArray)->a_element[9] = __mkSmallInteger(ke->y_root);
+__ArrayInstPtr(anEventArray)->a_element[9] = __mkSmallInteger(ke->y_root);
-	    t = __MKUINT(ke->time); __ArrayInstPtr(anEventArray)->a_element[10] = t; __STORE(anEventArray, t);
+t = __MKUINT(ke->time); __ArrayInstPtr(anEventArray)->a_element[10] = t; __STORE(anEventArray, t);
-	    break;
+break;
-	case ButtonPress:
+case ButtonPress:
-	    sym = @symbol(buttonPress:button:state:x:y:rootX:rootY:time:);
+sym = @symbol(buttonPress:button:state:x:y:rootX:rootY:time:);
-	    goto buttonPressAndRelease;
+goto buttonPressAndRelease;
-	case ButtonRelease:
+case ButtonRelease:
-	    sym = @symbol(buttonRelease:button:state:x:y:rootX:rootY:time:);
+sym = @symbol(buttonRelease:button:state:x:y:rootX:rootY:time:);
-	    /* fall into */
+/* fall into */
-	buttonPressAndRelease:
+buttonPressAndRelease:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = sym;
+__ArrayInstPtr(anEventArray)->a_element[2] = sym;
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(be->button);
+__ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(be->button);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(ke->state);
+__ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(ke->state);
-	    __ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(be->x);
+__ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(be->x);
-	    __ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(be->y);
+__ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(be->y);
-	    __ArrayInstPtr(anEventArray)->a_element[7] = __mkSmallInteger(be->x_root);
+__ArrayInstPtr(anEventArray)->a_element[7] = __mkSmallInteger(be->x_root);
-	    __ArrayInstPtr(anEventArray)->a_element[8] = __mkSmallInteger(be->y_root);
+__ArrayInstPtr(anEventArray)->a_element[8] = __mkSmallInteger(be->y_root);
-	    t = __MKUINT(be->time); __ArrayInstPtr(anEventArray)->a_element[9] = t; __STORE(anEventArray, t);
+t = __MKUINT(be->time); __ArrayInstPtr(anEventArray)->a_element[9] = t; __STORE(anEventArray, t);
-	    break;
+break;
-	case MotionNotify:
+case MotionNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(buttonMotion:state:x:y:rootX:rootY:time:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(buttonMotion:state:x:y:rootX:rootY:time:);
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(me->state);
+__ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(me->state);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(me->x);
+__ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(me->x);
-	    __ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(me->y);
+__ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(me->y);
-	    __ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(me->x_root);
+__ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(me->x_root);
-	    __ArrayInstPtr(anEventArray)->a_element[7] = __mkSmallInteger(me->y_root);
+__ArrayInstPtr(anEventArray)->a_element[7] = __mkSmallInteger(me->y_root);
-	    t = __MKUINT(me->time); __ArrayInstPtr(anEventArray)->a_element[8] = t; __STORE(anEventArray, t);
+t = __MKUINT(me->time); __ArrayInstPtr(anEventArray)->a_element[8] = t; __STORE(anEventArray, t);
-	    break;
+break;
-	case FocusIn:
+case FocusIn:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(focusIn:mode:detail:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(focusIn:mode:detail:);
-	    goto focusInOut;
+goto focusInOut;
-	case FocusOut:
+case FocusOut:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(focusOut:mode:detail:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(focusOut:mode:detail:);
-	    /* fall into */
+/* fall into */
-	focusInOut:
+focusInOut:
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(fe->mode);
+__ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(fe->mode);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(fe->detail);
+__ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(fe->detail);
-	    break;
+break;
-	case EnterNotify:
+case EnterNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(pointerEnter:x:y:rootX:rootY:state:mode:detail:time:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(pointerEnter:x:y:rootX:rootY:state:mode:detail:time:);
-	    goto enterLeave;
+goto enterLeave;
-	case LeaveNotify:
+case LeaveNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(pointerLeave:x:y:rootX:rootY:state:mode:detail:time:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(pointerLeave:x:y:rootX:rootY:state:mode:detail:time:);
-	    /* fall into */
+/* fall into */
-	enterLeave:
+enterLeave:
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(ele->x);
+__ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(ele->x);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(ele->y);
+__ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(ele->y);
-	    __ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(ele->x_root);
+__ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(ele->x_root);
-	    __ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(ele->y_root);
+__ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(ele->y_root);
-	    __ArrayInstPtr(anEventArray)->a_element[7] = __mkSmallInteger(ele->state);
+__ArrayInstPtr(anEventArray)->a_element[7] = __mkSmallInteger(ele->state);
-	    __ArrayInstPtr(anEventArray)->a_element[8] = __mkSmallInteger(ele->mode);
+__ArrayInstPtr(anEventArray)->a_element[8] = __mkSmallInteger(ele->mode);
-	    __ArrayInstPtr(anEventArray)->a_element[9] = __mkSmallInteger(ele->detail);
+__ArrayInstPtr(anEventArray)->a_element[9] = __mkSmallInteger(ele->detail);
-	    t = __MKUINT(ele->time); __ArrayInstPtr(anEventArray)->a_element[10] = t; __STORE(anEventArray, t);
+t = __MKUINT(ele->time); __ArrayInstPtr(anEventArray)->a_element[10] = t; __STORE(anEventArray, t);
-	    break;
+break;
-	case Expose:
+case Expose:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(expose:x:y:width:height:count:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(expose:x:y:width:height:count:);
-	    goto expose;
+goto expose;
-	case GraphicsExpose:
+case GraphicsExpose:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(graphicsExpose:x:y:width:height:count:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(graphicsExpose:x:y:width:height:count:);
-	    /* fall into */
+/* fall into */
-	expose:
+expose:
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(ee->x);
+__ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(ee->x);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(ee->y);
+__ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(ee->y);
-	    __ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(ee->width);
+__ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(ee->width);
-	    __ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(ee->height);
+__ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(ee->height);
-	    __ArrayInstPtr(anEventArray)->a_element[7] = __mkSmallInteger(ee->count);
+__ArrayInstPtr(anEventArray)->a_element[7] = __mkSmallInteger(ee->count);
-	    break;
+break;
-	case NoExpose:
+case NoExpose:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(noExposeView:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(noExposeView:);
-	    break;
+break;
-	case VisibilityNotify:
+case VisibilityNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(visibilityNotify:state:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(visibilityNotify:state:);
-	    switch (ve->state) {
+switch (ve->state) {
-		case VisibilityUnobscured:
+case VisibilityUnobscured:
-		    __ArrayInstPtr(anEventArray)->a_element[3] = @symbol(unobscured);
+__ArrayInstPtr(anEventArray)->a_element[3] = @symbol(unobscured);
-		    break;
+break;
-		case VisibilityPartiallyObscured:
+case VisibilityPartiallyObscured:
-		    __ArrayInstPtr(anEventArray)->a_element[3] = @symbol(partiallyObscured);
+__ArrayInstPtr(anEventArray)->a_element[3] = @symbol(partiallyObscured);
-		    break;
+break;
-		case VisibilityFullyObscured:
+case VisibilityFullyObscured:
-		    __ArrayInstPtr(anEventArray)->a_element[3] = @symbol(fullyObscured);
+__ArrayInstPtr(anEventArray)->a_element[3] = @symbol(fullyObscured);
-		    break;
+break;
-		default:
+default:
-		    __ArrayInstPtr(anEventArray)->a_element[3] = __MKSMALLINT(ve->state);
+__ArrayInstPtr(anEventArray)->a_element[3] = __MKSMALLINT(ve->state);
-		    break;
+break;
-	    }
+}
-	    break;
+break;
-	case CreateNotify:
+case CreateNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(createWindow:x:y:width:height:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(createWindow:x:y:width:height:);
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(cre->x);
+__ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(cre->x);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(cre->y);
+__ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(cre->y);
-	    __ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(cre->width);
+__ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(cre->width);
-	    __ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(cre->height);
+__ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(cre->height);
-	    break;
+break;
-	case DestroyNotify:
+case DestroyNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(destroyedView:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(destroyedView:);
-	    break;
+break;
-	case UnmapNotify:
+case UnmapNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(unmappedView:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(unmappedView:);
-	    break;
+break;
-	case MapNotify:
+case MapNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(mappedView:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(mappedView:);
-	    break;
+break;
-	case ConfigureNotify:
+case ConfigureNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(configure:x:y:width:height:above:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(configure:x:y:width:height:above:);
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(ce->x);
+__ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(ce->x);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(ce->y);
+__ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(ce->y);
-	    __ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(ce->width);
+__ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(ce->width);
-	    __ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(ce->height);
+__ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(ce->height);
-	    __ArrayInstPtr(anEventArray)->a_element[7] = nil;
+__ArrayInstPtr(anEventArray)->a_element[7] = nil;
-	    if (ce->above != None) {
+if (ce->above != None) {
-		t = __MKEXTERNALADDRESS(ce->above); __ArrayInstPtr(anEventArray)->a_element[7] = t; __STORE(anEventArray, t);
+t = __MKEXTERNALADDRESS(ce->above); __ArrayInstPtr(anEventArray)->a_element[7] = t; __STORE(anEventArray, t);
-	    }
+}
-	    break;
+break;
-	case GravityNotify:
+case GravityNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(gravityNotify:x:y:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(gravityNotify:x:y:);
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(gre->x);
+__ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(gre->x);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(gre->y);
+__ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(gre->y);
-	    break;
+break;
-	case ResizeRequest:
+case ResizeRequest:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(resizeRequest:width:height:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(resizeRequest:width:height:);
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(rr->width);
+__ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(rr->width);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(rr->height);
+__ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(rr->height);
-	    break;
+break;
-	case ConfigureRequest:
+case ConfigureRequest:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(configureRequest:x:y:width:height:above:detail:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(configureRequest:x:y:width:height:above:detail:);
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(cr->x);
+__ArrayInstPtr(anEventArray)->a_element[3] = __mkSmallInteger(cr->x);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(cr->y);
+__ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(cr->y);
-	    __ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(cr->width);
+__ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(cr->width);
-	    __ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(cr->height);
+__ArrayInstPtr(anEventArray)->a_element[6] = __mkSmallInteger(cr->height);
-	    __ArrayInstPtr(anEventArray)->a_element[7] = nil;
+__ArrayInstPtr(anEventArray)->a_element[7] = nil;
-	    if (cr->above != None) {
+if (cr->above != None) {
-		t = __MKEXTERNALADDRESS(cr->above); __ArrayInstPtr(anEventArray)->a_element[7] = t; __STORE(anEventArray, t);
+t = __MKEXTERNALADDRESS(cr->above); __ArrayInstPtr(anEventArray)->a_element[7] = t; __STORE(anEventArray, t);
-	    }
+}
-	    switch (cr->detail) {
+switch (cr->detail) {
-		case Above:
+case Above:
-		    __ArrayInstPtr(anEventArray)->a_element[8] = @symbol(above);
+__ArrayInstPtr(anEventArray)->a_element[8] = @symbol(above);
-		    break;
+break;
-		case Below:
+case Below:
-		    __ArrayInstPtr(anEventArray)->a_element[8] = @symbol(below);
+__ArrayInstPtr(anEventArray)->a_element[8] = @symbol(below);
-		    break;
+break;
-		case TopIf:
+case TopIf:
-		    __ArrayInstPtr(anEventArray)->a_element[8] = @symbol(topIf);
+__ArrayInstPtr(anEventArray)->a_element[8] = @symbol(topIf);
-		    break;
+break;
-		case BottomIf:
+case BottomIf:
-		    __ArrayInstPtr(anEventArray)->a_element[8] = @symbol(bottomIf);
+__ArrayInstPtr(anEventArray)->a_element[8] = @symbol(bottomIf);
-		    break;
+break;
-		case Opposite:
+case Opposite:
-		    __ArrayInstPtr(anEventArray)->a_element[8] = @symbol(opposite);
+__ArrayInstPtr(anEventArray)->a_element[8] = @symbol(opposite);
-		    break;
+break;
-		default:
+default:
-		    __ArrayInstPtr(anEventArray)->a_element[8] = __MKSMALLINT(cr->detail);
+__ArrayInstPtr(anEventArray)->a_element[8] = __MKSMALLINT(cr->detail);
-		    break;
+break;
-	    }
+}
-	    break;
+break;
-	case CirculateNotify:
+case CirculateNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(circulateNotify:place:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(circulateNotify:place:);
-	    goto circulate;
+goto circulate;
-	case CirculateRequest:
+case CirculateRequest:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(circulateRequest:place:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(circulateRequest:place:);
-	    /* fall into */
+/* fall into */
-	circulate:
+circulate:
-	    switch (cie->place) {
+switch (cie->place) {
-		case PlaceOnTop:
+case PlaceOnTop:
-		    __ArrayInstPtr(anEventArray)->a_element[3] = @symbol(placeOnTop);
+__ArrayInstPtr(anEventArray)->a_element[3] = @symbol(placeOnTop);
-		    break;
+break;
-		case PlaceOnBottom:
+case PlaceOnBottom:
-		    __ArrayInstPtr(anEventArray)->a_element[3] = @symbol(placeOnBottom);
+__ArrayInstPtr(anEventArray)->a_element[3] = @symbol(placeOnBottom);
-		    break;
+break;
-		default:
+default:
-		    __ArrayInstPtr(anEventArray)->a_element[3] = __MKSMALLINT(cie->place);
+__ArrayInstPtr(anEventArray)->a_element[3] = __MKSMALLINT(cie->place);
-		    break;
+break;
-	    }
+}
-	    break;
+break;
-	case PropertyNotify:
+case PropertyNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(propertyChange:property:state:time:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(propertyChange:property:state:time:);
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __MKATOMOBJ(pe->atom);
+__ArrayInstPtr(anEventArray)->a_element[3] = __MKATOMOBJ(pe->atom);
-	    switch (pe->state) {
+switch (pe->state) {
-		case PropertyNewValue:
+case PropertyNewValue:
-		    __ArrayInstPtr(anEventArray)->a_element[4] = @symbol(newValue);
+__ArrayInstPtr(anEventArray)->a_element[4] = @symbol(newValue);
-		    break;
+break;
-		case PropertyDelete:
+case PropertyDelete:
-		    __ArrayInstPtr(anEventArray)->a_element[4] = @symbol(deleted);
+__ArrayInstPtr(anEventArray)->a_element[4] = @symbol(deleted);
-		    break;
+break;
-		default:
+default:
-		    __ArrayInstPtr(anEventArray)->a_element[4] = __MKSMALLINT(pe->state);
+__ArrayInstPtr(anEventArray)->a_element[4] = __MKSMALLINT(pe->state);
-		    break;
+break;
-	    }
+}
-	    t = __MKUINT(pe->time); __ArrayInstPtr(anEventArray)->a_element[5] = t; __STORE(anEventArray, t);
+t = __MKUINT(pe->time); __ArrayInstPtr(anEventArray)->a_element[5] = t; __STORE(anEventArray, t);
-	    break;
+break;
-	case SelectionClear:
+case SelectionClear:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(selectionClear:selection:time:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(selectionClear:selection:time:);
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __MKATOMOBJ(sce->selection);
+__ArrayInstPtr(anEventArray)->a_element[3] = __MKATOMOBJ(sce->selection);
-	    t = __MKUINT(sce->time); __ArrayInstPtr(anEventArray)->a_element[4] = t; __STORE(anEventArray, t);
+t = __MKUINT(sce->time); __ArrayInstPtr(anEventArray)->a_element[4] = t; __STORE(anEventArray, t);
-	    break;
+break;
-	case SelectionRequest:
+case SelectionRequest:
-	    /*
+/*
-	     * someone wants the selection
+* someone wants the selection
-	     */
+*/
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(selectionRequest:requestor:selection:target:property:time:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(selectionRequest:requestor:selection:target:property:time:);
-	    t = __MKEXTERNALADDRESS(ev.xselectionrequest.requestor); __ArrayInstPtr(anEventArray)->a_element[3] = t; __STORE(anEventArray, t);
+t = __MKEXTERNALADDRESS(ev.xselectionrequest.requestor); __ArrayInstPtr(anEventArray)->a_element[3] = t; __STORE(anEventArray, t);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __MKATOMOBJ(ev.xselectionrequest.selection);
+__ArrayInstPtr(anEventArray)->a_element[4] = __MKATOMOBJ(ev.xselectionrequest.selection);
-	    __ArrayInstPtr(anEventArray)->a_element[5] = __MKATOMOBJ(ev.xselectionrequest.target);
+__ArrayInstPtr(anEventArray)->a_element[5] = __MKATOMOBJ(ev.xselectionrequest.target);
-	    __ArrayInstPtr(anEventArray)->a_element[6] = __MKATOMOBJ(ev.xselectionrequest.property);
+__ArrayInstPtr(anEventArray)->a_element[6] = __MKATOMOBJ(ev.xselectionrequest.property);
-	    t = __MKUINT(ev.xselectionrequest.time); __ArrayInstPtr(anEventArray)->a_element[7] = t; __STORE(anEventArray, t);
+t = __MKUINT(ev.xselectionrequest.time); __ArrayInstPtr(anEventArray)->a_element[7] = t; __STORE(anEventArray, t);
-	    break;
+break;
-	case SelectionNotify:
+case SelectionNotify:
-	    /*
+/*
-	     * returned selection value (answer from SelectionRequest)
+* returned selection value (answer from SelectionRequest)
-	     */
+*/
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(selectionNotify:selection:target:property:requestor:time:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(selectionNotify:selection:target:property:requestor:time:);
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __MKATOMOBJ(ev.xselection.selection);
+__ArrayInstPtr(anEventArray)->a_element[3] = __MKATOMOBJ(ev.xselection.selection);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __MKATOMOBJ(ev.xselection.target);
+__ArrayInstPtr(anEventArray)->a_element[4] = __MKATOMOBJ(ev.xselection.target);
-	    __ArrayInstPtr(anEventArray)->a_element[5] = __MKATOMOBJ(ev.xselection.property);
+__ArrayInstPtr(anEventArray)->a_element[5] = __MKATOMOBJ(ev.xselection.property);
-	    t = __MKEXTERNALADDRESS(ev.xselection.requestor); __ArrayInstPtr(anEventArray)->a_element[6] = t; __STORE(anEventArray, t);
+t = __MKEXTERNALADDRESS(ev.xselection.requestor); __ArrayInstPtr(anEventArray)->a_element[6] = t; __STORE(anEventArray, t);
-	    t = __MKUINT(ev.xselection.time); __ArrayInstPtr(anEventArray)->a_element[7] = t; __STORE(anEventArray, t);
+t = __MKUINT(ev.xselection.time); __ArrayInstPtr(anEventArray)->a_element[7] = t; __STORE(anEventArray, t);
-	    break;
+break;
-	case ColormapNotify:
+case ColormapNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(colormapNotify:state:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(colormapNotify:state:);
-	    __ArrayInstPtr(anEventArray)->a_element[3] = cme->state == ColormapInstalled ? true : false;
+__ArrayInstPtr(anEventArray)->a_element[3] = cme->state == ColormapInstalled ? true : false;
-	    break;
+break;
-	case ClientMessage:
+case ClientMessage:
-	    if (ev.xclient.message_type == (int) __AtomVal(__INST(protocolsAtom))) {
+if (ev.xclient.message_type == (int) __AtomVal(__INST(protocolsAtom))) {
-		if ((ev.xclient.data.l[0] == (int) __AtomVal(__INST(quitAppAtom)))
+if ((ev.xclient.data.l[0] == (int) __AtomVal(__INST(quitAppAtom)))
-		 || (ev.xclient.data.l[0] == (int) __AtomVal(__INST(deleteWindowAtom)))) {
+|| (ev.xclient.data.l[0] == (int) __AtomVal(__INST(deleteWindowAtom)))) {
-		    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(terminateView:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(terminateView:);
-		    break;
+break;
-		}
+}
-		if (ev.xclient.data.l[0] == (int) __AtomVal(__INST(saveYourselfAtom))) {
+if (ev.xclient.data.l[0] == (int) __AtomVal(__INST(saveYourselfAtom))) {
-		    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(saveAndTerminateView:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(saveAndTerminateView:);
-		    break;
+break;
-		}
+}
-	    }
+}
-	    /*
+/*
-	     * any other client message
+* any other client message
-	     */
+*/
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(clientMessage:type:format:data:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(clientMessage:type:format:data:);
-	    __ArrayInstPtr(anEventArray)->a_element[3] = __MKATOMOBJ(ev.xclient.message_type);
+__ArrayInstPtr(anEventArray)->a_element[3] = __MKATOMOBJ(ev.xclient.message_type);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __MKSMALLINT(ev.xclient.format);
+__ArrayInstPtr(anEventArray)->a_element[4] = __MKSMALLINT(ev.xclient.format);
-	    t = __MKBYTEARRAY(&ev.xclient.data, sizeof(ev.xclient.data)); __ArrayInstPtr(anEventArray)->a_element[5] = t; __STORE(anEventArray, t);
+t = __MKBYTEARRAY(&ev.xclient.data, sizeof(ev.xclient.data)); __ArrayInstPtr(anEventArray)->a_element[5] = t; __STORE(anEventArray, t);
-	    break;
+break;
-	case MappingNotify:
+case MappingNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(mappingNotify:request:event:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(mappingNotify:request:event:);
-	    switch(mape->request) {
+switch(mape->request) {
-		case MappingModifier:
+case MappingModifier:
-		    arg = @symbol(mappingModifier);
+arg = @symbol(mappingModifier);
-		    break;
+break;
-		case MappingKeyboard:
+case MappingKeyboard:
-		    arg = @symbol(mappingKeyboard);
+arg = @symbol(mappingKeyboard);
-		    break;
+break;
-		case MappingPointer:
+case MappingPointer:
-		    arg = @symbol(mappingPointer);
+arg = @symbol(mappingPointer);
-		    break;
+break;
-		default:
+default:
-		    arg = __MKSMALLINT(mape->request);
+arg = __MKSMALLINT(mape->request);
-		    break;
+break;
-	    }
+}
-	    __ArrayInstPtr(anEventArray)->a_element[3] = arg;
+__ArrayInstPtr(anEventArray)->a_element[3] = arg;
-	    t = __MKBYTEARRAY(&ev, sizeof(*mape)); __ArrayInstPtr(anEventArray)->a_element[4] = t;
+t = __MKBYTEARRAY(&ev, sizeof(*mape)); __ArrayInstPtr(anEventArray)->a_element[4] = t;
-	    __STORE(anEventArray, t);
+__STORE(anEventArray, t);
-	    break;
+break;
-	case KeymapNotify:
+case KeymapNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(keymapNotify:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(keymapNotify:);
-	    break;
+break;
-	case MapRequest:
+case MapRequest:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(mapRequest:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(mapRequest:);
-	    break;
+break;
-	case ReparentNotify:
+case ReparentNotify:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(reparentedView:parentId:x:y:);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(reparentedView:parentId:x:y:);
-	    t = __MKEXTERNALADDRESS(rpe->parent);
+t = __MKEXTERNALADDRESS(rpe->parent);
-	    __ArrayInstPtr(anEventArray)->a_element[3] = t; __STORE(anEventArray, t);
+__ArrayInstPtr(anEventArray)->a_element[3] = t; __STORE(anEventArray, t);
-	    __ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(rpe->x);
+__ArrayInstPtr(anEventArray)->a_element[4] = __mkSmallInteger(rpe->x);
-	    __ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(rpe->y);
+__ArrayInstPtr(anEventArray)->a_element[5] = __mkSmallInteger(rpe->y);
-	    break;
+break;
-	default:
+default:
-	    __ArrayInstPtr(anEventArray)->a_element[2] = @symbol(unknownX11Event);
+__ArrayInstPtr(anEventArray)->a_element[2] = @symbol(unknownX11Event);
-	    break;
+break;
 }
 #undef ae
 #undef ee
 #undef ke
 #undef be
 int mask;
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)
 && __isSmallInteger(aMask)) {
-	mask = __intVal(aMask);
+mask = __intVal(aMask);
 #ifdef OLD
-	/* these may not be disabled */
+/* these may not be disabled */
-	mask |= ExposureMask | StructureNotifyMask |
+mask |= ExposureMask | StructureNotifyMask |
-		KeyPressMask | KeyReleaseMask |
+KeyPressMask | KeyReleaseMask |
-		EnterWindowMask | LeaveWindowMask |
+EnterWindowMask | LeaveWindowMask |
-		ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
+ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
 #endif
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSelectInput(myDpy, __WindowVal(aWindowId), mask);
+XSelectInput(myDpy, __WindowVal(aWindowId), mask);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 buttonPress:button x:x y:y view:aView
 "forward a button-press event for some view"
 aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
+"/ event arrived, after I destroyed it myself
-	^ self
+^ self
 ].
 button == 1 ifTrue:[
-	activateOnClick == true ifTrue:[
+activateOnClick == true ifTrue:[
-	    "/ dont raise above an active popup view.
+"/ dont raise above an active popup view.
-	    (activeKeyboardGrab isNil and:[activePointerGrab isNil]) ifTrue:[
+(activeKeyboardGrab isNil and:[activePointerGrab isNil]) ifTrue:[
-		aView topView raise.
+aView topView raise.
 "/            ] ifFalse:[
 "/                activeKeyboardGrab printCR.
 "/                activePointerGrab printCR.
-	    ]
+]
-	].
+].
 ].
 super buttonPress:button x:x y:y view:aView
 && __isInteger(msgType)
 && __isInteger(msgFormat)
 && (eventMask == nil || __isInteger(eventMask))
 && (__isExternalAddress(windowID) || __isInteger(windowID))
 && (__isExternalAddress(targetWindowID) || __isInteger(targetWindowID))) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	XEvent ev;
+XEvent ev;
-	Status result;
+Status result;
-	Window targetWindow;
+Window targetWindow;
-	if (__isInteger(d1)) {
+if (__isInteger(d1)) {
-	    ev.xclient.data.l[0] = __longIntVal(d1);
+ev.xclient.data.l[0] = __longIntVal(d1);
-	} else {
+} else {
-	    if (__isExternalAddress(d1)) {
+if (__isExternalAddress(d1)) {
-		ev.xclient.data.l[0] = (INT)__externalAddressVal(d1);
+ev.xclient.data.l[0] = (INT)__externalAddressVal(d1);
-	    } else {
+} else {
-		ev.xclient.data.l[0] = 0;
+ev.xclient.data.l[0] = 0;
-	    }
+}
-	}
+}
-	if (__isInteger(d2)) {
+if (__isInteger(d2)) {
-	    ev.xclient.data.l[1] = __longIntVal(d2);
+ev.xclient.data.l[1] = __longIntVal(d2);
-	} else {
+} else {
-	    if (__isExternalAddress(d2)) {
+if (__isExternalAddress(d2)) {
-		ev.xclient.data.l[1] = (INT)__externalAddressVal(d2);
+ev.xclient.data.l[1] = (INT)__externalAddressVal(d2);
-	    } else {
+} else {
-		ev.xclient.data.l[1] = 0;
+ev.xclient.data.l[1] = 0;
-	    }
+}
-	}
+}
-	if (__isInteger(d3)) {
+if (__isInteger(d3)) {
-	    ev.xclient.data.l[2] = __longIntVal(d3);
+ev.xclient.data.l[2] = __longIntVal(d3);
-	} else {
+} else {
-	    if (__isExternalAddress(d3)) {
+if (__isExternalAddress(d3)) {
-		ev.xclient.data.l[2] = (INT)__externalAddressVal(d3);
+ev.xclient.data.l[2] = (INT)__externalAddressVal(d3);
-	    } else {
+} else {
-		ev.xclient.data.l[2] = 0;
+ev.xclient.data.l[2] = 0;
-	    }
+}
-	}
+}
-	if (__isInteger(d4)) {
+if (__isInteger(d4)) {
-	    ev.xclient.data.l[3] = __longIntVal(d4);
+ev.xclient.data.l[3] = __longIntVal(d4);
-	} else {
+} else {
-	    if (__isExternalAddress(d4)) {
+if (__isExternalAddress(d4)) {
-		ev.xclient.data.l[3] = (INT)__externalAddressVal(d4);
+ev.xclient.data.l[3] = (INT)__externalAddressVal(d4);
-	    } else {
+} else {
-		ev.xclient.data.l[3] = 0;
+ev.xclient.data.l[3] = 0;
-	    }
+}
-	}
+}
-	if (__isInteger(d5)) {
+if (__isInteger(d5)) {
-	    ev.xclient.data.l[4] = __longIntVal(d5);
+ev.xclient.data.l[4] = __longIntVal(d5);
-	} else {
+} else {
-	    if (__isExternalAddress(d5)) {
+if (__isExternalAddress(d5)) {
-		ev.xclient.data.l[4] = (INT)__externalAddressVal(d5);
+ev.xclient.data.l[4] = (INT)__externalAddressVal(d5);
-	    } else {
+} else {
-		ev.xclient.data.l[4] = 0;
+ev.xclient.data.l[4] = 0;
-	    }
+}
-	}
+}
-	if (__isExternalAddress(windowID)) {
+if (__isExternalAddress(windowID)) {
-	    ev.xclient.window = __WindowVal(windowID);
+ev.xclient.window = __WindowVal(windowID);
-	} else {
+} else {
-	    ev.xclient.window = (Window)__longIntVal(windowID);
+ev.xclient.window = (Window)__longIntVal(windowID);
-	}
+}
-	if (__isExternalAddress(targetWindowID)) {
+if (__isExternalAddress(targetWindowID)) {
-	    targetWindow = __WindowVal(targetWindowID);
+targetWindow = __WindowVal(targetWindowID);
-	} else {
+} else {
-	    targetWindow = (Window)__longIntVal(targetWindowID);
+targetWindow = (Window)__longIntVal(targetWindowID);
-	}
+}
-	ev.xclient.type              = ClientMessage;
+ev.xclient.type              = ClientMessage;
-	ev.xclient.display           = dpy;
+ev.xclient.display           = dpy;
-	ev.xclient.message_type      = __longIntVal(msgType);
+ev.xclient.message_type      = __longIntVal(msgType);
-	ev.xclient.format            = __longIntVal(msgFormat);
+ev.xclient.format            = __longIntVal(msgFormat);
-	if (eventMask == nil) {
+if (eventMask == nil) {
-	    __eventMask = NoEventMask;
+__eventMask = NoEventMask;
-	} else {
+} else {
-	    __eventMask = __longIntVal(eventMask);
+__eventMask = __longIntVal(eventMask);
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	result = XSendEvent(dpy, targetWindow, (propagate == true ? True : False), __eventMask , &ev);
+result = XSendEvent(dpy, targetWindow, (propagate == true ? True : False), __eventMask , &ev);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if ((result == BadValue) || (result == BadWindow)) {
+if ((result == BadValue) || (result == BadWindow)) {
-	    DPRINTF(("bad status in sendClientEvent\n"));
+DPRINTF(("bad status in sendClientEvent\n"));
-	    RETURN ( false )
+RETURN ( false )
-	}
+}
-	RETURN (true)
+RETURN (true)
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ false
 !
 %{
 int type;
 int state;
 if (__isSmallInteger(stateMask)) {
-	state = __intVal(stateMask);
+state = __intVal(stateMask);
 } else {
-	state = 0;
+state = 0;
 }
 if (ISCONNECTED
 && __isSmallInteger(xPos) && __isSmallInteger(yPos)
 && (__isSmallInteger(keySymCodeOrButtonNr) || __isStringLike(keySymCodeOrButtonNr))
 && (__isExternalAddress(targetId) || __isInteger(targetId))) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	XEvent ev;
+XEvent ev;
-	Window target;
+Window target;
-	Status result;
+Status result;
-	KeySym keySym, *syms;
+KeySym keySym, *syms;
-	int screen = __intVal(__INST(screen));
+int screen = __intVal(__INST(screen));
-	char s[2];
+char s[2];
-	int nSyms;
+int nSyms;
-	if ((typeSymbol == @symbol(keyPress))
+if ((typeSymbol == @symbol(keyPress))
-	 || (typeSymbol == @symbol(keyRelease))) {
+|| (typeSymbol == @symbol(keyRelease))) {
-	    if (__isStringLike(keySymCodeOrButtonNr)) {
+if (__isStringLike(keySymCodeOrButtonNr)) {
-		keySym = XStringToKeysym(__stringVal(keySymCodeOrButtonNr));
+keySym = XStringToKeysym(__stringVal(keySymCodeOrButtonNr));
-	    } else {
+} else {
-		if (__isCharacter(keySymCodeOrButtonNr)) {
+if (__isCharacter(keySymCodeOrButtonNr)) {
-		    s[0] = __intVal(__characterVal(keySymCodeOrButtonNr));
+s[0] = __intVal(__characterVal(keySymCodeOrButtonNr));
-		    s[1] = '\0';
+s[1] = '\0';
-		    keySym = XStringToKeysym(s);
+keySym = XStringToKeysym(s);
-		} else {
+} else {
-		    keySym = (KeySym) __intVal(keySymCodeOrButtonNr);
+keySym = (KeySym) __intVal(keySymCodeOrButtonNr);
-		}
+}
-	    }
+}
-	    ev.xkey.keycode = XKeysymToKeycode(dpy, keySym);
+ev.xkey.keycode = XKeysymToKeycode(dpy, keySym);
-	    if (stateMask == nil) {
+if (stateMask == nil) {
-		/*
+/*
-		 * get the modifier from the keySym
+* get the modifier from the keySym
-		 */
+*/
-		nSyms = 0;
+nSyms = 0;
-		syms = XGetKeyboardMapping(dpy, ev.xkey.keycode, 1, &nSyms);
+syms = XGetKeyboardMapping(dpy, ev.xkey.keycode, 1, &nSyms);
-		if (syms) {
+if (syms) {
-		    int i;
+int i;
-		    for (i=0; i<nSyms; i++) {
+for (i=0; i<nSyms; i++) {
-			if (syms[i] == keySym) {
+if (syms[i] == keySym) {
 #ifdef MODIFIERDEBUG
-			    console_printf("modifier-index is %d\n", i);
+console_printf("modifier-index is %d\n", i);
 #endif
-			    if (i) state = (1 << (i-1));
+if (i) state = (1 << (i-1));
-			    break;
+break;
-			}
+}
-		    }
+}
-		    XFree(syms);
+XFree(syms);
-		}
+}
-	    }
+}
-	} else {
+} else {
-	    if ((typeSymbol == @symbol(buttonPress))
+if ((typeSymbol == @symbol(buttonPress))
-	     || (typeSymbol == @symbol(buttonRelease))) {
+|| (typeSymbol == @symbol(buttonRelease))) {
-		if (__isSmallInteger(keySymCodeOrButtonNr)) {
+if (__isSmallInteger(keySymCodeOrButtonNr)) {
-		    ev.xbutton.button = __intVal(keySymCodeOrButtonNr);
+ev.xbutton.button = __intVal(keySymCodeOrButtonNr);
-		} else {
+} else {
-		    ev.xbutton.button = 1;
+ev.xbutton.button = 1;
-		}
+}
-	    } else {
+} else {
-		DPRINTF(("invalid sendEvent typeSymbol\n"));
+DPRINTF(("invalid sendEvent typeSymbol\n"));
-		RETURN (false);
+RETURN (false);
-	    }
+}
-	}
+}
-	if (typeSymbol == @symbol(keyPress))
+if (typeSymbol == @symbol(keyPress))
-	    ev.xany.type = KeyPress;
+ev.xany.type = KeyPress;
-	else if (typeSymbol == @symbol(keyRelease))
+else if (typeSymbol == @symbol(keyRelease))
-	    ev.xany.type = KeyRelease;
+ev.xany.type = KeyRelease;
-	else if (typeSymbol == @symbol(buttonPress))
+else if (typeSymbol == @symbol(buttonPress))
-	    ev.xany.type = ButtonPress;
+ev.xany.type = ButtonPress;
-	else if (typeSymbol == @symbol(buttonRelease))
+else if (typeSymbol == @symbol(buttonRelease))
-	    ev.xany.type = ButtonRelease;
+ev.xany.type = ButtonRelease;
-	if (__isExternalAddress(targetId)) {
+if (__isExternalAddress(targetId)) {
-	    target = __WindowVal(targetId);
+target = __WindowVal(targetId);
-	} else {
+} else {
-	    target = (Window) __longIntVal(targetId);
+target = (Window) __longIntVal(targetId);
-	}
+}
-	ev.xkey.window = target;
+ev.xkey.window = target;
-	ev.xkey.same_screen = 1;
+ev.xkey.same_screen = 1;
-	ev.xkey.subwindow = 0;
+ev.xkey.subwindow = 0;
-	ev.xkey.root = RootWindow(dpy, screen);
+ev.xkey.root = RootWindow(dpy, screen);
-	ev.xkey.x = __intVal(xPos);
+ev.xkey.x = __intVal(xPos);
-	ev.xkey.y = __intVal(yPos);
+ev.xkey.y = __intVal(yPos);
-	ev.xkey.state = state;
+ev.xkey.state = state;
-	ev.xkey.time = CurrentTime;
+ev.xkey.time = CurrentTime;
-	ENTER_XLIB();
+ENTER_XLIB();
-	result = XSendEvent(dpy, target, False, 0 , &ev);
+result = XSendEvent(dpy, target, False, 0 , &ev);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if ((result == BadValue) || (result == BadWindow)) {
+if ((result == BadValue) || (result == BadWindow)) {
-	    DPRINTF(("bad status\n"));
+DPRINTF(("bad status\n"));
-	    RETURN ( false )
+RETURN ( false )
-	}
+}
-	RETURN (true)
+RETURN (true)
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ false
 ! !
 XFontStruct *newFont;
 if (ISCONNECTED
 && __isStringLike(aFontName)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	newFont = XLoadQueryFont(myDpy, (char *)__stringVal(aFontName));
+newFont = XLoadQueryFont(myDpy, (char *)__stringVal(aFontName));
-	LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	if (newFont)
+if (newFont)
-	    __cnt_font++;
+__cnt_font++;
 #endif
-	RETURN ( newFont ? __MKEXTERNALADDRESS(newFont) : nil );
+RETURN ( newFont ? __MKEXTERNALADDRESS(newFont) : nil );
 }
 %}.
 "/ --- disabled due to UNLIMITEDSTACK -- self primitiveFailedOrClosedConnection.
 ^ nil
 !
 resX resY registry encoding coding fields|
 aString isNil ifTrue:[^ false].
 fields := aString asCollectionOfSubstringsSeparatedBy:$-.
 fields size == 3 ifTrue:[
-	"take care of old font names: family-style-size"
+"take care of old font names: family-style-size"
-	family := fields at:1.
+family := fields at:1.
-	style := fields at:2.
+style := fields at:2.
-	size := Number readFromString:(fields at:3) onError:[^ false].
+size := Number readFromString:(fields at:3) onError:[^ false].
 ] ifFalse:[fields size == 2 ifTrue:[
-	"take care of old font names: family-size"
+"take care of old font names: family-size"
-	family := fields at:1.
+family := fields at:1.
-	size := Number readFromString:(fields at:2) onError:[^ false].
+size := Number readFromString:(fields at:2) onError:[^ false].
 ] ifFalse:[fields size >= 15 ifTrue:[
-	family := fields at:3.
+family := fields at:3.
-	face := fields at:4.
+face := fields at:4.
-	style := fields at:5.
+style := fields at:5.
-	style = 'o' ifTrue:[
+style = 'o' ifTrue:[
-	    style := 'oblique'
+style := 'oblique'
-	] ifFalse:[style = 'i' ifTrue:[
+] ifFalse:[style = 'i' ifTrue:[
-	     style := 'italic'
+style := 'italic'
-	] ifFalse:[style = 'r' ifTrue:[
+] ifFalse:[style = 'r' ifTrue:[
-	     style := 'roman'
+style := 'roman'
-	]]].
+]]].
-	moreStyle := fields at:6.
+moreStyle := fields at:6.
-	(moreStyle ~= 'normal' and:[moreStyle size > 1]) ifTrue:[
+(moreStyle ~= 'normal' and:[moreStyle size > 1]) ifTrue:[
-	    style := style, '-', moreStyle.
+style := style, '-', moreStyle.
-	].
+].
-	fheight := fields at:8.
+fheight := fields at:8.
-	size := (Number readFromString:(fields at:9) onError:[^ false]) / 10.
+size := (Number readFromString:(fields at:9) onError:[^ false]) / 10.
-	resX := fields at:10.
+resX := fields at:10.
-	resY := fields at:11.
+resY := fields at:11.
-	registry := fields at:14.
+registry := fields at:14.
-	encoding := fields at:15.
+encoding := fields at:15.
-	coding := registry , '-' , encoding.
+coding := registry , '-' , encoding.
 ] ifFalse:[
-	^ false
+^ false
 ]]].
 aBlock value:family value:face value:style value:size value:coding.
 ^ true
 !
 int directionReturn, fontAscentReturn, fontDescentReturn;
 XCharStruct overAllReturn;
 OBJ *resultArray;
 if (ISCONNECTED
-	 && __bothSmallInteger(index1, index2)
+&& __bothSmallInteger(index1, index2)
-	 && __isExternalAddress(aFontId)
+&& __isExternalAddress(aFontId)
-	 && __isNonNilObject(aString)) {
+&& __isNonNilObject(aString)) {
-	int lMax = __intVal(@global(MaxStringLength));
+int lMax = __intVal(@global(MaxStringLength));
-	f = __FontVal(aFontId);
+f = __FontVal(aFontId);
-	if (! f) goto fail;
+if (! f) goto fail;
-	if (__isArray(anArray) && __arraySize(anArray) > 0) {
+if (__isArray(anArray) && __arraySize(anArray) > 0) {
-	    resultArray = __arrayVal(anArray);
+resultArray = __arrayVal(anArray);
-	} else {
+} else {
-	    resultArray = 0;
+resultArray = 0;
-	}
+}
-	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 ( __MKSMALLINT(0) );
+RETURN ( __MKSMALLINT(0) );
-	    }
+}
-	    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) goto fail;
+if (i2 >= n) goto fail;
-		cp += i1;
+cp += i1;
-		len = XTextExtents(f, cp, l,
+len = XTextExtents(f, cp, l,
-					&directionReturn, &fontAscentReturn, &fontDescentReturn,
+&directionReturn, &fontAscentReturn, &fontDescentReturn,
-					&overAllReturn);
+&overAllReturn);
-	    } else {
+} else {
-		cls = __qClass(aString);
+cls = __qClass(aString);
-		nInstBytes = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
+nInstBytes = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
-		cp += nInstBytes;
+cp += nInstBytes;
-		n = __byteArraySize(aString) - nInstBytes;
+n = __byteArraySize(aString) - nInstBytes;
-		if (__isBytes(aString)) {
+if (__isBytes(aString)) {
-		    if (i2 >= n) goto fail;
+if (i2 >= n) goto fail;
-		    cp += i1;
+cp += i1;
-		    len = XTextExtents(f, cp, l,
+len = XTextExtents(f, cp, l,
-					    &directionReturn, &fontAscentReturn, &fontDescentReturn,
+&directionReturn, &fontAscentReturn, &fontDescentReturn,
-					    &overAllReturn);
+&overAllReturn);
-		} else  if (__isWords(aString)) { /* TWOBYTESTRINGS */
+} else  if (__isWords(aString)) { /* TWOBYTESTRINGS */
-		    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;
-		    n = n / 2;
+n = n / 2;
-		    if (i2 >= n) goto fail;
+if (i2 >= n) goto fail;
-		    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;
-		    }
+}
-		    len = XTextExtents16(f, (XChar2b *)cp, l,
+len = XTextExtents16(f, (XChar2b *)cp, l,
-					    &directionReturn, &fontAscentReturn, &fontDescentReturn,
+&directionReturn, &fontAscentReturn, &fontDescentReturn,
-					    &overAllReturn);
+&overAllReturn);
-		    if (mustFree) {
+if (mustFree) {
-			free(cp2);
+free(cp2);
-		    }
+}
-		} else if (__isLongs(aString)) { /* FOURBYTESTRINGS */
+} else if (__isLongs(aString)) { /* FOURBYTESTRINGS */
-		    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;
-		    n = n / 4;
+n = n / 4;
-		    if (i2 >= n) goto fail;
+if (i2 >= n) goto fail;
-		    cp += (i1 * 4);
+cp += (i1 * 4);
-		    if (l > lMax) l = lMax;
+if (l > lMax) l = lMax;
-		    /*
+/*
-		     * For now: X does not support 32bit characters without the new 32Unicode extensions.
+* For now: X does not support 32bit characters without the new 32Unicode extensions.
-		     * For now, treat chars above 0xFFFF as 0xFFFF (should we use default-char ?).
+* For now, treat chars above 0xFFFF as 0xFFFF (should we use default-char ?).
-		     */
+*/
-		    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++) {
-			int codePoint;
+int codePoint;
-			codePoint = ((unsigned int32 *)cp)[i];
+codePoint = ((unsigned int32 *)cp)[i];
-			if (codePoint > 0xFFFF) {
+if (codePoint > 0xFFFF) {
-			    codePoint = 0xFFFF;
+codePoint = 0xFFFF;
-			}
+}
-			cp2[i].byte1 = codePoint & 0xFF;
+cp2[i].byte1 = codePoint & 0xFF;
-			cp2[i].byte2 = (codePoint >> 8) & 0xFF;;
+cp2[i].byte2 = (codePoint >> 8) & 0xFF;;
-		    }
+}
-		    cp = (char *) cp2;
+cp = (char *) cp2;
-		    len = XTextExtents16(f, (XChar2b *)cp, l,
+len = XTextExtents16(f, (XChar2b *)cp, l,
-					    &directionReturn, &fontAscentReturn, &fontDescentReturn,
+&directionReturn, &fontAscentReturn, &fontDescentReturn,
-					    &overAllReturn);
+&overAllReturn);
-		    if (mustFree) {
+if (mustFree) {
-			free(cp2);
+free(cp2);
-		    }
+}
-		} else
+} else
-		    goto fail;      /*unknown string class */
+goto fail;      /*unknown string class */
-	    }
+}
-	    if (resultArray) {
+if (resultArray) {
-		switch (__arraySize(anArray)) {
+switch (__arraySize(anArray)) {
-		default:
+default:
-		case 8:
+case 8:
-		    resultArray[7] = __MKSMALLINT(directionReturn);
+resultArray[7] = __MKSMALLINT(directionReturn);
-		case 7:
+case 7:
-		    resultArray[6] = __MKSMALLINT(fontDescentReturn);
+resultArray[6] = __MKSMALLINT(fontDescentReturn);
-		case 6:
+case 6:
-		    resultArray[5] = __MKSMALLINT(fontAscentReturn);
+resultArray[5] = __MKSMALLINT(fontAscentReturn);
-		case 5:
+case 5:
-		    resultArray[4] = __MKSMALLINT(overAllReturn.descent);
+resultArray[4] = __MKSMALLINT(overAllReturn.descent);
-		case 4:
+case 4:
-		    resultArray[3] = __MKSMALLINT(overAllReturn.ascent);
+resultArray[3] = __MKSMALLINT(overAllReturn.ascent);
-		case 3:
+case 3:
-		    resultArray[2] = __MKSMALLINT(overAllReturn.width);
+resultArray[2] = __MKSMALLINT(overAllReturn.width);
-		case 2:
+case 2:
-		    resultArray[1] = __MKSMALLINT(overAllReturn.rbearing);
+resultArray[1] = __MKSMALLINT(overAllReturn.rbearing);
-		case 1:
+case 1:
-		    resultArray[0] = __MKSMALLINT(overAllReturn.lbearing);
+resultArray[0] = __MKSMALLINT(overAllReturn.lbearing);
-		case 0:
+case 0:
-		    break;
+break;
-		}
+}
-	    }
+}
-	    RETURN ( __MKSMALLINT(overAllReturn.width) );
+RETURN ( __MKSMALLINT(overAllReturn.width) );
-	}
+}
 }
 #undef NLOCALBUFFER
 fail: ;
 %}.
 self primitiveFailedOrClosedConnection.
 "
 |result|
 result := Array new:8.
 Screen current
-	extentsOf:'hello World' from:1 to:11
+extentsOf:'hello World' from:1 to:11
-	inFont:(Screen current  getFontWithFoundry:'*'
+inFont:(Screen current  getFontWithFoundry:'*'
-		    family:'courier new'
+family:'courier new'
-		    weight:'medium'
+weight:'medium'
-		    slant:'r'
+slant:'r'
-		    spacing:nil
+spacing:nil
-		    pixelSize:nil
+pixelSize:nil
-		    size:10
+size:10
-		    encoding:#'iso10646-1'
+encoding:#'iso10646-1'
-	    )
+)
-	into:result.
+into:result.
 result
 "
 !
 This is pure magic ..."
 |enc charSets|
 (registry size ~~ 0) ifTrue:[
-	enc := registry asLowercase.
+enc := registry asLowercase.
-	encoding size ~~ 0 ifTrue:[
+encoding size ~~ 0 ifTrue:[
-	   enc := enc, '-', encoding asLowercase.
+enc := enc, '-', encoding asLowercase.
-	].
+].
-	enc := enc asSymbol.
+enc := enc asSymbol.
 ] ifFalse:[
-	(encoding size ~~ 0) ifTrue:[
+(encoding size ~~ 0) ifTrue:[
-	    enc := encoding asLowercase asSymbol
+enc := encoding asLowercase asSymbol
-	] ifFalse:[
+] ifFalse:[
-	    charSets := charSetCollections.
+charSets := charSetCollections.
-	    (charSets notEmptyOrNil) ifTrue:[
+(charSets notEmptyOrNil) ifTrue:[
-		charSets := charSets asUppercase asCollectionOfWords.
+charSets := charSets asUppercase asCollectionOfWords.
-		(charSets includes:'ISO8859-1') ifTrue:[
+(charSets includes:'ISO8859-1') ifTrue:[
-		    enc := #'iso8859-1'
+enc := #'iso8859-1'
-		] ifFalse:[
+] ifFalse:[
-		    (charSets includes:'ISO8859') ifTrue:[
+(charSets includes:'ISO8859') ifTrue:[
-			enc := #iso8859
+enc := #iso8859
-		    ] ifFalse:[
+] ifFalse:[
-			(charSets includes:'ASCII') ifTrue:[
+(charSets includes:'ASCII') ifTrue:[
-			    enc := #ascii
+enc := #ascii
-			] ifFalse:[
+] ifFalse:[
-			    (charSets includes:'ADOBE-STANDARD') ifTrue:[
+(charSets includes:'ADOBE-STANDARD') ifTrue:[
-				enc := #iso8859
+enc := #iso8859
-			    ]
+]
-			]
+]
-		    ]
+]
-		]
+]
-	    ]
+]
-	]
+]
 ].
 ^  enc
 "Created: 17.4.1996 / 14:57:06 / cg"
 "Modified: 17.4.1996 / 17:22:35 / cg"
 resX resY registry encoding coding fields|
 aFontNameString isNil ifTrue:[^ nil].
 Error handle:[:ex |
-	family := nil.
+family := nil.
 ] do:[
-	fields := aFontNameString asCollectionOfSubstringsSeparatedBy:$-.
+fields := aFontNameString asCollectionOfSubstringsSeparatedBy:$-.
-	fields size == 3 ifTrue:[
+fields size == 3 ifTrue:[
-	    "take care of old font names: family-style-size"
+"take care of old font names: family-style-size"
-	    family := fields at:1.
+family := fields at:1.
-	    style := fields at:2.
+style := fields at:2.
-	    size := Number readFromString:(fields at:3).
+size := Number readFromString:(fields at:3).
-	] ifFalse:[
+] ifFalse:[
-	    fields size == 2 ifTrue:[
+fields size == 2 ifTrue:[
-		"take care of old font names: family-size"
+"take care of old font names: family-size"
-		family := fields at:1.
+family := fields at:1.
-		size := Number readFromString:(fields at:2).
+size := Number readFromString:(fields at:2).
-	    ] ifFalse:[
+] ifFalse:[
-		fields size >= 15 ifTrue:[
+fields size >= 15 ifTrue:[
-		    family := fields at:3.
+family := fields at:3.
-		    face := fields at:4.
+face := fields at:4.
-		    style := fields at:5.
+style := fields at:5.
-		    style = 'o' ifTrue:[
+style = 'o' ifTrue:[
-			style := 'oblique'
+style := 'oblique'
-		    ] ifFalse:[style = 'i' ifTrue:[
+] ifFalse:[style = 'i' ifTrue:[
-			 style := 'italic'
+style := 'italic'
-		    ] ifFalse:[style = 'r' ifTrue:[
+] ifFalse:[style = 'r' ifTrue:[
-			 style := 'roman'
+style := 'roman'
-		    ]]].
+]]].
-		    moreStyle := fields at:6.
+moreStyle := fields at:6.
-		    (moreStyle ~= 'normal' and:[moreStyle size > 1]) ifTrue:[
+(moreStyle ~= 'normal' and:[moreStyle size > 1]) ifTrue:[
-			style := style, '-', moreStyle.
+style := style, '-', moreStyle.
-		    ].
+].
 "/                    pxlSize := (Integer readFromString:(fields at:8)).
-		    size := (Number readFromString:(fields at:9)) / 10.
+size := (Number readFromString:(fields at:9)) / 10.
-		    resX := fields at:10.
+resX := fields at:10.
-		    resY := fields at:11.
+resY := fields at:11.
-		    registry := fields at:14.
+registry := fields at:14.
-		    encoding := fields at:15.
+encoding := fields at:15.
-		    coding := registry , '-' , encoding.
+coding := registry , '-' , encoding.
-		] ifFalse:[
+] ifFalse:[
-		    "/ very old name (such as cursor, 5x7 etc)
+"/ very old name (such as cursor, 5x7 etc)
-		]
+]
-	    ]
+]
-	].
+].
 ].
 family notNil ifTrue:[
 ^ FontDescription family:family face:face style:style size:size sizeUnit:#pt encoding:coding.
 ].
 %{  /* UNLIMITEDSTACK */
 XFontStruct *f;
 int len;
 if (ISCONNECTED) {
-	if (__isExternalAddress(fontId)) {
+if (__isExternalAddress(fontId)) {
-	    f = __FontVal(fontId);
+f = __FontVal(fontId);
-	    if (f) {
+if (f) {
-		minCode = __MKUINT((f->min_byte1<<8) + f->min_char_or_byte2);
+minCode = __MKUINT((f->min_byte1<<8) + f->min_char_or_byte2);
-		maxCode = __MKUINT((f->max_byte1<<8) + f->max_char_or_byte2);
+maxCode = __MKUINT((f->max_byte1<<8) + f->max_char_or_byte2);
-		if (f->direction == FontLeftToRight) {
+if (f->direction == FontLeftToRight) {
-		    dir = @symbol(LeftToRight);
+dir = @symbol(LeftToRight);
-		} else if (f->direction == FontRightToLeft) {
+} else if (f->direction == FontRightToLeft) {
-		    dir = @symbol(RightToLeft);
+dir = @symbol(RightToLeft);
-		}
+}
-		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, "n", 1);
+len = XTextWidth(f, "n", 1);
-		LEAVE_XLIB();
+LEAVE_XLIB();
-		avgWidth = __MKSMALLINT( len );
+avgWidth = __MKSMALLINT( len );
-	    }
+}
-	}
+}
 }
 %}.
 avgAscent == nil ifTrue:[
-	self primitiveFailedOrClosedConnection.
+self primitiveFailedOrClosedConnection.
-	^ nil
+^ nil
 ].
 "DingBats font returns 0 for maxAscent/maxDescent"
 maxAscent := maxAscent max:avgAscent.
 maxDescent := maxDescent max:avgDescent.
 props := self fontPropertiesOf:aFontId.
 ^ propertyNames collect:[:propName | props at:propName ifAbsent:nil].
 "
 Screen current
-	fontProperties:#(#'PIXEL_SIZE' #'POINT_SIZE' RESOLUTION notExistant)
+fontProperties:#(#'PIXEL_SIZE' #'POINT_SIZE' RESOLUTION notExistant)
-	of:(Screen current getDefaultFontWithEncoding:#'iso10646-1')
+of:(Screen current getDefaultFontWithEncoding:#'iso10646-1')
 "
 !
 fontPropertiesOf:aFontId
 "Answer an array with all the properties of a font.
 XFontProp *prop;
 int n, i;
 OBJ x;
 if (__isExternalAddress(aFontId)) {
-	f = __FontVal(aFontId);
+f = __FontVal(aFontId);
-	if (f && (prop = f->properties) != 0) {
+if (f && (prop = f->properties) != 0) {
-	    n = f->n_properties;
+n = f->n_properties;
-	    propsArray = __ARRAY_NEW_INT(n*2);
+propsArray = __ARRAY_NEW_INT(n*2);
-	    for (i = 0; n; n--, prop++) {
+for (i = 0; n; n--, prop++) {
-		x = __MKUINT(prop->name); __ArrayInstPtr(propsArray)->a_element[i++] = x; __STORE(propsArray, x);
+x = __MKUINT(prop->name); __ArrayInstPtr(propsArray)->a_element[i++] = x; __STORE(propsArray, x);
-		x = __MKUINT(prop->card32); __ArrayInstPtr(propsArray)->a_element[i++] = x; __STORE(propsArray, x);
+x = __MKUINT(prop->card32); __ArrayInstPtr(propsArray)->a_element[i++] = x; __STORE(propsArray, x);
-	    }
+}
-	}
+}
 }
 %}.
 result := Dictionary new.
 propsArray notNil ifTrue:[
-	propsArray pairWiseDo:[:n :v | result at:(self atomName:n) put:v].
+propsArray pairWiseDo:[:n :v | result at:(self atomName:n) put:v].
 ].
 ^ result
 "
 Screen current fontPropertiesOf:(Screen current getDefaultFontWithEncoding:#'iso10646-1')
 Dictionary withKeysAndValues:(Screen current fontPropertiesOf:(Screen current getDefaultFontWithEncoding:#'iso10646-1'))
 |d|
 d := Dictionary new.
 (Screen current fontPropertiesOf:(Screen current getDefaultFontWithEncoding:#'iso10646-1')) keysAndValuesDo:[:name :value|
-	  d at:name put:((Screen current atomName:value) ? value)
+d at:name put:((Screen current atomName:value) ? value)
 ].
 d
 "
 !
 props := self fontProperties:#(#'RESOLUTION_X' #'RESOLUTION_Y' RESOLUTION) of:fontId.
 resX := props at:1.
 resY := props at:2.
 (resX notNil and:[resY notNil]) ifTrue:[
-	^ resX @ resY
+^ resX @ resY
 ].
 res := props at:3.
 res notNil ifTrue:[
-	^ res @ res
+^ res @ res
 ].
 ^ self resolution
 "
 Screen current fontResolutionOf:(Screen current getDefaultFontWithEncoding:#'iso10646-1')
 |props fullName|
 props := self fontPropertiesOf:aFontId.
 #('FONT' 'FONT_NAME' 'FULL_NAME' 'FULLNAME' ) do:[:try |
-	|fullNameID|
+|fullNameID|
-	fullNameID := props at:try ifAbsent:nil.
+fullNameID := props at:try ifAbsent:nil.
-	fullNameID notNil ifTrue:[
+fullNameID notNil ifTrue:[
-	    fullName := self atomName:fullNameID.
+fullName := self atomName:fullNameID.
-	    fullName notEmptyOrNil ifTrue:[
+fullName notEmptyOrNil ifTrue:[
-		^ fullName
+^ fullName
-	    ].
+].
-	]
+]
 ].
 ^ nil.
 "
 char **fonts;
 OBJ arr, str;
 int i;
 if (ISCONNECTED) {
-	if (__isStringLike(pattern)) {
+if (__isStringLike(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
 "
 |id|
 id := self createFontFor:'-misc-fixed-*-*-*-*-*-*-*-*-*-*-', encoding.
 id isNil ifTrue:[
-	id := self createFontFor:'fixed'
+id := self createFontFor:'fixed'
 ].
 ^ id.
 "
 Screen current getDefaultFontWithEncoding:#'iso10646-1'
 "
 !
 getFontWithFamily:familyString face:faceString
-	    style:styleArgString size:sizeArgOrNil sizeUnit:sizeUnit encoding:encoding
+style:styleArgString size:sizeArgOrNil sizeUnit:sizeUnit encoding:encoding
 "try to get the specified font, if not available, try next smaller
 font. Access to X-fonts by name is possible, by passing the X font name
 as family and the other parameters as nil. For example, the cursor font
 can be aquired that way."
 id spacing encodingMatch idx roundedSize pixelSize pointSize|
 styleString := styleArgString.
 sizeArgOrNil notNil ifTrue:[
-	roundedSize := sizeArgOrNil rounded asInteger.
+roundedSize := sizeArgOrNil rounded asInteger.
-	sizeUnit == #px ifTrue:[
+sizeUnit == #px ifTrue:[
-	    pixelSize := roundedSize.
+pixelSize := roundedSize.
-	] ifFalse:[
+] ifFalse:[
-	    pointSize := roundedSize.
+pointSize := roundedSize.
-	].
+].
 ].
 "special: if face is nil, allow access to X-fonts"
 faceString isNil ifTrue:[
-	roundedSize notNil ifTrue:[
+roundedSize notNil ifTrue:[
-	    theName := familyString , '-' , roundedSize printString
+theName := familyString , '-' , roundedSize printString
-	] ifFalse:[
+] ifFalse:[
-	    theName := familyString
+theName := familyString
-	].
+].
-	theName notNil ifTrue:[
+theName notNil ifTrue:[
-	    theId := self createFontFor:theName.
+theId := self createFontFor:theName.
-	].
+].
-	theId isNil ifTrue:[
+theId isNil ifTrue:[
-	    theId := self getDefaultFontWithEncoding:encoding
+theId := self getDefaultFontWithEncoding:encoding
-	].
+].
-	^ theId
+^ theId
 ].
 "/ spacing other than 'normal' is contained as last component
 "/ in style
 (styleString notNil
 and:[(styleString endsWith:'-narrow')
-	  or:[styleString endsWith:'-semicondensed']]) ifTrue:[
+or:[styleString endsWith:'-semicondensed']]) ifTrue:[
-	|i|
+|i|
-	i := styleString lastIndexOf:$-.
+i := styleString lastIndexOf:$-.
-	spacing := styleString copyFrom:(i+1).
+spacing := styleString copyFrom:(i+1).
-	styleString := styleString copyTo:(i-1).
+styleString := styleString copyTo:(i-1).
 ] ifFalse:[
-	spacing := 'normal'.
+spacing := 'normal'.
 ].
 xlatedStyle := styleString.
 xlatedStyle notNil ifTrue:[
-	xlatedStyle := xlatedStyle first asString
+xlatedStyle := xlatedStyle first asString
 ].
 encoding isNil ifTrue:[
-	encodingMatch := '*-*'.
+encodingMatch := '*-*'.
 ] ifFalse:[
-	idx := encoding indexOf:$-.
+idx := encoding indexOf:$-.
-	idx ~~ 0 ifTrue:[
+idx ~~ 0 ifTrue:[
-	    encodingMatch := encoding
+encodingMatch := encoding
-	] ifFalse:[
+] ifFalse:[
-	    encodingMatch := encoding , '-*'.
+encodingMatch := encoding , '-*'.
-	].
+].
 ].
 id := self
-	    getFontWithFoundry:'*'
+getFontWithFoundry:'*'
-	    family:familyString asLowercase
+family:familyString asLowercase
-	    weight:faceString
+weight:faceString
-	    slant:xlatedStyle
+slant:xlatedStyle
-	    spacing:spacing
+spacing:spacing
-	    pixelSize:pixelSize
+pixelSize:pixelSize
-	    size:pointSize
+size:pointSize
-	    encoding:encodingMatch.
+encoding:encodingMatch.
 id isNil ifTrue:[
-	(encodingMatch notNil and:[encodingMatch ~= '*']) ifTrue:[
+(encodingMatch notNil and:[encodingMatch ~= '*']) ifTrue:[
-	    "/ too stupid: registries come in both cases
+"/ too stupid: registries come in both cases
-	    "/ and X does not ignore case
+"/ and X does not ignore case
-	    "/
+"/
-	    id := self
+id := self
-		    getFontWithFoundry:'*'
+getFontWithFoundry:'*'
-		    family:familyString asLowercase
+family:familyString asLowercase
-		    weight:faceString
+weight:faceString
-		    slant:xlatedStyle
+slant:xlatedStyle
-		    spacing:spacing
+spacing:spacing
-		    pixelSize:nil
+pixelSize:nil
-		    size:roundedSize
+size:roundedSize
-		    encoding:encodingMatch asUppercase.
+encoding:encodingMatch asUppercase.
-	    id isNil ifTrue:[
+id isNil ifTrue:[
-		id := self
+id := self
-			getFontWithFoundry:'*'
+getFontWithFoundry:'*'
-			family:familyString asLowercase
+family:familyString asLowercase
-			weight:faceString
+weight:faceString
-			slant:xlatedStyle
+slant:xlatedStyle
-			spacing:spacing
+spacing:spacing
-			pixelSize:nil
+pixelSize:nil
-			size:roundedSize
+size:roundedSize
-			encoding:encodingMatch asLowercase.
+encoding:encodingMatch asLowercase.
-	    ]
+]
-	]
+]
 ].
 ^ id
 "Modified: 4.7.1996 / 11:38:47 / stefan"
 "Modified: 10.4.1997 / 19:20:06 / cg"
 !
 getFontWithFoundry:foundry family:family weight:weight
-	      slant:slant spacing:spc pixelSize:pSize size:size
+slant:slant spacing:spc pixelSize:pSize size:size
-	      encoding:encoding
+encoding:encoding
 "get the specified font, if not available, return nil.
 This is the new font creation method - all others will be changed to
 use this entry.
 Individual attributes can be left empty (i.e. '') or nil to match any.
 foundryMatch familyMatch weightMatch slantMatch spcMatch
 pSizeMatch encodingMatch|
 "this works only on 'Release >= 3' - X-servers"
 "name is:
-	-foundry-family    -weight -slant-
+-foundry-family    -weight -slant-
-	 sony    helvetica bold     r
+sony    helvetica bold     r
-	 adobe   courier   medium   i
+adobe   courier   medium   i
-	 msic    fixed              o
+msic    fixed              o
-	 ...     ...
+...     ...
 "
 size isNil ifTrue:[
-	sizeMatch := '*'
+sizeMatch := '*'
 ] ifFalse:[
-	sizeMatch := size printString , '0'
+sizeMatch := size printString , '0'
 ].
 foundry isNil ifTrue:[
-	foundryMatch := '*'
+foundryMatch := '*'
 ] ifFalse:[
-	foundryMatch := foundry
+foundryMatch := foundry
 ].
 family isNil ifTrue:[
-	familyMatch := '*'
+familyMatch := '*'
 ] ifFalse:[
-	familyMatch := family
+familyMatch := family
 ].
 weight isNil ifTrue:[
-	weightMatch := '*'
+weightMatch := '*'
 ] ifFalse:[
-	weightMatch := weight
+weightMatch := weight
 ].
 slant isNil ifTrue:[
-	slantMatch := '*'
+slantMatch := '*'
 ] ifFalse:[
-	slantMatch := slant
+slantMatch := slant
 ].
 spc isNil ifTrue:[
-	spcMatch := '*'
+spcMatch := '*'
 ] ifFalse:[
-	spcMatch := spc
+spcMatch := spc
 ].
 pSize isNil ifTrue:[
-	pSizeMatch := '*'
+pSizeMatch := '*'
 ] ifFalse:[
-	pSizeMatch := pSize printString
+pSizeMatch := pSize printString
 ].
 encoding isNil ifTrue:[
-	encodingMatch := '*'
+encodingMatch := '*'
 ] ifFalse:[
-	encodingMatch := encoding
+encodingMatch := encoding
 ].
 theName := ('-' , foundryMatch,
-		'-' , familyMatch,
+'-' , familyMatch,
-		'-' , weightMatch ,
+'-' , weightMatch ,
-		'-' , slantMatch ,
+'-' , slantMatch ,
-		'-' , spcMatch ,
+'-' , spcMatch ,
-		'-*' ,
+'-*' ,
-		'-' , pSizeMatch ,
+'-' , pSizeMatch ,
-		'-' , sizeMatch ,
+'-' , sizeMatch ,
-		'-*-*-*-*' ,
+'-*-*-*-*' ,
-		'-' , encodingMatch).
+'-' , encodingMatch).
 "/  Transcript showCR:theName; endEntry.
 ^ self createFontFor:theName.
 "
 Display
-	getFontWithFoundry:'*'
+getFontWithFoundry:'*'
-	family:'courier'
+family:'courier'
-	weight:'medium'
+weight:'medium'
-	slant:'r'
+slant:'r'
-	spacing:nil
+spacing:nil
-	pixelSize:nil
+pixelSize:nil
-	size:13
+size:13
-	encoding:#'iso8859-1'.
+encoding:#'iso8859-1'.
 Display
-	getFontWithFoundry:'*'
+getFontWithFoundry:'*'
-	family:'courier'
+family:'courier'
-	weight:'medium'
+weight:'medium'
-	slant:'r'
+slant:'r'
-	spacing:nil
+spacing:nil
-	pixelSize:nil
+pixelSize:nil
-	size:13
+size:13
-	encoding:#'iso10646-1'
+encoding:#'iso10646-1'
 "
 "Modified: 10.4.1997 / 19:15:44 / cg"
 !
 self extentsOf:aString from:index1 to:index2 inFont:aFontId into:resultArray.
 ^ (resultArray at:4) + (resultArray at:5).
 "
 Screen current
-	heightOf:'hello world' from:1 to:10
+heightOf:'hello world' from:1 to:10
-	inFont:(Screen current  getFontWithFoundry:'*'
+inFont:(Screen current  getFontWithFoundry:'*'
-		    family:'courier new'
+family:'courier new'
-		    weight:'medium'
+weight:'medium'
-		    slant:'r'
+slant:'r'
-		    spacing:nil
+spacing:nil
-		    pixelSize:nil
+pixelSize:nil
-		    size:13
+size:13
-		    encoding:#'iso10646-1'
+encoding:#'iso10646-1'
-	    ).
+).
 Screen current
-	heightOf:'hello World ggg��' from:1 to:15
+heightOf:'hello World ggg��' from:1 to:15
-	inFont:(Screen current getDefaultFontWithEncoding:#'iso10646-1')
+inFont:(Screen current getDefaultFontWithEncoding:#'iso10646-1')
 "
 !
 listOfAvailableFonts
 "return a list with all available fonts on this display.
 FontDescription."
 |names|
 listOfXFonts isNil ifTrue:[
-	names := self getAvailableFontsMatching:'*'.
+names := self getAvailableFontsMatching:'*'.
-	names isNil ifTrue:[
+names isNil ifTrue:[
-	    "no names returned ..."
+"no names returned ..."
-	    ^ nil
+^ nil
-	].
+].
-	listOfXFonts := names collect:[:aName | self fontDescriptionFromXFontName:aName].
+listOfXFonts := names collect:[:aName | self fontDescriptionFromXFontName:aName].
-	listOfXFonts := FontDescription genericFonts, listOfXFonts.
+listOfXFonts := FontDescription genericFonts, listOfXFonts.
 ].
 ^ listOfXFonts
 "
 Display flushListOfAvailableFonts.
 |sizes|
 sizes := super pixelSizesInFamily:aFamilyName face:aFaceName style:aStyleName filtering:filter.
 (sizes notNil and:[sizes isEmpty or:[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 pixelSizesInFamily:'courier' face:'bold' style:'roman' filtering:nil
 /*
 * ignore closed connection
 */
 if (! ISCONNECTED) {
-	RETURN ( self );
+RETURN ( self );
 }
 if (__isExternalAddress(aFontId)) {
-	f = __FontVal(aFontId);
+f = __FontVal(aFontId);
-	if (f) {
+if (f) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XFreeFont(myDpy, f);
+XFreeFont(myDpy, f);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	    __cnt_font--;
+__cnt_font--;
 #endif
-	}
+}
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailed
 !
 |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' filtering:nil
 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(MaxStringLength));
+int lMax = __intVal(@global(MaxStringLength));
-	    f = __FontVal(aFontId);
+f = __FontVal(aFontId);
-	    if (! f) goto fail;
+if (! f) goto fail;
-	    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 ( __MKSMALLINT(0) );
+RETURN ( __MKSMALLINT(0) );
-		}
+}
-		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 1
-			len = XTextExtents(f, cp, l,
+len = XTextExtents(f, cp, l,
-						&directionReturn, &fontAscentReturn, &fontDescentReturn,
+&directionReturn, &fontAscentReturn, &fontDescentReturn,
-						&overAllReturn);
+&overAllReturn);
-			//console_printf("lBear:%d rBear:%d width:%d\n", overAllReturn.lbearing, overAllReturn.rbearing, overAllReturn.width);
+//console_printf("lBear:%d rBear:%d width:%d\n", overAllReturn.lbearing, overAllReturn.rbearing, overAllReturn.width);
-			RETURN ( __MKSMALLINT(overAllReturn.width) );
+RETURN ( __MKSMALLINT(overAllReturn.width) );
 #else
-			ENTER_XLIB();
+ENTER_XLIB();
-			len = XTextWidth(f, cp, l);
+len = XTextWidth(f, cp, l);
-			LEAVE_XLIB();
+LEAVE_XLIB();
-			RETURN ( __MKSMALLINT(len) );
+RETURN ( __MKSMALLINT(len) );
 #endif
-		    }
+}
-		}
+}
-		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;
+n = __byteArraySize(aString) - nInstBytes;
-		    if (i2 < n) {
+if (i2 < n) {
-			cp += i1;
+cp += i1;
 #if 1
-			len = XTextExtents(f, cp, l,
+len = XTextExtents(f, cp, l,
-						&directionReturn, &fontAscentReturn, &fontDescentReturn,
+&directionReturn, &fontAscentReturn, &fontDescentReturn,
-						&overAllReturn);
+&overAllReturn);
-			RETURN ( __MKSMALLINT(overAllReturn.width) );
+RETURN ( __MKSMALLINT(overAllReturn.width) );
 #else
-			ENTER_XLIB();
+ENTER_XLIB();
-			len = XTextWidth(f, cp, l);
+len = XTextWidth(f, cp, l);
-			LEAVE_XLIB();
+LEAVE_XLIB();
-			RETURN ( __MKSMALLINT(len) );
+RETURN ( __MKSMALLINT(len) );
 #endif
-		    }
+}
-		}
+}
-		/* 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;
-			}
+}
 #if 1
-			len = XTextExtents16(f, (XChar2b *)cp, l,
+len = XTextExtents16(f, (XChar2b *)cp, l,
-						&directionReturn, &fontAscentReturn, &fontDescentReturn,
+&directionReturn, &fontAscentReturn, &fontDescentReturn,
-						&overAllReturn);
+&overAllReturn);
-			len = overAllReturn.width;
+len = overAllReturn.width;
 #else
-			ENTER_XLIB();
+ENTER_XLIB();
-			len = XTextWidth16(f, (XChar2b *)cp, l);
+len = XTextWidth16(f, (XChar2b *)cp, l);
-			LEAVE_XLIB();
+LEAVE_XLIB();
 #endif
-			if (mustFree) {
+if (mustFree) {
-			    free(cp2);
+free(cp2);
-			}
+}
-			RETURN ( __MKSMALLINT(len) );
+RETURN ( __MKSMALLINT(len) );
-		    }
+}
-		}
+}
-		/* FOURBYTESTRINGS */
+/* FOURBYTESTRINGS */
-		if (__isLongs(aString)) {
+if (__isLongs(aString)) {
-		    int i;
+int i;
-		    XChar2b *cp2;
+XChar2b *cp2;
-		    int mustFree = 0;
+int mustFree = 0;
-		    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;
-			int mustFree = 0;
+int mustFree = 0;
-			cp += (i1 * 4);
+cp += (i1 * 4);
-			if (l > lMax) l = lMax;
+if (l > lMax) l = lMax;
-			/*
+/*
-			 * For now: X does not support 32bit characters without the new 32Unicode extensions.
+* For now: X does not support 32bit characters without the new 32Unicode extensions.
-			 * For now, treat chars above 0xFFFF as 0xFFFF (should we use default-char ?).
+* For now, treat chars above 0xFFFF as 0xFFFF (should we use default-char ?).
-			 */
+*/
-			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++) {
-			    int codePoint;
+int codePoint;
-			    codePoint = ((unsigned int32 *)cp)[i];
+codePoint = ((unsigned int32 *)cp)[i];
-			    if (codePoint > 0xFFFF) {
+if (codePoint > 0xFFFF) {
-				codePoint = 0xFFFF;
+codePoint = 0xFFFF;
-			    }
+}
-			    cp2[i].byte1 = codePoint & 0xFF;
+cp2[i].byte1 = codePoint & 0xFF;
-			    cp2[i].byte2 = (codePoint >> 8) & 0xFF;;
+cp2[i].byte2 = (codePoint >> 8) & 0xFF;;
-			}
+}
-			cp = (char *) cp2;
+cp = (char *) cp2;
 #if 1
-			len = XTextExtents16(f, (XChar2b *)cp, l,
+len = XTextExtents16(f, (XChar2b *)cp, l,
-						&directionReturn, &fontAscentReturn, &fontDescentReturn,
+&directionReturn, &fontAscentReturn, &fontDescentReturn,
-						&overAllReturn);
+&overAllReturn);
-			len = overAllReturn.width;
+len = overAllReturn.width;
 #else
-			ENTER_XLIB();
+ENTER_XLIB();
-			len = XTextWidth16(f, (XChar2b *)cp, l);
+len = XTextWidth16(f, (XChar2b *)cp, l);
-			LEAVE_XLIB();
+LEAVE_XLIB();
 #endif
-			if (mustFree) {
+if (mustFree) {
-			    free(cp2);
+free(cp2);
-			}
+}
-			RETURN ( __MKSMALLINT(len) );
+RETURN ( __MKSMALLINT(len) );
-		    }
+}
-		}
+}
-	    }
+}
-	}
+}
 }
 #undef NLOCALBUFFER
 fail: ;
 %}.
 self primitiveFailedOrClosedConnection.
 %{
 int _mode, ok = 1;
 if (mode == @symbol(asyncPointer))
-	_mode = AsyncPointer;
+_mode = AsyncPointer;
 else if (mode == @symbol(syncPointer))
-	_mode = SyncPointer;
+_mode = SyncPointer;
 else if (mode == @symbol(asyncKeyboard))
-	_mode = AsyncKeyboard;
+_mode = AsyncKeyboard;
 else if (mode == @symbol(syncKeyboard))
-	_mode = SyncKeyboard;
+_mode = SyncKeyboard;
 else if (mode == @symbol(syncBoth))
-	_mode = SyncBoth;
+_mode = SyncBoth;
 else if (mode == @symbol(asyncBoth))
-	_mode = AsyncBoth;
+_mode = AsyncBoth;
 else if (mode == @symbol(replayPointer))
-	_mode = ReplayPointer;
+_mode = ReplayPointer;
 else if (mode == @symbol(replayKeyboard))
-	_mode = ReplayKeyboard;
+_mode = ReplayKeyboard;
 else
-	ok = 0;
+ok = 0;
 if (ok
 && ISCONNECTED) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XAllowEvents(myDpy, _mode, CurrentTime);
+XAllowEvents(myDpy, _mode, CurrentTime);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN (self);
+RETURN (self);
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 %{
 int result, ok;
 if (ISCONNECTED) {
-	if (__isExternalAddress(aWindowId)) {
+if (__isExternalAddress(aWindowId)) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    result = XGrabKeyboard(myDpy,
+result = XGrabKeyboard(myDpy,
-				   __WindowVal(aWindowId),
+__WindowVal(aWindowId),
-				   True /* False */,
+True /* False */,
-				   GrabModeAsync,
+GrabModeAsync,
-				   GrabModeAsync,
+GrabModeAsync,
-				   CurrentTime);
+CurrentTime);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    ok = 0;
+ok = 0;
-	    switch(result) {
+switch(result) {
-		case AlreadyGrabbed:
+case AlreadyGrabbed:
-		    if (@global(ErrorPrinting) == true) {
+if (@global(ErrorPrinting) == true) {
-			console_fprintf(stderr, "XWorkstation [warning]: grab keyboard: AlreadyGrabbed\n");
+console_fprintf(stderr, "XWorkstation [warning]: grab keyboard: AlreadyGrabbed\n");
-		    }
+}
-		    break;
+break;
-		case GrabNotViewable:
+case GrabNotViewable:
-		    if (@global(ErrorPrinting) == true) {
+if (@global(ErrorPrinting) == true) {
-			console_fprintf(stderr, "XWorkstation [warning]: grab keyboard: GrabNotViewable\n");
+console_fprintf(stderr, "XWorkstation [warning]: grab keyboard: GrabNotViewable\n");
-		    }
+}
-		    break;
+break;
-		case GrabInvalidTime:
+case GrabInvalidTime:
-		    if (@global(ErrorPrinting) == true) {
+if (@global(ErrorPrinting) == true) {
-			console_fprintf(stderr, "XWorkstation [warning]: grab keyboard: InvalidTime\n");
+console_fprintf(stderr, "XWorkstation [warning]: grab keyboard: InvalidTime\n");
-		    }
+}
-		    break;
+break;
-		case GrabFrozen:
+case GrabFrozen:
-		    if (@global(ErrorPrinting) == true) {
+if (@global(ErrorPrinting) == true) {
-			console_fprintf(stderr, "XWorkstation [warning]: grab keyboard: Frozen\n");
+console_fprintf(stderr, "XWorkstation [warning]: grab keyboard: Frozen\n");
-		    }
+}
-		    break;
+break;
-		default:
+default:
-		    ok = 1;
+ok = 1;
-		    break;
+break;
-	    }
+}
-	    if (! ok) {
+if (! ok) {
-		ENTER_XLIB();
+ENTER_XLIB();
-		XUngrabKeyboard(myDpy, CurrentTime);
+XUngrabKeyboard(myDpy, CurrentTime);
-		LEAVE_XLIB();
+LEAVE_XLIB();
-		RETURN (false);
+RETURN (false);
-	    }
+}
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ false
 !
 Window confineWin;
 Cursor curs;
 int pointer_mode, keyboard_mode;
 if (ISCONNECTED) {
-	if (__isExternalAddress(aWindowId)) {
+if (__isExternalAddress(aWindowId)) {
-	    if (__isExternalAddress(confineId))
+if (__isExternalAddress(confineId))
-		confineWin = __WindowVal(confineId);
+confineWin = __WindowVal(confineId);
-	    else
+else
-		confineWin = (Window) None;
+confineWin = (Window) None;
-	    if (__isExternalAddress(aCursorId))
+if (__isExternalAddress(aCursorId))
-		curs = __CursorVal(aCursorId);
+curs = __CursorVal(aCursorId);
-	    else
+else
-		curs = (Cursor) None;
+curs = (Cursor) None;
-	    if (pMode == @symbol(sync))
+if (pMode == @symbol(sync))
-		pointer_mode = GrabModeSync;
+pointer_mode = GrabModeSync;
-	    else
+else
-		pointer_mode = GrabModeAsync;
+pointer_mode = GrabModeAsync;
-	    if (kMode == @symbol(sync))
+if (kMode == @symbol(sync))
-		keyboard_mode = GrabModeSync;
+keyboard_mode = GrabModeSync;
-	    else
+else
-		keyboard_mode = GrabModeAsync;
+keyboard_mode = GrabModeAsync;
-	    if (__isSmallInteger(eventMask))
+if (__isSmallInteger(eventMask))
-		evMask = __intVal(eventMask);
+evMask = __intVal(eventMask);
-	    else
+else
-		evMask = ButtonPressMask | ButtonMotionMask | PointerMotionMask | ButtonReleaseMask;
+evMask = ButtonPressMask | ButtonMotionMask | PointerMotionMask | ButtonReleaseMask;
 /*
-	    ENTER_XLIB();
+ENTER_XLIB();
 */
-	    result = XGrabPointer(myDpy,
+result = XGrabPointer(myDpy,
-				  __WindowVal(aWindowId),
+__WindowVal(aWindowId),
-				  False,
+False,
-				  evMask,
+evMask,
-				  pointer_mode, keyboard_mode,
+pointer_mode, keyboard_mode,
-				  confineWin,
+confineWin,
-				  curs,
+curs,
-				  CurrentTime);
+CurrentTime);
 /*
-	    LEAVE_XLIB();
+LEAVE_XLIB();
 */
-	    ok = 0;
+ok = 0;
-	    switch (result) {
+switch (result) {
-		case AlreadyGrabbed:
+case AlreadyGrabbed:
-		    if (@global(ErrorPrinting) == true) {
+if (@global(ErrorPrinting) == true) {
-			console_fprintf(stderr, "XWorkstation [warning]: grab pointer: AlreadyGrabbed\n");
+console_fprintf(stderr, "XWorkstation [warning]: grab pointer: AlreadyGrabbed\n");
-		    }
+}
-		    break;
+break;
-		case GrabNotViewable:
+case GrabNotViewable:
-		    if (@global(ErrorPrinting) == true) {
+if (@global(ErrorPrinting) == true) {
-			console_fprintf(stderr, "XWorkstation [warning]: grab pointer: GrabNotViewable\n");
+console_fprintf(stderr, "XWorkstation [warning]: grab pointer: GrabNotViewable\n");
-		    }
+}
-		    break;
+break;
-		case GrabInvalidTime:
+case GrabInvalidTime:
-		    if (@global(ErrorPrinting) == true) {
+if (@global(ErrorPrinting) == true) {
-			console_fprintf(stderr, "XWorkstation [warning]: grab pointer: InvalidTime\n");
+console_fprintf(stderr, "XWorkstation [warning]: grab pointer: InvalidTime\n");
-		    }
+}
-		    break;
+break;
-		case GrabFrozen:
+case GrabFrozen:
-		    if (@global(ErrorPrinting) == true) {
+if (@global(ErrorPrinting) == true) {
-			console_fprintf(stderr, "XWorkstation [warning]: grab pointer: Frozen\n");
+console_fprintf(stderr, "XWorkstation [warning]: grab pointer: Frozen\n");
-		    }
+}
-		    break;
+break;
-		default:
+default:
-		    ok = 1;
+ok = 1;
-		    break;
+break;
-	    }
+}
-	    if (! ok) {
+if (! ok) {
 /*
-		ENTER_XLIB();
+ENTER_XLIB();
 */
-		XUngrabPointer(myDpy, CurrentTime);
+XUngrabPointer(myDpy, CurrentTime);
 /*
-		LEAVE_XLIB();
+LEAVE_XLIB();
 */
-		RETURN (false);
+RETURN (false);
-	    }
+}
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ false
 !
 grabPointerIn:aWindowId withCursor:aCursorId pointerMode:pMode keyboardMode:kMode confineTo:confineId
 "grap the pointer - return true if ok"
 ^ self
-	grabPointerIn:aWindowId
+grabPointerIn:aWindowId
-	withCursor:aCursorId
+withCursor:aCursorId
-	eventMask:nil
+eventMask:nil
-	pointerMode:pMode
+pointerMode:pMode
-	keyboardMode:kMode
+keyboardMode:kMode
-	confineTo:confineId
+confineTo:confineId
 "Modified: / 28.7.1998 / 02:47:51 / cg"
 !
 primUngrabKeyboard
 <context: #return>
 %{
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	ENTER_XLIB();
+ENTER_XLIB();
-	XUngrabKeyboard(dpy, CurrentTime);
+XUngrabKeyboard(dpy, CurrentTime);
-	XSync(dpy, 0);
+XSync(dpy, 0);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 %}.
 !
 <context: #return>
 %{
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	ENTER_XLIB();
+ENTER_XLIB();
-	XUngrabPointer(dpy, CurrentTime);
+XUngrabPointer(dpy, CurrentTime);
-	XSync(dpy, 0);
+XSync(dpy, 0);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 %}.
 !
 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'!
 XGCValues gcv;
 GC gc;
 if (ISCONNECTED) {
-	if (__isExternalAddress(aGCId)) {
+if (__isExternalAddress(aGCId)) {
-	    gc = __GCVal(aGCId);
+gc = __GCVal(aGCId);
-	    gcv.clip_mask = None;
+gcv.clip_mask = None;
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XChangeGC(myDpy, gc, GCClipMask, &gcv);
+XChangeGC(myDpy, gc, GCClipMask, &gcv);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 %{
 if (ISCONNECTED) {
-	if (__isExternalAddress(aGCId)
+if (__isExternalAddress(aGCId)
-	 && __isSmallInteger(bgColorIndex)) {
+&& __isSmallInteger(bgColorIndex)) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XSetBackground(myDpy, __GCVal(aGCId), __intVal(bgColorIndex));
+XSetBackground(myDpy, __GCVal(aGCId), __intVal(bgColorIndex));
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 GC gc;
 Pixmap bitmap;
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	if (__isExternalAddress(aGCId)) {
+if (__isExternalAddress(aGCId)) {
-	    gc = __GCVal(aGCId);
+gc = __GCVal(aGCId);
-	    if (__isExternalAddress(aBitmapId)) {
+if (__isExternalAddress(aBitmapId)) {
-		bitmap = __PixmapVal(aBitmapId);
+bitmap = __PixmapVal(aBitmapId);
-		ENTER_XLIB();
+ENTER_XLIB();
-		XSetStipple(dpy, gc, bitmap);
+XSetStipple(dpy, gc, bitmap);
-		XSetFillStyle(dpy, gc, FillOpaqueStippled);
+XSetFillStyle(dpy, gc, FillOpaqueStippled);
-		LEAVE_XLIB();
+LEAVE_XLIB();
-		RETURN ( self );
+RETURN ( self );
-	    }
+}
-	    if (aBitmapId == nil) {
+if (aBitmapId == nil) {
-		ENTER_XLIB();
+ENTER_XLIB();
-		XSetFillStyle(dpy, gc, FillSolid);
+XSetFillStyle(dpy, gc, FillSolid);
-		LEAVE_XLIB();
+LEAVE_XLIB();
-		RETURN ( self );
+RETURN ( self );
-	    }
+}
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 XGCValues gcv;
 GC gc;
 if (ISCONNECTED) {
-	if (__isExternalAddress(aGCId)) {
+if (__isExternalAddress(aGCId)) {
-	    gc = __GCVal(aGCId);
+gc = __GCVal(aGCId);
-	    if (aBool == true)
+if (aBool == true)
-		gcv.subwindow_mode = ClipByChildren;
+gcv.subwindow_mode = ClipByChildren;
-	    else
+else
-		gcv.subwindow_mode = IncludeInferiors;
+gcv.subwindow_mode = IncludeInferiors;
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XChangeGC(myDpy, gc, GCSubwindowMode, &gcv);
+XChangeGC(myDpy, gc, GCSubwindowMode, &gcv);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 %{
 XRectangle r;
 if (ISCONNECTED) {
-	if (__isExternalAddress(aGCId)
+if (__isExternalAddress(aGCId)
-	 && __bothSmallInteger(clipX, clipY)
+&& __bothSmallInteger(clipX, clipY)
-	 && __bothSmallInteger(clipWidth, clipHeight)) {
+&& __bothSmallInteger(clipWidth, clipHeight)) {
-	    r.x = __intVal(clipX);
+r.x = __intVal(clipX);
-	    r.y = __intVal(clipY);
+r.y = __intVal(clipY);
-	    r.width = __intVal(clipWidth);
+r.width = __intVal(clipWidth);
-	    r.height = __intVal(clipHeight);
+r.height = __intVal(clipHeight);
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XSetClipRectangles(myDpy, __GCVal(aGCId), 0, 0, &r, 1, Unsorted);
+XSetClipRectangles(myDpy, __GCVal(aGCId), 0, 0, &r, 1, Unsorted);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 %{
 if (ISCONNECTED) {
-	if (__isExternalAddress(aGCId)
+if (__isExternalAddress(aGCId)
-	 && __isSmallInteger(offset)
+&& __isSmallInteger(offset)
-	 && __isByteArrayLike(dashList)) {
+&& __isByteArrayLike(dashList)) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XSetDashes(myDpy, __GCVal(aGCId),
+XSetDashes(myDpy, __GCVal(aGCId),
-		       __intVal(offset),
+__intVal(offset),
-		       __ByteArrayInstPtr(dashList)->ba_element,
+__ByteArrayInstPtr(dashList)->ba_element,
-		       __byteArraySize(dashList));
+__byteArraySize(dashList));
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 bad: ;
 %}.
 "
 either aGCId is invalid,
 %{
 XFontStruct *f;
 if (ISCONNECTED) {
-	if (__isExternalAddress(aFontId)
+if (__isExternalAddress(aFontId)
-	 && __isExternalAddress(aGCId)) {
+&& __isExternalAddress(aGCId)) {
-	    f = (XFontStruct *) __FontVal(aFontId);
+f = (XFontStruct *) __FontVal(aFontId);
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XSetFont(myDpy, __GCVal(aGCId), f->fid);
+XSetFont(myDpy, __GCVal(aGCId), f->fid);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 %}.
 "
 aGCId and/or aFontId are invalid
 "
 %{
 GC gc;
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	if (__bothSmallInteger(fgColorIndex, bgColorIndex)
+if (__bothSmallInteger(fgColorIndex, bgColorIndex)
-	 && __isExternalAddress(aGCId)) {
+&& __isExternalAddress(aGCId)) {
-	    gc = __GCVal(aGCId);
+gc = __GCVal(aGCId);
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XSetForeground(dpy, gc, __intVal(fgColorIndex));
+XSetForeground(dpy, gc, __intVal(fgColorIndex));
-	    XSetBackground(dpy, gc, __intVal(bgColorIndex));
+XSetBackground(dpy, gc, __intVal(bgColorIndex));
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 %{
 if (ISCONNECTED) {
-	if (__isExternalAddress(aGCId)
+if (__isExternalAddress(aGCId)
-	 && __isSmallInteger(fgColorIndex)) {
+&& __isSmallInteger(fgColorIndex)) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XSetForeground(myDpy, __GCVal(aGCId), __intVal(fgColorIndex));
+XSetForeground(myDpy, __GCVal(aGCId), __intVal(fgColorIndex));
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 GC gc;
 int fun = -1;
 if (ISCONNECTED) {
-	if (__isExternalAddress(aGCId)) {
+if (__isExternalAddress(aGCId)) {
-	    gc = __GCVal(aGCId);
+gc = __GCVal(aGCId);
-	    if (aFunctionSymbol == @symbol(copy)) fun = GXcopy;
+if (aFunctionSymbol == @symbol(copy)) fun = GXcopy;
-	    else if (aFunctionSymbol == @symbol(copyInverted)) fun = GXcopyInverted;
+else if (aFunctionSymbol == @symbol(copyInverted)) fun = GXcopyInverted;
-	    else if (aFunctionSymbol == @symbol(xor)) fun = GXxor;
+else if (aFunctionSymbol == @symbol(xor)) fun = GXxor;
-	    else if (aFunctionSymbol == @symbol(and)) fun = GXand;
+else if (aFunctionSymbol == @symbol(and)) fun = GXand;
-	    else if (aFunctionSymbol == @symbol(andReverse)) fun = GXandReverse;
+else if (aFunctionSymbol == @symbol(andReverse)) fun = GXandReverse;
-	    else if (aFunctionSymbol == @symbol(andInverted)) fun = GXandInverted;
+else if (aFunctionSymbol == @symbol(andInverted)) fun = GXandInverted;
-	    else if (aFunctionSymbol == @symbol(or)) fun = GXor;
+else if (aFunctionSymbol == @symbol(or)) fun = GXor;
-	    else if (aFunctionSymbol == @symbol(orReverse)) fun = GXorReverse;
+else if (aFunctionSymbol == @symbol(orReverse)) fun = GXorReverse;
-	    else if (aFunctionSymbol == @symbol(orInverted)) fun = GXorInverted;
+else if (aFunctionSymbol == @symbol(orInverted)) fun = GXorInverted;
-	    else if (aFunctionSymbol == @symbol(invert)) fun = GXinvert;
+else if (aFunctionSymbol == @symbol(invert)) fun = GXinvert;
-	    else if (aFunctionSymbol == @symbol(clear)) fun = GXclear;
+else if (aFunctionSymbol == @symbol(clear)) fun = GXclear;
-	    else if (aFunctionSymbol == @symbol(set)) fun = GXset;
+else if (aFunctionSymbol == @symbol(set)) fun = GXset;
-	    else if (aFunctionSymbol == @symbol(noop)) fun = GXnoop;
+else if (aFunctionSymbol == @symbol(noop)) fun = GXnoop;
-	    else if (aFunctionSymbol == @symbol(equiv)) fun = GXequiv;
+else if (aFunctionSymbol == @symbol(equiv)) fun = GXequiv;
-	    else if (aFunctionSymbol == @symbol(nand)) fun = GXnand;
+else if (aFunctionSymbol == @symbol(nand)) fun = GXnand;
-	    if (fun != -1) {
+if (fun != -1) {
-		ENTER_XLIB();
+ENTER_XLIB();
-		XSetFunction(myDpy, gc, fun);
+XSetFunction(myDpy, gc, fun);
-		LEAVE_XLIB();
+LEAVE_XLIB();
-		RETURN ( self );
+RETURN ( self );
-	    }
+}
-	}
+}
 }
 %}.
 "
 either aGCId is not an integer, or an invalid symbol
 was passed ... valid functions are #copy, #copyInverted, #xor, #and, #andReverse,
 <context: #return>
 %{
 if (ISCONNECTED) {
-	if (__isExternalAddress(aGCId)) {
+if (__isExternalAddress(aGCId)) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XSetGraphicsExposures(myDpy, __GCVal(aGCId), (aBoolean==true)?1:0);
+XSetGraphicsExposures(myDpy, __GCVal(aGCId), (aBoolean==true)?1:0);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 static char dashDotDotList[6] = { 4,1 , 1,1 , 1,1 };
 char *x_dashes = 0;
 int x_nDash;
 if (ISCONNECTED) {
-	if (__isExternalAddress(aGCId)
+if (__isExternalAddress(aGCId)
-	 && __isSmallInteger(aNumber)) {
+&& __isSmallInteger(aNumber)) {
-	    Display *dpy = myDpy;
+Display *dpy = myDpy;
-	    if (lineStyle == @symbol(solid)) {
+if (lineStyle == @symbol(solid)) {
-		x_dashes = (char *)0;
+x_dashes = (char *)0;
-		x_style = LineSolid;
+x_style = LineSolid;
-	    } else if (lineStyle == @symbol(dashed)) {
+} else if (lineStyle == @symbol(dashed)) {
-		x_dashes = dashList;
+x_dashes = dashList;
-		x_nDash = sizeof(dashList);
+x_nDash = sizeof(dashList);
-		x_style = LineOnOffDash;
+x_style = LineOnOffDash;
-	    } else if (lineStyle == @symbol(doubleDashed)) {
+} else if (lineStyle == @symbol(doubleDashed)) {
-		x_dashes = dashList;
+x_dashes = dashList;
-		x_nDash = sizeof(dashList);
+x_nDash = sizeof(dashList);
-		x_style = LineDoubleDash;
+x_style = LineDoubleDash;
-	    } else if (lineStyle == @symbol(dotted)) {
+} else if (lineStyle == @symbol(dotted)) {
-		x_dashes = dotList;
+x_dashes = dotList;
-		x_nDash = sizeof(dotList);
+x_nDash = sizeof(dotList);
-		x_style = LineOnOffDash;
+x_style = LineOnOffDash;
-	    } else if (lineStyle == @symbol(dashDot)) {
+} else if (lineStyle == @symbol(dashDot)) {
-		x_dashes = dashDotList;
+x_dashes = dashDotList;
-		x_nDash = sizeof(dashDotList);
+x_nDash = sizeof(dashDotList);
-		x_style = LineOnOffDash;
+x_style = LineOnOffDash;
-	    } else if (lineStyle == @symbol(dashDotDot)) {
+} else if (lineStyle == @symbol(dashDotDot)) {
-		x_dashes = dashDotDotList;
+x_dashes = dashDotDotList;
-		x_nDash = sizeof(dashDotDotList);
+x_nDash = sizeof(dashDotDotList);
-		x_style = LineOnOffDash;
+x_style = LineOnOffDash;
-	    } else goto bad;
+} else goto bad;
-	    if (capStyle == @symbol(notLast)) x_cap = CapNotLast;
+if (capStyle == @symbol(notLast)) x_cap = CapNotLast;
-	    else if (capStyle == @symbol(butt)) x_cap = CapButt;
+else if (capStyle == @symbol(butt)) x_cap = CapButt;
-	    else if (capStyle == @symbol(round)) x_cap  = CapRound;
+else if (capStyle == @symbol(round)) x_cap  = CapRound;
-	    else if (capStyle == @symbol(projecting)) x_cap  = CapProjecting;
+else if (capStyle == @symbol(projecting)) x_cap  = CapProjecting;
-	    else goto bad;
+else goto bad;
-	    if (joinStyle == @symbol(miter)) x_join = JoinMiter;
+if (joinStyle == @symbol(miter)) x_join = JoinMiter;
-	    else if (joinStyle == @symbol(bevel)) x_join = JoinBevel;
+else if (joinStyle == @symbol(bevel)) x_join = JoinBevel;
-	    else if (joinStyle == @symbol(round)) x_join  = JoinRound;
+else if (joinStyle == @symbol(round)) x_join  = JoinRound;
-	    else goto bad;
+else goto bad;
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    if (x_dashes) {
+if (x_dashes) {
-		XSetDashes(dpy, __GCVal(aGCId), 0, x_dashes, x_nDash);
+XSetDashes(dpy, __GCVal(aGCId), 0, x_dashes, x_nDash);
-	    }
+}
-	    XSetLineAttributes(dpy,
+XSetLineAttributes(dpy,
-			       __GCVal(aGCId), __intVal(aNumber),
+__GCVal(aGCId), __intVal(aNumber),
-			       x_style, x_cap, x_join);
+x_style, x_cap, x_join);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 bad: ;
 %}.
 "
 either aGCId is invalid,
 <context: #return>
 %{
 if (ISCONNECTED) {
-	if (__bothSmallInteger(orgX, orgY) && __isExternalAddress(aGCid)) {
+if (__bothSmallInteger(orgX, orgY) && __isExternalAddress(aGCid)) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XSetTSOrigin(myDpy, __GCVal(aGCid), __intVal(orgX), __intVal(orgY));
+XSetTSOrigin(myDpy, __GCVal(aGCid), __intVal(orgX), __intVal(orgY));
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 GC gc;
 Pixmap pixmap;
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	if (__isExternalAddress(aGCId)) {
+if (__isExternalAddress(aGCId)) {
-	    gc = __GCVal(aGCId);
+gc = __GCVal(aGCId);
-	    if (__isExternalAddress(aPixmapId)) {
+if (__isExternalAddress(aPixmapId)) {
-		pixmap = __PixmapVal(aPixmapId);
+pixmap = __PixmapVal(aPixmapId);
-		ENTER_XLIB();
+ENTER_XLIB();
-		XSetTile(dpy, gc, pixmap);
+XSetTile(dpy, gc, pixmap);
-		XSetFillStyle(dpy, gc, FillTiled);
+XSetFillStyle(dpy, gc, FillTiled);
-		LEAVE_XLIB();
+LEAVE_XLIB();
-		RETURN ( self );
+RETURN ( self );
-	    }
+}
-	    if (aPixmapId == nil) {
+if (aPixmapId == nil) {
-		ENTER_XLIB();
+ENTER_XLIB();
-		XSetFillStyle(dpy, gc, FillSolid);
+XSetFillStyle(dpy, gc, FillSolid);
-		LEAVE_XLIB();
+LEAVE_XLIB();
-		RETURN ( self );
+RETURN ( self );
-	    }
+}
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection
 ! !
 "/ 'closing' errorPrintCR.
 "/ thisContext fullPrintAll.
 %{ /* UNLIMITEDSTACK */   /* calls XSync()! */
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	__INST(displayId) = nil;
+__INST(displayId) = nil;
-	ENTER_XLIB();
+ENTER_XLIB();
-	XCloseDisplay(dpy);
+XCloseDisplay(dpy);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 %}
 !
 emergencyCloseConnection
 "low level close of the displays connection (without sending any buffered
 requests to the display). Only used in case of emergency (brokenConnection)"
 %{
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	__INST(displayId) = nil;
+__INST(displayId) = nil;
-	close(ConnectionNumber(dpy));
+close(ConnectionNumber(dpy));
 }
 %}
 !
 eventBufferSize
 "Creates a fake WindowGroup view. This window is used
 in XWMHints & _NET_WM_LEADER properties to define
 application window group"
 windowGroupWindow isNil ifTrue:[
-	windowGroupWindow := WindowGroupWindow new create.
+windowGroupWindow := WindowGroupWindow new create.
 ].
 ^ windowGroupWindow
 !
 initializeDefaultValues
 the argument, aDisplayName may be nil (for the default server from
 DISPLAY-variable or command line argument) or the name of the server
 as hostname:number"
 displayId notNil ifTrue:[
-	"/ already connected - you bad guy try to trick me manually ?
+"/ already connected - you bad guy try to trick me manually ?
-	^ self
+^ self
 ].
 displayId := self openConnectionTo:aDisplayName.
 displayId isNil ifTrue:[
-	"/ could not connect.
+"/ could not connect.
-	DeviceOpenErrorSignal raiseWith:aDisplayName.
+DeviceOpenErrorSignal raiseWith:aDisplayName.
-	^ nil
+^ nil
 ].
 xlibTimeout := xlibTimeout ? DefaultXLibTimeout.
 xlibTimeoutForWindowCreation := xlibTimeoutForWindowCreation ? DefaultXLibTimeoutForWindowCreation.
 hasConnectionBroken := false.
 rawKeySymTranslation := RawKeySymTranslation.
 map := self modifierMapping.
 map isNil ifTrue:[
-	"/
+"/
-	"/ mhmh - a crippled Xlib which does not provide modifier mappings
+"/ mhmh - a crippled Xlib which does not provide modifier mappings
-	"/ setup some reasonable default. If that is not sufficient,
+"/ setup some reasonable default. If that is not sufficient,
-	"/ you have to change things from your display.rc file.
+"/ you have to change things from your display.rc file.
-	"/
+"/
-	altModifierMask := self modifier1Mask.
+altModifierMask := self modifier1Mask.
-	metaModifierMask := self modifier2Mask.
+metaModifierMask := self modifier2Mask.
 ] ifFalse:[
-	| mod symbolFromKeyCode nonNilOnes |
+| mod symbolFromKeyCode nonNilOnes |
-	altModifierMask := 0.
+altModifierMask := 0.
-	metaModifierMask := 0.
+metaModifierMask := 0.
-	symbolFromKeyCode := [:key | self symbolFromKeycode:key].
+symbolFromKeyCode := [:key | self symbolFromKeycode:key].
-	nonNilOnes := [:str | str notNil].
+nonNilOnes := [:str | str notNil].
-	mod := map at:1.
+mod := map at:1.
-	mod notNil ifTrue:[
+mod notNil ifTrue:[
-	    shiftModifiers := mod collect:symbolFromKeyCode thenSelect:nonNilOnes.
+shiftModifiers := mod collect:symbolFromKeyCode thenSelect:nonNilOnes.
-	].
+].
-	mod := map at:3.
+mod := map at:3.
-	mod notNil ifTrue:[
+mod notNil ifTrue:[
-	    ctrlModifiers  := mod collect:symbolFromKeyCode thenSelect:nonNilOnes.
+ctrlModifiers  := mod collect:symbolFromKeyCode thenSelect:nonNilOnes.
-	].
+].
-	mod := map at:4.
+mod := map at:4.
-	mod notNil ifTrue:[
+mod notNil ifTrue:[
-	    mod := mod collect:symbolFromKeyCode thenSelect:nonNilOnes.
+mod := mod collect:symbolFromKeyCode thenSelect:nonNilOnes.
-	    (mod includes:#'Num_Lock') ifFalse:[
+(mod includes:#'Num_Lock') ifFalse:[
-		metaModifiers := mod.
+metaModifiers := mod.
-		metaModifierMask := 1 bitShift:(4-1).
+metaModifierMask := 1 bitShift:(4-1).
-	    ].
+].
-	].
+].
-	mod := map at:5.
+mod := map at:5.
-	mod notNil ifTrue:[
+mod notNil ifTrue:[
-	    mod := mod collect:symbolFromKeyCode thenSelect:nonNilOnes.
+mod := mod collect:symbolFromKeyCode thenSelect:nonNilOnes.
-	    (mod includes:#'Num_Lock') ifFalse:[
+(mod includes:#'Num_Lock') ifFalse:[
-		altModifiers   := mod.
+altModifiers   := mod.
-		altModifierMask := 1 bitShift:(5-1).
+altModifierMask := 1 bitShift:(5-1).
-	    ].
+].
-	]
+]
 ].
 "
 Display initializeModifierMappings
 "
 "Modified: 1.12.1995 / 23:44:40 / stefan"
 !
 initializeScreenBounds
 self isXineramaActive ifTrue:[
-	|rect|
+|rect|
-	self monitorBounds do:[:eachRect|
+self monitorBounds do:[:eachRect|
-	    rect isNil ifTrue:[
+rect isNil ifTrue:[
-		rect := eachRect.
+rect := eachRect.
-	    ] ifFalse:[
+] ifFalse:[
-		rect := rect merge:eachRect.
+rect := rect merge:eachRect.
-	    ]
+]
-	].
+].
-	width := rect width.
+width := rect width.
-	height := rect height.
+height := rect height.
-	"propagate possible size changes to our rottView"
+"propagate possible size changes to our rottView"
-	rootView notNil ifTrue:[
+rootView notNil ifTrue:[
-	    rootView initialize.
+rootView initialize.
-	].
+].
 ] ifFalse:[
-	width := self queryWidth.
+width := self queryWidth.
-	height := self queryHeight.
+height := self queryHeight.
 ].
 widthMM := self queryWidthMM.
 heightMM := self queryHeightMM.
 "
 visualType := self queryDefaultVisualType.
 hasColors := hasGreyscales := true.
 (visualType == #StaticGray
 or:[ visualType == #GrayScale]) ifTrue:[
-	hasColors := false.
+hasColors := false.
-	monitorType := #monochrome.
+monitorType := #monochrome.
 ].
 ncells == 2 ifTrue:[
-	hasColors := hasGreyscales := false.
+hasColors := hasGreyscales := false.
 ].
 masks := self queryRGBMasks.
 redMask := masks at:1.
 greenMask := masks at:2.
 blueMask := masks at:3.
 bitsPerRGB := masks at:4.
 visualType == #TrueColor ifTrue:[
-	redShift := redMask lowBit - 1.
+redShift := redMask lowBit - 1.
-	greenShift := greenMask lowBit - 1.
+greenShift := greenMask lowBit - 1.
-	blueShift := blueMask lowBit - 1.
+blueShift := blueMask lowBit - 1.
-	bitsRed := redMask highBit - redMask lowBit + 1.
+bitsRed := redMask highBit - redMask lowBit + 1.
-	bitsGreen := greenMask highBit - greenMask lowBit + 1.
+bitsGreen := greenMask highBit - greenMask lowBit + 1.
-	bitsBlue := blueMask highBit - blueMask lowBit + 1.
+bitsBlue := blueMask highBit - blueMask lowBit + 1.
 ].
 %{
 Display *dpy;
 int nvi, i;
 char *type, *nm;
 int dummy;
 if (ISCONNECTED) {
-	dpy = myDpy;
+dpy = myDpy;
-	/*
+/*
-	 * look for RGB visual with the highest depth
+* look for RGB visual with the highest depth
-	 */
+*/
-	nvi = 0;
+nvi = 0;
-	viproto.screen = scr;
+viproto.screen = scr;
-	vip = XGetVisualInfo (dpy, VisualScreenMask, &viproto, &nvi);
+vip = XGetVisualInfo (dpy, VisualScreenMask, &viproto, &nvi);
-	maxRGBDepth = maxRGBADepth = 0;
+maxRGBDepth = maxRGBADepth = 0;
-	for (i = 0; i < nvi; i++) {
+for (i = 0; i < nvi; i++) {
-	    int thisDepth = vip[i].depth;
+int thisDepth = vip[i].depth;
-	    switch (vip[i].class) {
+switch (vip[i].class) {
-		case TrueColor:
+case TrueColor:
-		    if (thisDepth > maxRGBDepth) {
+if (thisDepth > maxRGBDepth) {
-			if (thisDepth <= 24) {
+if (thisDepth <= 24) {
-			    maxRGBDepth = thisDepth;
+maxRGBDepth = thisDepth;
-			    rgbRedMask = vip[i].red_mask;
+rgbRedMask = vip[i].red_mask;
-			    rgbGreenMask = vip[i].green_mask;
+rgbGreenMask = vip[i].green_mask;
-			    rgbBlueMask = vip[i].blue_mask;
+rgbBlueMask = vip[i].blue_mask;
-			    rgbVisualID = vip[i].visualid;
+rgbVisualID = vip[i].visualid;
-			} else {
+} else {
-			    if (thisDepth > maxRGBADepth) {
+if (thisDepth > maxRGBADepth) {
-				// printf("found rgba visual!\n");
+// printf("found rgba visual!\n");
-				maxRGBADepth = thisDepth;
+maxRGBADepth = thisDepth;
-				rgbaRedMask = vip[i].red_mask;
+rgbaRedMask = vip[i].red_mask;
-				rgbaGreenMask = vip[i].green_mask;
+rgbaGreenMask = vip[i].green_mask;
-				rgbaBlueMask = vip[i].blue_mask;
+rgbaBlueMask = vip[i].blue_mask;
-				rgbaVisualID = vip[i].visualid;
+rgbaVisualID = vip[i].visualid;
-			    }
+}
-			}
+}
-		    }
+}
-		    break;
+break;
-	    }
+}
-	}
+}
-	if (vip) XFree ((char *) vip);
+if (vip) XFree ((char *) vip);
-	if (maxRGBDepth) {
+if (maxRGBDepth) {
-	    __INST(rgbVisual) = __MKEXTERNALADDRESS(rgbVisualID); __STORESELF(rgbVisual);
+__INST(rgbVisual) = __MKEXTERNALADDRESS(rgbVisualID); __STORESELF(rgbVisual);
-	}
+}
-	if (maxRGBADepth) {
+if (maxRGBADepth) {
-	    __INST(rgbaVisual) = __MKEXTERNALADDRESS(rgbaVisualID); __STORESELF(rgbaVisual);
+__INST(rgbaVisual) = __MKEXTERNALADDRESS(rgbaVisualID); __STORESELF(rgbaVisual);
-	    if (!maxRGBDepth) {
+if (!maxRGBDepth) {
-		__INST(rgbVisual) = __INST(rgbaVisual); __STORESELF(rgbVisual);
+__INST(rgbVisual) = __INST(rgbaVisual); __STORESELF(rgbVisual);
-	    }
+}
-	}
+}
 }
 %}.
 !
 initializeSpecialFlags
 "/
 hasSaveUnder := true.
 ignoreBackingStore := false.
 (self serverVendor = 'X11/NeWS') ifTrue:[
-	"/
+"/
-	"/ this is a kludge around a bug in the X11/NeWS server,
+"/ this is a kludge around a bug in the X11/NeWS server,
-	"/ which does not correctly handle saveUnder
+"/ which does not correctly handle saveUnder
-	"/
+"/
-	hasSaveUnder := false.
+hasSaveUnder := false.
 ].
 !
 initializeUniqueID
 uniqueDeviceID isNil ifTrue:[
-	uniqueDeviceID := UUID genUUID.
+uniqueDeviceID := UUID genUUID.
 ]
 !
 openConnectionTo:dpyName
 "open a connection to some display;
 Display *dpy;
 int i;
 char *nm;
 if (__isStringLike(dpyName))
-	nm = (char *) __stringVal(dpyName);
+nm = (char *) __stringVal(dpyName);
 else {
-	nm = NULL;
+nm = NULL;
 }
 dpy = XOpenDisplay(nm);
 if (dpy) {
-	static int firstCall = 1;
+static int firstCall = 1;
-	OBJ dpyID;
+OBJ dpyID;
-	dpyID = __MKEXTERNALADDRESS(dpy);
+dpyID = __MKEXTERNALADDRESS(dpy);
-	if (firstCall) {
+if (firstCall) {
-	    firstCall = 0;
+firstCall = 0;
-	    XSetErrorHandler(__XErrorHandler__);
+XSetErrorHandler(__XErrorHandler__);
-	    XSetIOErrorHandler(__XIOErrorHandler__);
+XSetIOErrorHandler(__XIOErrorHandler__);
-	}
+}
-	RETURN (dpyID);
+RETURN (dpyID);
 }
 %}.
 ^ nil
 !
 queryBlackPixel
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int scr;
+int scr;
-	dpy = myDpy;
+dpy = myDpy;
-	scr = DefaultScreen(dpy);
+scr = DefaultScreen(dpy);
-	RETURN ( __MKSMALLINT(BlackPixel(dpy, scr)));
+RETURN ( __MKSMALLINT(BlackPixel(dpy, scr)));
 }
 %}.
 ^ nil
 "
 queryCells
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int scr;
+int scr;
-	dpy = myDpy;
+dpy = myDpy;
-	scr = DefaultScreen(dpy);
+scr = DefaultScreen(dpy);
-	RETURN ( __MKSMALLINT(DisplayCells(dpy, scr)));
+RETURN ( __MKSMALLINT(DisplayCells(dpy, scr)));
 }
 %}.
 ^ nil
 "
 queryDPSExtension
 %{  /* NOCONTEXT */
 #ifdef DPS
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int dummy;
+int dummy;
-	dpy = myDpy;
+dpy = myDpy;
-	if (XQueryExtension(dpy, "DPSExtension", &dummy, &dummy, &dummy)) {
+if (XQueryExtension(dpy, "DPSExtension", &dummy, &dummy, &dummy)) {
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 #endif
 %}.
 ^ false
 queryDefaultScreen
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	dpy = myDpy;
+dpy = myDpy;
-	RETURN ( __MKSMALLINT(DefaultScreen(dpy)));
+RETURN ( __MKSMALLINT(DefaultScreen(dpy)));
 }
 %}.
 ^ nil
 "
 queryDefaultVisualType
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	Visual *visual;
+Visual *visual;
-	dpy = myDpy;
+dpy = myDpy;
-	visual = DefaultVisualOfScreen(DefaultScreenOfDisplay(dpy));
+visual = DefaultVisualOfScreen(DefaultScreenOfDisplay(dpy));
-	switch (visual->class) {
+switch (visual->class) {
-	    case StaticGray:
+case StaticGray:
-		RETURN ( @symbol(StaticGray) );
+RETURN ( @symbol(StaticGray) );
-	    case GrayScale:
+case GrayScale:
-		RETURN ( @symbol(GrayScale) );
+RETURN ( @symbol(GrayScale) );
-	    case StaticColor:
+case StaticColor:
-		RETURN ( @symbol(StaticColor) );
+RETURN ( @symbol(StaticColor) );
-	    case PseudoColor:
+case PseudoColor:
-		RETURN ( @symbol(PseudoColor) );
+RETURN ( @symbol(PseudoColor) );
-	    case TrueColor:
+case TrueColor:
-		RETURN ( @symbol(TrueColor) );
+RETURN ( @symbol(TrueColor) );
-	    case DirectColor:
+case DirectColor:
-		RETURN ( @symbol(DirectColor) );
+RETURN ( @symbol(DirectColor) );
-	}
+}
 }
 %}.
 ^ nil
 "
 queryDepth
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int scr;
+int scr;
-	dpy = myDpy;
+dpy = myDpy;
-	scr = DefaultScreen(dpy);
+scr = DefaultScreen(dpy);
-	RETURN ( __MKSMALLINT(DisplayPlanes(dpy, scr)));
+RETURN ( __MKSMALLINT(DisplayPlanes(dpy, scr)));
 }
 %}.
 ^ nil
 "
 queryHeight
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int scr;
+int scr;
-	dpy = myDpy;
+dpy = myDpy;
-	scr = DefaultScreen(dpy);
+scr = DefaultScreen(dpy);
-	RETURN ( __MKSMALLINT(DisplayHeight(dpy, scr)));
+RETURN ( __MKSMALLINT(DisplayHeight(dpy, scr)));
 }
 %}.
 ^ nil
 "
 queryHeightMM
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int scr;
+int scr;
-	dpy = myDpy;
+dpy = myDpy;
-	scr = DefaultScreen(dpy);
+scr = DefaultScreen(dpy);
-	RETURN ( __MKSMALLINT(DisplayHeightMM(dpy, scr)));
+RETURN ( __MKSMALLINT(DisplayHeightMM(dpy, scr)));
 }
 %}.
 ^ nil
 "
 queryMBUFExtension
 %{  /* NOCONTEXT */
 #ifdef MBUF
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int dummy;
+int dummy;
-	dpy = myDpy;
+dpy = myDpy;
-	if (XQueryExtension(dpy, "Multi-Buffering", &dummy, &dummy, &dummy)) {
+if (XQueryExtension(dpy, "Multi-Buffering", &dummy, &dummy, &dummy)) {
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 #endif
 %}.
 ^ false
 queryPEXExtension
 %{  /* NOCONTEXT */
 #ifdef PEX5
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int dummy;
+int dummy;
-	dpy = myDpy;
+dpy = myDpy;
-	if (XQueryExtension(dpy, PEX_NAME_STRING, &dummy, &dummy, &dummy)) {
+if (XQueryExtension(dpy, PEX_NAME_STRING, &dummy, &dummy, &dummy)) {
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 #endif
 %}.
 ^ false
 queryRGBMasks
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	Visual *visual;
+Visual *visual;
-	OBJ redMask, greenMask, blueMask, bprgb;
+OBJ redMask, greenMask, blueMask, bprgb;
-	dpy = myDpy;
+dpy = myDpy;
-	visual = DefaultVisualOfScreen(DefaultScreenOfDisplay(dpy));
+visual = DefaultVisualOfScreen(DefaultScreenOfDisplay(dpy));
-	redMask   = __MKSMALLINT(visual->red_mask);
+redMask   = __MKSMALLINT(visual->red_mask);
-	greenMask = __MKSMALLINT(visual->green_mask);
+greenMask = __MKSMALLINT(visual->green_mask);
-	blueMask  = __MKSMALLINT(visual->blue_mask);
+blueMask  = __MKSMALLINT(visual->blue_mask);
-	bprgb  = __MKSMALLINT(visual->bits_per_rgb);
+bprgb  = __MKSMALLINT(visual->bits_per_rgb);
-	RETURN ( __ARRAY_WITH4(redMask, greenMask, blueMask, bprgb) );
+RETURN ( __ARRAY_WITH4(redMask, greenMask, blueMask, bprgb) );
 }
 %}.
 ^ nil
 "
 queryRenderExtension
 %{  /* NOCONTEXT */
 #ifdef XRENDER
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int dummy;
+int dummy;
-	dpy = myDpy;
+dpy = myDpy;
-	if (XRenderQueryExtension (dpy, &dummy, &dummy)) {
+if (XRenderQueryExtension (dpy, &dummy, &dummy)) {
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 #endif
 %}.
 ^ false
 querySHMExtension
 %{  /* NOCONTEXT */
 #ifdef xxSHM
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int dummy;
+int dummy;
-	dpy = myDpy;
+dpy = myDpy;
-	if (XQueryExtension(dpy, "MIT_SHM", &dummy, &dummy, &dummy)) {
+if (XQueryExtension(dpy, "MIT_SHM", &dummy, &dummy, &dummy)) {
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 #endif
 %}.
 ^ false
 queryShapeExtension
 %{  /* NOCONTEXT */
 #ifdef SHAPE
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int dummy;
+int dummy;
-	dpy = myDpy;
+dpy = myDpy;
-	if (XShapeQueryExtension(dpy, &dummy, &dummy)) {
+if (XShapeQueryExtension(dpy, &dummy, &dummy)) {
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 #endif
 %}.
 ^ false
 queryWhitePixel
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int scr;
+int scr;
-	dpy = myDpy;
+dpy = myDpy;
-	scr = DefaultScreen(dpy);
+scr = DefaultScreen(dpy);
-	RETURN ( __MKSMALLINT(WhitePixel(dpy, scr)));
+RETURN ( __MKSMALLINT(WhitePixel(dpy, scr)));
 }
 %}.
 ^ nil
 "
 queryWidth
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int scr;
+int scr;
-	dpy = myDpy;
+dpy = myDpy;
-	scr = DefaultScreen(dpy);
+scr = DefaultScreen(dpy);
-	RETURN ( __MKSMALLINT(DisplayWidth(dpy, scr)));
+RETURN ( __MKSMALLINT(DisplayWidth(dpy, scr)));
 }
 %}.
 ^ nil
 "
 queryWidthMM
 %{  /* NOCONTEXT */
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int scr;
+int scr;
-	dpy = myDpy;
+dpy = myDpy;
-	scr = DefaultScreen(dpy);
+scr = DefaultScreen(dpy);
-	RETURN ( __MKSMALLINT(DisplayWidthMM(dpy, scr)));
+RETURN ( __MKSMALLINT(DisplayWidthMM(dpy, scr)));
 }
 %}.
 ^ nil
 "
 queryXIEExtension
 %{  /* NOCONTEXT */
 #ifdef XIE
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int dummy;
+int dummy;
-	dpy = myDpy;
+dpy = myDpy;
-	if (XQueryExtension(dpy, xieExtName, &dummy, &dummy, &dummy)) {
+if (XQueryExtension(dpy, xieExtName, &dummy, &dummy, &dummy)) {
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 #endif
 %}.
 ^ false
 queryXIExtension
 %{  /* NOCONTEXT */
 #ifdef XI
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int dummy;
+int dummy;
-	dpy = myDpy;
+dpy = myDpy;
-	if (XQueryExtension(dpy, "XInputExtension", &dummy, &dummy, &dummy)) {
+if (XQueryExtension(dpy, "XInputExtension", &dummy, &dummy, &dummy)) {
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 #endif
 %}.
 ^ false
 queryXVideoExtension
 %{  /* NOCONTEXT */
 #ifdef XVIDEO
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int dummy;
+int dummy;
-	dpy = myDpy;
+dpy = myDpy;
-	if (XQueryExtension(dpy, "XVideo", &dummy, &dummy, &dummy)) {
+if (XQueryExtension(dpy, "XVideo", &dummy, &dummy, &dummy)) {
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 #endif
 %}.
 ^ false
 queryXineramaExtension
 %{  /* NOCONTEXT */
 #ifdef XINERAMA
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	int dummy;
+int dummy;
-	dpy = myDpy;
+dpy = myDpy;
-	if (XineramaQueryExtension (dpy, &dummy, &dummy)) {
+if (XineramaQueryExtension (dpy, &dummy, &dummy)) {
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 #endif
 %}.
 ^ false
 "
 !
 reinitialize
 preWaitAction notNil ifTrue:[
-	Processor removePreWaitAction:preWaitAction.
+Processor removePreWaitAction:preWaitAction.
-	preWaitAction := nil.
+preWaitAction := nil.
 ].
 virtualRootId := rootId := nil.
 selectionFetchers := nil.
 super reinitialize.
 dispatchingExpose := nil
 !
 releaseDeviceResources
 preWaitAction notNil ifTrue:[
-	Processor removePreWaitAction:preWaitAction.
+Processor removePreWaitAction:preWaitAction.
-	preWaitAction := nil.
+preWaitAction := nil.
 ].
 selectionFetchers := nil.
 super releaseDeviceResources.
 ! !
 altModifierMask:aSmallInteger
 "define which key takes the role of an alt-key.
 By default, this is X's modifier1, which is the ALT key on
 most keyboards. However, there may be exceptions to this,
 and the setting can be changed with:
-	Display altModifierMask:(Display modifier2Mask)
+Display altModifierMask:(Display modifier2Mask)
 Setting the mask to 0 disables the ALT key (in ST/X) altogether.
 "
 altModifierMask := aSmallInteger
 !
 "define which key takes the role of a meta key.
 By default, this is X's modifier2, which is the 2nd ALT key on
 most keyboards (if present at all).
 However, there may be exceptions to this, and the setting can
 be changed with:
-	Display metaModifierMask:(Display modifier1Mask)
+Display metaModifierMask:(Display modifier1Mask)
 Setting the mask to 0 disables the META key (in ST/X) altogether.
 As reported, some Xservers place the Meta-key onto NumLock,
 and having NumLock enabled makes ST/X think, that meta is pressed
 all the time. On those, you should disable the meta key by setting
 the mask to 0.
 maxKeyPerMod := modifierKeyMap size // 8.
 ret := Array new:8.
 nextKey := 1.
 1 to:8 do:[ :i |
-	(modifierKeyMap at:nextKey) ~= 0 ifTrue:[
+(modifierKeyMap at:nextKey) ~= 0 ifTrue:[
-	    |mod|
+|mod|
-	    mod := OrderedCollection new:maxKeyPerMod.
+mod := OrderedCollection new:maxKeyPerMod.
-	    modifierKeyMap from:nextKey to:(nextKey+maxKeyPerMod-1) do:[ :key |
+modifierKeyMap from:nextKey to:(nextKey+maxKeyPerMod-1) do:[ :key |
-		key ~= 0 ifTrue:[
+key ~= 0 ifTrue:[
-		    mod add:key
+mod add:key
-		].
+].
-	    ].
+].
-	    ret at:i put:mod asArray.
+ret at:i put:mod asArray.
-	].
+].
-	nextKey := nextKey+maxKeyPerMod.
+nextKey := nextKey+maxKeyPerMod.
 ].
 ^ ret
 "
 "
 |mapping|
 mapping := Display modifierMapping.
 ^ mapping collect:[:eachRow |
-			     eachRow notNil ifTrue:[
+eachRow notNil ifTrue:[
-				 eachRow collect:[ :key | Display stringFromKeycode:key ].
+eachRow collect:[ :key | Display stringFromKeycode:key ].
-			     ] ifFalse:[
+] ifFalse:[
-				 nil
+nil
-			     ]
+]
-		       ].
+].
 "
 !
 rawKeySymTranslation
 "Get the raw keyboard mapping (maps some special X-keySyms to STX-internal names
 %{
 XModifierKeymap *modmap;
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	if ((modmap = XGetModifierMapping(dpy)) != 0) {
+if ((modmap = XGetModifierMapping(dpy)) != 0) {
-	   modifierKeyMap = __BYTEARRAY_UNINITIALIZED_NEW_INT(modmap->max_keypermod * 8);
+modifierKeyMap = __BYTEARRAY_UNINITIALIZED_NEW_INT(modmap->max_keypermod * 8);
-	   if (modifierKeyMap != nil) {
+if (modifierKeyMap != nil) {
-		memcpy((char *)__ByteArrayInstPtr(modifierKeyMap)->ba_element,
+memcpy((char *)__ByteArrayInstPtr(modifierKeyMap)->ba_element,
-		       (char *)modmap->modifiermap, modmap->max_keypermod * 8);
+(char *)modmap->modifiermap, modmap->max_keypermod * 8);
-	   }
+}
-	   XFreeModifiermap(modmap);
+XFreeModifiermap(modmap);
-	}
+}
 }
 %}.
 ^ modifierKeyMap
 "
-	Display rawModifierMapping
+Display rawModifierMapping
 "
 !
 shiftModifierMask
 "return the Xlib mask bit for the shift modifier key"
 %{
 KeySym keysym;
 char *keystring;
 if (ISCONNECTED && __isSmallInteger(code)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
 // Our Windows Xlib does not support Xkb as of 2013-01
 //        if ((keysym = XkbKeycodeToKeysym(dpy, __intVal(code), 0, 0)) != NoSymbol
-	if ((keysym = XKeycodeToKeysym(dpy, __intVal(code), 0)) != NoSymbol
+if ((keysym = XKeycodeToKeysym(dpy, __intVal(code), 0)) != NoSymbol
-	    && (keystring = XKeysymToString(keysym)) != 0)
+&& (keystring = XKeysymToString(keysym)) != 0)
-	    str = __MKSYMBOL(keystring, 0);
+str = __MKSYMBOL(keystring, 0);
 }
 %}.
 ^ str
 "
-	Display symbolFromKeycode:50
+Display symbolFromKeycode:50
 "
 ! !
 !XWorkstation methodsFor:'misc'!
 beep
 "output an audible beep or bell"
 UserPreferences current beepEnabled ifTrue:[
-	self beep:0 volume:50
+self beep:0 volume:50
 ]
 "Modified: / 3.12.1999 / 17:13:59 / ps"
 !
 %{
 int volume;
 if (__isSmallInteger(volumeInPercent)
 && ISCONNECTED) {
-	/* stupid: X wants -100 .. 100 and calls this percent */
+/* stupid: X wants -100 .. 100 and calls this percent */
-	volume = __intVal(volumeInPercent) * 2 - 100;
+volume = __intVal(volumeInPercent) * 2 - 100;
-	if (volume < -100) volume = -100;
+if (volume < -100) volume = -100;
-	else if (volume > 100) volume = 100;
+else if (volume > 100) volume = 100;
-	ENTER_XLIB();
+ENTER_XLIB();
-	XBell(myDpy, volume);
+XBell(myDpy, volume);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 %}
 !
 buffered
 See #unBuffered for additional info."
 <context: #return>
 %{
 if (ISCONNECTED) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSynchronize(myDpy, 0);
+XSynchronize(myDpy, 0);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 %}
 "
 Display buffered
 "
 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.
 !
 flushDpsContext:aDPSContext
 <context: #return>
 %{
 #ifdef DPS
 if (ISCONNECTED
-	&& __isExternalAddress(aDPSContext)) {
+&& __isExternalAddress(aDPSContext)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	DPSFlushContext(__DPSContextVal(aDPSContext));
+DPSFlushContext(__DPSContextVal(aDPSContext));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 #endif
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 %{
 if (ISCONNECTED) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSync(myDpy, 0);
+XSync(myDpy, 0);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 %}.
 operationsUntilFlush := maxOperationsUntilFlush.
 !
 <context: #return>
 %{
 XMappingEvent *ev;
 if (ISCONNECTED && __isByteArrayLike(eB)) {
-	ev = (XMappingEvent *)(__ByteArrayInstPtr(eB)->ba_element);
+ev = (XMappingEvent *)(__ByteArrayInstPtr(eB)->ba_element);
-	ENTER_XLIB();
+ENTER_XLIB();
-	XRefreshKeyboardMapping(ev);
+XRefreshKeyboardMapping(ev);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 %{
 int arg;
 Window focusWindow;
 if (ISCONNECTED) {
-	if (__isExternalAddress(aWindowId)) {
+if (__isExternalAddress(aWindowId)) {
-	    focusWindow = __WindowVal(aWindowId);
+focusWindow = __WindowVal(aWindowId);
-	} else if (aWindowId == nil) {
+} else if (aWindowId == nil) {
-	    focusWindow = None;
+focusWindow = None;
-	} else
+} else
-	    goto err;
+goto err;
-	if (revertSymbol == @symbol(parent))
+if (revertSymbol == @symbol(parent))
-	    arg = RevertToParent;
+arg = RevertToParent;
-	else if (revertSymbol == @symbol(root))
+else if (revertSymbol == @symbol(root))
-	    arg = RevertToPointerRoot;
+arg = RevertToPointerRoot;
-	else
+else
-	    arg = RevertToNone;
+arg = RevertToNone;
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetInputFocus(myDpy, focusWindow, arg, CurrentTime);
+XSetInputFocus(myDpy, focusWindow, arg, CurrentTime);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 err:;
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 %{
 if (ISCONNECTED) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSynchronize(myDpy, 1);
+XSynchronize(myDpy, 1);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 %}
 "
 Display unBuffered
 Window rootRet, childRet;
 int rootX, rootY, winX, winY;
 unsigned int mask;
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	w = RootWindow(dpy, screen);
+w = RootWindow(dpy, screen);
-	if (w) {
+if (w) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XQueryPointer(dpy, w, &rootRet, &childRet,
+XQueryPointer(dpy, w, &rootRet, &childRet,
-				 &rootX, &rootY,
+&rootX, &rootY,
-				 &winX, &winY,
+&winX, &winY,
-				 &mask);
+&mask);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN (__MKSMALLINT(mask));
+RETURN (__MKSMALLINT(mask));
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ nil
 Window rootRet, childRet;
 int rootX, rootY, winX, winY;
 unsigned int mask;
 if (ISCONNECTED && rootWindowId != nil) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	Window w = (Window)__externalAddressVal(rootWindowId);
+Window w = (Window)__externalAddressVal(rootWindowId);
-	ENTER_XLIB();
+ENTER_XLIB();
-	XQueryPointer(dpy, w, &rootRet, &childRet,
+XQueryPointer(dpy, w, &rootRet, &childRet,
-			      &rootX, &rootY,
+&rootX, &rootY,
-			      &winX, &winY,
+&winX, &winY,
-			      &mask);
+&mask);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	xpos = __MKSMALLINT(rootX);
+xpos = __MKSMALLINT(rootX);
-	ypos = __MKSMALLINT(rootY);
+ypos = __MKSMALLINT(rootY);
 }
 %}.
 xpos isNil ifTrue:[
-	self primitiveFailedOrClosedConnection.
+self primitiveFailedOrClosedConnection.
-	^ nil
+^ nil
 ].
 ^ xpos @ ypos
 !
 rightButtonStateMask
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)
 && __bothSmallInteger(xpos, ypos)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	Window w = __WindowVal(aWindowId);
+Window w = __WindowVal(aWindowId);
-	ENTER_XLIB();
+ENTER_XLIB();
-	XWarpPointer(dpy,
+XWarpPointer(dpy,
-		     None,  /* src window */
+None,  /* src window */
-		     w,  /* dst window */
+w,  /* dst window */
-		     0,  /* src_x */
+0,  /* src_x */
-		     0,  /* src_y */
+0,  /* src_y */
-		     0,  /* src_w */
+0,  /* src_w */
-		     0,  /* src_h */
+0,  /* src_h */
-		     __intVal(xpos),  /* dst_x */
+__intVal(xpos),  /* dst_x */
-		     __intVal(ypos)   /* dst_y */
+__intVal(ypos)   /* dst_y */
-		    );
+);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 %}.
 ^ self
 "
 addSelectionHandler:someone
 "register someone to be notified when the selection changes"
 selectionHandlers isNil ifTrue:[
-	selectionHandlers := IdentitySet new.
+selectionHandlers := IdentitySet new.
 ].
 selectionHandlers add:someone
 !
 findSelectionFetcher:aDrawableId
 removeSelectionHandler:someone
 "no longer tell someone about selection changes"
 selectionHandlers notNil ifTrue:[
-	selectionHandlers remove:someone ifAbsent:nil.
+selectionHandlers remove:someone ifAbsent:nil.
-	selectionHandlers := selectionHandlers asNilIfEmpty
+selectionHandlers := selectionHandlers asNilIfEmpty
 ].
 !
 unregisterSelectionFetcher:aSelectionFetcher
 "unregister a SelectionFetcher that received selection events for aDrawableId"
 <context: #return>
 %{
 if (ISCONNECTED && __isAtomID(propertyID)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	Atom prop;
+Atom prop;
-	Window window;
+Window window;
-	prop = __AtomVal(propertyID);
+prop = __AtomVal(propertyID);
-	if (__isExternalAddress(aWindowID)) {
+if (__isExternalAddress(aWindowID)) {
-	    window = __WindowVal(aWindowID);
+window = __WindowVal(aWindowID);
-	} else if (aWindowID == nil) {
+} else if (aWindowID == nil) {
-	    window = DefaultRootWindow(dpy);
+window = DefaultRootWindow(dpy);
-	} else if (__isInteger(aWindowID)) {
+} else if (__isInteger(aWindowID)) {
-	    window = (Window)__unsignedLongIntVal(aWindowID);
+window = (Window)__unsignedLongIntVal(aWindowID);
-	} else {
+} else {
-	    goto fail;
+goto fail;
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	XDeleteProperty(dpy, window, prop);
+XDeleteProperty(dpy, window, prop);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN(true);
+RETURN(true);
 }
 fail:;
 %}.
 self primitiveFailedOrClosedConnection.
 !
 <context: #return>
 |val typeID propertyID windowID|
 propertySymbolOrAtomID isString ifTrue:[
-	propertyID := self atomIDOf:propertySymbolOrAtomID create:false.
+propertyID := self atomIDOf:propertySymbolOrAtomID create:false.
-	propertyID isNil ifTrue:[^ nil].
+propertyID isNil ifTrue:[^ nil].
 ] ifFalse:[
-	propertyID := propertySymbolOrAtomID.
+propertyID := propertySymbolOrAtomID.
 ].
 aWindowOrWindowIDOrNil isView ifTrue:[
-	windowID := aWindowOrWindowIDOrNil id.
+windowID := aWindowOrWindowIDOrNil id.
 ] ifFalse:[
-	windowID := aWindowOrWindowIDOrNil.
+windowID := aWindowOrWindowIDOrNil.
 ].
 %{
 Window window;
 Atom property;
 unsigned char *data;
 int ok = 1;
 #   define PROP_SIZE    2048
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	if (__isAtomID(propertyID)) {
+if (__isAtomID(propertyID)) {
-	    property = __AtomVal(propertyID);
+property = __AtomVal(propertyID);
-	    if (__isExternalAddress(windowID)) {
+if (__isExternalAddress(windowID)) {
-		window = __WindowVal(windowID);
+window = __WindowVal(windowID);
-	    } else if (windowID == nil) {
+} else if (windowID == nil) {
-		window = DefaultRootWindow(dpy);
+window = DefaultRootWindow(dpy);
-	    } else
+} else
-		goto fail;
+goto fail;
-	    nread = 0;
+nread = 0;
-	    cp = 0;
+cp = 0;
 #ifdef PROPERTY_DEBUG
-	    console_fprintf(stderr, "getProperty %x\n", property);
+console_fprintf(stderr, "getProperty %x\n", property);
 #endif
-	    do {
+do {
-		int retVal;
+int retVal;
-		ENTER_XLIB();
+ENTER_XLIB();
-		retVal = XGetWindowProperty(dpy, window, property, nread/4, PROP_SIZE,
+retVal = XGetWindowProperty(dpy, window, property, nread/4, PROP_SIZE,
-					    doDelete == true,
+doDelete == true,
-					    AnyPropertyType, &actual_type, &actual_format,
+AnyPropertyType, &actual_type, &actual_format,
-					    &nitems, &bytes_after, (unsigned char **)&data);
+&nitems, &bytes_after, (unsigned char **)&data);
-		LEAVE_XLIB();
+LEAVE_XLIB();
-		if (retVal != Success) {
+if (retVal != Success) {
 #ifdef PROPERTY_DEBUG
-		    console_fprintf(stderr, "- no success\n");
+console_fprintf(stderr, "- no success\n");
 #endif
-		    ok = 0;
+ok = 0;
-		    break;
+break;
-		}
+}
 #ifdef PROPERTY_DEBUG
-		console_fprintf(stderr, "- type:%x\n", actual_type);
+console_fprintf(stderr, "- type:%x\n", actual_type);
 #endif
-		nitems *= (actual_format / 8);
+nitems *= (actual_format / 8);
-		typeID = __MKATOMOBJ(actual_type);
+typeID = __MKATOMOBJ(actual_type);
-		if (! cp) {
+if (! cp) {
-		    cp = cp2 = (char *)malloc(nitems+bytes_after);
+cp = cp2 = (char *)malloc(nitems+bytes_after);
-		} else {
+} else {
-		    cp2 = cp + nread;
+cp2 = cp + nread;
-		}
+}
-		if (! cp) {
+if (! cp) {
-		    XFree(data);
+XFree(data);
-		    goto fail;
+goto fail;
-		}
+}
-		nread += nitems;
+nread += nitems;
-		bcopy(data, cp2, nitems);
+bcopy(data, cp2, nitems);
-		XFree(data);
+XFree(data);
 #ifdef PROPERTY_DEBUG
-		console_fprintf(stderr, "- <nitems:%d bytes_after:%d>\n", nitems, bytes_after);
+console_fprintf(stderr, "- <nitems:%d bytes_after:%d>\n", nitems, bytes_after);
 #endif
-	    } while (bytes_after > 0);
+} while (bytes_after > 0);
-	    if (ok) {
+if (ok) {
-		switch (actual_format) {
+switch (actual_format) {
-		case 32:
+case 32:
-		    val = __stArrayFromCUIntArray((unsigned int*)cp, nread/4);
+val = __stArrayFromCUIntArray((unsigned int*)cp, nread/4);
-		    break;
+break;
-		case 16:
+case 16:
-		    val = __stArrayFromCUShortArray((unsigned short*)cp, nread/2);
+val = __stArrayFromCUShortArray((unsigned short*)cp, nread/2);
-		    break;
+break;
-		case 8:
+case 8:
-		default:
+default:
-		    if (actual_type == XA_STRING) {
+if (actual_type == XA_STRING) {
-			val = __MKSTRING_L(cp, nread);
+val = __MKSTRING_L(cp, nread);
-		    } else {
+} else {
-			val = __MKBYTEARRAY(cp, nread);
+val = __MKBYTEARRAY(cp, nread);
-		    }
+}
-		    break;
+break;
-		}
+}
-	    }
+}
-	    if (cp)
+if (cp)
-		free(cp);
+free(cp);
-	}
+}
 }
 fail: ;
 %}.
 (typeID isNil or:[typeID == 0]) ifTrue:[
-	"typeID == 0 (None): The property does not exist in the specified window"
+"typeID == 0 (None): The property does not exist in the specified window"
-	^ nil
+^ nil
 ].
 ^ typeID->val
 "
 Display
-	getProperty:#'_NET_WM_ICON_GEOMETRY'
+getProperty:#'_NET_WM_ICON_GEOMETRY'
-	from:nil
+from:nil
-	delete:false
+delete:false
 "
 !
 propertiesOf:aWindowOrWindowIDOrNil
 "return a collection of all properties' atomIDs of a window.
 <context: #return>
 |windowID atoms|
 aWindowOrWindowIDOrNil isView ifTrue:[
-	windowID := aWindowOrWindowIDOrNil id.
+windowID := aWindowOrWindowIDOrNil id.
 ] ifFalse:[
-	windowID := aWindowOrWindowIDOrNil.
+windowID := aWindowOrWindowIDOrNil.
 ].
 %{
 Window window;
 Atom *atomListPtr;
 int i;
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	int numProps = 0;
+int numProps = 0;
-	if (__isExternalAddress(windowID)) {
+if (__isExternalAddress(windowID)) {
-	    window = __WindowVal(windowID);
+window = __WindowVal(windowID);
-	} else if (windowID == nil) {
+} else if (windowID == nil) {
-	    window = DefaultRootWindow(dpy);
+window = DefaultRootWindow(dpy);
-	} else if (__isInteger(windowID)) {
+} else if (__isInteger(windowID)) {
-	    window = (Window)__unsignedLongIntVal(windowID);
+window = (Window)__unsignedLongIntVal(windowID);
-	} else {
+} else {
-	    goto fail;
+goto fail;
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	atomListPtr = XListProperties(dpy, window, &numProps);
+atomListPtr = XListProperties(dpy, window, &numProps);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if (atomListPtr == NULL) {
+if (atomListPtr == NULL) {
-	    RETURN (nil);
+RETURN (nil);
-	}
+}
-	atoms = __ARRAY_NEW_INT(numProps);
+atoms = __ARRAY_NEW_INT(numProps);
-	if (atoms == nil) {
+if (atoms == nil) {
-	    goto fail;
+goto fail;
-	}
+}
-	for (i=0; i<numProps; i++) {
+for (i=0; i<numProps; i++) {
-	    OBJ atm;
+OBJ atm;
-	    atm = __MKATOMOBJ(atomListPtr[i]);
+atm = __MKATOMOBJ(atomListPtr[i]);
-	    __ArrayInstPtr(atoms)->a_element[i] = atm; __STORE(atoms, atm);
+__ArrayInstPtr(atoms)->a_element[i] = atm; __STORE(atoms, atm);
-	}
+}
-	XFree(atomListPtr);
+XFree(atomListPtr);
-	RETURN (atoms);
+RETURN (atoms);
 }
 fail: ;
 %}.
 ^ self primitiveFailed
 Display propertiesOf:nil
 Display propertiesOf:Transcript view id
 "
 "
 (Display propertiesOf:nil) do:[:atm |
-	|v prop|
+|v prop|
-	Transcript show:((Display atomName:atm) printStringLeftPaddedTo:5).
+Transcript show:((Display atomName:atm) printStringLeftPaddedTo:5).
-	Transcript show:': '.
+Transcript show:': '.
-	prop := Display getProperty:atm from:nil delete:false.
+prop := Display getProperty:atm from:nil delete:false.
-	Transcript showCR:prop value.
+Transcript showCR:prop value.
 ]
 "
 !
 setIcon:anIcon for:aWindowID
 |iconAtom typeAtom buffer iWidth iHeight|
 iconAtom := self atomIDOf:#'_NET_WM_ICON' create:false.
 iconAtom isNil ifTrue:[
-	"/Hmm, no such property, not running under EWMH compliant WM?
+"/Hmm, no such property, not running under EWMH compliant WM?
-	^ self
+^ self
 ].
 typeAtom := self atomIDOf:#'CARDINAL' create:false.
 typeAtom isNil ifTrue:[
-	"/Hmm, no such property, not running under EWMH compliant WM?
+"/Hmm, no such property, not running under EWMH compliant WM?
-	^ self
+^ self
 ].
 iWidth  := anIcon width.
 iHeight := anIcon height.
 buffer := IntegerArray new:(iWidth*iHeight+2).
 buffer at:1 put:iWidth.
 buffer at:2 put:iHeight.
 self setProperty:iconAtom type:typeAtom value:buffer for:aWindowID
 "
-	Display setIcon:0 for:0
+Display setIcon:0 for:0
 "
 !
 setProperty:propertyID type:typeID value:anObject for:aWindowID
 "set a property in the XServer"
 retval := false.
 %{  /* UNLIMITEDSTACK */
 if (ISCONNECTED && __isAtomID(propertyID) && __isAtomID(typeID)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	Atom prop, type;
+Atom prop, type;
-	Window window;
+Window window;
-	prop = __AtomVal(propertyID);
+prop = __AtomVal(propertyID);
-	type = __AtomVal(typeID);
+type = __AtomVal(typeID);
-	if (__isExternalAddress(aWindowID)) {
+if (__isExternalAddress(aWindowID)) {
-	    window = __WindowVal(aWindowID);
+window = __WindowVal(aWindowID);
-	} else if (aWindowID == nil) {
+} else if (aWindowID == nil) {
-	    window = DefaultRootWindow(dpy);
+window = DefaultRootWindow(dpy);
-	} else if (__isInteger(aWindowID)) {
+} else if (__isInteger(aWindowID)) {
-	    window = (Window)__unsignedLongIntVal(aWindowID);
+window = (Window)__unsignedLongIntVal(aWindowID);
-	} else {
+} else {
-	    RETURN(false);
+RETURN(false);
-	}
+}
-	retval = true;
+retval = true;
-	ENTER_XLIB();
+ENTER_XLIB();
-	if (__isInteger(anObject)) {
+if (__isInteger(anObject)) {
-	    unsigned INT value = __longIntVal(anObject);
+unsigned INT value = __longIntVal(anObject);
-	    XChangeProperty(dpy, window, prop, type, 32,
+XChangeProperty(dpy, window, prop, type, 32,
-			    PropModeReplace,
+PropModeReplace,
-			    (unsigned char *)&value, 1);
+(unsigned char *)&value, 1);
-	} else if (__isByteArrayLike(anObject)) {
+} else if (__isByteArrayLike(anObject)) {
-	    XChangeProperty(dpy, window, prop, type, 8,
+XChangeProperty(dpy, window, prop, type, 8,
-			    PropModeReplace,
+PropModeReplace,
-			    __byteArrayVal(anObject),
+__byteArrayVal(anObject),
-			    __byteArraySize(anObject));
+__byteArraySize(anObject));
-	} else if (__isWords(anObject)) {
+} else if (__isWords(anObject)) {
-	    /* wordArray-like (16bit-string) object */
+/* wordArray-like (16bit-string) object */
-	    XChangeProperty(dpy, window, prop, type, 16,
+XChangeProperty(dpy, window, prop, type, 16,
-			    PropModeReplace,
+PropModeReplace,
-			    __stringVal(anObject),
+__stringVal(anObject),
-			    __wordArraySize(anObject));
+__wordArraySize(anObject));
-	} else if (__isIntegerArray(anObject)) {
+} else if (__isIntegerArray(anObject)) {
-	    /* array of atoms */
+/* array of atoms */
-	    XChangeProperty(dpy, window, prop, type, 32,
+XChangeProperty(dpy, window, prop, type, 32,
-			    PropModeReplace,
+PropModeReplace,
-			    (char *)__integerArrayVal(anObject),
+(char *)__integerArrayVal(anObject),
-			    __integerArraySize(anObject));
+__integerArraySize(anObject));
-	} else if (__isStringLike(anObject)) {
+} else if (__isStringLike(anObject)) {
-	    XChangeProperty(dpy, window, prop, type, 8,
+XChangeProperty(dpy, window, prop, type, 8,
-			    PropModeReplace,
+PropModeReplace,
-			    __stringVal(anObject),
+__stringVal(anObject),
-			    __stringSize(anObject));
+__stringSize(anObject));
-	} else {
+} else {
-	    retval = false;
+retval = false;
-	}
+}
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	DPRINTF(("changeProp win=%"_lx_" prop=%"_lx_" type=%"_lx_"\n", (INT)window, (INT)prop, (INT)type));
+DPRINTF(("changeProp win=%"_lx_" prop=%"_lx_" type=%"_lx_"\n", (INT)window, (INT)prop, (INT)type));
 }
 %}.
 ^ retval
 ! !
 "the standard monitor is the first entry in monitorBounds"
 extent := self monitorBounds first extent.
 self isPDA ifTrue:[
-	^ extent - (16 @ 20)
+^ extent - (16 @ 20)
 ].
 ^ extent * 2 // 3
 !
 isXineramaActive
 %{  /* NOCONTEXT */
 #ifdef XINERAMA
 if (ISCONNECTED) {
-	Display *dpy;
+Display *dpy;
-	dpy = myDpy;
+dpy = myDpy;
-	if (XineramaIsActive(dpy)) {
+if (XineramaIsActive(dpy)) {
-	    RETURN ( true );
+RETURN ( true );
-	}
+}
 }
 #endif
 %}.
 ^ false
 |atomSymbol atom|
 atomSymbol := aStringOrSymbol asSymbol.
 (atoms notNil and:[(atom := atoms at:atomSymbol ifAbsent:nil) notNil]) ifTrue:[
-	^ atom.
+^ atom.
 ].
 atom := self primAtomIDOf:atomSymbol create:create.
 atom notNil ifTrue:[
-	atoms isNil ifTrue:[
+atoms isNil ifTrue:[
-	    atoms := IdentityDictionary new.
+atoms := IdentityDictionary new.
-	].
+].
-	atoms at:atomSymbol put:atom.
+atoms at:atomSymbol put:atom.
 ].
 ^ atom
 "
 %{
 OBJ str;
 char *name;
 if (ISCONNECTED && __isAtomID(anAtomID)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	name = XGetAtomName(myDpy, __AtomVal(anAtomID));
+name = XGetAtomName(myDpy, __AtomVal(anAtomID));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if (name == 0) {
+if (name == 0) {
-	    RETURN (nil);
+RETURN (nil);
-	}
+}
-	str = __MKSTRING(name);
+str = __MKSTRING(name);
-	XFree(name);
+XFree(name);
-	RETURN ( str );
+RETURN ( str );
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ nil
 "access the displays resource database for a default value
 of name in a resource class.
 This is highly X specific and  currently not used.
 Notice:
-	we do not plan to use X's resources for ST/X's defaults,
+we do not plan to use X's resources for ST/X's defaults,
-	styles or resources. This would make porting of applications
+styles or resources. This would make porting of applications
-	to different platforms much more difficult (Windows has no resource
+to different platforms much more difficult (Windows has no resource
-	database). If you stay within ST/X's resource files, these can be
+database). If you stay within ST/X's resource files, these can be
-	easily transported to other platforms.
+easily transported to other platforms.
 This method is provided for special applications which want to access
 existing X resources and are not planned to be ever ported to other
 platforms."
 if (ISCONNECTED
 && __isStringLike(name)
 && __isStringLike(cls)) {
-	rslt = XGetDefault(myDpy, (char *) __stringVal(cls),
+rslt = XGetDefault(myDpy, (char *) __stringVal(cls),
-				  (char *) __stringVal(name));
+(char *) __stringVal(name));
-	RETURN (rslt ? __MKSTRING(rslt) : nil );
+RETURN (rslt ? __MKSTRING(rslt) : nil );
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ nil.
 "if your ~/.Xdefaults contains an entry such as:
-	OpenWindows.Beep:       notices
+OpenWindows.Beep:       notices
 the following returns 'notices'.
-	 Display getResource:'Beep' class:'OpenWindows'
+Display getResource:'Beep' class:'OpenWindows'
 if your ~/.Xdefaults contains an entry such as:
-	*.beNiceToColormap:       false
+*.beNiceToColormap:       false
 the following return 'false'.
-	 Display getResource:'beNiceToColormap' class:'any'
+Display getResource:'beNiceToColormap' class:'any'
-	 Display getResource:'beNiceToColormap' class:''
+Display getResource:'beNiceToColormap' class:''
 "
 !
 primAtomIDOf:aStringOrSymbol create:create
 "return an Atoms ID; if create is true, create it if not already present.
 Atom prop;
 if (ISCONNECTED
 && __isStringLike(aStringOrSymbol)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	prop = XInternAtom(myDpy, __stringVal(aStringOrSymbol),
+prop = XInternAtom(myDpy, __stringVal(aStringOrSymbol),
-				  (create == true) ? False : True);
+(create == true) ? False : True);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if (prop == None) {
+if (prop == None) {
-	    RETURN (nil);
+RETURN (nil);
-	}
+}
-	RETURN ( __MKATOMOBJ(prop) );
+RETURN ( __MKATOMOBJ(prop) );
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ nil
 in advance, since the X-server is free to return whatever it thinks is a good padding."
 |rawInfo info|
 ((w <= 0) or:[h <= 0]) ifTrue:[
-	self primitiveFailed.
+self primitiveFailed.
-	^ nil
+^ nil
 ].
 rawInfo := Array new:8.
-		  "1 -> bit order"
+"1 -> bit order"
-		  "2 -> depth"
+"2 -> depth"
-		  "3 -> bytes_per_line"
+"3 -> bytes_per_line"
-		  "4 -> byte_order"
+"4 -> byte_order"
-		  "5 -> format"
+"5 -> format"
-		  "6 -> bitmap_unit"
+"6 -> bitmap_unit"
-		  "7 -> bitmap_pad"
+"7 -> bitmap_pad"
-		  "8 -> bits_per_pixel"
+"8 -> bits_per_pixel"
 "/ had to extract the getPixel call into a separate method, to specify
 "/ unlimitedStack (some implementations use alloca and require huge amounts
 "/ of temporary stack space
 (self primGetBitsFrom:aDrawableId x:srcx y:srcy width:w height:h into:imageBits infoInto:rawInfo) ifTrue:[
-	info := IdentityDictionary new.
+info := IdentityDictionary new.
-	info at:#bitOrder put:(rawInfo at:1).
+info at:#bitOrder put:(rawInfo at:1).
-	info at:#depth put:(rawInfo at:2).
+info at:#depth put:(rawInfo at:2).
-	info at:#bytesPerLine put:(rawInfo at:3).
+info at:#bytesPerLine put:(rawInfo at:3).
-	info at:#byteOrder put:(rawInfo at:4).
+info at:#byteOrder put:(rawInfo at:4).
-	info at:#format put:(rawInfo at:5).
+info at:#format put:(rawInfo at:5).
-	info at:#bitmapUnit put:(rawInfo at:6).
+info at:#bitmapUnit put:(rawInfo at:6).
-	info at:#bitmapPad put:(rawInfo at:7).
+info at:#bitmapPad put:(rawInfo at:7).
-	info at:#bitsPerPixel put:(rawInfo at:8).
+info at:#bitsPerPixel put:(rawInfo at:8).
-	^ info
+^ info
 ].
 "
 some error occured - either args are not smallintegers, imageBits is not a ByteArray
 or is too small to hold the bits
 "
 int ret;
 int xpos, ypos;
 if (ISCONNECTED
 && __isExternalAddress(aDrawableId) && __bothSmallInteger(x, y)) {
-	win = __WindowVal(aDrawableId);
+win = __WindowVal(aDrawableId);
-	xpos = __intVal(x);
+xpos = __intVal(x);
-	ypos = __intVal(y);
+ypos = __intVal(y);
-	if ((xpos < 0) || (ypos < 0)) {
+if ((xpos < 0) || (ypos < 0)) {
-	    RETURN ( __MKSMALLINT(0) );
+RETURN ( __MKSMALLINT(0) );
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	img = XGetImage(myDpy, win, xpos, ypos, 1, 1, (unsigned)~0, ZPixmap);
+img = XGetImage(myDpy, win, xpos, ypos, 1, 1, (unsigned)~0, ZPixmap);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if (img != 0) {
+if (img != 0) {
-	    ret = XGetPixel(img, 0, 0);
+ret = XGetPixel(img, 0, 0);
-	    XDestroyImage(img);
+XDestroyImage(img);
-	    RETURN (  __MKSMALLINT(ret) );
+RETURN (  __MKSMALLINT(ret) );
-	}
+}
 }
 %}.
 ^ nil
 !
 && __isExternalAddress(aDrawableId)
 && __bothSmallInteger(srcx, srcy)
 && __bothSmallInteger(w, h)
 && __isArray(info)
 && __isByteArray(imageBits)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	win = __WindowVal(aDrawableId);
+win = __WindowVal(aDrawableId);
-	ENTER_XLIB();
+ENTER_XLIB();
-	image = XGetImage(dpy, win, __intVal(srcx), __intVal(srcy),
+image = XGetImage(dpy, win, __intVal(srcx), __intVal(srcy),
-				    __intVal(w), __intVal(h),
+__intVal(w), __intVal(h),
-				    (unsigned)AllPlanes, ZPixmap);
+(unsigned)AllPlanes, ZPixmap);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if (! image) {
+if (! image) {
-	    RETURN ( false );
+RETURN ( false );
-	}
+}
-	pad = image->bitmap_pad;
+pad = image->bitmap_pad;
 #ifdef SUPERDEBUG
-	console_printf("pad:%d depth:%d\n", image->bitmap_pad, image->depth);
+console_printf("pad:%d depth:%d\n", image->bitmap_pad, image->depth);
 #endif
-	switch (image->depth) {
+switch (image->depth) {
-	    case 1:
+case 1:
-	    case 2:
+case 2:
-	    case 4:
+case 4:
-	    case 8:
+case 8:
-	    case 16:
+case 16:
-	    case 24:
+case 24:
-	    case 32:
+case 32:
-		numBytes = image->bytes_per_line * image->height;
+numBytes = image->bytes_per_line * image->height;
-		break;
+break;
-	    default:
+default:
-		/* unsupported depth ? */
+/* unsupported depth ? */
-		console_fprintf(stderr, "possibly unsupported depth:%d in primGetBits\n", image->depth);
+console_fprintf(stderr, "possibly unsupported depth:%d in primGetBits\n", image->depth);
-		numBytes = image->bytes_per_line * image->height;
+numBytes = image->bytes_per_line * image->height;
-		break;
+break;
-	}
+}
 #ifdef SUPERDEBUG
-	console_printf("bytes need:%d bytes given:%d\n", numBytes, __byteArraySize(imageBits));
+console_printf("bytes need:%d bytes given:%d\n", numBytes, __byteArraySize(imageBits));
 #endif
-	if (numBytes > __byteArraySize(imageBits)) {
+if (numBytes > __byteArraySize(imageBits)) {
-	    /* imageBits too small */
+/* imageBits too small */
-	    console_fprintf(stderr, "Workstation [warning]: byteArray too small in primGetBits\n");
+console_fprintf(stderr, "Workstation [warning]: byteArray too small in primGetBits\n");
-	    console_fprintf(stderr, "  bytes need:%d given:%d\n", numBytes, (int)__byteArraySize(imageBits));
+console_fprintf(stderr, "  bytes need:%d given:%d\n", numBytes, (int)__byteArraySize(imageBits));
-	    console_fprintf(stderr, "  pad:%d depth:%d imgBytesPerLine:%d\n",
+console_fprintf(stderr, "  pad:%d depth:%d imgBytesPerLine:%d\n",
-				image->bitmap_pad, image->depth, image->bytes_per_line);
+image->bitmap_pad, image->depth, image->bytes_per_line);
-	    goto fail;
+goto fail;
-	}
+}
-	if (image->bitmap_bit_order == MSBFirst)
+if (image->bitmap_bit_order == MSBFirst)
-	    __ArrayInstPtr(info)->a_element[0] = @symbol(msbFirst);
+__ArrayInstPtr(info)->a_element[0] = @symbol(msbFirst);
-	else
+else
-	    __ArrayInstPtr(info)->a_element[0] = @symbol(lsbFirst);
+__ArrayInstPtr(info)->a_element[0] = @symbol(lsbFirst);
-	__ArrayInstPtr(info)->a_element[1] = __MKSMALLINT(image->depth);
+__ArrayInstPtr(info)->a_element[1] = __MKSMALLINT(image->depth);
-	__ArrayInstPtr(info)->a_element[2] = __MKSMALLINT(image->bytes_per_line);
+__ArrayInstPtr(info)->a_element[2] = __MKSMALLINT(image->bytes_per_line);
-	if (image->byte_order == MSBFirst)
+if (image->byte_order == MSBFirst)
-	    __ArrayInstPtr(info)->a_element[3] = @symbol(msbFirst);
+__ArrayInstPtr(info)->a_element[3] = @symbol(msbFirst);
-	else
+else
-	    __ArrayInstPtr(info)->a_element[3] = @symbol(lsbFirst);
+__ArrayInstPtr(info)->a_element[3] = @symbol(lsbFirst);
-	if (image->format == XYBitmap)
+if (image->format == XYBitmap)
-	    __ArrayInstPtr(info)->a_element[4] = @symbol(XYBitmap);
+__ArrayInstPtr(info)->a_element[4] = @symbol(XYBitmap);
-	else if (image->format == XYPixmap)
+else if (image->format == XYPixmap)
-	    __ArrayInstPtr(info)->a_element[4] = @symbol(XYPixmap);
+__ArrayInstPtr(info)->a_element[4] = @symbol(XYPixmap);
-	else if (image->format == ZPixmap)
+else if (image->format == ZPixmap)
-	    __ArrayInstPtr(info)->a_element[4] = @symbol(ZPixmap);
+__ArrayInstPtr(info)->a_element[4] = @symbol(ZPixmap);
-	__ArrayInstPtr(info)->a_element[5] = __MKSMALLINT(image->bitmap_unit);
+__ArrayInstPtr(info)->a_element[5] = __MKSMALLINT(image->bitmap_unit);
-	__ArrayInstPtr(info)->a_element[6] = __MKSMALLINT(image->bitmap_pad);
+__ArrayInstPtr(info)->a_element[6] = __MKSMALLINT(image->bitmap_pad);
-	__ArrayInstPtr(info)->a_element[7] = __MKSMALLINT(image->bits_per_pixel);
+__ArrayInstPtr(info)->a_element[7] = __MKSMALLINT(image->bits_per_pixel);
-	bcopy(image->data, __ByteArrayInstPtr(imageBits)->ba_element, numBytes);
+bcopy(image->data, __ByteArrayInstPtr(imageBits)->ba_element, numBytes);
-	XDestroyImage(image);
+XDestroyImage(image);
-	RETURN ( true );
+RETURN ( true );
 }
 fail:
 if (image) {
-	XDestroyImage(image);
+XDestroyImage(image);
 }
 %}.
 ^ false
 ! !
 |selectionOwnerWindowId selection|
 selectionOwnerWindowId := self getSelectionOwnerOf:clipboardAtom.
 selectionOwnerWindowId isNil ifTrue:[
-	"no selection. There is the possibilty that one of our (modal)
+"no selection. There is the possibilty that one of our (modal)
-	 views has been closed. Get the selection from the copyBuffer"
+views has been closed. Get the selection from the copyBuffer"
-	^ copyBuffer.
+^ copyBuffer.
 ].
 selectionOwnerWindowId = selectionOwner ifTrue:[
-	"I still hold the selection, so return my locally buffered data"
+"I still hold the selection, so return my locally buffered data"
-	^ copyBuffer
+^ copyBuffer
 ].
 drawableId notNil ifTrue:[
-	"sorry, cannot fetch a selection, if there is no drawableId.
+"sorry, cannot fetch a selection, if there is no drawableId.
-	 Should I borrow a drawableId from another window?"
+Should I borrow a drawableId from another window?"
-	selection := SelectionFetcher
+selection := SelectionFetcher
-	    requestSelection:clipboardAtom
+requestSelection:clipboardAtom
-	    type:(self atomIDOf:#'ST_OBJECT')
+type:(self atomIDOf:#'ST_OBJECT')
-	    onDevice:self for:drawableId.
+onDevice:self for:drawableId.
-	"/ should not happen
+"/ should not happen
 false ifTrue:[
-	"/ cg: disabled the code below: I don't want any string here (when asking for an object)
+"/ cg: disabled the code below: I don't want any string here (when asking for an object)
-	selection isEmptyOrNil ifTrue:[
+selection isEmptyOrNil ifTrue:[
-	    selection := SelectionFetcher
+selection := SelectionFetcher
-		requestSelection:clipboardAtom
+requestSelection:clipboardAtom
-		type:(self atomIDOf:#'UTF8_STRING')
+type:(self atomIDOf:#'UTF8_STRING')
-		onDevice:self for:drawableId.
+onDevice:self for:drawableId.
-	    selection isNil ifTrue:[
+selection isNil ifTrue:[
-		selection := SelectionFetcher
+selection := SelectionFetcher
-		    requestSelection:clipboardAtom
+requestSelection:clipboardAtom
-		    type:(self atomIDOf:#STRING)
+type:(self atomIDOf:#STRING)
-		    onDevice:self for:drawableId.
+onDevice:self for:drawableId.
-	    ].
+].
-	].
+].
 ].
 ].
 selection isEmptyOrNil ifTrue:[ ^ copyBuffer ].
 ^ selection.
 Returns nil, if no selection is available"
 |selectionId selectionOwnerWindowId selection|
 selectionBufferSymbol == #selection ifTrue:[
-	selectionId := primaryAtom.
+selectionId := primaryAtom.
 ] ifFalse:[
-	selectionId := clipboardAtom.
+selectionId := clipboardAtom.
 ].
 selectionOwnerWindowId := self getSelectionOwnerOf:selectionId.
 selectionOwnerWindowId isNil ifTrue:[
-	"no selection. There is the possibilty that one of our (modal)
+"no selection. There is the possibilty that one of our (modal)
-	 views has been closed. Get the selection from the copyBuffer"
+views has been closed. Get the selection from the copyBuffer"
-	^ self copyBufferAsString.
+^ self copyBufferAsString.
 ].
 selectionOwnerWindowId = selectionOwner ifTrue:[
-	"I still hold the selection, so return my locally buffered data"
+"I still hold the selection, so return my locally buffered data"
-	"JV@2012-04-02: Added support for PRIMARY/SELECTION buffers."
+"JV@2012-04-02: Added support for PRIMARY/SELECTION buffers."
-	^ selectionId == primaryAtom ifTrue:[
+^ selectionId == primaryAtom ifTrue:[
-	    self primaryBufferAsString
+self primaryBufferAsString
-	] ifFalse:[
+] ifFalse:[
-	    self copyBufferAsString.
+self copyBufferAsString.
-	]
+]
 ].
 drawableId notNil ifTrue:[
-	"sorry, cannot fetch a selection, if there is no drawableId.
+"sorry, cannot fetch a selection, if there is no drawableId.
-	 Should I borrow a drawableId from another window?"
+Should I borrow a drawableId from another window?"
-	selection := SelectionFetcher
+selection := SelectionFetcher
-	    requestSelection:selectionId
+requestSelection:selectionId
-	    type:(self atomIDOf:#'UTF8_STRING')
+type:(self atomIDOf:#'UTF8_STRING')
-	    onDevice:self for:drawableId.
+onDevice:self for:drawableId.
-	selection isNil ifTrue:[
+selection isNil ifTrue:[
-	    selection := SelectionFetcher
+selection := SelectionFetcher
-		requestSelection:selectionId
+requestSelection:selectionId
-		type:(self atomIDOf:#STRING)
+type:(self atomIDOf:#STRING)
-		onDevice:self for:drawableId.
+onDevice:self for:drawableId.
-	].
+].
 ].
 ^ selection
 "
 "Modified: / 02-04-2012 / 10:34:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !XWorkstation methodsFor:'selection sending'!
-copyBufferAs:aTargetAtom
+selectionBuffer:bufferGetSelector as:aTargetAtomID
 "convert the current selection to the format defined by aTargetAtom.
-Answer the converted selection"
+Answer an association with the type of converted selection (an atomID)
+and the converted selection"
-(aTargetAtom == (self atomIDOf:#STRING)) ifTrue:[
-	"/ 'string' printCR.
+|buffer bufferAsString|
-	"the other view wants the selection as string"
-	^ self copyBufferAsString.
+buffer := self perform:bufferGetSelector.
-].
+(aTargetAtomID == (self atomIDOf:#'ST_OBJECT')) ifTrue:[
-(aTargetAtom == (self atomIDOf:#UTF8_STRING)) ifTrue:[
+"/ 'st-object' printCR.
-	"/ 'utf string' printCR.
+"send the selection in binaryStore format"
-	"the other view wants the selection as utf8 string"
+"require libboss to be loaded"
-	^ self copyBufferAsString utf8Encoded.
+(Smalltalk isClassLibraryLoaded:'libstx_libboss') ifFalse:[
-].
+'XWorkstation: cannot use binary store for copy buffer (libboss missing)' errorPrintCR.
+^ nil -> nil.
-(aTargetAtom == (self atomIDOf:#TIMESTAMP)) ifTrue:[
+].
-	"the other view wants to know when we acquired ownership of the selection"
-	^ selectionTime.
+[
-].
+^ aTargetAtomID -> (buffer binaryStoreBytes).
+] on:Error do:[:ex|
-(aTargetAtom == (self atomIDOf:#TARGETS)) ifTrue:[
+'XWorkstation: error on binary store of copy buffer: ' errorPrint.
-	"the other view wants to know which targets we support"
+ex description errorPrintCR.
-	^ self supportedTargetAtoms.
+^ nil.
 ].
+].
-(aTargetAtom == (self atomIDOf:#'ST_OBJECT')) ifTrue:[
-	"/ 'st-object' printCR.
+bufferAsString := self class bufferAsString:buffer.
-	"send the selection in binaryStore format"
-	"require libboss to be loaded"
+(aTargetAtomID == (self atomIDOf:#STRING)
-	(Smalltalk isClassLibraryLoaded:'libstx_libboss') ifFalse:[
+or:[aTargetAtomID == (self atomIDOf:#'text/plain')]
-	    'XWorkstation: cannot use binary store for copy buffer (libboss missing)' errorPrintCR.
+) ifTrue:[
-	    ^ nil
+"/ 'string' printCR.
-	].
+"the other view wants the selection as string"
+^ aTargetAtomID -> (bufferAsString asSingleByteStringReplaceInvalidWith:$#).
-	[
+].
-	    ^ self getCopyBuffer binaryStoreBytes.
-	] on:Error do:[:ex|
+(aTargetAtomID == (self atomIDOf:#UTF8_STRING)
-	    'XWorkstation: error on binary store of copy buffer: ' errorPrint.
+or:[aTargetAtomID == (self atomIDOf:#'text/plain;codeset=utf-8')]
-	    ex description errorPrintCR.
+) ifTrue:[
-	    ^ nil.
+"/ 'utf string' printCR.
-	].
+"the other view wants the selection as utf8 string"
-].
+^ aTargetAtomID -> (bufferAsString utf8Encoded).
+].
-aTargetAtom == (self atomIDOf:#LENGTH) ifTrue:[
-	"the other one wants to know the size of our selection.
+aTargetAtomID == (self atomIDOf:#LENGTH) ifTrue:[
-	 LENGTH is deprecated, since we do not know how the selection is
+"the other one wants to know the size of our selection.
-	 going to be converted. The client must not rely on the length returned"
+LENGTH is deprecated, since we do not know how the selection is
+going to be converted. The client must not rely on the length returned"
-	^ self copyBufferAsString size
+^ (self atomIDOf:#INTEGER) -> (bufferAsString size).
 ].
 "we do not support the requestet target type"
-^ nil.
+^ nil -> nil.
 "Modified: / 23-08-2006 / 15:56:08 / cg"
-!
-primaryBufferAs:aTargetAtom
-"convert the current selection to the format defined by aTargetAtom.
-Answer the converted selection"
-(aTargetAtom == (self atomIDOf:#STRING)) ifTrue:[
-	"the other view wants the selection as string"
-	^ self primaryBufferAsString.
-].
-(aTargetAtom == (self atomIDOf:#UTF8_STRING)) ifTrue:[
-	"the other view wants the selection as utf8 string"
-	^ self primaryBufferAsString utf8Encoded.
-].
-(aTargetAtom == (self atomIDOf:#TIMESTAMP)) ifTrue:[
-	"the other view wants to know when we acquired ownership of the selection"
-	^ selectionTime.
-].
-(aTargetAtom == (self atomIDOf:#TARGETS)) ifTrue:[
-	"the other view wants to know which targets we support"
-	^ self supportedTargetAtoms copyWithoutFirst "/we do not support ST_OBJECT in primary
-].
-aTargetAtom == (self atomIDOf:#LENGTH) ifTrue:[
-	"the other one wants to know the size of our selection.
-	 LENGTH is deprecated, since we do not know how the selection is
-	 going to be converted. The client must not rely on the length returned"
-	^ self primaryBufferAsString size
-].
-"we do not support the requestet target type"
-^ nil.
-"Modified: / 23-08-2006 / 15:56:08 / cg"
-"Created: / 27-03-2012 / 14:49:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 setClipboardObject:anObject owner:aWindowId
 "set the object selection, and make aWindowId be the owner.
 This can be used by other Smalltalk(X) applications only.
 We set only the CLIPBOARD selection"
-selectionTime := lastEventTime.
+clipboardSelectionTime := lastEventTime.
-self setSelectionOwner:aWindowId of:clipboardAtom time:selectionTime
+self setSelectionOwner:aWindowId of:clipboardAtom time:clipboardSelectionTime
 !
 setClipboardText:aString owner:aWindowId
 "set the text selection, and make aWindowId be the owner.
 This can be used by any other X application.
 We set both the PRIMARY and CLIPBOARD, so that you can paste
 into xterm."
-selectionTime := lastEventTime.
+clipboardSelectionTime := primarySelectionTime := lastEventTime.
-self setSelectionOwner:aWindowId of:clipboardAtom time:selectionTime.
+self setSelectionOwner:aWindowId of:clipboardAtom time:clipboardSelectionTime.
-self setSelectionOwner:aWindowId of:primaryAtom time:selectionTime.
+self setSelectionOwner:aWindowId of:primaryAtom time:primarySelectionTime.
 "Modified: / 17.6.1998 / 19:48:54 / cg"
 !
 setPrimaryText:aString owner:aWindowId
 "set the PRIMARY selection, and make aWindowId be the owner.
 This can be used by any other X application when middle-click
 pasting. X Window specific."
-selectionTime := lastEventTime.
+primarySelectionTime := lastEventTime.
-self setSelectionOwner:aWindowId of:primaryAtom time:selectionTime.
+self setSelectionOwner:aWindowId of:primaryAtom time:primarySelectionTime.
 "Created: / 27-03-2012 / 14:16:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 supportedTargetAtoms
 "answer an integer array containing the list of supported targets
 i.e. supported clipboard formats"
-|supportedTargets numericTargetArray|
 "Note: some sender code assumes that ST_OBJECT is first"
-supportedTargets := #(ST_OBJECT STRING UTF8_STRING TIMESTAMP TARGETS LENGTH).
+^ #(ST_OBJECT STRING UTF8_STRING TIMESTAMP TARGETS LENGTH
+#'text/plain' #'text/plain;codeset=utf-8'
-numericTargetArray := IntegerArray new:supportedTargets size.
+) collect:[:eachTargetSymbol|
-supportedTargets keysAndValuesDo:[:index :targetSymbol|
+self atomIDOf:eachTargetSymbol
-numericTargetArray at:index put:(self atomIDOf:targetSymbol)
+] as:IntegerArray.
-].
-^ numericTargetArray
 ! !
 !XWorkstation methodsFor:'selections-basic'!
 getSelectionOwnerOf:selectionAtomSymbolOrID
 <context:#return>
 |selectionAtomID|
 selectionAtomSymbolOrID isString ifTrue:[
-	selectionAtomID := self atomIDOf:selectionAtomSymbolOrID create:false.
+selectionAtomID := self atomIDOf:selectionAtomSymbolOrID create:false.
 ] ifFalse:[
-	selectionAtomID := selectionAtomSymbolOrID.
+selectionAtomID := selectionAtomSymbolOrID.
 ].
 %{
 Window window;
 if (__isAtomID(selectionAtomID) && ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	ENTER_XLIB();
+ENTER_XLIB();
-	window = XGetSelectionOwner(dpy, __AtomVal(selectionAtomID));
+window = XGetSelectionOwner(dpy, __AtomVal(selectionAtomID));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ((window == None) ? nil : __MKEXTERNALADDRESS(window));
+RETURN ((window == None) ? nil : __MKEXTERNALADDRESS(window));
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ nil
 !
 if (ISCONNECTED
 && __isAtomID(typeID)
 && __isAtomID(propertyID)
 && __isAtomID(selectionID)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	Window w;
+Window w;
-	Time time;
+Time time;
-	if (__isExternalAddress(aWindowId)) {
+if (__isExternalAddress(aWindowId)) {
-	    w = __WindowVal(aWindowId);
+w = __WindowVal(aWindowId);
-	} else if (aWindowId == nil) {
+} else if (aWindowId == nil) {
-	    w = (Window)0;
+w = (Window)0;
-	} else
+} else
-	    goto err;
+goto err;
-	if (anIntegerTimestamp == nil) {
+if (anIntegerTimestamp == nil) {
-	    /*
+/*
-	     * the ICCCM convention says: you should set the time to the time when
+* the ICCCM convention says: you should set the time to the time when
-	     * the selection was requested and not to CurrentTime
+* the selection was requested and not to CurrentTime
-	     */
+*/
-	    time = CurrentTime;
+time = CurrentTime;
-	} else if (__isInteger(anIntegerTimestamp)) {
+} else if (__isInteger(anIntegerTimestamp)) {
-	    time = __unsignedLongIntVal(anIntegerTimestamp);
+time = __unsignedLongIntVal(anIntegerTimestamp);
-	} else
+} else
-	    goto err;
+goto err;
-	ENTER_XLIB();
+ENTER_XLIB();
-	XConvertSelection(dpy, __AtomVal(selectionID), __AtomVal(typeID),
+XConvertSelection(dpy, __AtomVal(selectionID), __AtomVal(typeID),
-			       __AtomVal(propertyID), w, time);
+__AtomVal(propertyID), w, time);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN (true);
+RETURN (true);
 err:;
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ false
 "
 Display
-	requestSelection:(Display atomIDOf:'PRIMARY')
+requestSelection:(Display atomIDOf:'PRIMARY')
-	property:(Display atomIDOf:'VT_SELECTION')
+property:(Display atomIDOf:'VT_SELECTION')
-	type:(Display atomIDOf:'STRING')
+type:(Display atomIDOf:'STRING')
-	for:Transcript id
+for:Transcript id
 "
 "
 Display
-	requestSelection:(Display atomIDOf:'PRIMARY')
+requestSelection:(Display atomIDOf:'PRIMARY')
-	property:(Display atomIDOf:'VT_SELECTION')
+property:(Display atomIDOf:'VT_SELECTION')
-	type:(Display atomIDOf:'C_STRING')
+type:(Display atomIDOf:'C_STRING')
-	for:Transcript id
+for:Transcript id
 "
 !
 sendNotifySelection:selectionID property:propertyID target:targetID time:aTime to:requestorID
 "send a selectionNotify back from a SelectionRequest.
 Time should be the time when the selection has been acquired"
 <context: #return>
 %{
 if (ISCONNECTED
-	&& (__isAtomID(propertyID) || propertyID == nil)
+&& (__isAtomID(propertyID) || propertyID == nil)
-	&& __isAtomID(targetID) && __isAtomID(selectionID)) {
+&& __isAtomID(targetID) && __isAtomID(selectionID)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	XEvent ev;
+XEvent ev;
-	Window requestor;
+Window requestor;
-	Status result;
+Status result;
-	if (__isExternalAddress(requestorID)) {
+if (__isExternalAddress(requestorID)) {
-	    requestor = __WindowVal(requestorID);
+requestor = __WindowVal(requestorID);
-	} else if (__isSmallInteger(requestorID)) {
+} else if (__isSmallInteger(requestorID)) {
-	    requestor = (Window)__smallIntegerVal(requestorID);
+requestor = (Window)__smallIntegerVal(requestorID);
-	} else if (requestorID == nil) {
+} else if (requestorID == nil) {
-	    requestor = DefaultRootWindow(dpy);
+requestor = DefaultRootWindow(dpy);
-	} else {
+} else {
-	    requestor = (Window)__unsignedLongIntVal(requestorID);
+requestor = (Window)__unsignedLongIntVal(requestorID);
-	}
+}
-	ev.xselection.type = SelectionNotify;
+ev.xselection.type = SelectionNotify;
-	ev.xselection.display = dpy;
+ev.xselection.display = dpy;
-	ev.xselection.selection = __AtomVal(selectionID);
+ev.xselection.selection = __AtomVal(selectionID);
-	ev.xselection.target = __AtomVal(targetID);
+ev.xselection.target = __AtomVal(targetID);
-	ev.xselection.requestor = requestor;
+ev.xselection.requestor = requestor;
-	if (__isExternalAddress(aTime)) {
+if (__isExternalAddress(aTime)) {
-	    ev.xselection.time = (INT)(__externalAddressVal(aTime));
+ev.xselection.time = (INT)(__externalAddressVal(aTime));
-	} else if (__isSmallInteger(aTime)) {
+} else if (__isSmallInteger(aTime)) {
-	    ev.xselection.time = __smallIntegerVal(aTime);
+ev.xselection.time = __smallIntegerVal(aTime);
-	} else if (aTime == nil) {
+} else if (aTime == nil) {
-	    ev.xselection.time = CurrentTime;
+ev.xselection.time = CurrentTime;
-	} else {
+} else {
-	    ev.xselection.time = (INT)__unsignedLongIntVal(aTime);
+ev.xselection.time = (INT)__unsignedLongIntVal(aTime);
-	}
+}
 #if 0
-	console_printf("ev.xselection.selection: %x\n", ev.xselection.selection);
+console_printf("ev.xselection.selection: %x\n", ev.xselection.selection);
-	console_printf("ev.xselection.target: %x\n", ev.xselection.target);
+console_printf("ev.xselection.target: %x\n", ev.xselection.target);
-	console_printf("ev.xselection.requestor: %x\n", ev.xselection.requestor);
+console_printf("ev.xselection.requestor: %x\n", ev.xselection.requestor);
-	console_printf("ev.xselection.time: %x\n", ev.xselection.time);
+console_printf("ev.xselection.time: %x\n", ev.xselection.time);
-	console_printf("requestor: %x\n", requestor);
+console_printf("requestor: %x\n", requestor);
 #endif
-	/* send nil property if selection cannot be converted */
+/* send nil property if selection cannot be converted */
-	if (propertyID == nil)
+if (propertyID == nil)
-	    ev.xselection.property = None;
+ev.xselection.property = None;
-	else
+else
-	    ev.xselection.property = __AtomVal(propertyID);
+ev.xselection.property = __AtomVal(propertyID);
-	DPRINTF(("sending SelectionNotify sel=%"_lx_" prop=%"_lx_" target=%"_lx_" requestor=%"_lx_" to %"_lx_"\n",
+DPRINTF(("sending SelectionNotify sel=%"_lx_" prop=%"_lx_" target=%"_lx_" requestor=%"_lx_" to %"_lx_"\n",
-		(INT)ev.xselection.selection,
+(INT)ev.xselection.selection,
-		(INT)ev.xselection.property,
+(INT)ev.xselection.property,
-		(INT)ev.xselection.target,
+(INT)ev.xselection.target,
-		(INT)ev.xselection.requestor,
+(INT)ev.xselection.requestor,
-		(INT)requestor));
+(INT)requestor));
-	ENTER_XLIB();
+ENTER_XLIB();
-	result = XSendEvent(dpy, requestor, False, 0 , &ev);
+result = XSendEvent(dpy, requestor, False, 0 , &ev);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if ((result == BadValue) || (result == BadWindow)) {
+if ((result == BadValue) || (result == BadWindow)) {
-	    DPRINTF(("bad status\n"));
+DPRINTF(("bad status\n"));
-	    RETURN (false);
+RETURN (false);
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	XFlush(dpy);
+XFlush(dpy);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN (true)
+RETURN (true)
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ false
 we can avoid the X11 overhead"
 selectionOwner := aWindowId.
 selectionAtomSymbolOrID isString ifTrue:[
-	selectionAtomID := self atomIDOf:selectionAtomSymbolOrID create:false.
+selectionAtomID := self atomIDOf:selectionAtomSymbolOrID create:false.
 ] ifFalse:[
-	selectionAtomID := selectionAtomSymbolOrID.
+selectionAtomID := selectionAtomSymbolOrID.
 ].
 %{
 Window win;
 if (__isExternalAddress(aWindowId)
 && __isAtomID(selectionAtomID)
 && ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	Time time;
+Time time;
-	win = __WindowVal(aWindowId);
+win = __WindowVal(aWindowId);
-	if (anIntegerTimestamp == nil) {
+if (anIntegerTimestamp == nil) {
-	    /*
+/*
-	     * the ICCCM convention says: you should set the time to the time when
+* the ICCCM convention says: you should set the time to the time when
-	     * the selection was acquired and not to CurrentTime
+* the selection was acquired and not to CurrentTime
-	     */
+*/
-	    time = CurrentTime;
+time = CurrentTime;
-	} else if (__isInteger(anIntegerTimestamp)) {
+} else if (__isInteger(anIntegerTimestamp)) {
-	    time = __unsignedLongIntVal(anIntegerTimestamp);
+time = __unsignedLongIntVal(anIntegerTimestamp);
-	} else
+} else
-	    goto err;
+goto err;
-	DPRINTF(("setOwner prop=%"_lx_" win=%"_lx_"\n", (INT)__AtomVal(selectionAtomID), (INT)win));
+DPRINTF(("setOwner prop=%"_lx_" win=%"_lx_"\n", (INT)__AtomVal(selectionAtomID), (INT)win));
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetSelectionOwner(dpy, __AtomVal(selectionAtomID), win, time);
+XSetSelectionOwner(dpy, __AtomVal(selectionAtomID), win, time);
-	RETURN (self);
+RETURN (self);
-	LEAVE_XLIB();
+LEAVE_XLIB();
 }
 err:;
 %}.
 self primitiveFailedOrClosedConnection.
 ! !
 |childIDs allChildIDs|
 allChildIDs := OrderedCollection new.
 childIDs := self childIdsOf:aWindowId.
 childIDs notNil ifTrue:[
-	allChildIDs addAll:childIDs.
+allChildIDs addAll:childIDs.
-	childIDs do:[:eachChildId |
+childIDs do:[:eachChildId |
-	    allChildIDs addAll:(self allChildIdsOf:eachChildId).
+allChildIDs addAll:(self allChildIdsOf:eachChildId).
-	].
+].
 ].
 ^ allChildIDs
 "
 Display allChildIdsOf:(Display rootWindowId)
 |deviceIDAtom uuidAtom|
 deviceIDAtom := (Display atomIDOf:#'STX_DEVICE_ID').
 uuidAtom     := (Display atomIDOf:#'UUID').
 (Display allChildIdsOf:(Display rootWindowId))
-	select:[:id |
+select:[:id |
-	    |uuid|
+|uuid|
-	    Display
+Display
-		getProperty:deviceIDAtom
+getProperty:deviceIDAtom
-		from:id
+from:id
-		delete:false
+delete:false
-		into:[:type :value |
+into:[:type :value |
-		    type == uuidAtom ifTrue:[
+type == uuidAtom ifTrue:[
-			uuid := UUID fromBytes:value.
+uuid := UUID fromBytes:value.
-		    ].
+].
-		].
+].
-	    uuid notNil.
+uuid notNil.
-	]
+]
 "
 !
 childIdsOf:aWindowId
 "return all children-ids of the given window. Allows for all windows to be
 %{
 OBJ id;
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	Window win = __WindowVal(aWindowId);
+Window win = __WindowVal(aWindowId);
-	Window rootReturn, parentReturn;
+Window rootReturn, parentReturn;
-	Window* children = (Window *)0;
+Window* children = (Window *)0;
-	unsigned int numChildren;
+unsigned int numChildren;
-	int i;
+int i;
-	int rslt;
+int rslt;
-	ENTER_XLIB();
+ENTER_XLIB();
-	rslt = XQueryTree(dpy, win,
+rslt = XQueryTree(dpy, win,
-		       &rootReturn, &parentReturn,
+&rootReturn, &parentReturn,
-		       &children, &numChildren);
+&children, &numChildren);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	if (rslt) {
+if (rslt) {
-	    childIdArray = __ARRAY_NEW_INT(numChildren);
+childIdArray = __ARRAY_NEW_INT(numChildren);
-	    if (childIdArray != nil) {
+if (childIdArray != nil) {
-		for (i=0; i < numChildren; i++) {
+for (i=0; i < numChildren; i++) {
-		    if (children[i]) {
+if (children[i]) {
-			OBJ childId;
+OBJ childId;
-			childId = __MKEXTERNALADDRESS(children[i]);
+childId = __MKEXTERNALADDRESS(children[i]);
-			__ArrayInstPtr(childIdArray)->a_element[i] = childId;
+__ArrayInstPtr(childIdArray)->a_element[i] = childId;
-			__STORE(childIdArray, childId);
+__STORE(childIdArray, childId);
-		    }
+}
-		}
+}
-		if (children) XFree(children);
+if (children) XFree(children);
-	    }
+}
-	    RETURN (childIdArray);
+RETURN (childIdArray);
-	}
+}
 }
 %}.
 ^ nil.
 "
 int screen = __intVal(__INST(screen));
 Window root;
 OBJ id;
 if (__INST(rootId) != nil) {
-	RETURN (__INST(rootId));
+RETURN (__INST(rootId));
 }
 if (ISCONNECTED) {
-	root = RootWindow(myDpy, screen);
+root = RootWindow(myDpy, screen);
-	if (! root) {
+if (! root) {
-	    id = nil;
+id = nil;
-	} else {
+} else {
-	    id = __MKEXTERNALADDRESS(root); __INST(rootId) = id; __STORE(self, id);
+id = __MKEXTERNALADDRESS(root); __INST(rootId) = id; __STORE(self, id);
-	}
+}
-	RETURN (id);
+RETURN (id);
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ nil
 int screen = __intVal(__INST(screen));
 Window rootWin, vRootWin = 0;
 OBJ id;
 if (__INST(virtualRootId) != nil) {
-	RETURN (__INST(virtualRootId));
+RETURN (__INST(virtualRootId));
 }
 if (ISCONNECTED) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	rootWin = RootWindow(dpy, screen);
+rootWin = RootWindow(dpy, screen);
 #ifndef IRIS
-	/*
+/*
-	 * on IRIS, this creates a badwindow error - why ?
+* on IRIS, this creates a badwindow error - why ?
-	 * children contains a funny window (000034)
+* children contains a funny window (000034)
-	 */
+*/
-	/*
+/*
-	 * care for virtual root windows (tvtwm & friends)
+* care for virtual root windows (tvtwm & friends)
-	 */
+*/
-	{
+{
-	    Atom vRootAtom, kwinAtom;
+Atom vRootAtom, kwinAtom;
-	    int i;
+int i;
-	    Window rootReturn, parentReturn;
+Window rootReturn, parentReturn;
-	    Window* children = (Window *)0;
+Window* children = (Window *)0;
-	    unsigned int numChildren;
+unsigned int numChildren;
-	    int ignoreVRoot = 0;
+int ignoreVRoot = 0;
-	    /*
+/*
-	     * Take care of KDE 2.1.
+* Take care of KDE 2.1.
-	     * they define _SWM_ROOT but this is not the parent of
+* they define _SWM_ROOT but this is not the parent of
-	     * the application windows.
+* the application windows.
-	     * Instead it is used for background painting
+* Instead it is used for background painting
-	     */
+*/
-	    kwinAtom = XInternAtom(dpy, "KWIN_RUNNING", True);
+kwinAtom = XInternAtom(dpy, "KWIN_RUNNING", True);
-	    if (kwinAtom != None) {
+if (kwinAtom != None) {
-		Atom actual_type;
+Atom actual_type;
-		int actual_format;
+int actual_format;
-		unsigned long nitems, bytesafter;
+unsigned long nitems, bytesafter;
-		unsigned char *retVal = 0;
+unsigned char *retVal = 0;
-		ignoreVRoot = XGetWindowProperty(dpy, rootWin, kwinAtom,
+ignoreVRoot = XGetWindowProperty(dpy, rootWin, kwinAtom,
-				       0L, 1L, False, kwinAtom,
+0L, 1L, False, kwinAtom,
-				       &actual_type, &actual_format,
+&actual_type, &actual_format,
-				       &nitems, &bytesafter, &retVal) == Success
+&nitems, &bytesafter, &retVal) == Success
-			      && actual_type != 0;
+&& actual_type != 0;
-		if (retVal)
+if (retVal)
-		    XFree(retVal);
+XFree(retVal);
-	    }
+}
-	    if (!ignoreVRoot) {
+if (!ignoreVRoot) {
-		vRootAtom = XInternAtom(dpy, "__SWM_VROOT", True);
+vRootAtom = XInternAtom(dpy, "__SWM_VROOT", True);
-		if (vRootAtom != None) {
+if (vRootAtom != None) {
-		    if (XQueryTree(dpy, rootWin,
+if (XQueryTree(dpy, rootWin,
-				       &rootReturn, &parentReturn,
+&rootReturn, &parentReturn,
-				       &children, &numChildren)) {
+&children, &numChildren)) {
-			for (i=0; i < numChildren; i++) {
+for (i=0; i < numChildren; i++) {
-			    Atom actual_type;
+Atom actual_type;
-			    int actual_format;
+int actual_format;
-			    unsigned long nitems, bytesafter;
+unsigned long nitems, bytesafter;
-			    Window* newRoot = (Window*) 0;
+Window* newRoot = (Window*) 0;
-			    if (children[i]) {
+if (children[i]) {
-				if (XGetWindowProperty(dpy, children[i], vRootAtom,
+if (XGetWindowProperty(dpy, children[i], vRootAtom,
-						       0L, 1L, False, XA_WINDOW,
+0L, 1L, False, XA_WINDOW,
-						       &actual_type, &actual_format,
+&actual_type, &actual_format,
-						       &nitems, &bytesafter,
+&nitems, &bytesafter,
-						       (unsigned char**) &newRoot
+(unsigned char**) &newRoot
-						      ) == Success && newRoot) {
+) == Success && newRoot) {
-				    vRootWin = *newRoot;
+vRootWin = *newRoot;
-				    XFree(newRoot); /* XXX */
+XFree(newRoot); /* XXX */
-				    break;
+break;
-				}
+}
-			    }
+}
-			}
+}
-			if (children) XFree(children);
+if (children) XFree(children);
-		    }
+}
-		}
+}
-	     }
+}
-	}
+}
 #endif
 }
 if (! vRootWin) {
-	vRootWin = rootWin;
+vRootWin = rootWin;
-	if (! vRootWin) {
+if (! vRootWin) {
-	    RETURN ( nil );
+RETURN ( nil );
-	}
+}
 }
 id = __MKEXTERNALADDRESS(rootWin); __INST(rootId) = id; __STORE(self, id);
 id = __MKEXTERNALADDRESS(vRootWin); __INST(virtualRootId) = id; __STORE(self, id);
 RETURN ( id );
 %}
 %{
 int w, h;
 if (ISCONNECTED) {
-	if (__isExternalAddress(aWindowId)
+if (__isExternalAddress(aWindowId)
-	 && __bothSmallInteger(x, y)
+&& __bothSmallInteger(x, y)
-	 && __bothSmallInteger(width, height)) {
+&& __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();
-		XClearArea(myDpy, __WindowVal(aWindowId), __intVal(x), __intVal(y), w, h, 0);
+XClearArea(myDpy, __WindowVal(aWindowId), __intVal(x), __intVal(y), w, h, 0);
-		LEAVE_XLIB();
+LEAVE_XLIB();
-	    }
+}
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection.
 !
 <context: #return>
 %{
 if (ISCONNECTED) {
-	if (__isExternalAddress(aWindowId)) {
+if (__isExternalAddress(aWindowId)) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XClearWindow(myDpy, __WindowVal(aWindowId));
+XClearWindow(myDpy, __WindowVal(aWindowId));
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 XWindowChanges chg;
 int mask = CWSibling | CWStackMode;
 if (ISCONNECTED) {
-	if (__isExternalAddress(aWindowId)
+if (__isExternalAddress(aWindowId)
-	 && __isExternalAddress(siblingId)) {
+&& __isExternalAddress(siblingId)) {
-	    if (modeSymbol == @symbol(above)) {
+if (modeSymbol == @symbol(above)) {
-		chg.stack_mode = Above;
+chg.stack_mode = Above;
-	    } else if (modeSymbol == @symbol(below)) {
+} else if (modeSymbol == @symbol(below)) {
-		chg.stack_mode = Below;
+chg.stack_mode = Below;
-	    } else if (modeSymbol == @symbol(topIf)) {
+} else if (modeSymbol == @symbol(topIf)) {
-		chg.stack_mode = TopIf;
+chg.stack_mode = TopIf;
-	    } else if (modeSymbol == @symbol(bottomIf)) {
+} else if (modeSymbol == @symbol(bottomIf)) {
-		chg.stack_mode = BottomIf;
+chg.stack_mode = BottomIf;
-	    } else if (modeSymbol == @symbol(opposite)) {
+} else if (modeSymbol == @symbol(opposite)) {
-		chg.stack_mode = Opposite;
+chg.stack_mode = Opposite;
-	    } else {
+} else {
-		mask = CWSibling;
+mask = CWSibling;
-	    }
+}
-	    chg.sibling = __WindowVal(siblingId);
+chg.sibling = __WindowVal(siblingId);
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XConfigureWindow(myDpy, __WindowVal(aWindowId),
+XConfigureWindow(myDpy, __WindowVal(aWindowId),
-				    mask, &chg);
+mask, &chg);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    RETURN ( self );
+RETURN ( self );
-	}
+}
 }
 bad: ;
 %}.
 self primitiveFailedOrClosedConnection
 !
 |x y width height depth borderWidth info|
 %{
 int x_ret, y_ret;
 unsigned int width_ret, height_ret,
-		 border_width_ret, depth_ret;
+border_width_ret, depth_ret;
 Window root_ret;
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XGetGeometry(myDpy, __WindowVal(aWindowId),
+XGetGeometry(myDpy, __WindowVal(aWindowId),
-		     &root_ret,
+&root_ret,
-		     &x_ret, &y_ret,
+&x_ret, &y_ret,
-		     &width_ret, &height_ret, &border_width_ret,
+&width_ret, &height_ret, &border_width_ret,
-		     &depth_ret);
+&depth_ret);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	x = __MKSMALLINT(x_ret);
+x = __MKSMALLINT(x_ret);
-	y = __MKSMALLINT(y_ret);
+y = __MKSMALLINT(y_ret);
-	width = __MKSMALLINT(width_ret);
+width = __MKSMALLINT(width_ret);
-	height = __MKSMALLINT(height_ret);
+height = __MKSMALLINT(height_ret);
-	depth = __MKSMALLINT(depth_ret);
+depth = __MKSMALLINT(depth_ret);
-	borderWidth = __MKSMALLINT(border_width_ret);
+borderWidth = __MKSMALLINT(border_width_ret);
 }
 %}.
 borderWidth isNil ifTrue:[
-	self primitiveFailedOrClosedConnection.
+self primitiveFailedOrClosedConnection.
-	^ nil
+^ nil
 ].
 info := Dictionary new.
 info at:#origin put:(x @ y).
 info at:#extent put:(width @ height).
 info at:#depth  put:depth.
 info at:#borderWidth put:borderWidth.
 ^ info
 "
 Transcript topView device
-	getGeometryOf:(Transcript id)
+getGeometryOf:(Transcript id)
 "
 "
 Transcript topView device
-	getGeometryOf:(Transcript topView id)
+getGeometryOf:(Transcript topView id)
 "
 "
 Display
-	getGeometryOf:(Display viewIdFromUser)
+getGeometryOf:(Display viewIdFromUser)
 "
 "
 |d|
 d := Transcript topView device.
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	char *name = NULL;
+char *name = NULL;
-	Status ok;
+Status ok;
-	Window root, parent, *children = NULL;
+Window root, parent, *children = NULL;
-	unsigned int nChildren;
+unsigned int nChildren;
 /*        ENTER_XLIB(); */
-	ok = XQueryTree(myDpy, __WindowVal(aWindowId),
+ok = XQueryTree(myDpy, __WindowVal(aWindowId),
-			&root, &parent, &children, &nChildren);
+&root, &parent, &children, &nChildren);
-	if (children) {
+if (children) {
-	    XFree(children);
+XFree(children);
-	}
+}
 /*        LEAVE_XLIB();   */
-	if (ok) {
+if (ok) {
-	    RETURN (true);
+RETURN (true);
-	}
+}
-	RETURN (false);
+RETURN (false);
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ false
 <context: #return>
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XLowerWindow(myDpy, __WindowVal(aWindowId));
+XLowerWindow(myDpy, __WindowVal(aWindowId));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 mapView:aView id:aWindowId iconified:aBoolean atX:xPos y:yPos
-	      width:w height:h minExtent:minExt maxExtent:maxExt
+width:w height:h minExtent:minExt maxExtent:maxExt
 <context: #return>
 "make a window visible - either as icon or as a real view
 in addition, allow change of extend, position, minExtend and maxExtent.
 and to collaps/expand windows."
 |wicon wiconId iconMaskId wiconView wiconViewId wlabel minW minH maxW maxH|
 aBoolean ifTrue:[
-	wicon := aView icon.
+wicon := aView icon.
-	wicon notNil ifTrue:[
+wicon notNil ifTrue:[
-	    wiconId := wicon id.
+wiconId := wicon id.
-	    wicon mask notNil ifTrue:[
+wicon mask notNil ifTrue:[
-		iconMaskId := wicon mask id.
+iconMaskId := wicon mask id.
-	    ].
+].
-	].
+].
-	wiconView := aView iconView.
+wiconView := aView iconView.
-	wiconView notNil ifTrue:[
+wiconView notNil ifTrue:[
-	    wiconViewId := wiconView id
+wiconViewId := wiconView id
-	].
+].
-	wlabel := aView label.
+wlabel := aView label.
 ].
 minExt notNil ifTrue:[
-	minW := minExt x.
+minW := minExt x.
-	minH := minExt y.
+minH := minExt y.
 ].
 maxExt notNil ifTrue:[
-	maxW := maxExt x.
+maxW := maxExt x.
-	maxH := maxExt y.
+maxH := maxExt y.
 ].
 %{
 XWMHints wmhints;
 XSizeHints szhints;
 Window win;
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	win = __WindowVal(aWindowId);
+win = __WindowVal(aWindowId);
-	szhints.flags = 0;
+szhints.flags = 0;
-	if (__bothSmallInteger(xPos, yPos)) {
+if (__bothSmallInteger(xPos, yPos)) {
-	    szhints.x = __intVal(xPos);
+szhints.x = __intVal(xPos);
-	    szhints.y = __intVal(yPos);
+szhints.y = __intVal(yPos);
-	    szhints.flags |= USPosition;
+szhints.flags |= USPosition;
-	}
+}
-	if (__bothSmallInteger(w, h)) {
+if (__bothSmallInteger(w, h)) {
-	    szhints.width = __intVal(w);
+szhints.width = __intVal(w);
-	    szhints.height = __intVal(h);
+szhints.height = __intVal(h);
-	    szhints.flags |= USSize;
+szhints.flags |= USSize;
-	}
+}
-	if (__bothSmallInteger(minW, minH)) {
+if (__bothSmallInteger(minW, minH)) {
-	    szhints.flags |= PMinSize;
+szhints.flags |= PMinSize;
-	    szhints.min_width = __intVal(minW);
+szhints.min_width = __intVal(minW);
-	    szhints.min_height = __intVal(minH);
+szhints.min_height = __intVal(minH);
-	}
+}
-	if (__bothSmallInteger(maxW, maxH)) {
+if (__bothSmallInteger(maxW, maxH)) {
-	    szhints.flags |= PMaxSize;
+szhints.flags |= PMaxSize;
-	    szhints.max_width = __intVal(maxW);
+szhints.max_width = __intVal(maxW);
-	    szhints.max_height = __intVal(maxH);
+szhints.max_height = __intVal(maxH);
-	}
+}
-	if (aBoolean == true) {
+if (aBoolean == true) {
-	    char *windowName = "";
+char *windowName = "";
-	    Pixmap iconBitmap = (Pixmap)0;
+Pixmap iconBitmap = (Pixmap)0;
-	    Pixmap iconMask = (Pixmap)0;
+Pixmap iconMask = (Pixmap)0;
-	    Window iconWindow = (Window)0;
+Window iconWindow = (Window)0;
-	    if (__isExternalAddress(wiconId))
+if (__isExternalAddress(wiconId))
-		iconBitmap = __PixmapVal(wiconId);
+iconBitmap = __PixmapVal(wiconId);
-	    if (__isExternalAddress(iconMaskId)) {
+if (__isExternalAddress(iconMaskId)) {
-		iconMask = __PixmapVal(iconMaskId);
+iconMask = __PixmapVal(iconMaskId);
-	    }
+}
-	    if (__isExternalAddress(wiconViewId))
+if (__isExternalAddress(wiconViewId))
-		iconWindow = __WindowVal(wiconViewId);
+iconWindow = __WindowVal(wiconViewId);
-	    if (__isStringLike(wlabel))
+if (__isStringLike(wlabel))
-		windowName = (char *) __stringVal(wlabel);
+windowName = (char *) __stringVal(wlabel);
-	    if (iconBitmap || windowName) {
+if (iconBitmap || windowName) {
-		ENTER_XLIB();
+ENTER_XLIB();
-		XSetStandardProperties(dpy, win,
+XSetStandardProperties(dpy, win,
-					windowName, windowName,
+windowName, windowName,
-					iconBitmap,
+iconBitmap,
-					0, 0, &szhints);
+0, 0, &szhints);
-		LEAVE_XLIB();
+LEAVE_XLIB();
-	    }
+}
-	    wmhints.flags = 0;
+wmhints.flags = 0;
-	    if (iconBitmap) {
+if (iconBitmap) {
-		wmhints.flags |= IconPixmapHint;
+wmhints.flags |= IconPixmapHint;
-		wmhints.icon_pixmap = iconBitmap;
+wmhints.icon_pixmap = iconBitmap;
-	    }
+}
-	    if (iconMask) {
+if (iconMask) {
-		wmhints.flags |= IconMaskHint;
+wmhints.flags |= IconMaskHint;
-		wmhints.icon_mask = iconMask;
+wmhints.icon_mask = iconMask;
-	    }
+}
-	    if (iconWindow) {
+if (iconWindow) {
-		wmhints.flags |= IconWindowHint;
+wmhints.flags |= IconWindowHint;
-		wmhints.icon_window = iconWindow;
+wmhints.icon_window = iconWindow;
-	    }
+}
-	    wmhints.initial_state = IconicState;
+wmhints.initial_state = IconicState;
-	    wmhints.flags |= StateHint;
+wmhints.flags |= StateHint;
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XSetWMHints(dpy, win, &wmhints);
+XSetWMHints(dpy, win, &wmhints);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	}
+}
-	if (szhints.flags) {
+if (szhints.flags) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XSetNormalHints(dpy, win, &szhints);
+XSetNormalHints(dpy, win, &szhints);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	XMapWindow(dpy, win);
+XMapWindow(dpy, win);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XMapWindow(myDpy, __WindowVal(aWindowId));
+XMapWindow(myDpy, __WindowVal(aWindowId));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)
 && __bothSmallInteger(w, h)
 && __bothSmallInteger(x, y)) {
-	newWidth = __intVal(w);
+newWidth = __intVal(w);
-	newHeight = __intVal(h);
+newHeight = __intVal(h);
-	if (newWidth < 1) newWidth = 1;
+if (newWidth < 1) newWidth = 1;
-	if (newHeight < 1) newHeight = 1;
+if (newHeight < 1) newHeight = 1;
-	ENTER_XLIB();
+ENTER_XLIB();
-	XMoveResizeWindow(myDpy, __WindowVal(aWindowId),
+XMoveResizeWindow(myDpy, __WindowVal(aWindowId),
-			      __intVal(x), __intVal(y),
+__intVal(x), __intVal(y),
-			      newWidth, newHeight);
+newWidth, newHeight);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId) && __bothSmallInteger(x, y)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XMoveWindow(myDpy, __WindowVal(aWindowId), __intVal(x), __intVal(y));
+XMoveWindow(myDpy, __WindowVal(aWindowId), __intVal(x), __intVal(y));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	Status ok;
+Status ok;
-	Window root, parent, *children = NULL;
+Window root, parent, *children = NULL;
-	unsigned int nChildren;
+unsigned int nChildren;
 /*        ENTER_XLIB(); */
-	ok = XQueryTree(myDpy, __WindowVal(aWindowId),
+ok = XQueryTree(myDpy, __WindowVal(aWindowId),
-			&root, &parent, &children, &nChildren);
+&root, &parent, &children, &nChildren);
-	if (children) {
+if (children) {
-	    XFree(children);
+XFree(children);
-	}
+}
 /*        LEAVE_XLIB();   */
-	if (! ok) {
+if (! ok) {
-	    RETURN ( nil );
+RETURN ( nil );
-	}
+}
-	RETURN ( __MKEXTERNALADDRESS(parent) );
+RETURN ( __MKEXTERNALADDRESS(parent) );
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ false
 <context: #return>
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XRaiseWindow(myDpy, __WindowVal(aWindowId));
+XRaiseWindow(myDpy, __WindowVal(aWindowId));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 %{
 if (ISCONNECTED
 && __isExternalAddress(windowId)
 && __isExternalAddress(newParentWindowId)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	Window _child, _newParent;
+Window _child, _newParent;
-	int i;
+int i;
-	_child = __WindowVal(windowId);
+_child = __WindowVal(windowId);
-	_newParent = __WindowVal(newParentWindowId);
+_newParent = __WindowVal(newParentWindowId);
-	ENTER_XLIB();
+ENTER_XLIB();
 #if 0
-	XWithdrawWindow (dpy, _child, DefaultScreen(dpy));
+XWithdrawWindow (dpy, _child, DefaultScreen(dpy));
-	XSync (dpy, 0);
+XSync (dpy, 0);
 #endif
-	/*
+/*
-	 * Code 'stolen' from xswallow source ...
+* Code 'stolen' from xswallow source ...
-	 * ... mhmh - what is this loop for ?
+* ... mhmh - what is this loop for ?
-	 */
+*/
-	for (i=0; i<5; i++) {
+for (i=0; i<5; i++) {
-	    XReparentWindow (dpy, _child, _newParent, 0, 0);
+XReparentWindow (dpy, _child, _newParent, 0, 0);
-	    XSync (dpy, 0);
+XSync (dpy, 0);
-	}
+}
 #if 0
-	XMapWindow (dpy, _child);
+XMapWindow (dpy, _child);
-	XSync (dpy, 0);
+XSync (dpy, 0);
 #endif
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( true );
+RETURN ( true );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 int newWidth, newHeight;
 if (ISCONNECTED
 && __isExternalAddress(aWindowId) && __bothSmallInteger(w, h)) {
-	newWidth = __intVal(w);
+newWidth = __intVal(w);
-	newHeight = __intVal(h);
+newHeight = __intVal(h);
-	if (newWidth < 1) newWidth = 1;
+if (newWidth < 1) newWidth = 1;
-	if (newHeight < 1) newHeight = 1;
+if (newHeight < 1) newHeight = 1;
-	ENTER_XLIB();
+ENTER_XLIB();
-	XResizeWindow(myDpy, __WindowVal(aWindowId), newWidth, newHeight);
+XResizeWindow(myDpy, __WindowVal(aWindowId), newWidth, newHeight);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 XSetWindowAttributes wa;
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	if (__INST(ignoreBackingStore) != true) {
+if (__INST(ignoreBackingStore) != true) {
-	    if (how == @symbol(always)) wa.backing_store = Always;
+if (how == @symbol(always)) wa.backing_store = Always;
-	    else if (how == @symbol(whenMapped)) wa.backing_store = WhenMapped;
+else if (how == @symbol(whenMapped)) wa.backing_store = WhenMapped;
-	    else if (how == true) wa.backing_store = Always;
+else if (how == true) wa.backing_store = Always;
-	    else wa.backing_store = 0;
+else wa.backing_store = 0;
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XChangeWindowAttributes(myDpy, __WindowVal(aWindowId), CWBackingStore, &wa);
+XChangeWindowAttributes(myDpy, __WindowVal(aWindowId), CWBackingStore, &wa);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	}
+}
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 XSetWindowAttributes wa;
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	if (how == @symbol(NorthWest)) {
+if (how == @symbol(NorthWest)) {
-	    wa.bit_gravity = NorthWestGravity;
+wa.bit_gravity = NorthWestGravity;
-	} else if (how == @symbol(NorthEast)) {
+} else if (how == @symbol(NorthEast)) {
-	    wa.bit_gravity = NorthEastGravity;
+wa.bit_gravity = NorthEastGravity;
-	} else if (how == @symbol(SouthWest)) {
+} else if (how == @symbol(SouthWest)) {
-	    wa.bit_gravity = SouthWestGravity;
+wa.bit_gravity = SouthWestGravity;
-	} else if (how == @symbol(SouthEast)) {
+} else if (how == @symbol(SouthEast)) {
-	    wa.bit_gravity = SouthEastGravity;
+wa.bit_gravity = SouthEastGravity;
-	} else if (how == @symbol(Center)) {
+} else if (how == @symbol(Center)) {
-	    wa.bit_gravity = CenterGravity;
+wa.bit_gravity = CenterGravity;
-	} else if (how == @symbol(North)) {
+} else if (how == @symbol(North)) {
-	    wa.bit_gravity = NorthGravity;
+wa.bit_gravity = NorthGravity;
-	} else if (how == @symbol(South)) {
+} else if (how == @symbol(South)) {
-	    wa.bit_gravity = SouthGravity;
+wa.bit_gravity = SouthGravity;
-	} else if (how == @symbol(West)) {
+} else if (how == @symbol(West)) {
-	    wa.bit_gravity = WestGravity;
+wa.bit_gravity = WestGravity;
-	} else if (how == @symbol(East)) {
+} else if (how == @symbol(East)) {
-	    wa.bit_gravity = EastGravity;
+wa.bit_gravity = EastGravity;
-	} else {
+} else {
-	    wa.bit_gravity = NorthWestGravity;
+wa.bit_gravity = NorthWestGravity;
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	XChangeWindowAttributes(myDpy, __WindowVal(aWindowId), CWBitGravity, &wa);
+XChangeWindowAttributes(myDpy, __WindowVal(aWindowId), CWBitGravity, &wa);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)
 && __isExternalAddress(aCursorId)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	Window w = __WindowVal(aWindowId);
+Window w = __WindowVal(aWindowId);
-	Cursor c = __CursorVal(aCursorId);
+Cursor c = __CursorVal(aCursorId);
-	if (w && c) {
+if (w && c) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XDefineCursor(dpy, w, c);
+XDefineCursor(dpy, w, c);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	}
+}
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 "/    self raiseWindow:aWindowId.
 activeWindowAtom := self atomIDOf:#'_NET_ACTIVE_WINDOW' create:false.
 activeWindowAtom notNil ifTrue:[
-	self
+self
-	    sendClientEvent:activeWindowAtom
+sendClientEvent:activeWindowAtom
-	    format:32
+format:32
-	    to:(self rootWindowId)
+to:(self rootWindowId)
-	    propagate:false
+propagate:false
-	    eventMask:((self eventMaskFor:#substructureNotify) bitOr:(self eventMaskFor:#substructureRedirect))
+eventMask:((self eventMaskFor:#substructureNotify) bitOr:(self eventMaskFor:#substructureRedirect))
-	    window:aWindowId
+window:aWindowId
-	    data1:2                 "activate request from pager. This is a trick: kwm ignores requests from applications (1)"
+data1:2                 "activate request from pager. This is a trick: kwm ignores requests from applications (1)"
-	    data2:nil
+data2:nil
-	    data3:nil
+data3:nil
-	    data4:nil
+data4:nil
-	    data5:nil.
+data5:nil.
 ].
 "
 Transcript topView setForegroundWindow
 "
 utf8StringAtom := self atomIDOf:#UTF8_STRING create:true.
 utf8String := aString utf8Encoded.
 aString isWideString ifTrue:[
-	"/ X does not like 2-byte labels ...
+"/ X does not like 2-byte labels ...
-	simpleString := aString asSingleByteStringReplaceInvalidWith:$?
+simpleString := aString asSingleByteStringReplaceInvalidWith:$?
 ] ifFalse:[
-	simpleString := aString.
+simpleString := aString.
 ].
 %{
 XTextProperty titleProperty;
 if (ISCONNECTED
 && __isStringLike(utf8String)
 && __isStringLike(simpleString)
 && __isExternalAddress(aWindowId)) {
-	titleProperty.value =  __stringVal(utf8String);
+titleProperty.value =  __stringVal(utf8String);
-	titleProperty.encoding = __smallIntegerVal(utf8StringAtom);
+titleProperty.encoding = __smallIntegerVal(utf8StringAtom);
-	titleProperty.format = 8;
+titleProperty.format = 8;
-	titleProperty.nitems = __stringSize(utf8String);
+titleProperty.nitems = __stringSize(utf8String);
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetIconName(myDpy, __WindowVal(aWindowId), (char *) __stringVal(simpleString));
+XSetIconName(myDpy, __WindowVal(aWindowId), (char *) __stringVal(simpleString));
-	/* alternative settings for UTF8-Strings */
+/* alternative settings for UTF8-Strings */
-	XSetWMIconName(myDpy, __WindowVal(aWindowId), &titleProperty);
+XSetWMIconName(myDpy, __WindowVal(aWindowId), &titleProperty);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 XSetWindowAttributes wa;
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	if (__INST(hasSaveUnder) == true) {
+if (__INST(hasSaveUnder) == true) {
-	    wa.save_under = (yesOrNo == true) ? 1 : 0;
+wa.save_under = (yesOrNo == true) ? 1 : 0;
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XChangeWindowAttributes(myDpy, __WindowVal(aWindowId), CWSaveUnder, &wa);
+XChangeWindowAttributes(myDpy, __WindowVal(aWindowId), CWSaveUnder, &wa);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	}
+}
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	Window w;
+Window w;
-	if ((aMainWindowId == nil) || (aMainWindowId == __MKSMALLINT(0))) {
+if ((aMainWindowId == nil) || (aMainWindowId == __MKSMALLINT(0))) {
-	    w = (Window) 0;
+w = (Window) 0;
-	} else {
+} else {
-	    if (__isExternalAddress(aMainWindowId)) {
+if (__isExternalAddress(aMainWindowId)) {
-		w = __WindowVal(aMainWindowId);
+w = __WindowVal(aMainWindowId);
-	    } else {
+} else {
-		goto getOutOfHere;
+goto getOutOfHere;
-	    }
+}
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetTransientForHint(myDpy, __WindowVal(aWindowId), w);
+XSetTransientForHint(myDpy, __WindowVal(aWindowId), w);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 getOutOfHere: ;
 %}.
 self primitiveFailedOrClosedConnection
 !
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)
 && __isSmallInteger(aColorIndex)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetWindowBackground(myDpy, __WindowVal(aWindowId), __intVal(aColorIndex));
+XSetWindowBackground(myDpy, __WindowVal(aWindowId), __intVal(aColorIndex));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 %{  /* STACK: 64000 */
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)
 && __isExternalAddress(aPixmapId)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetWindowBackgroundPixmap(myDpy, __WindowVal(aWindowId), __PixmapVal(aPixmapId));
+XSetWindowBackgroundPixmap(myDpy, __WindowVal(aWindowId), __PixmapVal(aPixmapId));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)
 && __isSmallInteger(aColorIndex)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetWindowBorder(myDpy, __WindowVal(aWindowId), __intVal(aColorIndex));
+XSetWindowBorder(myDpy, __WindowVal(aWindowId), __intVal(aColorIndex));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)
 && __isExternalAddress(aPixmapId)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetWindowBorderPixmap(myDpy, __WindowVal(aWindowId), __PixmapVal(aPixmapId));
+XSetWindowBorderPixmap(myDpy, __WindowVal(aWindowId), __PixmapVal(aPixmapId));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 #ifdef SHAPE
 Pixmap shapeBitmap;
 if (__isExternalAddress(aPixmapId))
-	shapeBitmap = __PixmapVal(aPixmapId);
+shapeBitmap = __PixmapVal(aPixmapId);
 else
-	shapeBitmap = (Pixmap)0;
+shapeBitmap = (Pixmap)0;
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XShapeCombineMask(myDpy, __WindowVal(aWindowId), ShapeBounding,
+XShapeCombineMask(myDpy, __WindowVal(aWindowId), ShapeBounding,
-			  0, 0, shapeBitmap, ShapeSet);
+0, 0, shapeBitmap, ShapeSet);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 #endif
 %}.
 self primitiveFailedOrClosedConnection
 !
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)
 && __isSmallInteger(aNumber)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetWindowBorderWidth(myDpy, __WindowVal(aWindowId), __intVal(aNumber));
+XSetWindowBorderWidth(myDpy, __WindowVal(aWindowId), __intVal(aNumber));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	XClassHint classhint;
+XClassHint classhint;
-	classhint.res_class = classhint.res_name = 0;
+classhint.res_class = classhint.res_name = 0;
-	if (__isStringLike(wClass)) {
+if (__isStringLike(wClass)) {
-	    classhint.res_class = (char *) __stringVal(wClass);
+classhint.res_class = (char *) __stringVal(wClass);
-	} else if (wClass != nil)
+} else if (wClass != nil)
-	    goto error;
+goto error;
-	if (__isStringLike(wName)) {
+if (__isStringLike(wName)) {
-	    classhint.res_name = (char *) __stringVal(wName);
+classhint.res_name = (char *) __stringVal(wName);
-	} else if (wName != nil)
+} else if (wName != nil)
-	    goto error;
+goto error;
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetClassHint(myDpy, __WindowVal(aWindowId), &classhint);
+XSetClassHint(myDpy, __WindowVal(aWindowId), &classhint);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 error:;
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 XSetWindowAttributes wa;
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	if (how == @symbol(NorthWest)) {
+if (how == @symbol(NorthWest)) {
-	    wa.win_gravity = NorthWestGravity;
+wa.win_gravity = NorthWestGravity;
-	} else if (how == @symbol(NorthEast)) {
+} else if (how == @symbol(NorthEast)) {
-	    wa.win_gravity = NorthEastGravity;
+wa.win_gravity = NorthEastGravity;
-	} else if (how == @symbol(SouthWest)) {
+} else if (how == @symbol(SouthWest)) {
-	    wa.win_gravity = SouthWestGravity;
+wa.win_gravity = SouthWestGravity;
-	} else if (how == @symbol(SouthEast)) {
+} else if (how == @symbol(SouthEast)) {
-	    wa.win_gravity = SouthEastGravity;
+wa.win_gravity = SouthEastGravity;
-	} else if (how == @symbol(Center)) {
+} else if (how == @symbol(Center)) {
-	    wa.win_gravity = CenterGravity;
+wa.win_gravity = CenterGravity;
-	} else if (how == @symbol(North)) {
+} else if (how == @symbol(North)) {
-	    wa.win_gravity = NorthGravity;
+wa.win_gravity = NorthGravity;
-	} else if (how == @symbol(South)) {
+} else if (how == @symbol(South)) {
-	    wa.win_gravity = SouthGravity;
+wa.win_gravity = SouthGravity;
-	} else if (how == @symbol(West)) {
+} else if (how == @symbol(West)) {
-	    wa.win_gravity = WestGravity;
+wa.win_gravity = WestGravity;
-	} else if (how == @symbol(East)) {
+} else if (how == @symbol(East)) {
-	    wa.win_gravity = EastGravity;
+wa.win_gravity = EastGravity;
-	} else {
+} else {
-	    wa.win_gravity = NorthWestGravity;
+wa.win_gravity = NorthWestGravity;
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	XChangeWindowAttributes(myDpy, __WindowVal(aWindowId), CWWinGravity, &wa);
+XChangeWindowAttributes(myDpy, __WindowVal(aWindowId), CWWinGravity, &wa);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 |iconId|
 aForm notNil ifTrue:[
-	iconId := aForm id
+iconId := aForm id
 ].
 %{
 if (ISCONNECTED
 && __isExternalAddress(iconId)
 && __isExternalAddress(aWindowId)) {
-	XWMHints hints;
+XWMHints hints;
-	hints.icon_pixmap = __PixmapVal(iconId);
+hints.icon_pixmap = __PixmapVal(iconId);
-	hints.flags = IconPixmapHint;
+hints.flags = IconPixmapHint;
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetWMHints(myDpy, __WindowVal(aWindowId), &hints);
+XSetWMHints(myDpy, __WindowVal(aWindowId), &hints);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 |iconId maskId|
 aForm notNil ifTrue:[
-	iconId := aForm id
+iconId := aForm id
 ].
 aMaskForm notNil ifTrue:[
-	maskId := aMaskForm id.
+maskId := aMaskForm id.
 ].
 %{
 if (ISCONNECTED
 && __isExternalAddress(iconId)
 && __isExternalAddress(aWindowId)) {
-	XWMHints hints;
+XWMHints hints;
-	hints.icon_pixmap = __PixmapVal(iconId);
+hints.icon_pixmap = __PixmapVal(iconId);
-	hints.flags = IconPixmapHint;
+hints.flags = IconPixmapHint;
-	if ((maskId != nil)
+if ((maskId != nil)
-	 && __isExternalAddress(maskId)) {
+&& __isExternalAddress(maskId)) {
-	    hints.icon_mask = __PixmapVal(maskId);
+hints.icon_mask = __PixmapVal(maskId);
-	    hints.flags |= IconMaskHint;
+hints.flags |= IconMaskHint;
-	}
+}
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetWMHints(myDpy, __WindowVal(aWindowId), &hints);
+XSetWMHints(myDpy, __WindowVal(aWindowId), &hints);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 |iconWindowId|
 aView notNil ifTrue:[
-	iconWindowId := aView id
+iconWindowId := aView id
 ].
 %{
 if (ISCONNECTED
 && __isExternalAddress(iconWindowId)
 && __isExternalAddress(aWindowId)) {
-	XWMHints wmhints;
+XWMHints wmhints;
-	wmhints.icon_window = __WindowVal(iconWindowId);
+wmhints.icon_window = __WindowVal(iconWindowId);
-	wmhints.flags = IconWindowHint;
+wmhints.flags = IconWindowHint;
-	ENTER_XLIB();
+ENTER_XLIB();
-	XSetWMHints(myDpy, __WindowVal(aWindowId), &wmhints);
+XSetWMHints(myDpy, __WindowVal(aWindowId), &wmhints);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 <context: #return>
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	Display *dpy = myDpy;
+Display *dpy = myDpy;
-	XSizeHints szhints;
+XSizeHints szhints;
-	Window win;
+Window win;
-	win = __WindowVal(aWindowId);
+win = __WindowVal(aWindowId);
-	szhints.flags = 0;
+szhints.flags = 0;
-	if (__bothSmallInteger(minW, minH)) {
+if (__bothSmallInteger(minW, minH)) {
-	    szhints.flags |= PMinSize;
+szhints.flags |= PMinSize;
-	    szhints.min_width = __intVal(minW);
+szhints.min_width = __intVal(minW);
-	    szhints.min_height = __intVal(minH);
+szhints.min_height = __intVal(minH);
-	}
+}
-	if (__bothSmallInteger(maxW, maxH)) {
+if (__bothSmallInteger(maxW, maxH)) {
-	    szhints.flags |= PMaxSize;
+szhints.flags |= PMaxSize;
-	    szhints.max_width = __intVal(maxW);
+szhints.max_width = __intVal(maxW);
-	    szhints.max_height = __intVal(maxH);
+szhints.max_height = __intVal(maxH);
-	}
+}
-	if (szhints.flags) {
+if (szhints.flags) {
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XSetNormalHints(dpy, win, &szhints);
+XSetNormalHints(dpy, win, &szhints);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	}
+}
 }
 %}.
 !
 setWindowName:aString in:aWindowId
 utf8StringAtom := self atomIDOf:#UTF8_STRING create:true.
 utf8String := aString utf8Encoded.
 aString isWideString ifTrue:[
-	"/ X does not like 2-byte labels ...
+"/ X does not like 2-byte labels ...
-	simpleString := aString asSingleByteStringReplaceInvalidWith:$?
+simpleString := aString asSingleByteStringReplaceInvalidWith:$?
 ] ifFalse:[
-	simpleString := aString.
+simpleString := aString.
 ].
 %{
 XTextProperty titleProperty;
 if (ISCONNECTED
 && __isStringLike(utf8String)
 && __isStringLike(simpleString)
 && __isExternalAddress(aWindowId)) {
-	titleProperty.value =  __stringVal(utf8String);
+titleProperty.value =  __stringVal(utf8String);
-	titleProperty.encoding = __smallIntegerVal(utf8StringAtom);
+titleProperty.encoding = __smallIntegerVal(utf8StringAtom);
-	titleProperty.format = 8;
+titleProperty.format = 8;
-	titleProperty.nitems = __stringSize(utf8String);
+titleProperty.nitems = __stringSize(utf8String);
-	ENTER_XLIB();
+ENTER_XLIB();
-	XStoreName(myDpy, __WindowVal(aWindowId), (char *) __stringVal(simpleString));
+XStoreName(myDpy, __WindowVal(aWindowId), (char *) __stringVal(simpleString));
-	/* alternative settings for UTF8-Strings */
+/* alternative settings for UTF8-Strings */
-	XSetWMName(myDpy, __WindowVal(aWindowId), &titleProperty);
+XSetWMName(myDpy, __WindowVal(aWindowId), &titleProperty);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailedOrClosedConnection
 !
 #ifdef SHAPE
 Pixmap shapeBitmap;
 if (__isExternalAddress(aPixmapId))
-	shapeBitmap = __PixmapVal(aPixmapId);
+shapeBitmap = __PixmapVal(aPixmapId);
 else
-	shapeBitmap = (Pixmap)0;
+shapeBitmap = (Pixmap)0;
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XShapeCombineMask(myDpy, __WindowVal(aWindowId), ShapeClip,
+XShapeCombineMask(myDpy, __WindowVal(aWindowId), ShapeClip,
-			  0, 0,
+0, 0,
-			  shapeBitmap, ShapeSet);
+shapeBitmap, ShapeSet);
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 #endif
 %}.
 self primitiveFailedOrClosedConnection
 !
 netWmWindowStateAtom := self atomIDOf:#'_NET_WM_WINDOW_STATE' create:false.
 stateAtom := self atomIDOf:aSymbol create:false.
 (netWmWindowStateAtom notNil and:[stateAtom notNil]) ifTrue:[
-	self
+self
-	    sendClientEvent:netWmWindowStateAtom
+sendClientEvent:netWmWindowStateAtom
-	    format:32
+format:32
-	    to:(self rootWindowId)
+to:(self rootWindowId)
-	    propagate:true
+propagate:true
-	    eventMask:((self eventMaskFor:#substructureNotify) bitOr:(self eventMaskFor:#substructureRedirect))
+eventMask:((self eventMaskFor:#substructureNotify) bitOr:(self eventMaskFor:#substructureRedirect))
-	    window:aWindowId
+window:aWindowId
-	    data1:(self atomIDOf:#'_NET_WM_STATE_ADD' create:false)
+data1:(self atomIDOf:#'_NET_WM_STATE_ADD' create:false)
-	    data2:stateAtom
+data2:stateAtom
-	    data3:nil
+data3:nil
-	    data4:1
+data4:1
-	    data5:nil.
+data5:nil.
 ] ifFalse:[self halt.].
 "
 |v|
 "
 | nameAtom typeAtom valueAtom |
 self assert:(#(_NET_WM_WINDOW_TYPE_DESKTOP
-		  _NET_WM_WINDOW_TYPE_DOCK
+_NET_WM_WINDOW_TYPE_DOCK
-		  _NET_WM_WINDOW_TYPE_TOOLBAR
+_NET_WM_WINDOW_TYPE_TOOLBAR
-		  _NET_WM_WINDOW_TYPE_MENU
+_NET_WM_WINDOW_TYPE_MENU
-		  _NET_WM_WINDOW_TYPE_UTILITY
+_NET_WM_WINDOW_TYPE_UTILITY
-		  _NET_WM_WINDOW_TYPE_SPLASH
+_NET_WM_WINDOW_TYPE_SPLASH
-		  _NET_WM_WINDOW_TYPE_DIALOG
+_NET_WM_WINDOW_TYPE_DIALOG
-		  _NET_WM_WINDOW_TYPE_NORMAL) includes: aSymbol).
+_NET_WM_WINDOW_TYPE_NORMAL) includes: aSymbol).
 nameAtom := self atomIDOf:#'_NET_WM_WINDOW_TYPE' create:false.
 nameAtom isNil ifTrue:[
-	"/Hmm, no such property, not running under EWMH compliant WM?
+"/Hmm, no such property, not running under EWMH compliant WM?
-	self breakPoint: #jv.
+self breakPoint: #jv.
-	^self
+^self
 ].
 "/ Hmm, hmm, no access to XA_ATOM, XA_INTEGER and so on...
 typeAtom := self atomIDOf:#'ATOM' create:false.
 typeAtom isNil ifTrue:[
-	self error:'Oops, no ATOM atom'.
+self error:'Oops, no ATOM atom'.
 ].
 valueAtom := self atomIDOf: aSymbol create:false.
 valueAtom isNil ifTrue:[
-	"/Hmm, no such property, not running under EWMH compliant WM?
+"/Hmm, no such property, not running under EWMH compliant WM?
-	self breakPoint: #jv.
+self breakPoint: #jv.
-	^self
+^self
 ].
 self setProperty: nameAtom type: typeAtom value: valueAtom for: aWindowId.
 %{
 /*
 * ignore closed connection
 */
 if (! ISCONNECTED) {
-	RETURN ( self );
+RETURN ( self );
 }
 if (__isExternalAddress(aWindowId)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	XUnmapWindow(myDpy, __WindowVal(aWindowId));
+XUnmapWindow(myDpy, __WindowVal(aWindowId));
-	LEAVE_XLIB();
+LEAVE_XLIB();
-	RETURN ( self );
+RETURN ( self );
 }
 %}.
 self primitiveFailed
 !
 <context: #return>
 %{
 if (ISCONNECTED
 && __isExternalAddress(aWindowId)) {
-	Atom JunkAtom;
+Atom JunkAtom;
-	int JunkInt;
+int JunkInt;
-	unsigned long WinState,JunkLong;
+unsigned long WinState,JunkLong;
-	unsigned char *Property;
+unsigned char *Property;
-	Atom WM_STATE_Atom;
+Atom WM_STATE_Atom;
-	if (__INST(wmStateAtom) != nil) {
+if (__INST(wmStateAtom) != nil) {
-	    WM_STATE_Atom = __AtomVal(__INST(wmStateAtom));
+WM_STATE_Atom = __AtomVal(__INST(wmStateAtom));
-	    ENTER_XLIB();
+ENTER_XLIB();
-	    XGetWindowProperty(myDpy, __WindowVal(aWindowId),
+XGetWindowProperty(myDpy, __WindowVal(aWindowId),
-			       WM_STATE_Atom,
+WM_STATE_Atom,
-			       0L, 2L, False, AnyPropertyType,
+0L, 2L, False, AnyPropertyType,
-			       &JunkAtom,&JunkInt,&WinState,&JunkLong,
+&JunkAtom,&JunkInt,&WinState,&JunkLong,
-			       &Property);
+&Property);
-	    LEAVE_XLIB();
+LEAVE_XLIB();
-	    WinState=(unsigned long)(*((long*)Property));
+WinState=(unsigned long)(*((long*)Property));
-	    if (WinState==3) {
+if (WinState==3) {
-		RETURN (true);
+RETURN (true);
-	    }
+}
-	}
+}
-	RETURN (false);
+RETURN (false);
 }
 %}.
 self primitiveFailedOrClosedConnection.
 ^ false "/ or true or what ?
 ! !
 For each fetch operation an instance of this class is created.
 The asynchronous messages are queued and executed in the
 process that requests the clipboard.
 [author:]
-	Stefan Vogel (stefan@zwerg)
+Stefan Vogel (stefan@zwerg)
 [instance variables:]
 [class variables:]
 "convert the data in buffer to a selection"
 |selection|
 buffer isNil ifTrue:[
-	^ nil.
+^ nil.
 ].
 targetID == (display atomIDOf:#STRING) ifTrue:[
-	display clipboardEncoding notNil ifTrue:[
+display clipboardEncoding notNil ifTrue:[
-	    selection := buffer decodeFrom:display clipboardEncoding
+selection := buffer decodeFrom:display clipboardEncoding
-	].
+].
-	selection := buffer.
+selection := buffer.
 ] ifFalse:[targetID == (display atomIDOf:#'UTF8_STRING') ifTrue:[
 "/ Transcript show:'UTF8: '; showCR:buffer storeString.
-	selection := CharacterArray fromUTF8Bytes:buffer
+selection := CharacterArray fromUTF8Bytes:buffer
 ] ifFalse:[targetID == (display atomIDOf:#TEXT) ifTrue:[
 "/ Transcript show:'TEXT: '; showCR:buffer storeString.
-	selection := buffer asString
+selection := buffer asString
 ] ifFalse:[targetID == (display atomIDOf:#'COMPOUND_TEXT') ifTrue:[
 "/ Transcript show:'COMPOUND_TEXT: '; showCR:buffer storeString.
-	selection := buffer asString
+selection := buffer asString
 ]]]].
 selection notNil ifTrue:[
-	(selection endsWith:Character cr) ifTrue:[
+(selection endsWith:Character cr) ifTrue:[
-	    selection := selection asStringCollection copyWith:''
+selection := selection asStringCollection copyWith:''
-	].
+].
-	^ selection.
+^ selection.
 ].
 targetID == (display atomIDOf:#'TARGETS') ifTrue:[
-	^ buffer
+^ buffer
 ].
 targetID == (display atomIDOf:#'ST_OBJECT') ifTrue:[
-	"require libboss to be loaded"
+"require libboss to be loaded"
-	(Smalltalk isClassLibraryLoaded:'libstx_libboss') ifFalse:[
+(Smalltalk isClassLibraryLoaded:'libstx_libboss') ifFalse:[
-	    'SelectionFetch: cannot decode object (libboss library missing)' errorPrintCR.
+'SelectionFetch: cannot decode object (libboss library missing)' errorPrintCR.
-	    ^ nil
+^ nil
-	].
+].
-	^ (Object
+^ (Object
-	    readBinaryFrom:(ReadStream on:buffer)
+readBinaryFrom:(ReadStream on:buffer)
-	    onError:[:ex |
+onError:[:ex |
-		('SelectionFetch: error while decoding binary object: ',ex description) errorPrintCR.
+('SelectionFetch: error while decoding binary object: ',ex description) errorPrintCR.
-		nil
+nil
-	    ])
+])
 ].
 'XWorkstation: unimplemented property targetID: ' infoPrint. (display atomName:targetID) infoPrint.
 ' buffer:' infoPrint. buffer infoPrintCR.
 ^ nil
 message:aMessage
 "got an asynchronous event from the display.
 Save and wake up waiters"
 aMessage selector == #propertyChange:property:state:time: ifTrue:[
-	(aMessage arguments at:2) ~~ propertyID ifTrue:[
+(aMessage arguments at:2) ~~ propertyID ifTrue:[
-	    "I am only interested in changes of the property used to
+"I am only interested in changes of the property used to
-	     store the selection"
+store the selection"
-	    ^ self.
+^ self.
-	].
+].
-	message notNil ifTrue:[
+message notNil ifTrue:[
-	    "this should not happen - bad selection holder?"
+"this should not happen - bad selection holder?"
-	    'XWorkstation(error): message overflow: ' errorPrint. display errorPrintCR.
+'XWorkstation(error): message overflow: ' errorPrint. display errorPrintCR.
-	    ^ self.
+^ self.
-	].
+].
 ].
 "we get a propertyChange before the selectionNotify.
 Since the propertyChange will be ignored anyway (because we are not in incremental mod,
 a selectionNotify message may overwrite a propertyChange message"
 "this is a forwarded propretyChange event from XWorkstation"
 |property propertyValue|
 incremental ifFalse:[
-	"ignore property changes until we are in incremental mode"
+"ignore property changes until we are in incremental mode"
-	^ self.
+^ self.
 ].
 property := display getProperty:propertyID from:drawableID delete:true.
 propertyValue := property value.
 propertyValue size == 0 ifTrue:[
-	"property with size 0 signals end of transfer"
+"property with size 0 signals end of transfer"
-	done := true.
+done := true.
 ] ifFalse:[
-	buffer isNil ifTrue:[
+buffer isNil ifTrue:[
-	    targetID := property key.
+targetID := property key.
-	    buffer := propertyValue.
+buffer := propertyValue.
-	] ifFalse:[
+] ifFalse:[
-	    targetID ~= property key ifTrue:[
+targetID ~= property key ifTrue:[
-		'XWorkstation(warning): targetID change in incremental select: ' errorPrint. display errorPrintCR.
+'XWorkstation(warning): targetID change in incremental select: ' errorPrint. display errorPrintCR.
-	    ].
+].
-	    buffer := buffer, propertyValue.
+buffer := buffer, propertyValue.
-	].
+].
 ].
 !
 selectionClear:aView selection:selectionId time:time
 "sent when another X-client has created a selection.
 "this is a forwarded selectionNotify event from XWorkstation"
 |property propertyKey atomName|
 aSelectionID ~~ selectionID ifTrue:[
-	"ignore notification that is not for our selection"
+"ignore notification that is not for our selection"
-	^ self.
+^ self.
 ].
 aPropertyID == 0 ifTrue:[
-	"the selection owner could not convert the selection to our target type"
+"the selection owner could not convert the selection to our target type"
-	done := true.
+done := true.
-	^ self.
+^ self.
 ].
 property := display getProperty:aPropertyID from:drawableID delete:true.
 property isNil ifTrue:[
-	"the property does not exist in the specified window"
+"the property does not exist in the specified window"
-	done := true.
+done := true.
-	^ self
+^ self
 ].
 propertyKey := property key.
 propertyKey == aTargetID ifTrue:[
-	"good, the property is consistent with our request.
+"good, the property is consistent with our request.
-	 The whole selection is in the property"
+The whole selection is in the property"
-	buffer := property value.
+buffer := property value.
-	done := true.
+done := true.
 ] ifFalse:[propertyKey == (display atomIDOf:#INCR) ifTrue:[
-	"this is an incremental transfer. Wait for property change"
+"this is an incremental transfer. Wait for property change"
-	incremental := true.
+incremental := true.
 ] ifFalse:[
-	atomName := (display atomName:propertyKey) ? propertyKey.
+atomName := (display atomName:propertyKey) ? propertyKey.
-	'XWorkstation(error): unexpected targetID (' errorPrint.
+'XWorkstation(error): unexpected targetID (' errorPrint.
-	atomName errorPrint.
+atomName errorPrint.
-	') in selectionNotify: ' errorPrint.
+') in selectionNotify: ' errorPrint.
-	display errorPrintCR.
+display errorPrintCR.
-	done := true.
+done := true.
 ]].
 ! !
 !XWorkstation::SelectionFetcher methodsFor:'selection actions'!
 sema := Semaphore new name:'X11SelectionFetcher'.
 done := false.
 incremental := false.
 [
-	|timeout|
+|timeout|
-	display registerSelectionFetcher:self.
+display registerSelectionFetcher:self.
-	display
+display
-	    requestSelection:aSelectionId
+requestSelection:aSelectionId
-	    type:aTargetId
+type:aTargetId
-	    for:drawableID
+for:drawableID
-	    intoProperty:propertyID.
+intoProperty:propertyID.
-	timeout := display xlibTimeout.
+timeout := display xlibTimeout.
-	[
+[
-	    |currentMessage|
+|currentMessage|
-	    (sema waitWithTimeout:timeout) isNil ifTrue:[
+(sema waitWithTimeout:timeout) isNil ifTrue:[
-		"the selection owner didn't respond within reasonable time"
+"the selection owner didn't respond within reasonable time"
-		'XWorkstation(error): selection owner does not respond:' infoPrint. display infoPrintCR.
+'XWorkstation(error): selection owner does not respond:' infoPrint. display infoPrintCR.
-		^ nil.
+^ nil.
-	    ].
+].
-	    currentMessage := message.
+currentMessage := message.
-	    message := nil.
+message := nil.
-	    currentMessage notNil ifTrue:[currentMessage sendTo:self].
+currentMessage notNil ifTrue:[currentMessage sendTo:self].
-	] doUntil:[done].
+] doUntil:[done].
 ] ensure:[
-	display unregisterSelectionFetcher:self.
+display unregisterSelectionFetcher:self.
 ].
 ^ self getSelection
 ! !
 "
 A special window to serve as window group id. This window
 is newer mapped.
 [author:]
-	Jan Vrany <jan.vrany@fit.cvut.cz>
+Jan Vrany <jan.vrany@fit.cvut.cz>
 [instance variables:]
 [class variables:]
 [see also:]
-	Inter-Client Communication Conventions Manual [http://tronche.com/gui/x/icccm/]
+Inter-Client Communication Conventions Manual [http://tronche.com/gui/x/icccm/]
 "
 ! !
 !XWorkstation class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.575 2013-11-25 10:51:46 cg Exp $'
+^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.576 2013-11-25 11:00:04 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.575 2013-11-25 10:51:46 cg Exp $'
+^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.576 2013-11-25 11:00:04 stefan Exp $'
 !
 version_SVN
 ^ '$ Id $'
 ! !

changeset 6160	3ea2f08308ae
parent 6159	d4e463e0c56c
child 6169	426e8838363a