--- a/GLXWorkstation.st Thu Apr 26 11:16:07 2018 +0200
+++ b/GLXWorkstation.st Thu Apr 26 11:16:22 2018 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 1993 by Claus Gittinger
All Rights Reserved
@@ -8663,7 +8665,7 @@
wsuperView := aView superView view.
wsuperView notNil ifTrue:[
- wsuperViewId := wsuperView id
+ wsuperViewId := wsuperView drawableId
].
%{ /* CALLSSTACK: 20000 */
@@ -8674,42 +8676,44 @@
if (__isSmallInteger(xpos) && __isSmallInteger(ypos)
&& __isSmallInteger(wwidth) && __isSmallInteger(wheight)) {
- if (__isExternalAddress(wsuperViewId)) {
- parentWindow = _WindowVal(wsuperViewId);
- } else {
- parentWindow = RootWindow(dpy, screen);
- }
-
- if (glxType == @symbol(colorIndexSingleBuffer))
- t = GLXcolorIndexSingleBuffer;
- else if (glxType == @symbol(colorIndexDoubleBuffer))
- t = GLXcolorIndexDoubleBuffer;
- else if (glxType == @symbol(rgbSingleBuffer))
- t = GLXrgbSingleBuffer;
- else if (glxType == @symbol(rgbDoubleBuffer))
- t = GLXrgbDoubleBuffer;
- else {
- RETURN ( nil );
- }
-
- ENTERGLX;
- newWindow = __GLXCreateWindow(dpy, parentWindow,
- __intVal(xpos), __intVal(ypos),
- __intVal(wwidth), __intVal(wheight),
- 0, t);
- LEAVEGLX;
-
- if (! newWindow) {
- RETURN ( nil );
- }
-
- windowId = __MKOBJ(newWindow);
+ if (__isExternalAddress(wsuperViewId)) {
+ parentWindow = _WindowVal(wsuperViewId);
+ } else {
+ parentWindow = RootWindow(dpy, screen);
+ }
+
+ if (glxType == @symbol(colorIndexSingleBuffer))
+ t = GLXcolorIndexSingleBuffer;
+ else if (glxType == @symbol(colorIndexDoubleBuffer))
+ t = GLXcolorIndexDoubleBuffer;
+ else if (glxType == @symbol(rgbSingleBuffer))
+ t = GLXrgbSingleBuffer;
+ else if (glxType == @symbol(rgbDoubleBuffer))
+ t = GLXrgbDoubleBuffer;
+ else {
+ RETURN ( nil );
+ }
+
+ ENTERGLX;
+ newWindow = __GLXCreateWindow(dpy, parentWindow,
+ __intVal(xpos), __intVal(ypos),
+ __intVal(wwidth), __intVal(wheight),
+ 0, t);
+ LEAVEGLX;
+
+ if (! newWindow) {
+ RETURN ( nil );
+ }
+
+ windowId = __MKOBJ(newWindow);
}
%}.
windowId notNil ifTrue:[
- self addKnownView:aView withId:windowId.
+ self addKnownView:aView withId:windowId.
].
^ windowId
+
+ "Modified: / 26-04-2018 / 11:03:08 / stefan"
!
unlinkGLXView:aGLXWindowId