hg/stx-libview: comparison GLXWorkstation.st

equal deleted inserted replaced

-:8f9c629a4245
+:ea2bf46eb669
 GLXWorkstation comment:'
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
-$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.16 1994-11-21 16:43:13 claus Exp $
+$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.17 1995-02-06 00:36:30 claus Exp $
 '!
 !GLXWorkstation class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.16 1994-11-21 16:43:13 claus Exp $
+$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.17 1995-02-06 00:36:30 claus Exp $
 "
 !
 documentation
 "
 interface to GL functions. More high-level stuff is required, to make
 3D drawing be more object-oriented.
 (see a bit of this in 'clients/IRIS-specials')
 Some functions are duplicated, Jeff and I developed those in parallel -
-those will be merged and duplicates removed ...
+for now, both will remain - finally they will be merged and duplicates removed ...
+(examples are makeobj and makeObject).
 Also, in a hurry to implement all those methods, many do no or only
 limited argument checking - make certain, that you pass the correct
 arguments.
 Notice: this should be rewritten to use the openGL library functions
 "
 ! !
-!GLXWorkstation class primitiveDefinitions!
+!GLXWorkstation primitiveDefinitions!
 %{
 /*
 * on SGI, this class is compiled with -DGLX, while
 * for simulation (using vogl), this is compiled with -DVGL
 * put/pack them into corresponding c variables.
 *
 */
 #if defined(hpux) && defined(POSITIVE_ADDRESSES)
 # define MKDPY(o)       (Display *)((int)(o) & ~TAG_INT)
-# define MKWIN(o)        (Window)((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
 	+ OHDR_SIZE                     \
 	+ (_intVal(_ClassInstPtr(_qClass(object))->c_ninstvars)) * sizeof(OBJ))
 %}
 ! !
-!GLXWorkstation class primitiveFunctions!
+!GLXWorkstation primitiveFunctions!
 %{
 /*
 * helper for rotation - call rot()
 */
 "return true, if this gl workstation supports rgb
 (in addition to indexed) colors. Actually, we return true
 for a real GL engine, false for the simulator here."
 %{  /* NOCONTEXT */
-#ifdef VGL
-RETURN ( false );
-#endif
 #ifdef GLX
 RETURN ( true );
 #endif
-%}
+%}.
+^ false
+"
+Display supportsRGB
+"
 !
 supportsLight
-"return true, if this gl workstation supports light (i.e.
+"return true, if this gl workstation supports light
-if its a real GL)"
+(i.e. if its a real GL)"
-%{  /* NOCONTEXT */
+%{  /* NOCONTEXT */
-#ifdef VGL
-RETURN ( false );
-#endif
 #ifdef GLX
 RETURN ( true );
 #endif
-%}
+%}.
+^ false
+"
+Display supportsLight
+"
+!
+supportsTextures
+"return true, if this gl workstation supports texture mapping
+(i.e. if its a real GL)"
+%{  /* NOCONTEXT */
+#ifdef GLX
+if (getgdesc(GD_TEXTURE) != 0) {
+	RETURN ( true );
+}
+#endif
+%}.
+^ false
+"
+Display supportsTextures
+"
+!
+supportsDoubleBuffer
+"return true, if this gl workstation supports double buffering"
+%{  /* NOCONTEXT */
+#ifdef GLX
+if (getgdesc(GD_BITS_NORM_DBL_RED) != 0) {
+	RETURN ( true );
+}
+#endif
+%}.
+^ false
+"
+Display supportsDoubleBuffer
+"
+!
+supportsZBuffer
+"return true, if this gl workstation has z buffer support"
+%{  /* NOCONTEXT */
+#ifdef GLX
+if (getgdesc(GD_BITS_NORM_ZBUFFER) != 0) {
+	RETURN ( true );
+}
+#endif
+%}.
+^ false
+"
+Display supportsZBuffer
+"
+!
+maxZValue
+"return the max. Z value (only valid if z-buffer is supported)"
+%{
+#ifdef GLX
+long zMax;
+extern OBJ _MKLARGEINT();
+zMax = getgdesc(GD_ZMAX);
+if ((zMax >= _MIN_INT) && (zMax <= _MAX_INT)) {
+	RETURN ( _MKSMALLINT(zMax) );
+}
+RETURN ( _MKLARGEINT(zMax) );
+#endif
+%}.
+^ nil
 ! !
 !GLXWorkstation methodsFor:'window creation'!
 createGLXWindowFor:aView left:xpos top:ypos width:wwidth height:wheight type:glxType
 _FLOAT_(left, f_left)
 _FLOAT_(right, f_right)
 _FLOAT_(bottom, f_bottom)
 _FLOAT_(top, f_top)
 ortho2(f_left, f_right, f_bottom, f_top);
-RETURN (true);
+%}
-%}
+.
-.
+^ true
-^ false
 !
 glxReshapeViewPortIn: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 reshapeviewport();
-RETURN (true);
+%}
-%}
+.
-.
+^ true
-^ false
 ! !
 !GLXWorkstation methodsFor:'transformations'!
 glxTranslateX:x in:aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 RETURN (doRotate(angle, 'x'));
 %}
-.
-^ false
 !
 glxRotateY:angle in:aGLXWindowId
 "rotate the current matrix on y axis.
 The angle is in degrees."
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 RETURN (doRotate(angle, 'y'));
 %}
-.
-^ false
 !
 glxRotateZ:angle in:aGLXWindowId
 "rotate the current matrix on z axis.
 The angle is in degrees."
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 RETURN (doRotate(angle, 'z'));
 %}
-.
-^ false
 !
 glxRotate:angle axis:axis in:aGLXWindowId
 "rotate the current matrix around the axis given by the axis arg,
 which must be one of the symbols: #x, #y or #z.
 !GLXWorkstation methodsFor:'materials & lights'!
 glxLmdef:what index:index np:np props:props in:aGLXWindowId
 "define a material, light source or lighting model;
+what must be one of #material, #light or #lightModel.
 props must be a FloatArray or a subclass of FloatArray"
 %{  /* NOCONTEXT */
 #ifdef GLX
 short defType;
 .
 ^ false
 !
 glxLmbind:target index:index in:aGLXWindowId
-"select a material, lighyt or lighting model"
+"select a material, light or lighting model.
+target must be a symbol from: #material, #backMaterial,
+#light0-light7 or #lightModel."
 %{  /* NOCONTEXT */
 #ifdef GLX
 short defType;
 short i_index;
 RETURN (true);
 #endif
 %}
 .
 ^ false
+!
+glxTexDef2d:index nc:nc width:w height:h bits:image np:np props:props in:aGLXWindowId
+"define a 2D texture. index is the 'name' of the texture;
+nc is the number of components (1-4) per pixel;
+w/h define the size of the texture; bits is a byteArray containing the
+long-word aligned pixel data; np is the number of props found in
+the floatArray props. Props must be delimited by a 0.0 entry."
+%{  /* NOCONTEXT */
+#ifdef GLX
+unsigned char *cp;
+const float *fp;
+OBJ cls;
+float fbuff[30];
+if (__isByteArray(image)) {
+	cp = _ByteArrayInstPtr(image)->ba_element;
+	fp = getFloatsFromFloatArrayInto(props, fbuff);
+	SETWIN(aGLXWindowId)
+	texdef2d(_intVal(index), _intVal(nc), _intVal(w), _intVal(h),
+		 (const unsigned long *)cp, _intVal(np), fp);
+	RETURN (true);
+}
+#endif
+%}
+.
+^ false
+!
+glxTexDef3d:index nc:nc width:w height:h depth:d bits:image np:np props:props in:aGLXWindowId
+"define a 3D texture. index is the 'name' of the texture;
+nc is the number of components (1-4) per pixel;
+w/h/d define the size of the texture; bits is a byteArray containing the
+long-word aligned pixel data; np is the number of props found in
+the floatArray props. Props must be delimited by a 0.0 entry."
+%{  /* NOCONTEXT */
+#ifdef GLX
+unsigned char *cp;
+const float *fp;
+OBJ cls;
+float fbuff[30];
+if (__isByteArray(image)) {
+	cp = _ByteArrayInstPtr(image)->ba_element;
+	fp = getFloatsFromFloatArrayInto(props, fbuff);
+	SETWIN(aGLXWindowId)
+	texdef3d(_intVal(index), _intVal(nc), _intVal(w), _intVal(h),
+		 _intVal(d),
+		 (const unsigned long *)cp, _intVal(np), fp);
+	RETURN (true);
+}
+#endif
+%}
+.
+^ false
+!
+glxTevdef:index np:np props:props in:aGLXWindowId
+%{  /* NOCONTEXT */
+#ifdef GLX
+const float *fp;
+float fbuff[30];
+SETWIN(aGLXWindowId)
+fp = getFloatsFromFloatArrayInto(props, fbuff);
+tevdef(_intVal(index), _intVal(np), fp);
+RETURN (true);
+#endif
+%}
+.
+^ false
+!
+glxTevbind:target index:index in:aGLXWindowId
+"bind a texture environment; target must be 0
+or the symbol #env0."
+%{  /* NOCONTEXT */
+#ifdef GLX
+long t;
+if (_isSmallInteger(target)) {
+	t = _intVal(target);
+} else {
+	if (target == @symbol(env0)) {
+	    t = TV_ENV0;
+	} else {
+	    RETURN (false);
+	}
+}
+SETWIN(aGLXWindowId)
+tevbind(t, _intVal(index));
+RETURN (true);
+#endif
+%}
+.
+^ false
+!
+glxTexbind:target index:index in:aGLXWindowId
+"bind a texture; target must be an integer or one
+of the symbols #texture0, #textureDetail or #textureIdle."
+%{  /* NOCONTEXT */
+#ifdef GLX
+long t;
+if (_isSmallInteger(target)) {
+	t = _intVal(target);
+} else {
+	if (target == @symbol(texture0)) {
+	    t = TX_TEXTURE_0;
+	} else if (target == @symbol(textureDetail)) {
+	    t = TX_TEXTURE_DETAIL;
+	} else if (target == @symbol(textureIdle)) {
+	    t = TX_TEXTURE_IDLE;
+	} else {
+	    RETURN (false);
+	}
+}
+SETWIN(aGLXWindowId)
+texbind(t, _intVal(index));
+RETURN (true);
+#endif
+%}
+.
+^ false
 ! !
 !GLXWorkstation methodsFor:'color'!
 glxColor:index in:aGLXWindowId
 .
 ^ false
 !
 glxColorRed:r green:g blue:b in:aGLXWindowId
-"set color, args must be integer values"
+"set color, args must be integer values in 0..255"
 %{  /* NOCONTEXT */
 #ifdef GLX
 short s_r, s_g, s_b;
 RETURN (true);
 #endif
 %}
 .
 ^ false
+!
+glxColorRed:r green:g blue:b alpha:a in:aGLXWindowId
+"set color including alpha value, args must be integer values within 0..255"
+%{  /* NOCONTEXT */
+#ifdef GLX
+short s_r, s_g, s_b, s_a;
+_INT_(r, s_r);
+_INT_(g, s_g);
+_INT_(b, s_b);
+_INT_(a, s_a);
+SETWIN(aGLXWindowId)
+cpack((((((s_a<<8) | s_b) << 8) | s_g) << 8) | s_r);
+RETURN (true);
+#endif
+%}
+.
+^ false
 ! !
 !GLXWorkstation methodsFor:'clearing'!
 glxClearIn:aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 clear();
 RETURN (true);
 %}
-.
-^ false
 !
 glxZClearIn:aGLXWindowId
 "clear z buffer"
 RETURN (true);
 #endif
 %}
 .
 ^ false
+!
+glxCzclearCval:cval zval:zval in:aGLXWindowId
+"clear to a color (cval) and clear z buffer to zval simultaniously"
+%{  /* NOCONTEXT */
+#ifdef GLX
+SETWIN(aGLXWindowId)
+czclear((ulong)_intVal(cval), _intVal(zval));
+RETURN (true);
+#endif
+%}
+.
+^ false
 ! !
 !GLXWorkstation methodsFor:'matrix stack'!
 glxPushmatrixIn:aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 pushmatrix();
 RETURN (true);
 %}
-.
-^ false
 !
 glxPopmatrixIn:aGLXWindowId
 "pop transformation stack"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 popmatrix();
 RETURN (true);
 %}
-.
-^ false
 !
 glxGetMatrix:arrayOf16Floats in:aGLXWindowId
 "argument must be an array (a matrix) of 16 floats. The current matrix
 will be stored into that."
 if (! (m = getFloatsFromMatrixInto(arrayOf16Floats, &matrix))) RETURN (false);
 SETWIN(aGLXWindowId)
 loadmatrix(*m);
 RETURN (true);
 %}
-.
-^ false
 !
 glxMultMatrix:arrayOf16Floats in:aGLXWindowId
 "argument must be an array(a matrix) of 16 floats containing a
 matrix to multiply into the current matrix."
 if (! (m = getFloatsFromMatrixInto(arrayOf16Floats, &matrix))) RETURN (false);
 SETWIN(aGLXWindowId)
 multmatrix(*m);
 RETURN (true);
 %}
-.
-^ false
 ! !
 !GLXWorkstation methodsFor:'double buffering'!
 glxDoubleBufferIn:aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 doublebuffer();
 RETURN (true);
 %}
-.
+!
-^ false
+glxSingleBufferIn: aGLXWindowId
+"set single buffer mode"
+%{  /* NOCONTEXT */
+SETWIN(aGLXWindowId)
+singlebuffer();
+RETURN (true);
+%}
 !
 glxSwapBuffersIn:aGLXWindowId
 "swap double buffers"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 swapbuffers();
 RETURN (true);
 %}
-.
-^ false
 !
 glxFrontBufferIn:aGLXWindowId
 "switch to front buffer - turning backbuffer off"
 backbuffer(FALSE);
 #endif
 frontbuffer(TRUE);
 RETURN (true);
 %}
-.
-^ false
 !
 glxBackBufferIn:aGLXWindowId
 "switch to back buffer - turning frontbuffer off"
 frontbuffer(FALSE);
 #endif
 backbuffer(TRUE);
 RETURN (true);
 %}
-.
-^ false
 !
 glxBackbuffer: b in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 backbuffer(_booleanVal(b));
 RETURN (true);
 %}
-.
-^ false
 !
 glxFrontbuffer: b in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 frontbuffer(_booleanVal(b));
 RETURN (true);
 %}
-.
-^ false
 ! !
 !GLXWorkstation methodsFor:'zbuffer'!
 glxZbuffer:aBoolean in:aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 gconfig();
 RETURN (true);
 %}
-.
-^ false
 !
 glxNmode:aSymbol in:aGLXWindowId
 "set normalize mode: #auto, #normalize"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 bgnpoint();
 RETURN (true);
 %}
-.
-^ false
 !
 glxEndPointIn:aGLXWindowId
 "end a point group"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 endpoint();
 RETURN (true);
 %}
-.
-^ false
 !
 glxBeginClosedLineIn:aGLXWindowId
 "start a closed line"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 bgnclosedline();
 RETURN (true);
 %}
-.
-^ false
 !
 glxEndClosedLineIn:aGLXWindowId
 "end a closed line"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 endclosedline();
 RETURN (true);
 %}
-.
-^ false
 !
 glxBeginLineIn:aGLXWindowId
 "start a line group"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 bgnline();
 RETURN (true);
 %}
-.
-^ false
 !
 glxEndLineIn:aGLXWindowId
 "end a line group"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 endline();
 RETURN (true);
 %}
-.
-^ false
 !
 glxBeginPolygonIn:aGLXWindowId
 "start a polygon"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 bgnpolygon();
 RETURN (true);
 %}
-.
-^ false
 !
 glxEndPolygonIn:aGLXWindowId
 "end a polygon"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 endpolygon();
 RETURN (true);
 %}
-.
-^ false
 !
 glxBeginTriangleMeshIn:aGLXWindowId
 "start a triangle mesh"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 bgntmesh();
 RETURN (true);
 %}
-.
-^ false
 !
 glxEndTriangleMeshIn:aGLXWindowId
 "end a triangle mesh"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 endtmesh();
 RETURN (true);
 %}
-.
-^ false
 !
 glxBeginQuadrilateralStripIn:aGLXWindowId
 "start a quadrilateral strip"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 bgnqstrip();
 RETURN (true);
 %}
-.
-^ false
 !
 glxEndQuadrilateralStripIn:aGLXWindowId
 "end a quadrilateral strip"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 endqstrip();
 RETURN (true);
 %}
-.
-^ false
 ! !
 !GLXWorkstation methodsFor:'sphere drawing'!
 glxSphDraw:arrayOf4Floats in:aGLXWindowId
 if (! (mZ = getFloatsFromMatrixInto(arrayOf16ZFloats, &matrixZ))) RETURN (false);
 SETWIN(aGLXWindowId)
 patch(*mX, *mY, *mZ);
 RETURN (true);
 %}
-.
-^ false
 !
 glxBeginCurveIn:aGLXWindowId
 "start a NURBS curve def - in real GL only"
 %}
 .
 ^ false
 ! !
-!GLXWorkstation methodsFor:'arcs and circles '!
+!GLXWorkstation methodsFor:'arcs and circles'!
 glxArcX: x y: y radius: radius startang: startang endang: endang in: aGLXWindowId
 "draw an arc"
 %{  /* NOCONTEXT */
 _ANGLE_(endang, a_endang)
 SETWIN(aGLXWindowId)
 arci(c_x, c_y, c_radius, a_startang, a_endang);
 RETURN (true);
 %}
-.
-^ false
 !
 glxArcsX: x y: y radius: radius startang: startang endang: endang in: aGLXWindowId
 "draw an arc"
 _ANGLE_(endang, a_endang)
 SETWIN(aGLXWindowId)
 arcs(c_x, c_y, c_radius, a_startang, a_endang);
 RETURN (true);
 %}
-.
-^ false
 !
 glxArcfX: x y: y radius: radius startang: startang endang: endang in: aGLXWindowId
 "draw a filled arc"
 _ANGLE_(endang, a_endang)
 SETWIN(aGLXWindowId)
 arcf(c_x, c_y, c_radius, a_startang, a_endang);
 RETURN (true);
 %}
-.
-^ false
 !
 glxArcfiX: x y: y radius: radius startang: startang endang: endang in: aGLXWindowId
 "draw a filled arc"
 _ANGLE_(endang, a_endang)
 SETWIN(aGLXWindowId)
 arcfi(c_x, c_y, c_radius, a_startang, a_endang);
 RETURN (true);
 %}
-.
-^ false
 !
 glxArcfsX: x y: y radius: radius startang: startang endang: endang in: aGLXWindowId
 "draw a filled arc"
 _ANGLE_(endang, a_endang)
 SETWIN(aGLXWindowId)
 arcfs(c_x, c_y, c_radius, a_startang, a_endang);
 RETURN (true);
 %}
-.
-^ false
 !
 glxCircX: x y: y radius: radius in: aGLXWindowId
 "draw a circle"
 _COORD_ (radius, c_radius)
 SETWIN(aGLXWindowId)
 circ(c_x, c_y, c_radius);
 RETURN (true);
 %}
-.
-^ false
 !
 glxCirciX: x y: y radius: radius in: aGLXWindowId
 "draw a circle"
 _ICOORD_ (radius, c_radius)
 SETWIN(aGLXWindowId)
 circi(c_x, c_y, c_radius);
 RETURN (true);
 %}
-.
-^ false
 !
 glxCircsX: x y: y radius: radius in: aGLXWindowId
 "draw a circle"
 _SCOORD_ (radius, c_radius)
 SETWIN(aGLXWindowId)
 circs(c_x, c_y, c_radius);
 RETURN (true);
 %}
-.
-^ false
 !
 glxCircfX: x y: y radius: radius in: aGLXWindowId
 "draw a filled circle"
 _COORD_ (radius, c_radius)
 SETWIN(aGLXWindowId)
 circf(c_x, c_y, c_radius);
 RETURN (true);
 %}
-.
-^ false
 !
 glxCircfiX: x y: y radius: radius in: aGLXWindowId
 "draw a filled circle"
 _ICOORD_ (radius, c_radius)
 SETWIN(aGLXWindowId)
 circfi(c_x, c_y, c_radius);
 RETURN (true);
 %}
-.
-^ false
 !
 glxCircfsX: x y: y radius: radius in: aGLXWindowId
 "draw a filled circle"
 _SCOORD_ (radius, c_radius)
 SETWIN(aGLXWindowId)
 circfs(c_x, c_y, c_radius);
 RETURN (true);
 %}
-.
-^ false
 ! !
-!GLXWorkstation methodsFor:'unspecified rest '!
+!GLXWorkstation methodsFor:'objects'!
-glxAcbufOp: op value: value in: aGLXWindowId
+glxCallObject:obj in:aGLXWindowId
+"perform the commands of an object (macro)."
+%{  /* NOCONTEXT */
+if (_isSmallInteger(obj)) {
+	SETWIN(aGLXWindowId)
+	callobj(_objectVal(obj));
+	RETURN (true);
+}
+%}
+.
+^ false
+!
+glxCallobj: obj in: aGLXWindowId
+"OBSOLETE; use glxCallObject:in:
+This one will be removed soon."
+%{  /* NOCONTEXT */
+if (_isSmallInteger(obj)) {
+	SETWIN(aGLXWindowId)
+	callobj(_objectVal(obj));
+	RETURN (true);
+}
+%}
+.
+^ false
+!
+glxCloseObjectIn:aGLXWindowId
+"end object defnition"
+%{  /* NOCONTEXT */
+SETWIN(aGLXWindowId)
+closeobj();
+RETURN (true);
+%}
+!
+glxCloseobjIn:aGLXWindowId
+"OBSOLETE: use glxCloseObjectIn:
+This one will be removed."
+%{  /* NOCONTEXT */
+SETWIN(aGLXWindowId)
+closeobj();
+RETURN (true);
+%}
+!
+glxDeleteObject:obj in:aGLXWindowId
+%{  /* NOCONTEXT */
+SETWIN(aGLXWindowId)
+delobj(_objectVal(obj));
+RETURN (true);
+%}
+!
+glxDelobj:obj in:aGLXWindowId
+"OBSOLETE: use glxDeleteObject:in:
+This one will be removed."
+%{  /* NOCONTEXT */
+SETWIN(aGLXWindowId)
+delobj(_objectVal(obj));
+RETURN (true);
+%}
+!
+glxGenObjectIn:aGLXWindowId
+"return a new (free & unused) object id for use
+with makeObj"
+%{  /* NOCONTEXT */
+SETWIN(aGLXWindowId)
+RETURN (_MKSMALLINT(genobj()));
+%}
+!
+glxGenobjIn:aGLXWindowId
+"OBSOLETE: use glxGenObject:in:
+This one will be removed."
+%{  /* NOCONTEXT */
+SETWIN(aGLXWindowId)
+RETURN (_MKSMALLINT(genobj()));
+%}
+!
+glxMakeObject:id in:aGLXWindowId
+"start object definition -
+another name conflict"
+%{  /* NOCONTEXT */
+if (_isSmallInteger(id)) {
+	SETWIN(aGLXWindowId)
+	makeobj(_objectVal(id));
+	RETURN (true);
+}
+%}
+.
+^ false
+!
+glxMakeobj:obj in:aGLXWindowId
+"OBSOLETE; use glxMakeObject:in:
+This one will be removed soon."
+%{  /* NOCONTEXT */
+if (_isSmallInteger(obj)) {
+	SETWIN(aGLXWindowId)
+	makeobj(_objectVal(obj));
+	RETURN (true);
+}
+%}
+.
+^ false
+!
+glxIsobj:obj in:aGLXWindowId
+"return true, if obj is a valid object id"
+%{  /* NOCONTEXT */
+SETWIN(aGLXWindowId)
+RETURN (_MKBOOLEAN(isobj(_objectVal(obj))));
+%}
+!
+glxGetopenobjIn:aGLXWindowId
+"return the currently open objects id; -1 if none is open"
+%{  /* NOCONTEXT */
+SETWIN(aGLXWindowId)
+RETURN (_MKSMALLINT(getopenobj()));
+%}
+! !
+!GLXWorkstation methodsFor:'unspecified rest'!
+glxAcbufOp:op value:value in:aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef GLX
 SETWIN(aGLXWindowId)
 acbuf(_intVal(op), _floatVal(value));
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 backface(_booleanVal(b));
 RETURN (true);
 %}
-.
-^ false
 !
 glxBbox2Xmin: xmin ymin: ymin x1: x1 y1: y1 x2: x2 y2: y2 in: aGLXWindowId
 %{  /* NOCONTEXT */
 %}
 .
 ^ false
 !
-glxCallObject:obj in:aGLXWindowId
-"do objects definition
-I defined that one too - but with a different name"
-%{  /* NOCONTEXT */
-if (_isSmallInteger(obj)) {
-	SETWIN(aGLXWindowId)
-	callobj(_objectVal(obj));
-	RETURN (true);
-}
-%}
-.
-^ false
-!
-glxCallobj: obj in: aGLXWindowId
-%{  /* NOCONTEXT */
-if (_isSmallInteger(obj)) {
-	SETWIN(aGLXWindowId)
-	callobj(_objectVal(obj));
-	RETURN (true);
-}
-%}
-.
-^ false
-!
 glxClearhitcodeIn: aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef GLX
 SETWIN(aGLXWindowId)
 if (! (v = getFloatsFromInto(params, vec, 4))) RETURN(false);
 SETWIN(aGLXWindowId)
 clipplane(_intVal(index), _intVal(mode), v);
 RETURN (true);
 #endif
-%}
-.
-^ false
-!
-glxCloseObjectIn:aGLXWindowId
-"end object defnition - JEFF and I defined this with different names"
-%{  /* NOCONTEXT */
-SETWIN(aGLXWindowId)
-closeobj();
-RETURN (true);
-%}
-.
-^ false
-!
-glxCloseobjIn: aGLXWindowId
-%{  /* NOCONTEXT */
-SETWIN(aGLXWindowId)
-closeobj();
-RETURN (true);
 %}
 .
 ^ false
 !
 _COORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 cmov(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxCmoviX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 cmovi(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxCmovsX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 cmovs(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxCmov2X: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 cmov2(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxCmov2iX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 cmov2i(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxCmov2sX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 cmov2s(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxColorfIndex: index in: aGLXWindowId
 ^self glxColor: index in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 concave(_booleanVal(b));
 RETURN (true);
 %}
-.
-^ false
 !
 glxCuroriginN: n xorigin: xorigin yorigin: yorigin in: aGLXWindowId
 %{  /* NOCONTEXT */
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 curvebasis(_shortVal(basid));
 RETURN (true);
 %}
-.
-^ false
 !
 glxCurveit: iterationcount in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 curveit(_shortVal(iterationcount));
 RETURN (true);
 %}
-.
-^ false
 !
 glxCurveprecision: nsegments in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 curveprecision(_shortVal(nsegments));
 RETURN (true);
 %}
-.
-^ false
 !
 glxCyclemapDuration: duration map: map nxtmap: nxtmap in: aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef GLX
 SETWIN(aGLXWindowId)
 cyclemap(_shortVal(duration), _shortVal(map), _shortVal(nxtmap));
-RETURN (true);
-#endif
-%}
-.
-^ false
-!
-glxCzclearCval: cval zval: zval in: aGLXWindowId
-%{  /* NOCONTEXT */
-#ifdef GLX
-SETWIN(aGLXWindowId)
-czclear((ulong)_intVal(cval), _intVal(zval));
 RETURN (true);
 #endif
 %}
 .
 ^ false
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 deflinestyle(_shortVal(n), _linestyleVal(ls));
 RETURN (true);
 %}
-.
-^ false
 !
 glxDefpatternN: n size: size mask: mask in: aGLXWindowId
 %{  /* NOCONTEXT */
 #endif
 %}
 .
 ^ false
 !
-glxDelobj: obj in: aGLXWindowId
-%{  /* NOCONTEXT */
-SETWIN(aGLXWindowId)
-delobj(_objectVal(obj));
-RETURN (true);
-%}
-.
-^ false
-!
 glxDeltag: t in: aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef GLX
 _COORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 draw(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxDrawiX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 drawi(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxDrawsX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 draws(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxDraw2X: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 draw2(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxDraw2iX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 draw2i(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxDraw2sX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 draw2s(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxDrawmode: mode in: aGLXWindowId
 %{  /* NOCONTEXT */
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 font(_shortVal(fntnum));
 RETURN (true);
 %}
-.
-^ false
 !
 glxForegroundIn: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 foreground();
 RETURN (true);
 %}
-.
-^ false
 !
 glxFreepup: pup in: aGLXWindowId
 %{  /* NOCONTEXT */
 %}
 .
 ^ false
 !
-glxGenobjIn: aGLXWindowId
-%{  /* NOCONTEXT */
-SETWIN(aGLXWindowId)
-RETURN (_MKSMALLINT(genobj()));
-%}
-.
-^ false
-!
 glxGentagIn: aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef GLX
 SETWIN(aGLXWindowId)
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 RETURN (_MKSMALLINT(getbutton(_deviceVal(num))));
 %}
-.
-^ false
 !
 glxGetcmmodeIn: aGLXWindowId
 %{  /* NOCONTEXT */
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 RETURN (_MKSMALLINT(getcolor()));
 %}
-.
-^ false
 !
 glxGetcposIn: aGLXWindowId
 | x y |
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 RETURN (_MKSMALLINT(getgdesc(_longVal(inquiry))));
 %}
-.
-^ false
 !
 glxGetheightIn: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 RETURN (_MKSMALLINT(getheight()));
 %}
-.
-^ false
 !
 glxGethitcodeIn: aGLXWindowId
 %{  /* NOCONTEXT */
 %}
 .
 ^ false
 !
-glxGetopenobjIn: aGLXWindowId
-%{  /* NOCONTEXT */
-#ifdef GLX
-SETWIN(aGLXWindowId)
-RETURN (_MKSMALLINT(getopenobj()));
-#endif
-%}
-.
-^ false
-!
 glxGetothermonitorIn: aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef GLX
 SETWIN(aGLXWindowId)
 #ifdef GLX
 SETWIN(aGLXWindowId)
 initnames();
 RETURN (true);
 #endif
-%}
-.
-^ false
-!
-glxIsobj: obj in: aGLXWindowId
-%{  /* NOCONTEXT */
-SETWIN(aGLXWindowId)
-RETURN (_MKBOOLEAN(isobj(_objectVal(obj))));
 %}
 .
 ^ false
 !
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 linewidth(_shortVal(n));
 RETURN (true);
 %}
-.
-^ false
 !
 glxLinewidthf: n in: aGLXWindowId
 "set the linewidth"
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 linewidthf(_floatVal(n));
 RETURN (true);
 %}
-.
-^ false
 !
 glxLmcolorMode: mode in: aGLXWindowId
 %{  /* NOCONTEXT */
 %}
 .
 ^ false
 !
-glxMakeObject:id in:aGLXWindowId
-"start object definition -
-another name conflict"
-%{  /* NOCONTEXT */
-if (_isSmallInteger(id)) {
-	SETWIN(aGLXWindowId)
-	makeobj(_objectVal(id));
-	RETURN (true);
-}
-%}
-.
-^ false
-!
-glxMakeobj: obj in: aGLXWindowId
-"start object definition"
-%{  /* NOCONTEXT */
-if (_isSmallInteger(obj)) {
-	SETWIN(aGLXWindowId)
-	makeobj(_objectVal(obj));
-	RETURN (true);
-}
-%}
-.
-^ false
-!
 glxMaketag: t in: aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef GLX
 SETWIN(aGLXWindowId)
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 mapcolor(_colorindexVal(i), _shortVal(red), _shortVal(green), _shortVal(blue));
 RETURN (true);
 %}
-.
-^ false
 !
 glxMaxsizeX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 move(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxMoveiX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 movei(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxMovesX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 moves(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxMove2X: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 move2(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxMove2iX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 move2i(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxMove2sX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 move2s(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxMsalphaMode: mode in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 pdr(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPdriX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 pdri(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPdrsX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 pdrs(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPdr2X: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 pdr2(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPdr2iX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 pdr2i(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPdr2sX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 pdr2s(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPicksizeX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 pmv(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPmviX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 pmvi(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPmvsX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 pmvs(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPmv2X: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 pmv2(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPmv2iX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 pmv2i(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPmv2sX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 pmv2s(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPntX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 pnt(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPntiX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 pnti(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPntsX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 pnts(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPnt2X: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 pnt2(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPnt2iX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 pnt2i(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPnt2sX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 pnt2s(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPntsize: n in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ANGLE_(twist, a_twist)
 SETWIN(aGLXWindowId)
 polarview(c_dist, a_azim, a_inc, a_twist);
 RETURN (true);
 %}
-.
-^ false
 !
 glxPolymode: mode in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 polymode(_longVal(mode));
 RETURN (true);
 %}
-.
-^ false
 !
 glxPolysmoothMode: mode in: aGLXWindowId
 %{  /* NOCONTEXT */
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 popattributes();
 RETURN (true);
 %}
-.
-^ false
 !
 glxPopnameIn: aGLXWindowId
 %{  /* NOCONTEXT */
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 popviewport();
 RETURN (true);
 %}
-.
-^ false
 !
 glxPrefpositionX1: x1 x2: x2 y1: y1 y2: y2 in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 prefposition(_longVal(x1), _longVal(x2), _longVal(y1), _longVal(y2));
 RETURN (true);
 %}
-.
-^ false
 !
 glxPrefsizeX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 prefsize(_longVal(x), _longVal(y));
 RETURN (true);
 %}
-.
-^ false
 !
 glxPushattributesIn: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 pushattributes();
 RETURN (true);
 %}
-.
-^ false
 !
 glxPushname: name In: aGLXWindowId
 %{  /* NOCONTEXT */
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 pushviewport();
 RETURN (true);
 %}
-.
-^ false
 !
 glxQdevice: dev in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 qdevice(_deviceVal(dev));
 RETURN (true);
 %}
-.
-^ false
 !
 glxQenterDev: dev val: val in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 qenter(_deviceVal(dev), _shortVal(val));
 RETURN (true);
 %}
-.
-^ false
 !
 glxQgetfdIn: aGLXWindowId
 %{  /* NOCONTEXT */
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 qreset();
 RETURN (true);
 %}
-.
-^ false
 !
 glxQtestIn: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 RETURN (_MKSMALLINT(qtest()));
 %}
-.
-^ false
 !
 glxRdrX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 rdr(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRdriX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 rdri(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRdrsX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 rdrs(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRdr2X: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 rdr2(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRdr2iX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 rdr2i(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRdr2sX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 rdr2s(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxReadsource: src in: aGLXWindowId
 %{  /* NOCONTEXT */
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 rect(_coordVal(x1), _coordVal(y1), _coordVal(x2), _coordVal(y2));
 RETURN (true);
 %}
-.
-^ false
 !
 glxRectiX1: x1 y1: y1 x2: x2 y2: y2 in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 recti(_icoordVal(x1), _icoordVal(y1), _icoordVal(x2), _icoordVal(y2));
 RETURN (true);
 %}
-.
-^ false
 !
 glxRectsX1: x1 y1: y1 x2: x2 y2: y2 in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 rects(_scoordVal(x1), _scoordVal(y1), _scoordVal(x2), _scoordVal(y2));
 RETURN (true);
 %}
-.
-^ false
 !
 glxRectfX1: x1 y1: y1 x2: x2 y2: y2 in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 rectf(_coordVal(x1), _coordVal(y1), _coordVal(x2), _coordVal(y2));
 RETURN (true);
 %}
-.
-^ false
 !
 glxRectfiX1: x1 y1: y1 x2: x2 y2: y2 in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 rectfi(_icoordVal(x1), _icoordVal(y1), _icoordVal(x2), _icoordVal(y2));
 RETURN (true);
 %}
-.
-^ false
 !
 glxRectfsX1: x1 y1: y1 x2: x2 y2: y2 in: aGLXWindowId
 %{  /* NOCONTEXT */
 SETWIN(aGLXWindowId)
 rectfs(_scoordVal(x1), _scoordVal(y1), _scoordVal(x2), _scoordVal(y2));
 RETURN (true);
 %}
-.
-^ false
 !
 glxRectcopyX1: x1 y1: y1 x2: x2 y2: y2 newx: newx newy: newy in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 rmv(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRmviX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 rmvi(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRmvsX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 rmvs(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRmv2X: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 rmv2(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRmv2iX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 rmv2i(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRmv2sX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 rmv2s(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRpdrX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 rpdr(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRpdriX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 rpdri(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRpdrsX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 rpdrs(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRpdr2X: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 rpdr2(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRpdr2iX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 rpdr2i(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRpdr2sX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 rpdr2s(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRpmvX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 rpmv(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRpmviX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 rpmvi(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRpmvsX: x y: y z: z in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (z, c_z)
 SETWIN(aGLXWindowId)
 rpmvs(c_x, c_y, c_z);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRpmv2X: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _COORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 rpmv2(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRpmv2iX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _ICOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 rpmv2i(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxRpmv2sX: x y: y in: aGLXWindowId
 %{  /* NOCONTEXT */
 _SCOORD_ (y, c_y)
 SETWIN(aGLXWindowId)
 rpmv2s(c_x, c_y);
 RETURN (true);
 %}
-.
-^ false
 !
 glxSboxX1: x1 y1: y1 x2: x2 y2: y2 in: aGLXWindowId
 %{  /* NOCONTEXT */
 %}
 .
 ^ false
 !
-glxSinglebufferIn: aGLXWindowId
-%{  /* NOCONTEXT */
-SETWIN(aGLXWindowId)
-singlebuffer();
-RETURN (true);
-%}
-.
-^ false
-!
 glxSmoothline: mode in: aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef GLX
 SETWIN(aGLXWindowId)
 %}
 .
 ^ false
 !
-glxT3s: v in: aGLXWindowId
+glxT3s:v in:aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef FULL_GLX
 short vec[3], *c_v;
 %}
 .
 ^ false
 !
-glxT3i: v in: aGLXWindowId
+glxT3i:v in:aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef FULL_GLX
 long vec[3], *c_v;
 %}
 .
 ^ false
 !
-glxT3f: v in: aGLXWindowId
+glxT3f:v in:aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef FULL_GLX
 float vec[3], *c_v;
 %}
 .
 ^ false
 !
-glxT3d: v in: aGLXWindowId
+glxT3d:v in:aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef FULL_GLX
 double vec[3], *c_v;
 #endif
 %}
 .
 ^ false
 !
-glxTexDef2dIndex: index nc:nc width:w height:h bits:image np:np props:props in: aGLXWindowId
-"bind a texture"
-%{  /* NOCONTEXT */
-#ifdef GLX
-unsigned char *cp;
-const float *fp;
-OBJ cls;
-float fbuff[30];
-if (__isByteArray(image)) {
-	cp = _ByteArrayInstPtr(image)->ba_element;
-	fp = getFloatsFromFloatArrayInto(props, fbuff);
-	SETWIN(aGLXWindowId)
-	texdef2d(_longVal(index), _longVal(nc), _longVal(w), _longVal(h),
-		 (const unsigned long *)cp, _longVal(np), fp);
-	RETURN (true);
-}
-#endif
-%}
-.
-^ false
-!
-glxTevbind: target index: index in: aGLXWindowId
-%{  /* NOCONTEXT */
-#ifdef GLX
-SETWIN(aGLXWindowId)
-tevbind(_longVal(target), _longVal(index));
-RETURN (true);
-#endif
-%}
-.
-^ false
-!
-glxTexbind: target index: index in: aGLXWindowId
-"bind a texture"
-%{  /* NOCONTEXT */
-#ifdef GLX
-SETWIN(aGLXWindowId)
-texbind(_longVal(target), _longVal(index));
-RETURN (true);
-#endif
-%}
-.
-^ false
-!
 glxTextcolor: tcolor in: aGLXWindowId
 %{  /* NOCONTEXT */
 #ifdef GLX
 %}
 .
 ^ false
 ! !
-!GLXWorkstation methodsFor:'vertex data transfer '!
+!GLXWorkstation methodsFor:'vertex data transfer'!
 glxV2s:v in:aGLXWindowId
 "pass a vertex; v must be a vector with 2 shorts; z is taken as 0"
 %{  /* NOCONTEXT */

changeset 89	ea2bf46eb669
parent 82	98a70bce6d51
child 97	dd6116883ac0