hg/stx-libview: comparison XWorkstation.st

equal deleted inserted replaced

-:1a09a1d7d28d
+:cf8e46015072
 			      stringAtom lengthAtom
 			      listOfXFonts buttonsPressed
 			      eventRootX eventRootY
 			      displayName eventTrace
 			      dispatchingExpose
-			      rgbVisual virtualRootId'
+			      rgbVisual virtualRootId
+			      eventBuffer'
 classVariableNames:   ''
 poolDictionaries:''
 category:'Interface-Graphics'
 !
 XWorkstation comment:'
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
-$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.40 1995-04-11 15:55:56 claus Exp $
+$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.41 1995-05-03 00:27:22 claus Exp $
 '!
 !XWorkstation class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.40 1995-04-11 15:55:56 claus Exp $
+$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.41 1995-05-03 00:27:22 claus Exp $
 "
 !
 documentation
 "
 ! !
 !XWorkstation primitiveVariables!
 %{
-static XEvent __ev__;
 /*
 * a private error handler
 */
 static char lastErrorMsg[80] = "";
 static unsigned lastRequestCode = 0;
 }
 #endif
 %}
 ! !
-!XWorkstation class methodsFor:'initialization'!
-initialize
-self initializeConstants.
-! !
 !XWorkstation class methodsFor:'error handling'!
 debug:aBoolean
 %{  /* NOCONTEXT */
 %{
 RETURN ( _MKSTRING(lastErrorMsg, __context) );
 %}
 !
-lastError
+lastErrorString
 "return the last X-error string -
 when buffering is on, this may be
 an error for a long-ago operation"
 |string requestCode s match line|
 |dpyName index|
 dpyName := aDisplayName.
 dpyName isNil ifTrue:[
 	"look for a '-display xxx' argument"
-	index := Arguments indexOf:'-display'.
+	Arguments notNil ifTrue:[
-	(index between:1 and:(Arguments size - 1)) ifTrue:[
+	    index := Arguments indexOf:'-display'.
-	    dpyName := Arguments at:index+1
+	    (index between:1 and:(Arguments size - 1)) ifTrue:[
+	        dpyName := Arguments at:index+1
+	    ]
 	]
 ].
 %{
 int scr;
 Display *dpy;
 	_INST(height) = _MKSMALLINT(DisplayHeight(dpy, scr));
 	_INST(widthMM) = _MKSMALLINT(DisplayWidthMM(dpy, scr));
 	_INST(heightMM) = _MKSMALLINT(DisplayHeightMM(dpy, scr));
 	_INST(blackpixel) = _MKSMALLINT(BlackPixel(dpy, scr));
 	_INST(whitepixel) = _MKSMALLINT(WhitePixel(dpy, scr));
 #ifdef SHAPE
 	if (XShapeQueryExtension(dpy, &shapeEventBase, &shapeErrorBase))
 	    _INST(hasShapeExtension) = true;
 	else
-#else
+#endif
 	_INST(hasShapeExtension) = false;
-#endif
 #ifdef SHM
 	if (XShmQueryExtension(dpy, &shmEventBase, &shmErrorBase))
 	    _INST(hasShmExtension) = true;
 	else
-#else
+#endif
 	_INST(hasShmExtension) = false;
-#endif
 #ifdef FAX
 	if (XFAXImageQueryExtension(dpy, &faxEventBase, &faxErrorBase))
 	    _INST(hasFaxExtension) = true;
 	else
-#else
+#endif
 	_INST(hasFaxExtension) = false;
-#endif
 #ifdef DPS
 	if (XQueryExtension(dpy, "DPSExtension", &dummy, &dummy, &dummy))
 	    _INST(hasDPSExtension) = true;
 	else
-#else
+#endif
 	_INST(hasDPSExtension) = false;
-#endif
-	/*
-	 * this is a kludge around a bug in the X11/NeWS server,
-	 * which does not correctly handle saveUnder
-	 */
-	if (strncmp(XServerVendor(dpy), "X11/NeWS", 8) == 0) {
-	    _INST(hasSaveUnder) = false;
-	} else
-	    _INST(hasSaveUnder) = true;
 	/*
 	 * look for RGB visual
 	 */
 	nvi = 0;
 protocolsAtom := nil.
 deleteWindowAtom := nil.
 saveYourselfAtom := nil.
 quitAppAtom := nil.
+self initializeEventBuffer.
+self initializeSpecialFlags.
 self initializeKeyboardMap.
 ObjectMemory errorInterruptHandler:self class.
+!
+initializeEventBuffer
+|sz|
+%{
+sz = _MKSMALLINT(sizeof(XEvent) + 100);
+%}.
+eventBuffer := ByteArray new:sz.
+!
+initializeSpecialFlags
+"perform additional special server implementation flags"
+"/
+"/ assume we have it ... (should check)
+"/
+hasSaveUnder := true.
+ignoreBackingStore := false.
+(self serverVendor = 'X11/NeWS') ifTrue:[
+	"/
+	"/ this is a kludge around a bug in the X11/NeWS server,
+	"/ which does not correctly handle saveUnder
+	"/
+	hasSaveUnder := false.
+].
 !
 close
 "close down the connection to the X-server"
 	y2 = _MKSMALLINT(ypos);
 }
 %}.
 ^ (x2 @ y2)
+!
+rootView
+rootView isNil ifTrue:[
+	rootView := DisplayRootView on:self
+].
+^ rootView
+"
+|v|
+v := Display rootView.
+v paint:Color red.
+v noClipByChildren.
+v fillRectangleX:10 y:10 width:100 height:100.
+"
 ! !
 !XWorkstation methodsFor:'bitmap/window creation'!
 createFaxImageFromArray:data width:w height:h type:type k:k msbFirst:msbFirst
 	} else {
 	    cp = b_bits = allocatedBits = (unsigned char *) malloc(nBytes);
 	    if (! cp) goto fail;
 	}
-	if (_qClass(anArray) == Array) {
+	if (__qClass(anArray) == Array) {
 	    index = 1;
 	    op = &(_ArrayInstPtr(anArray)->a_element[index - 1]);
 	    for (row = b_height; row; row--) {
 		for (col = bytesPerRow; col; col--) {
 		    num = *op++;
 		    bits = _intVal(num);
 		    *cp++ = reverseBitTable[bits];
 		}
 	    }
 	} else {
-	    if (_qClass(anArray) == ByteArray) {
+	    if (__qClass(anArray) == ByteArray) {
 		pBits = _ByteArrayInstPtr(anArray)->ba_element;
 		for (col = b_height*bytesPerRow; col; col--) {
 		    *cp++ = reverseBitTable[*pBits++];
 		}
 	    } else {
 	    len = XTextWidth(f, cp, n);
 	    END_INTERRUPTSBLOCKED
 	    RETURN ( _MKSMALLINT(len) );
 	}
 #ifdef TWOBYTESTRINGS
-	if (_Class(aString) == TwoByteString) {
+	if (__Class(aString) == TwoByteString) {
 	    n = _byteArraySize(aString) / 2;
 	    cp = (char *) _stringVal(aString);
 	    BEGIN_INTERRUPTSBLOCKED
 	    len = XTextWidth16(f, (XChar2b *)cp, n);
 	    END_INTERRUPTSBLOCKED
 		END_INTERRUPTSBLOCKED
 		RETURN ( _MKSMALLINT(len) );
 	    }
 	}
 #ifdef TWOBYTESTRINGS
-	if (_Class(aString) == TwoByteString) {
+	if (__Class(aString) == TwoByteString) {
 	    cp = (char *) _stringVal(aString);
 	    n = _byteArraySize(aString) / 2;
 	    if ((i1 >= 0) && (i2 >= i1) && (i2 < n)) {
 		cp += (i1 * 2);
 		BEGIN_INTERRUPTSBLOCKED
 #endif
 if (__bothSmallInteger(aGCId, aDrawableId)
 && __isNonNilObject(aString)
 && __bothSmallInteger(x, y)) {
-	cls = _qClass(aString);
+	cls = __qClass(aString);
 	if ((cls == String) || (cls == Symbol)) {
 	    cp = _stringVal(aString);
 	    n = _stringSize(aString);
 	    if (n > 1000) n = 1000;
 	    if (opaque == true)
 if (__bothSmallInteger(aGCId, aDrawableId)
 && __isNonNilObject(aString)
 && __bothSmallInteger(index1, index2)
 && __bothSmallInteger(x, y)) {
-	cls = _qClass(aString);
+	cls = __qClass(aString);
 	if ((cls == String) || (cls == Symbol)) {
 	    i1 = _intVal(index1) - 1;
 	    i2 = _intVal(index2) - 1;
 	    n = _stringSize(aString);
 	    cp = _stringVal(aString);
 knownViews isEmpty ifTrue:[
 	dispatching := false.
 	^ self
 ].
-((knownViews size == 1) and:[(knownViews at:1) == RootView]) ifTrue:[
+((knownViews size == 1) and:[(knownViews at:1) == rootView]) ifTrue:[
 	dispatching := false.
 ]
 !
 dispatchPendingEvents
 	]
 ].
 !
 getEventFor:aViewIdOrNil withMask:eventMask
-"read next event - put into local buffer. If aViewIdOrNil is
+"read next event - put into local eventBuffer.
-nil, events for any view are fetched; otherwise only events for that
+If aViewIdOrNil is nil, events for any view are fetched;
-view will be processed.
+otherwise only events for that specific view will be fetched.
+Returns true, if there was an event, false otherwise.
+This method may block - so you better check for pending events
+before calling for it.
 Sorry I had to split dispatch into this fetch method and an extra
 handle method to allow unlimitedstack here.
 (some Xlibs do a big alloca there ...) which cannot be done in
 dispatchLastEvent, since it dispatches out into ST-methods.
 %{  /* UNLIMITEDSTACK */
 Display *dpy = myDpy;
 Window win, wWanted;
 int evMask;
+OBJ eB;
-__ev__.type = 0;
+XEvent *ev;
+eB = _INST(eventBuffer);
+if (__isByteArray(eB)) {
+	ev = (XEvent *)(_ByteArrayInstPtr(eB)->ba_element);
+} else {
+	printf("DISPLAY: no eventBuffer\n");
+	RETURN (false);
+}
+ev->type = 0;
 if (__isSmallInteger(eventMask)) {
 	evMask = _intVal(eventMask);
 } else {
 	evMask = ~0;
 }
 if (__isSmallInteger(aViewIdOrNil)) {
 	wWanted = _WindowVal(aViewIdOrNil);
-	if (XCheckWindowEvent(dpy, wWanted, evMask, &__ev__)) {
+	if (XCheckWindowEvent(dpy, wWanted, evMask, ev)) {
 	    RETURN ( true );
 	}
 } else {
 	if (evMask == ~0) {
-	    XNextEvent(dpy, &__ev__);
+	    XNextEvent(dpy, ev);
 	    RETURN (true);
 	}
-	if (XCheckMaskEvent(dpy, evMask, &__ev__)) {
+	if (XCheckMaskEvent(dpy, evMask, ev)) {
 	   RETURN (true);
 	}
 }
 %}.
 ^ false
 %{  /* STACK: 8000 */
 #   define ANYBUTTON   (Button1MotionMask | Button2MotionMask | Button3MotionMask)
 Display *dpy = myDpy;
+OBJ eB;
-XAnyEvent *ae = (XAnyEvent *)&__ev__;
+XEvent *ev;
-#   define ee ((XExposeEvent *)&__ev__)
-#   define ke ((XKeyPressedEvent *)&__ev__)
+#   define ae ((XAnyEvent *)ev)
-#   define be ((XButtonPressedEvent *)&__ev__)
+#   define ee ((XExposeEvent *)ev)
-#   define ce ((XConfigureEvent *)&__ev__)
+#   define ke ((XKeyPressedEvent *)ev)
-#   define me ((XMotionEvent *)&__ev__)
+#   define be ((XButtonPressedEvent *)ev)
-#   define ewe ((XEnterWindowEvent *)&__ev__)
+#   define ce ((XConfigureEvent *)ev)
-#   define lwe ((XLeaveWindowEvent *)&__ev__)
+#   define me ((XMotionEvent *)ev)
-#   define de ((XDestroyWindowEvent *)&__ev__)
+#   define ewe ((XEnterWindowEvent *)ev)
-#   define ve ((XVisibilityEvent *)&__ev__)
+#   define lwe ((XLeaveWindowEvent *)ev)
+#   define de ((XDestroyWindowEvent *)ev)
+#   define ve ((XVisibilityEvent *)ev)
 KeySym keySym;
 unsigned char buffer[10];
 int i, nchars;
 char *keySymString;
 char keySymStringBuffer[32];
 static struct inlineCache vis = _ILC1;
 static struct inlineCache skpS = _ILC4;
 static struct inlineCache skrS = _ILC4;
+eB = _INST(eventBuffer);
+if (__isByteArray(eB)) {
+	ev = (XEvent *)(_ByteArrayInstPtr(eB)->ba_element);
+} else {
+	printf("DISPLAY: no eventBuffer\n");
+	RETURN (false);
+}
 theView = (*vid.ilc_func)(self, @symbol(viewFromId:) COMMA_CON, nil, &vid,
 			      MKOBJ(ae->window));
 if (theView == nil) {
 	RETURN (nil);
 * sensor and delegate get view as additional argument
 * all of this has been taken out of here to corresponding methods
 * in DeviceWorkstation.
 */
-switch (__ev__.type) {
+switch (ev->type) {
 	case KeyRelease:
 	    symS = @symbol(keyRelease:x:y:view:);
 	    ipS = &skrS;
 	    goto keyPressAndRelease;
 	    break;
 			       theView);
 	    break;
 	case MotionNotify:
 	    if (_INST(motionEventCompression) != false) {
-		while (XCheckWindowEvent(dpy, me->window, ANYBUTTON, &__ev__)) ;;
+		while (XCheckWindowEvent(dpy, me->window, ANYBUTTON, ev)) ;;
 	    }
 	    _INST(eventRootX) = _MKSMALLINT(me->x_root);
 	    _INST(eventRootY) = _MKSMALLINT(me->y_root);
 				    sibling);
 	    }
 	    break;
 	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)))) {
 		    (*termS.ilc_func)(self,
 				      @symbol(terminateView:)
 				      COMMA_CON, nil, &termS, theView);
 		    break;
 		}
-		if (__ev__.xclient.data.l[0] == (int) _AtomVal(_INST(saveYourselfAtom))) {
+		if (ev->xclient.data.l[0] == (int) _AtomVal(_INST(saveYourselfAtom))) {
 		    (*savtermS.ilc_func)(self,
 					 @symbol(saveAndTerminateView:)
 					 COMMA_CON, nil, &savtermS, theView);
 		    break;
 		}
 	case SelectionClear:
 	    (*selClear.ilc_func)(theView,
 				 @symbol(selectionClear:)
 				 COMMA_CON, nil, &selClear,
-				 MKOBJ(__ev__.xselectionclear.selection));
+				 MKOBJ(ev->xselectionclear.selection));
 	    break;
 	case SelectionNotify:
 	    /*
 	     * returned selection value (answer from SelectionRequest)
 	     */
 	    DPRINTF(("SelectionNotify prop=%x target=%x selection= %x requestor=%x\n",
-			__ev__.xselection.property, __ev__.xselection.target,
+			ev->xselection.property, ev->xselection.target,
-			__ev__.xselection.selection, __ev__.xselection.requestor));
+			ev->xselection.selection, ev->xselection.requestor));
 	    (*selNotify.ilc_func)(theView,
 				  @symbol(selectionNotify:target:selection:from:)
 				  COMMA_CON, nil, &selNotify,
-				  MKOBJ(__ev__.xselection.property),
+				  MKOBJ(ev->xselection.property),
-				  MKOBJ(__ev__.xselection.target),
+				  MKOBJ(ev->xselection.target),
-				  MKOBJ(__ev__.xselection.selection),
+				  MKOBJ(ev->xselection.selection),
-				  MKOBJ(__ev__.xselection.requestor));
+				  MKOBJ(ev->xselection.requestor));
 	    break;
 	case SelectionRequest:
 	    /*
 	     * someone wants the selection
 	     */
 	    DPRINTF(("SelectionRequest prop=%x target=%x selection=%x requestor=%x\n",
-			__ev__.xselectionrequest.property,
+			ev->xselectionrequest.property,
-			__ev__.xselectionrequest.target,
+			ev->xselectionrequest.target,
-			__ev__.xselectionrequest.selection,
+			ev->xselectionrequest.selection,
-			__ev__.xselectionrequest.requestor));
+			ev->xselectionrequest.requestor));
 	    (*selReq.ilc_func)(theView,
 			       @symbol(selectionRequest:target:selection:from:)
 			       COMMA_CON, nil, &selReq,
-			       MKOBJ(__ev__.xselectionrequest.property),
+			       MKOBJ(ev->xselectionrequest.property),
-			       MKOBJ(__ev__.xselectionrequest.target),
+			       MKOBJ(ev->xselectionrequest.target),
-			       MKOBJ(__ev__.xselectionrequest.selection),
+			       MKOBJ(ev->xselectionrequest.selection),
-			       MKOBJ(__ev__.xselectionrequest.requestor));
+			       MKOBJ(ev->xselectionrequest.requestor));
 	    break;
 	case ColormapNotify:
 	    (*colormap.ilc_func)(theView,
 				 @symbol(colorMapChange)
 				@symbol(mapping)
 				COMMA_CON, nil, &mapping);
 */
 	    break;
 }
+#undef ae
 #undef ee
 #undef ke
 #undef be
 #undef ce
 #undef me

changeset 135	cf8e46015072
parent 133	ca8ce3916382
child 143	b237b9013f51