--- a/GLXWorkstat.st Thu Nov 02 19:54:11 1995 +0100
+++ b/GLXWorkstat.st Thu Nov 02 21:13:00 1995 +0100
@@ -21,7 +21,7 @@
COPYRIGHT (c) 1993 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/Attic/GLXWorkstat.st,v 1.30 1995-11-02 18:53:32 cg Exp $
+$Header: /cvs/stx/stx/libview/Attic/GLXWorkstat.st,v 1.31 1995-11-02 20:12:17 cg Exp $
'!
!GLXWorkstation class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
version
"
-$Header: /cvs/stx/stx/libview/Attic/GLXWorkstat.st,v 1.30 1995-11-02 18:53:32 cg Exp $
+$Header: /cvs/stx/stx/libview/Attic/GLXWorkstat.st,v 1.31 1995-11-02 20:12:17 cg Exp $
"
!
@@ -173,24 +173,9 @@
* put/pack them into corresponding c variables.
*
*/
-#ifdef OLD
-#if defined(hpux) && defined(POSITIVE_ADDRESSES)
-# define MKDPY(o) (Display *)((int)(o) & ~TAG_INT)
-# define MKWIN(o) (Window)((int)(o) & ~TAG_INT)
-#else
-# define MKDPY(o) (Display *)(__intVal(o))
-# define MKWIN(o) (Window)(__intVal(o))
-#endif
-#else
-# undef MKOBJ
-# define MKOBJ(ptr) (__MKEXTERNALADDRESS(ptr))
-# define MKDPY(o) (Display *)(__externalAddressVal(o))
-# define MKWIN(o) (Window)(__externalAddressVal(o))
-#endif
-
-#define myDpy MKDPY(_INST(displayId))
-#define ISCONNECTED (_INST(displayId) != nil)
-#define _WindowVal(o) (Window)(__intVal(o))
+#define myDpy (Display *)(__MKCP(_INST(displayId)))
+#define ISCONNECTED (_INST(displayId) != nil)
+#define _WindowVal(o) (Window)(__MKCP(o))
/*
* set the GLXWindow for followup drawing
@@ -203,7 +188,7 @@
if (! __isExternalAddress(aGLXWindowId)) { \
RETURN (false); \
} \
- if (GLXwinset(myDpy, MKWIN(aGLXWindowId)) < 0) { \
+ if (GLXwinset(myDpy, _WindowVal(aGLXWindowId)) < 0) { \
RETURN (false); \
} \
_INST(activeWindow) = aGLXWindowId; \
@@ -368,7 +353,7 @@
event->minor_code, event->minor_code, event->resourceid);
fprintf(stderr, "XWORKSTAT: x-error message is '%s'\n", lastErrorMsg);
- __errorInterruptWithIDAndParameter__(@symbol(DisplayError), MKOBJ(dpy));
+ __errorInterruptWithIDAndParameter__(@symbol(DisplayError), __MKOBJ(dpy));
return 0;
}
@@ -1275,7 +1260,7 @@
if (__isSmallInteger(xpos) && __isSmallInteger(ypos)
&& __isSmallInteger(wwidth) && __isSmallInteger(wheight)) {
if (__isExternalAddress(wsuperViewId)) {
- parentWindow = MKWIN(wsuperViewId);
+ parentWindow = _WindowVal(wsuperViewId);
} else {
parentWindow = RootWindow(dpy, screen);
}
@@ -1303,7 +1288,7 @@
RETURN ( nil );
}
- windowId = MKOBJ(newWindow);
+ windowId = __MKOBJ(newWindow);
}
%}.
windowId notNil ifTrue:[
@@ -1317,7 +1302,7 @@
%{
if (__isExternalAddress(aGLXWindowId)) {
ENTERGLX;
- GLXUnlinkWindow(myDpy, MKWIN(aGLXWindowId));
+ GLXUnlinkWindow(myDpy, _WindowVal(aGLXWindowId));
LEAVEGLX;
}
%}
--- a/GLXWorkstation.st Thu Nov 02 19:54:11 1995 +0100
+++ b/GLXWorkstation.st Thu Nov 02 21:13:00 1995 +0100
@@ -21,7 +21,7 @@
COPYRIGHT (c) 1993 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.30 1995-11-02 18:53:32 cg Exp $
+$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.31 1995-11-02 20:12:17 cg Exp $
'!
!GLXWorkstation class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
version
"
-$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.30 1995-11-02 18:53:32 cg Exp $
+$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.31 1995-11-02 20:12:17 cg Exp $
"
!
@@ -173,24 +173,9 @@
* put/pack them into corresponding c variables.
*
*/
-#ifdef OLD
-#if defined(hpux) && defined(POSITIVE_ADDRESSES)
-# define MKDPY(o) (Display *)((int)(o) & ~TAG_INT)
-# define MKWIN(o) (Window)((int)(o) & ~TAG_INT)
-#else
-# define MKDPY(o) (Display *)(__intVal(o))
-# define MKWIN(o) (Window)(__intVal(o))
-#endif
-#else
-# undef MKOBJ
-# define MKOBJ(ptr) (__MKEXTERNALADDRESS(ptr))
-# define MKDPY(o) (Display *)(__externalAddressVal(o))
-# define MKWIN(o) (Window)(__externalAddressVal(o))
-#endif
-
-#define myDpy MKDPY(_INST(displayId))
-#define ISCONNECTED (_INST(displayId) != nil)
-#define _WindowVal(o) (Window)(__intVal(o))
+#define myDpy (Display *)(__MKCP(_INST(displayId)))
+#define ISCONNECTED (_INST(displayId) != nil)
+#define _WindowVal(o) (Window)(__MKCP(o))
/*
* set the GLXWindow for followup drawing
@@ -203,7 +188,7 @@
if (! __isExternalAddress(aGLXWindowId)) { \
RETURN (false); \
} \
- if (GLXwinset(myDpy, MKWIN(aGLXWindowId)) < 0) { \
+ if (GLXwinset(myDpy, _WindowVal(aGLXWindowId)) < 0) { \
RETURN (false); \
} \
_INST(activeWindow) = aGLXWindowId; \
@@ -368,7 +353,7 @@
event->minor_code, event->minor_code, event->resourceid);
fprintf(stderr, "XWORKSTAT: x-error message is '%s'\n", lastErrorMsg);
- __errorInterruptWithIDAndParameter__(@symbol(DisplayError), MKOBJ(dpy));
+ __errorInterruptWithIDAndParameter__(@symbol(DisplayError), __MKOBJ(dpy));
return 0;
}
@@ -1275,7 +1260,7 @@
if (__isSmallInteger(xpos) && __isSmallInteger(ypos)
&& __isSmallInteger(wwidth) && __isSmallInteger(wheight)) {
if (__isExternalAddress(wsuperViewId)) {
- parentWindow = MKWIN(wsuperViewId);
+ parentWindow = _WindowVal(wsuperViewId);
} else {
parentWindow = RootWindow(dpy, screen);
}
@@ -1303,7 +1288,7 @@
RETURN ( nil );
}
- windowId = MKOBJ(newWindow);
+ windowId = __MKOBJ(newWindow);
}
%}.
windowId notNil ifTrue:[
@@ -1317,7 +1302,7 @@
%{
if (__isExternalAddress(aGLXWindowId)) {
ENTERGLX;
- GLXUnlinkWindow(myDpy, MKWIN(aGLXWindowId));
+ GLXUnlinkWindow(myDpy, _WindowVal(aGLXWindowId));
LEAVEGLX;
}
%}
--- a/ImageRdr.st Thu Nov 02 19:54:11 1995 +0100
+++ b/ImageRdr.st Thu Nov 02 21:13:00 1995 +0100
@@ -24,7 +24,7 @@
COPYRIGHT (c) 1991 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/Attic/ImageRdr.st,v 1.21 1995-09-17 22:53:26 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/ImageRdr.st,v 1.22 1995-11-02 20:12:33 cg Exp $
'!
!ImageReader primitiveDefinitions!
@@ -994,7 +994,7 @@
version
"
-$Header: /cvs/stx/stx/libview/Attic/ImageRdr.st,v 1.21 1995-09-17 22:53:26 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/ImageRdr.st,v 1.22 1995-11-02 20:12:33 cg Exp $
"
!
@@ -1247,7 +1247,7 @@
RETURN (false);
}
if (loadBMP1to8(__intVal(width), __intVal(height),
- MKFD(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
+ __FILEVal(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
RETURN (true);
}
RETURN (false);
@@ -1266,7 +1266,7 @@
RETURN (false);
}
if (loadBMP2to8(__intVal(width), __intVal(height),
- MKFD(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
+ __FILEVal(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
RETURN (true);
}
RETURN (false);
@@ -1286,7 +1286,7 @@
RETURN (false);
}
if (loadBMP8(__intVal(width), __intVal(height), __intVal(compression),
- MKFD(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
+ __FILEVal(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
RETURN (true);
}
RETURN (false);
@@ -1306,7 +1306,7 @@
RETURN (false);
}
if (loadBMP4to8(__intVal(width), __intVal(height), __intVal(compression),
- MKFD(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
+ __FILEVal(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
RETURN (true);
}
RETURN (false);
--- a/ImageReader.st Thu Nov 02 19:54:11 1995 +0100
+++ b/ImageReader.st Thu Nov 02 21:13:00 1995 +0100
@@ -24,7 +24,7 @@
COPYRIGHT (c) 1991 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.21 1995-09-17 22:53:26 claus Exp $
+$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.22 1995-11-02 20:12:33 cg Exp $
'!
!ImageReader primitiveDefinitions!
@@ -994,7 +994,7 @@
version
"
-$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.21 1995-09-17 22:53:26 claus Exp $
+$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.22 1995-11-02 20:12:33 cg Exp $
"
!
@@ -1247,7 +1247,7 @@
RETURN (false);
}
if (loadBMP1to8(__intVal(width), __intVal(height),
- MKFD(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
+ __FILEVal(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
RETURN (true);
}
RETURN (false);
@@ -1266,7 +1266,7 @@
RETURN (false);
}
if (loadBMP2to8(__intVal(width), __intVal(height),
- MKFD(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
+ __FILEVal(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
RETURN (true);
}
RETURN (false);
@@ -1286,7 +1286,7 @@
RETURN (false);
}
if (loadBMP8(__intVal(width), __intVal(height), __intVal(compression),
- MKFD(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
+ __FILEVal(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
RETURN (true);
}
RETURN (false);
@@ -1306,7 +1306,7 @@
RETURN (false);
}
if (loadBMP4to8(__intVal(width), __intVal(height), __intVal(compression),
- MKFD(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
+ __FILEVal(f), __ByteArrayInstPtr(aByteArray)->ba_element)) {
RETURN (true);
}
RETURN (false);
--- a/XWorkstat.st Thu Nov 02 19:54:11 1995 +0100
+++ b/XWorkstat.st Thu Nov 02 21:13:00 1995 +0100
@@ -36,7 +36,7 @@
COPYRIGHT (c) 1989 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.65 1995-11-02 18:54:11 cg Exp $
+$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.66 1995-11-02 20:13:00 cg Exp $
'!
!XWorkstation class methodsFor:'documentation'!
@@ -57,7 +57,7 @@
version
"
-$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.65 1995-11-02 18:54:11 cg Exp $
+$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.66 1995-11-02 20:13:00 cg Exp $
"
!
@@ -181,43 +181,23 @@
# define DISPLAYACCESS(d) d
#endif
-#ifdef OLD
-#if defined(hpux) && defined(POSITIVE_ADDRESSES)
-# undef MKOBJ
-# define MKOBJ(p) (OBJ)((int)p | TAG_INT)
-# define MKCP(o) (char *)((int)(o) & ~TAG_INT)
-#else
-# define MKCP(o) (char *)(_intVal(o))
-#endif
-
-#else
-
-extern OBJ __MKEXTERNALADDRESS();
-
-# undef MKOBJ
-# undef MKCP
-# define MKOBJ(p) __MKEXTERNALADDRESS(p)
-# define MKCP(o) (char *)(__externalAddressVal(o))
-
-#endif
-
/*
* some defines - tired of typing ...
*/
-#define _DisplayVal(o) (Display *)(MKCP(o))
-#define _WindowVal(o) (Window)(MKCP(o))
-#define _PixmapVal(o) (Pixmap)(MKCP(o))
-#define _GCVal(o) (GC)(MKCP(o))
-#define _CursorVal(o) (Cursor)(MKCP(o))
-#define _FontVal(o) (XFontStruct *)(MKCP(o))
-#define _DPSContextVal(o) (DPSContext)(MKCP(o))
-
-#define MKATOMOBJ(a) __MKSMALLINT(a)
+#define _DisplayVal(o) (Display *)(__MKCP(o))
+#define _WindowVal(o) (Window)(__MKCP(o))
+#define _PixmapVal(o) (Pixmap)(__MKCP(o))
+#define _GCVal(o) (GC)(__MKCP(o))
+#define _CursorVal(o) (Cursor)(__MKCP(o))
+#define _FontVal(o) (XFontStruct *)(__MKCP(o))
+#define _DPSContextVal(o) (DPSContext)(__MKCP(o))
+
+#define __MKATOMOBJ(a) __MKSMALLINT(a)
#define _AtomVal(o) __intVal(o)
#define __isAtomID(o) __isSmallInteger(o)
-#define myDpy _DisplayVal(_INST(displayId))
-#define ISCONNECTED (_INST(displayId) != nil)
+#define myDpy _DisplayVal(_INST(displayId))
+#define ISCONNECTED (_INST(displayId) != nil)
#ifndef THISCONTEXT_IN_REGISTER
# define BEGIN_INTERRUPTSBLOCKED /* */
@@ -295,7 +275,7 @@
event->minor_code, event->minor_code, event->resourceid);
fprintf(stderr, "XWORKSTAT: x-error message is '%s'\n", lastErrorMsg);
- __errorInterruptWithIDAndParameter__(@symbol(DisplayError), MKOBJ(dpy));
+ __errorInterruptWithIDAndParameter__(@symbol(DisplayError), __MKOBJ(dpy));
return 0;
}
@@ -376,7 +356,7 @@
resourceIdOfLastError
%{ /* NOCONTEXT */
- RETURN ( MKOBJ(lastResource) );
+ RETURN ( __MKOBJ(lastResource) );
%}
!
@@ -464,7 +444,7 @@
dpy = XOpenDisplay(nm);
if (dpy) {
- dpyID = MKOBJ(dpy);
+ dpyID = __MKOBJ(dpy);
#ifdef SUPERDEBUG
XSynchronize(dpy, 1);
@@ -641,7 +621,7 @@
if (vip) XFree ((char *) vip);
if (maxRGBDepth) {
- _INST(rgbVisual) = MKOBJ(rgbVisualID); __STORESELF(rgbVisual);
+ _INST(rgbVisual) = __MKOBJ(rgbVisualID); __STORESELF(rgbVisual);
}
visual = DefaultVisualOfScreen(DefaultScreenOfDisplay(dpy));
@@ -729,29 +709,29 @@
}
#ifndef XA_PRIMARY
- _INST(primaryAtom) = MKATOMOBJ( XInternAtom(dpy, "PRIMARY", True) );
+ _INST(primaryAtom) = __MKATOMOBJ( XInternAtom(dpy, "PRIMARY", True) );
#else
- _INST(primaryAtom) = MKATOMOBJ( XA_PRIMARY );
+ _INST(primaryAtom) = __MKATOMOBJ( XA_PRIMARY );
#endif
#ifndef XA_SECONDARY
- _INST(secondaryAtom) = MKATOMOBJ( XInternAtom(dpy, "SECONDARY", True) );
+ _INST(secondaryAtom) = __MKATOMOBJ( XInternAtom(dpy, "SECONDARY", True) );
#else
- _INST(secondaryAtom) = MKATOMOBJ( XA_SECONDARY );
+ _INST(secondaryAtom) = __MKATOMOBJ( XA_SECONDARY );
#endif
#ifndef XA_CUT_BUFFER0
- _INST(cutBuffer0Atom) = MKATOMOBJ( XInternAtom(dpy, "CUT_BUFFER0", True) );
+ _INST(cutBuffer0Atom) = __MKATOMOBJ( XInternAtom(dpy, "CUT_BUFFER0", True) );
#else
- _INST(cutBuffer0Atom) = MKATOMOBJ( XA_CUT_BUFFER0 );
+ _INST(cutBuffer0Atom) = __MKATOMOBJ( XA_CUT_BUFFER0 );
#endif
#ifndef XA_STRING
- _INST(stringAtom) = MKATOMOBJ( XInternAtom(dpy, "STRING", True) );
+ _INST(stringAtom) = __MKATOMOBJ( XInternAtom(dpy, "STRING", True) );
#else
- _INST(stringAtom) = MKATOMOBJ( XA_STRING );
+ _INST(stringAtom) = __MKATOMOBJ( XA_STRING );
#endif
#ifndef XA_LENGTH
- _INST(lengthAtom) = MKATOMOBJ( XInternAtom(dpy, "LENGTH", True) );
+ _INST(lengthAtom) = __MKATOMOBJ( XInternAtom(dpy, "LENGTH", True) );
#else
- _INST(lengthAtom) = MKATOMOBJ( XA_LENGTH );
+ _INST(lengthAtom) = __MKATOMOBJ( XA_LENGTH );
#endif
END_INTERRUPTSBLOCKED
@@ -1288,7 +1268,7 @@
&xpos, &ypos, &child_return);
END_INTERRUPTSBLOCKED
if (child_return) {
- RETURN ( MKOBJ(child_return) );
+ RETURN ( __MKOBJ(child_return) );
}
RETURN ( nil );
}
@@ -1432,7 +1412,7 @@
_type, _k, _msb,
_intVal(nBytes), bits);
END_INTERRUPTSBLOCKED
- RETURN ( (newImage != (FAXImage)0) ? MKOBJ(newImage) : nil );
+ RETURN ( (newImage != (FAXImage)0) ? __MKOBJ(newImage) : nil );
}
#else
RETURN ( nil );
@@ -1458,7 +1438,7 @@
newBitmap = XCreatePixmap(dpy, RootWindow(dpy, screen),
_intVal(w), _intVal(h), 1);
END_INTERRUPTSBLOCKED
- RETURN ( (newBitmap != (Pixmap)0) ? MKOBJ(newBitmap) : nil );
+ RETURN ( (newBitmap != (Pixmap)0) ? __MKOBJ(newBitmap) : nil );
}
%}
.
@@ -1481,7 +1461,7 @@
newBitmap = XCreatePixmap(dpy, RootWindow(dpy, screen),
_intVal(w), _intVal(h), _intVal(d));
END_INTERRUPTSBLOCKED
- RETURN ( (newBitmap != (Pixmap)0) ? MKOBJ(newBitmap) : nil );
+ RETURN ( (newBitmap != (Pixmap)0) ? __MKOBJ(newBitmap) : nil );
}
%}
.
@@ -1514,7 +1494,7 @@
if (status == BitmapSuccess) {
w = _MKSMALLINT(b_width);
h = _MKSMALLINT(b_height);
- id = MKOBJ(newBitmap);
+ id = __MKOBJ(newBitmap);
}
}
}
@@ -1604,7 +1584,7 @@
fail: ;
if (allocatedBits)
free(allocatedBits);
- RETURN ( newBitmap ? MKOBJ(newBitmap) : nil );
+ RETURN ( newBitmap ? __MKOBJ(newBitmap) : nil );
}
%}
!
@@ -1671,7 +1651,7 @@
if (! root) {
id = nil;
} else {
- _INST(rootId) = id = MKOBJ(root); __STORE(self, id);
+ _INST(rootId) = id = __MKOBJ(root); __STORE(self, id);
}
RETURN (id);
}
@@ -1752,8 +1732,8 @@
RETURN ( nil );
}
}
- _INST(rootId) = id = MKOBJ(rootWin); __STORE(self, id);
- _INST(virtualRootId) = id = MKOBJ(vRootWin); __STORE(self, id);
+ _INST(rootId) = id = __MKOBJ(rootWin); __STORE(self, id);
+ _INST(virtualRootId) = id = __MKOBJ(vRootWin); __STORE(self, id);
RETURN ( id );
%}
!
@@ -2063,17 +2043,17 @@
*/
if (_INST(protocolsAtom) == nil) {
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);
- _INST(saveYourselfAtom) = MKATOMOBJ(WmSaveYourselfAtom);
+ _INST(saveYourselfAtom) = __MKATOMOBJ(WmSaveYourselfAtom);
#endif
#ifdef USE_QUIT_APP_ATOM
WmQuitAppAtom = XInternAtom(dpy, "_WM_QUIT_APP", False);
- _INST(quitAppAtom) = MKATOMOBJ(WmQuitAppAtom);
+ _INST(quitAppAtom) = __MKATOMOBJ(WmQuitAppAtom);
#endif
WmDeleteWindowAtom = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
- _INST(deleteWindowAtom) = MKATOMOBJ(WmDeleteWindowAtom);
+ _INST(deleteWindowAtom) = __MKATOMOBJ(WmDeleteWindowAtom);
} else {
#ifdef USE_QUIT_APP_ATOM
WmQuitAppAtom = _AtomVal(_INST(quitAppAtom));
@@ -2102,7 +2082,7 @@
END_INTERRUPTSBLOCKED
- windowId = MKOBJ(newWindow);
+ windowId = __MKOBJ(newWindow);
%}.
self addKnownView:aView withId:windowId.
^ windowId
@@ -2143,7 +2123,7 @@
gc = XCreateGC(myDpy, (Drawable)_WindowVal(aDrawableId),
0L, (XGCValues *)0);
END_INTERRUPTSBLOCKED
- RETURN ( gc ? MKOBJ(gc) : nil );
+ RETURN ( gc ? __MKOBJ(gc) : nil );
}
%}.
self primitiveFailed.
@@ -2169,7 +2149,7 @@
XDPSDefaultErrorProc,
NULL);
END_INTERRUPTSBLOCKED
- RETURN ( dps ? MKOBJ(dps) : nil );
+ RETURN ( dps ? __MKOBJ(dps) : nil );
}
#endif
%}
@@ -2338,7 +2318,7 @@
ok = 0;
break;
}
- typeID = MKATOMOBJ(actual_type);
+ typeID = __MKATOMOBJ(actual_type);
if (! cp) {
cp = cp2 = (char *)malloc(nitems+1);
} else {
@@ -2390,7 +2370,7 @@
if (__isAtomID(selectionAtomID) && ISCONNECTED) {
window = XGetSelectionOwner(dpy, _AtomVal(selectionAtomID));
- RETURN ((window == None) ? nil : MKOBJ(window));
+ RETURN ((window == None) ? nil : __MKOBJ(window));
}
%}.
self primitiveFailed.
@@ -2518,7 +2498,7 @@
if (prop == None) {
RETURN (nil);
}
- RETURN ( MKATOMOBJ(prop) );
+ RETURN ( __MKATOMOBJ(prop) );
}
}
%}.
@@ -3117,7 +3097,7 @@
BEGIN_INTERRUPTSBLOCKED
newFont = XLoadQueryFont(myDpy, (char *)__stringVal(aFontName));
END_INTERRUPTSBLOCKED
- RETURN ( newFont ? MKOBJ(newFont) : nil );
+ RETURN ( newFont ? __MKOBJ(newFont) : nil );
}
}
%}.
@@ -3403,7 +3383,7 @@
&fgColor, &bgColor, _intVal(hx), _intVal(hy));
END_INTERRUPTSBLOCKED
if (newCursor != (Cursor)0) {
- id = MKOBJ(newCursor);
+ id = __MKOBJ(newCursor);
}
}
%}.
@@ -3461,7 +3441,7 @@
newCursor = XCreateFontCursor(myDpy, _intVal(number));
END_INTERRUPTSBLOCKED
if (newCursor != (Cursor)0) {
- id = MKOBJ(newCursor);
+ id = __MKOBJ(newCursor);
}
}
%}.
@@ -4228,7 +4208,7 @@
%{ /* NOCONTEXT */
if (__isExternalAddress(aWindowId)
- && __isSmallInteger(aPixmapId)) {
+ && __isExternalAddress(aPixmapId)) {
XSetWindowBackgroundPixmap(myDpy, _WindowVal(aWindowId), _PixmapVal(aPixmapId));
RETURN ( self );
}
@@ -6141,7 +6121,7 @@
RETURN (false);
}
- windowID = MKOBJ(ae->window);
+ windowID = __MKOBJ(ae->window);
theView = (*vid.ilc_func)(self, @symbol(viewFromId:) COMMA_CON, nil, &vid, windowID);
if (theView == nil) {
@@ -6407,7 +6387,7 @@
case ConfigureNotify:
if (ce->above != None) {
- siblingID = MKOBJ(ce->above);
+ siblingID = __MKOBJ(ce->above);
sibling = (*vid.ilc_func)(self, @symbol(viewFromId:)
COMMA_CON, nil, &vid, siblingID);
}
@@ -6516,7 +6496,7 @@
break;
case SelectionClear:
- selectionID = MKATOMOBJ(ev->xselectionclear.selection);
+ selectionID = __MKATOMOBJ(ev->xselectionclear.selection);
(*selClear.ilc_func)(theView,
@symbol(selectionClear:)
COMMA_CON, nil, &selClear,
@@ -6531,10 +6511,10 @@
ev->xselection.property, ev->xselection.target,
ev->xselection.selection, ev->xselection.requestor));
- propertyID = MKATOMOBJ(ev->xselection.property);
- targetID = MKATOMOBJ(ev->xselection.target);
- selectionID = MKATOMOBJ(ev->xselection.selection);
- requestorID = MKOBJ(ev->xselection.requestor);
+ propertyID = __MKATOMOBJ(ev->xselection.property);
+ targetID = __MKATOMOBJ(ev->xselection.target);
+ selectionID = __MKATOMOBJ(ev->xselection.selection);
+ requestorID = __MKOBJ(ev->xselection.requestor);
(*selNotify.ilc_func)(theView,
@symbol(selectionNotify:target:selection:from:)
COMMA_CON, nil, &selNotify,
@@ -6551,10 +6531,10 @@
ev->xselectionrequest.selection,
ev->xselectionrequest.requestor));
- propertyID = MKATOMOBJ(ev->xselectionrequest.property);
- targetID = MKATOMOBJ(ev->xselectionrequest.target);
- selectionID = MKATOMOBJ(ev->xselectionrequest.selection);
- requestorID = MKOBJ(ev->xselectionrequest.requestor);
+ propertyID = __MKATOMOBJ(ev->xselectionrequest.property);
+ targetID = __MKATOMOBJ(ev->xselectionrequest.target);
+ selectionID = __MKATOMOBJ(ev->xselectionrequest.selection);
+ requestorID = __MKOBJ(ev->xselectionrequest.requestor);
(*selReq.ilc_func)(theView,
@symbol(selectionRequest:target:selection:from:)
COMMA_CON, nil, &selReq,
--- a/XWorkstation.st Thu Nov 02 19:54:11 1995 +0100
+++ b/XWorkstation.st Thu Nov 02 21:13:00 1995 +0100
@@ -36,7 +36,7 @@
COPYRIGHT (c) 1989 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.65 1995-11-02 18:54:11 cg Exp $
+$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.66 1995-11-02 20:13:00 cg Exp $
'!
!XWorkstation class methodsFor:'documentation'!
@@ -57,7 +57,7 @@
version
"
-$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.65 1995-11-02 18:54:11 cg Exp $
+$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.66 1995-11-02 20:13:00 cg Exp $
"
!
@@ -181,43 +181,23 @@
# define DISPLAYACCESS(d) d
#endif
-#ifdef OLD
-#if defined(hpux) && defined(POSITIVE_ADDRESSES)
-# undef MKOBJ
-# define MKOBJ(p) (OBJ)((int)p | TAG_INT)
-# define MKCP(o) (char *)((int)(o) & ~TAG_INT)
-#else
-# define MKCP(o) (char *)(_intVal(o))
-#endif
-
-#else
-
-extern OBJ __MKEXTERNALADDRESS();
-
-# undef MKOBJ
-# undef MKCP
-# define MKOBJ(p) __MKEXTERNALADDRESS(p)
-# define MKCP(o) (char *)(__externalAddressVal(o))
-
-#endif
-
/*
* some defines - tired of typing ...
*/
-#define _DisplayVal(o) (Display *)(MKCP(o))
-#define _WindowVal(o) (Window)(MKCP(o))
-#define _PixmapVal(o) (Pixmap)(MKCP(o))
-#define _GCVal(o) (GC)(MKCP(o))
-#define _CursorVal(o) (Cursor)(MKCP(o))
-#define _FontVal(o) (XFontStruct *)(MKCP(o))
-#define _DPSContextVal(o) (DPSContext)(MKCP(o))
-
-#define MKATOMOBJ(a) __MKSMALLINT(a)
+#define _DisplayVal(o) (Display *)(__MKCP(o))
+#define _WindowVal(o) (Window)(__MKCP(o))
+#define _PixmapVal(o) (Pixmap)(__MKCP(o))
+#define _GCVal(o) (GC)(__MKCP(o))
+#define _CursorVal(o) (Cursor)(__MKCP(o))
+#define _FontVal(o) (XFontStruct *)(__MKCP(o))
+#define _DPSContextVal(o) (DPSContext)(__MKCP(o))
+
+#define __MKATOMOBJ(a) __MKSMALLINT(a)
#define _AtomVal(o) __intVal(o)
#define __isAtomID(o) __isSmallInteger(o)
-#define myDpy _DisplayVal(_INST(displayId))
-#define ISCONNECTED (_INST(displayId) != nil)
+#define myDpy _DisplayVal(_INST(displayId))
+#define ISCONNECTED (_INST(displayId) != nil)
#ifndef THISCONTEXT_IN_REGISTER
# define BEGIN_INTERRUPTSBLOCKED /* */
@@ -295,7 +275,7 @@
event->minor_code, event->minor_code, event->resourceid);
fprintf(stderr, "XWORKSTAT: x-error message is '%s'\n", lastErrorMsg);
- __errorInterruptWithIDAndParameter__(@symbol(DisplayError), MKOBJ(dpy));
+ __errorInterruptWithIDAndParameter__(@symbol(DisplayError), __MKOBJ(dpy));
return 0;
}
@@ -376,7 +356,7 @@
resourceIdOfLastError
%{ /* NOCONTEXT */
- RETURN ( MKOBJ(lastResource) );
+ RETURN ( __MKOBJ(lastResource) );
%}
!
@@ -464,7 +444,7 @@
dpy = XOpenDisplay(nm);
if (dpy) {
- dpyID = MKOBJ(dpy);
+ dpyID = __MKOBJ(dpy);
#ifdef SUPERDEBUG
XSynchronize(dpy, 1);
@@ -641,7 +621,7 @@
if (vip) XFree ((char *) vip);
if (maxRGBDepth) {
- _INST(rgbVisual) = MKOBJ(rgbVisualID); __STORESELF(rgbVisual);
+ _INST(rgbVisual) = __MKOBJ(rgbVisualID); __STORESELF(rgbVisual);
}
visual = DefaultVisualOfScreen(DefaultScreenOfDisplay(dpy));
@@ -729,29 +709,29 @@
}
#ifndef XA_PRIMARY
- _INST(primaryAtom) = MKATOMOBJ( XInternAtom(dpy, "PRIMARY", True) );
+ _INST(primaryAtom) = __MKATOMOBJ( XInternAtom(dpy, "PRIMARY", True) );
#else
- _INST(primaryAtom) = MKATOMOBJ( XA_PRIMARY );
+ _INST(primaryAtom) = __MKATOMOBJ( XA_PRIMARY );
#endif
#ifndef XA_SECONDARY
- _INST(secondaryAtom) = MKATOMOBJ( XInternAtom(dpy, "SECONDARY", True) );
+ _INST(secondaryAtom) = __MKATOMOBJ( XInternAtom(dpy, "SECONDARY", True) );
#else
- _INST(secondaryAtom) = MKATOMOBJ( XA_SECONDARY );
+ _INST(secondaryAtom) = __MKATOMOBJ( XA_SECONDARY );
#endif
#ifndef XA_CUT_BUFFER0
- _INST(cutBuffer0Atom) = MKATOMOBJ( XInternAtom(dpy, "CUT_BUFFER0", True) );
+ _INST(cutBuffer0Atom) = __MKATOMOBJ( XInternAtom(dpy, "CUT_BUFFER0", True) );
#else
- _INST(cutBuffer0Atom) = MKATOMOBJ( XA_CUT_BUFFER0 );
+ _INST(cutBuffer0Atom) = __MKATOMOBJ( XA_CUT_BUFFER0 );
#endif
#ifndef XA_STRING
- _INST(stringAtom) = MKATOMOBJ( XInternAtom(dpy, "STRING", True) );
+ _INST(stringAtom) = __MKATOMOBJ( XInternAtom(dpy, "STRING", True) );
#else
- _INST(stringAtom) = MKATOMOBJ( XA_STRING );
+ _INST(stringAtom) = __MKATOMOBJ( XA_STRING );
#endif
#ifndef XA_LENGTH
- _INST(lengthAtom) = MKATOMOBJ( XInternAtom(dpy, "LENGTH", True) );
+ _INST(lengthAtom) = __MKATOMOBJ( XInternAtom(dpy, "LENGTH", True) );
#else
- _INST(lengthAtom) = MKATOMOBJ( XA_LENGTH );
+ _INST(lengthAtom) = __MKATOMOBJ( XA_LENGTH );
#endif
END_INTERRUPTSBLOCKED
@@ -1288,7 +1268,7 @@
&xpos, &ypos, &child_return);
END_INTERRUPTSBLOCKED
if (child_return) {
- RETURN ( MKOBJ(child_return) );
+ RETURN ( __MKOBJ(child_return) );
}
RETURN ( nil );
}
@@ -1432,7 +1412,7 @@
_type, _k, _msb,
_intVal(nBytes), bits);
END_INTERRUPTSBLOCKED
- RETURN ( (newImage != (FAXImage)0) ? MKOBJ(newImage) : nil );
+ RETURN ( (newImage != (FAXImage)0) ? __MKOBJ(newImage) : nil );
}
#else
RETURN ( nil );
@@ -1458,7 +1438,7 @@
newBitmap = XCreatePixmap(dpy, RootWindow(dpy, screen),
_intVal(w), _intVal(h), 1);
END_INTERRUPTSBLOCKED
- RETURN ( (newBitmap != (Pixmap)0) ? MKOBJ(newBitmap) : nil );
+ RETURN ( (newBitmap != (Pixmap)0) ? __MKOBJ(newBitmap) : nil );
}
%}
.
@@ -1481,7 +1461,7 @@
newBitmap = XCreatePixmap(dpy, RootWindow(dpy, screen),
_intVal(w), _intVal(h), _intVal(d));
END_INTERRUPTSBLOCKED
- RETURN ( (newBitmap != (Pixmap)0) ? MKOBJ(newBitmap) : nil );
+ RETURN ( (newBitmap != (Pixmap)0) ? __MKOBJ(newBitmap) : nil );
}
%}
.
@@ -1514,7 +1494,7 @@
if (status == BitmapSuccess) {
w = _MKSMALLINT(b_width);
h = _MKSMALLINT(b_height);
- id = MKOBJ(newBitmap);
+ id = __MKOBJ(newBitmap);
}
}
}
@@ -1604,7 +1584,7 @@
fail: ;
if (allocatedBits)
free(allocatedBits);
- RETURN ( newBitmap ? MKOBJ(newBitmap) : nil );
+ RETURN ( newBitmap ? __MKOBJ(newBitmap) : nil );
}
%}
!
@@ -1671,7 +1651,7 @@
if (! root) {
id = nil;
} else {
- _INST(rootId) = id = MKOBJ(root); __STORE(self, id);
+ _INST(rootId) = id = __MKOBJ(root); __STORE(self, id);
}
RETURN (id);
}
@@ -1752,8 +1732,8 @@
RETURN ( nil );
}
}
- _INST(rootId) = id = MKOBJ(rootWin); __STORE(self, id);
- _INST(virtualRootId) = id = MKOBJ(vRootWin); __STORE(self, id);
+ _INST(rootId) = id = __MKOBJ(rootWin); __STORE(self, id);
+ _INST(virtualRootId) = id = __MKOBJ(vRootWin); __STORE(self, id);
RETURN ( id );
%}
!
@@ -2063,17 +2043,17 @@
*/
if (_INST(protocolsAtom) == nil) {
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);
- _INST(saveYourselfAtom) = MKATOMOBJ(WmSaveYourselfAtom);
+ _INST(saveYourselfAtom) = __MKATOMOBJ(WmSaveYourselfAtom);
#endif
#ifdef USE_QUIT_APP_ATOM
WmQuitAppAtom = XInternAtom(dpy, "_WM_QUIT_APP", False);
- _INST(quitAppAtom) = MKATOMOBJ(WmQuitAppAtom);
+ _INST(quitAppAtom) = __MKATOMOBJ(WmQuitAppAtom);
#endif
WmDeleteWindowAtom = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
- _INST(deleteWindowAtom) = MKATOMOBJ(WmDeleteWindowAtom);
+ _INST(deleteWindowAtom) = __MKATOMOBJ(WmDeleteWindowAtom);
} else {
#ifdef USE_QUIT_APP_ATOM
WmQuitAppAtom = _AtomVal(_INST(quitAppAtom));
@@ -2102,7 +2082,7 @@
END_INTERRUPTSBLOCKED
- windowId = MKOBJ(newWindow);
+ windowId = __MKOBJ(newWindow);
%}.
self addKnownView:aView withId:windowId.
^ windowId
@@ -2143,7 +2123,7 @@
gc = XCreateGC(myDpy, (Drawable)_WindowVal(aDrawableId),
0L, (XGCValues *)0);
END_INTERRUPTSBLOCKED
- RETURN ( gc ? MKOBJ(gc) : nil );
+ RETURN ( gc ? __MKOBJ(gc) : nil );
}
%}.
self primitiveFailed.
@@ -2169,7 +2149,7 @@
XDPSDefaultErrorProc,
NULL);
END_INTERRUPTSBLOCKED
- RETURN ( dps ? MKOBJ(dps) : nil );
+ RETURN ( dps ? __MKOBJ(dps) : nil );
}
#endif
%}
@@ -2338,7 +2318,7 @@
ok = 0;
break;
}
- typeID = MKATOMOBJ(actual_type);
+ typeID = __MKATOMOBJ(actual_type);
if (! cp) {
cp = cp2 = (char *)malloc(nitems+1);
} else {
@@ -2390,7 +2370,7 @@
if (__isAtomID(selectionAtomID) && ISCONNECTED) {
window = XGetSelectionOwner(dpy, _AtomVal(selectionAtomID));
- RETURN ((window == None) ? nil : MKOBJ(window));
+ RETURN ((window == None) ? nil : __MKOBJ(window));
}
%}.
self primitiveFailed.
@@ -2518,7 +2498,7 @@
if (prop == None) {
RETURN (nil);
}
- RETURN ( MKATOMOBJ(prop) );
+ RETURN ( __MKATOMOBJ(prop) );
}
}
%}.
@@ -3117,7 +3097,7 @@
BEGIN_INTERRUPTSBLOCKED
newFont = XLoadQueryFont(myDpy, (char *)__stringVal(aFontName));
END_INTERRUPTSBLOCKED
- RETURN ( newFont ? MKOBJ(newFont) : nil );
+ RETURN ( newFont ? __MKOBJ(newFont) : nil );
}
}
%}.
@@ -3403,7 +3383,7 @@
&fgColor, &bgColor, _intVal(hx), _intVal(hy));
END_INTERRUPTSBLOCKED
if (newCursor != (Cursor)0) {
- id = MKOBJ(newCursor);
+ id = __MKOBJ(newCursor);
}
}
%}.
@@ -3461,7 +3441,7 @@
newCursor = XCreateFontCursor(myDpy, _intVal(number));
END_INTERRUPTSBLOCKED
if (newCursor != (Cursor)0) {
- id = MKOBJ(newCursor);
+ id = __MKOBJ(newCursor);
}
}
%}.
@@ -4228,7 +4208,7 @@
%{ /* NOCONTEXT */
if (__isExternalAddress(aWindowId)
- && __isSmallInteger(aPixmapId)) {
+ && __isExternalAddress(aPixmapId)) {
XSetWindowBackgroundPixmap(myDpy, _WindowVal(aWindowId), _PixmapVal(aPixmapId));
RETURN ( self );
}
@@ -6141,7 +6121,7 @@
RETURN (false);
}
- windowID = MKOBJ(ae->window);
+ windowID = __MKOBJ(ae->window);
theView = (*vid.ilc_func)(self, @symbol(viewFromId:) COMMA_CON, nil, &vid, windowID);
if (theView == nil) {
@@ -6407,7 +6387,7 @@
case ConfigureNotify:
if (ce->above != None) {
- siblingID = MKOBJ(ce->above);
+ siblingID = __MKOBJ(ce->above);
sibling = (*vid.ilc_func)(self, @symbol(viewFromId:)
COMMA_CON, nil, &vid, siblingID);
}
@@ -6516,7 +6496,7 @@
break;
case SelectionClear:
- selectionID = MKATOMOBJ(ev->xselectionclear.selection);
+ selectionID = __MKATOMOBJ(ev->xselectionclear.selection);
(*selClear.ilc_func)(theView,
@symbol(selectionClear:)
COMMA_CON, nil, &selClear,
@@ -6531,10 +6511,10 @@
ev->xselection.property, ev->xselection.target,
ev->xselection.selection, ev->xselection.requestor));
- propertyID = MKATOMOBJ(ev->xselection.property);
- targetID = MKATOMOBJ(ev->xselection.target);
- selectionID = MKATOMOBJ(ev->xselection.selection);
- requestorID = MKOBJ(ev->xselection.requestor);
+ propertyID = __MKATOMOBJ(ev->xselection.property);
+ targetID = __MKATOMOBJ(ev->xselection.target);
+ selectionID = __MKATOMOBJ(ev->xselection.selection);
+ requestorID = __MKOBJ(ev->xselection.requestor);
(*selNotify.ilc_func)(theView,
@symbol(selectionNotify:target:selection:from:)
COMMA_CON, nil, &selNotify,
@@ -6551,10 +6531,10 @@
ev->xselectionrequest.selection,
ev->xselectionrequest.requestor));
- propertyID = MKATOMOBJ(ev->xselectionrequest.property);
- targetID = MKATOMOBJ(ev->xselectionrequest.target);
- selectionID = MKATOMOBJ(ev->xselectionrequest.selection);
- requestorID = MKOBJ(ev->xselectionrequest.requestor);
+ propertyID = __MKATOMOBJ(ev->xselectionrequest.property);
+ targetID = __MKATOMOBJ(ev->xselectionrequest.target);
+ selectionID = __MKATOMOBJ(ev->xselectionrequest.selection);
+ requestorID = __MKOBJ(ev->xselectionrequest.requestor);
(*selReq.ilc_func)(theView,
@symbol(selectionRequest:target:selection:from:)
COMMA_CON, nil, &selReq,