--- a/GLXWorkstation.st Thu Dec 14 21:10:49 1995 +0100
+++ b/GLXWorkstation.st Thu Dec 14 21:15:03 1995 +0100
@@ -117,7 +117,7 @@
} \
}
-#define _MKBOOLEAN(b) ((b==FALSE) ? false : true)
+#define __MKBOOLEAN(b) ((b==FALSE) ? false : true)
#define _booleanVal(b) ((b==false) ? (Boolean)FALSE : (Boolean)TRUE)
#define _coordVal(c) \
((__isFloat(c)) ? (Coord)(_floatVal(c)) \
@@ -1022,21 +1022,21 @@
minorCodeOfLastError
%{ /* NOCONTEXT */
- RETURN ( _MKSMALLINT(lastMinorCode) );
+ RETURN ( __MKSMALLINT(lastMinorCode) );
%}
!
requestCodeOfLastError
%{ /* NOCONTEXT */
- RETURN ( _MKSMALLINT(lastRequestCode) );
+ RETURN ( __MKSMALLINT(lastRequestCode) );
%}
!
resourceIdOfLastError
%{ /* NOCONTEXT */
- RETURN ( _MKSMALLINT(lastResource) );
+ RETURN ( __MKSMALLINT(lastResource) );
%}
! !
@@ -2055,7 +2055,7 @@
%{ /* NOCONTEXT */
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(genobj()));
+ RETURN (__MKSMALLINT(genobj()));
%}
!
@@ -2065,7 +2065,7 @@
%{ /* NOCONTEXT */
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(genobj()));
+ RETURN (__MKSMALLINT(genobj()));
%}
!
@@ -2074,7 +2074,7 @@
%{ /* NOCONTEXT */
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getopenobj()));
+ RETURN (__MKSMALLINT(getopenobj()));
%}
!
@@ -2083,7 +2083,7 @@
%{ /* NOCONTEXT */
SETWIN(aGLXWindowId)
- RETURN (_MKBOOLEAN(isobj(_objectVal(obj))));
+ RETURN (__MKBOOLEAN(isobj(_objectVal(obj))));
%}
!
@@ -2338,15 +2338,14 @@
%{
#ifdef GLX
long zMax;
- extern OBJ _MKLARGEINT();
if (_INST(glOK) == true) {
zMax = getgdesc(GD_ZMAX);
if ((zMax >= _MIN_INT) && (zMax <= _MAX_INT)) {
- RETURN ( _MKSMALLINT(zMax) );
+ RETURN ( __MKSMALLINT(zMax) );
}
- RETURN ( _MKLARGEINT(zMax) );
+ RETURN ( __MKLARGEINT(zMax) );
}
#endif
%}.
@@ -2518,7 +2517,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(sphgnpolys()));
+ RETURN (__MKSMALLINT(sphgnpolys()));
#endif
%}
.
@@ -2711,7 +2710,6 @@
Status status;
Display *dpy = myDpy;
int major, minor;
- extern OBJ __ARRAY_WITH2();
if (ISCONNECTED) {
status = XSGIStereoQueryVersion(myDpy, &major, &minor);
@@ -3265,7 +3263,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(blkqread((short *)_indexedArea(data), __intVal(n))));
+ RETURN (__MKSMALLINT(blkqread((short *)_indexedArea(data), __intVal(n))));
#endif
%}
.
@@ -3941,7 +3939,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(gentag()));
+ RETURN (__MKSMALLINT(gentag()));
#endif
%}
.
@@ -3953,7 +3951,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getbackface()));
+ RETURN (__MKSMALLINT(getbackface()));
#endif
%}
.
@@ -3965,7 +3963,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getbuffer()));
+ RETURN (__MKSMALLINT(getbuffer()));
#endif
%}
.
@@ -3976,7 +3974,7 @@
%{ /* NOCONTEXT */
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getbutton(_deviceVal(num))));
+ RETURN (__MKSMALLINT(getbutton(_deviceVal(num))));
%}
!
@@ -3985,7 +3983,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKBOOLEAN(getcmmode()));
+ RETURN (__MKBOOLEAN(getcmmode()));
#endif
%}
.
@@ -3997,7 +3995,7 @@
%{ /* NOCONTEXT */
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getcolor()));
+ RETURN (__MKSMALLINT(getcolor()));
%}
!
@@ -4009,8 +4007,8 @@
short s_x, s_y;
SETWIN(aGLXWindowId)
getcpos(&s_x, &s_y);
- x = _MKSMALLINT(s_x);
- y = _MKSMALLINT(s_y);
+ x = __MKSMALLINT(s_x);
+ y = __MKSMALLINT(s_y);
#endif
%}
.
@@ -4022,7 +4020,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKBOOLEAN(getdcm()));
+ RETURN (__MKBOOLEAN(getdcm()));
#endif
%}
.
@@ -4034,7 +4032,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getdescender()));
+ RETURN (__MKSMALLINT(getdescender()));
#endif
%}
.
@@ -4046,7 +4044,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getdisplaymode()));
+ RETURN (__MKSMALLINT(getdisplaymode()));
#endif
%}
.
@@ -4058,7 +4056,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getdrawmode()));
+ RETURN (__MKSMALLINT(getdrawmode()));
#endif
%}
.
@@ -4070,7 +4068,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getfont()));
+ RETURN (__MKSMALLINT(getfont()));
#endif
%}
.
@@ -4082,7 +4080,7 @@
%{ /* NOCONTEXT */
#ifdef FULL_GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getgconfig(_longVal(buffer))));
+ RETURN (__MKSMALLINT(getgconfig(_longVal(buffer))));
#endif
%}
.
@@ -4093,7 +4091,7 @@
%{ /* NOCONTEXT */
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getgdesc(_longVal(inquiry))));
+ RETURN (__MKSMALLINT(getgdesc(_longVal(inquiry))));
%}
!
@@ -4101,7 +4099,7 @@
%{ /* NOCONTEXT */
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getheight()));
+ RETURN (__MKSMALLINT(getheight()));
%}
!
@@ -4110,7 +4108,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(gethitcode()));
+ RETURN (__MKSMALLINT(gethitcode()));
#endif
%}
.
@@ -4122,7 +4120,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKBOOLEAN(getlsbackup()));
+ RETURN (__MKBOOLEAN(getlsbackup()));
#endif
%}
.
@@ -4134,7 +4132,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getlsrepeat()));
+ RETURN (__MKSMALLINT(getlsrepeat()));
#endif
%}
.
@@ -4146,7 +4144,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getlstyle()));
+ RETURN (__MKSMALLINT(getlstyle()));
#endif
%}
.
@@ -4158,7 +4156,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getlwidth()));
+ RETURN (__MKSMALLINT(getlwidth()));
#endif
%}
.
@@ -4170,7 +4168,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getmap()));
+ RETURN (__MKSMALLINT(getmap()));
#endif
%}
.
@@ -4182,7 +4180,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getmmode()));
+ RETURN (__MKSMALLINT(getmmode()));
#endif
%}
.
@@ -4194,7 +4192,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getmonitor()));
+ RETURN (__MKSMALLINT(getmonitor()));
#endif
%}
.
@@ -4206,7 +4204,7 @@
%{ /* NOCONTEXT */
#ifdef FULL_GLX
SETWIN(aGLXWindowId)
- RETURN (_MKBOOLEAN(getmultisample()));
+ RETURN (__MKBOOLEAN(getmultisample()));
#endif
%}
.
@@ -4218,7 +4216,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getothermonitor()));
+ RETURN (__MKSMALLINT(getothermonitor()));
#endif
%}
.
@@ -4230,7 +4228,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getpattern()));
+ RETURN (__MKSMALLINT(getpattern()));
#endif
%}
.
@@ -4242,7 +4240,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getplanes()));
+ RETURN (__MKSMALLINT(getplanes()));
#endif
%}
.
@@ -4254,7 +4252,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKBOOLEAN(getresetls()));
+ RETURN (__MKBOOLEAN(getresetls()));
#endif
%}
.
@@ -4266,7 +4264,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getshade()));
+ RETURN (__MKSMALLINT(getshade()));
#endif
%}
.
@@ -4278,7 +4276,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getsm()));
+ RETURN (__MKSMALLINT(getsm()));
#endif
%}
.
@@ -4289,7 +4287,7 @@
%{ /* NOCONTEXT */
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getvaluator(_deviceVal(dev))));
+ RETURN (__MKSMALLINT(getvaluator(_deviceVal(dev))));
%}
.
^ false
@@ -4300,7 +4298,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getvideo(_longVal(reg))));
+ RETURN (__MKSMALLINT(getvideo(_longVal(reg))));
#endif
%}
.
@@ -4312,7 +4310,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getwritemask()));
+ RETURN (__MKSMALLINT(getwritemask()));
#endif
%}
.
@@ -4324,7 +4322,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(getwscrn()));
+ RETURN (__MKSMALLINT(getwscrn()));
#endif
%}
.
@@ -4336,7 +4334,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKBOOLEAN(getzbuffer()));
+ RETURN (__MKBOOLEAN(getzbuffer()));
#endif
%}
.
@@ -4465,7 +4463,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKBOOLEAN(isqueued(_deviceVal(dev))));
+ RETURN (__MKBOOLEAN(isqueued(_deviceVal(dev))));
#endif
%}
.
@@ -4477,7 +4475,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKBOOLEAN(istag(_tagVal(t))));
+ RETURN (__MKBOOLEAN(istag(_tagVal(t))));
#endif
%}
.
@@ -4913,7 +4911,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(newpup()));
+ RETURN (__MKSMALLINT(newpup()));
#endif
%}
.
@@ -5546,7 +5544,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(qgetfd()));
+ RETURN (__MKSMALLINT(qgetfd()));
#endif
%}
.
@@ -5560,8 +5558,8 @@
short c_data;
SETWIN(aGLXWindowId)
- dev = _MKSMALLINT(qread(&c_data));
- data = _MKSMALLINT(c_data);
+ dev = __MKSMALLINT(qread(&c_data));
+ data = __MKSMALLINT(c_data);
%}
.
^ Array with: dev with: data
@@ -5580,7 +5578,7 @@
%{ /* NOCONTEXT */
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(qtest()));
+ RETURN (__MKSMALLINT(qtest()));
%}
!
@@ -7531,7 +7529,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(windepth(_longVal(gwid))));
+ RETURN (__MKSMALLINT(windepth(_longVal(gwid))));
#endif
%}
.
@@ -7543,7 +7541,7 @@
%{ /* NOCONTEXT */
#ifdef GLX
SETWIN(aGLXWindowId)
- RETURN (_MKSMALLINT(winget()));
+ RETURN (__MKSMALLINT(winget()));
#endif
%}
.
@@ -7792,5 +7790,5 @@
!GLXWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.40 1995-12-10 00:17:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.41 1995-12-14 20:14:13 cg Exp $'
! !