--- a/XWorkstation.st Mon Sep 10 18:08:33 2001 +0200
+++ b/XWorkstation.st Tue Sep 11 22:49:36 2001 +0200
@@ -1130,415 +1130,6 @@
"Created: 10.6.1996 / 21:06:48 / cg"
!
-queryBlackPixel
-%{ /* NOCONTEXT */
-
- if (ISCONNECTED) {
- Display *dpy;
- int scr;
-
- dpy = myDpy;
- scr = DefaultScreen(dpy);
- RETURN ( __MKSMALLINT(BlackPixel(dpy, scr)));
- }
-%}.
- ^ nil
-
- "
- Display queryBlackPixel
- "
-!
-
-queryCells
-%{ /* NOCONTEXT */
-
- if (ISCONNECTED) {
- Display *dpy;
- int scr;
-
- dpy = myDpy;
- scr = DefaultScreen(dpy);
- RETURN ( __MKSMALLINT(DisplayCells(dpy, scr)));
- }
-%}.
- ^ nil
-
- "
- Display queryCells
- "
-!
-
-queryDPSExtension
-%{ /* NOCONTEXT */
-
-#ifdef DPS
- if (ISCONNECTED) {
- Display *dpy;
- int dummy;
-
- dpy = myDpy;
-
- if (XQueryExtension(dpy, "DPSExtension", &dummy, &dummy, &dummy)) {
- RETURN ( true );
- }
- }
-#endif
-%}.
- ^ false
-
- "
- Display queryDPSExtension
- "
-!
-
-queryDefaultScreen
-%{ /* NOCONTEXT */
-
- if (ISCONNECTED) {
- Display *dpy;
-
- dpy = myDpy;
- RETURN ( __MKSMALLINT(DefaultScreen(dpy)));
- }
-%}.
- ^ nil
-
- "
- Display queryDefaultScreen
- "
-!
-
-queryDefaultVisualType
-%{ /* NOCONTEXT */
-
- if (ISCONNECTED) {
- Display *dpy;
- Visual *visual;
-
- dpy = myDpy;
- visual = DefaultVisualOfScreen(DefaultScreenOfDisplay(dpy));
- switch (visual->class) {
- case StaticGray:
- RETURN ( @symbol(StaticGray) );
- case GrayScale:
- RETURN ( @symbol(GrayScale) );
- case StaticColor:
- RETURN ( @symbol(StaticColor) );
- case PseudoColor:
- RETURN ( @symbol(PseudoColor) );
- case TrueColor:
- RETURN ( @symbol(TrueColor) );
- case DirectColor:
- RETURN ( @symbol(DirectColor) );
- }
- }
-%}.
- ^ nil
-
- "
- Display queryDefaultVisualType
- "
-!
-
-queryDepth
-%{ /* NOCONTEXT */
-
- if (ISCONNECTED) {
- Display *dpy;
- int scr;
-
- dpy = myDpy;
- scr = DefaultScreen(dpy);
- RETURN ( __MKSMALLINT(DisplayPlanes(dpy, scr)));
- }
-%}.
- ^ nil
-
- "
- Display queryDepth
- "
-!
-
-queryHeight
-%{ /* NOCONTEXT */
-
- if (ISCONNECTED) {
- Display *dpy;
- int scr;
-
- dpy = myDpy;
- scr = DefaultScreen(dpy);
- RETURN ( __MKSMALLINT(DisplayHeight(dpy, scr)));
- }
-%}.
- ^ nil
-
- "
- Display queryHeight
- "
-!
-
-queryHeightMM
-%{ /* NOCONTEXT */
-
- if (ISCONNECTED) {
- Display *dpy;
- int scr;
-
- dpy = myDpy;
- scr = DefaultScreen(dpy);
- RETURN ( __MKSMALLINT(DisplayHeightMM(dpy, scr)));
- }
-%}.
- ^ nil
-
- "
- Display queryHeightMM
- "
-!
-
-queryMBUFExtension
-%{ /* NOCONTEXT */
-
-#ifdef MBUF
- if (ISCONNECTED) {
- Display *dpy;
- int dummy;
-
- dpy = myDpy;
-
- if (XQueryExtension(dpy, "Multi-Buffering", &dummy, &dummy, &dummy)) {
- RETURN ( true );
- }
- }
-#endif
-%}.
- ^ false
-
- "
- Display queryMBUFExtension
- "
-!
-
-queryPEXExtension
-%{ /* NOCONTEXT */
-
-#ifdef PEX5
- if (ISCONNECTED) {
- Display *dpy;
- int dummy;
-
- dpy = myDpy;
-
- if (XQueryExtension(dpy, PEX_NAME_STRING, &dummy, &dummy, &dummy)) {
- RETURN ( true );
- }
- }
-#endif
-%}.
- ^ false
-
- "
- Display queryPEXExtension
- "
-!
-
-queryRGBMasks
-%{ /* NOCONTEXT */
-
- if (ISCONNECTED) {
- Display *dpy;
- Visual *visual;
- OBJ redMask, greenMask, blueMask, bprgb;
-
- dpy = myDpy;
- visual = DefaultVisualOfScreen(DefaultScreenOfDisplay(dpy));
- redMask = __MKSMALLINT(visual->red_mask);
- greenMask = __MKSMALLINT(visual->green_mask);
- blueMask = __MKSMALLINT(visual->blue_mask);
- bprgb = __MKSMALLINT(visual->bits_per_rgb);
- RETURN ( __ARRAY_WITH4(redMask, greenMask, blueMask, bprgb) );
- }
-%}.
- ^ nil
-
- "
- Display queryRGBMasks
- "
-!
-
-querySHMExtension
-%{ /* NOCONTEXT */
-
-#ifdef xxSHM
- if (ISCONNECTED) {
- Display *dpy;
- int dummy;
-
- dpy = myDpy;
-
- if (XQueryExtension(dpy, "MIT_SHM", &dummy, &dummy, &dummy)) {
- RETURN ( true );
- }
- }
-#endif
-%}.
- ^ false
-
- "
- Display querySHMExtension
- "
-!
-
-queryShapeExtension
-%{ /* NOCONTEXT */
-
-#ifdef SHAPE
- if (ISCONNECTED) {
- Display *dpy;
- int dummy;
-
- dpy = myDpy;
-
- if (XShapeQueryExtension(dpy, &dummy, &dummy)) {
- RETURN ( true );
- }
- }
-#endif
-%}.
- ^ false
-
- "
- Display queryShapeExtension
- "
-!
-
-queryWhitePixel
-%{ /* NOCONTEXT */
-
- if (ISCONNECTED) {
- Display *dpy;
- int scr;
-
- dpy = myDpy;
- scr = DefaultScreen(dpy);
- RETURN ( __MKSMALLINT(WhitePixel(dpy, scr)));
- }
-%}.
- ^ nil
-
- "
- Display queryWhitePixel
- "
-!
-
-queryWidth
-%{ /* NOCONTEXT */
-
- if (ISCONNECTED) {
- Display *dpy;
- int scr;
-
- dpy = myDpy;
- scr = DefaultScreen(dpy);
- RETURN ( __MKSMALLINT(DisplayWidth(dpy, scr)));
- }
-%}.
- ^ nil
-
- "
- Display queryWidth
- "
-!
-
-queryWidthMM
-%{ /* NOCONTEXT */
-
- if (ISCONNECTED) {
- Display *dpy;
- int scr;
-
- dpy = myDpy;
- scr = DefaultScreen(dpy);
- RETURN ( __MKSMALLINT(DisplayWidthMM(dpy, scr)));
- }
-%}.
- ^ nil
-
- "
- Display queryWidthMM
- "
-!
-
-queryXIEExtension
-%{ /* NOCONTEXT */
-
-#ifdef XIE
- if (ISCONNECTED) {
- Display *dpy;
- int dummy;
-
- dpy = myDpy;
-
- if (XQueryExtension(dpy, xieExtName, &dummy, &dummy, &dummy)) {
- RETURN ( true );
- }
- }
-#endif
-%}.
- ^ false
-
- "
- Display queryXIEExtension
- "
-!
-
-queryXIExtension
-%{ /* NOCONTEXT */
-
-#ifdef XI
- if (ISCONNECTED) {
- Display *dpy;
- int dummy;
-
- dpy = myDpy;
-
- if (XQueryExtension(dpy, "XInputExtension", &dummy, &dummy, &dummy)) {
- RETURN ( true );
- }
- }
-#endif
-%}.
- ^ false
-
- "
- Display queryXIExtension
- "
-!
-
-queryXVideoExtension
-%{ /* NOCONTEXT */
-
-#ifdef XVIDEO
- if (ISCONNECTED) {
- Display *dpy;
- int dummy;
-
- dpy = myDpy;
-
- if (XQueryExtension(dpy, "XVideo", &dummy, &dummy, &dummy)) {
- RETURN ( true );
- }
- }
-#endif
-%}.
- ^ false
-
- "
- Display queryXVideoExtension
- "
-!
-
scrollsAsynchronous
"return true, if this display asynchronously sends expose events after a
scroll operation. False otherwise. Asynchronous expose events are an X
@@ -9022,6 +8613,415 @@
^ nil
!
+queryBlackPixel
+%{ /* NOCONTEXT */
+
+ if (ISCONNECTED) {
+ Display *dpy;
+ int scr;
+
+ dpy = myDpy;
+ scr = DefaultScreen(dpy);
+ RETURN ( __MKSMALLINT(BlackPixel(dpy, scr)));
+ }
+%}.
+ ^ nil
+
+ "
+ Display queryBlackPixel
+ "
+!
+
+queryCells
+%{ /* NOCONTEXT */
+
+ if (ISCONNECTED) {
+ Display *dpy;
+ int scr;
+
+ dpy = myDpy;
+ scr = DefaultScreen(dpy);
+ RETURN ( __MKSMALLINT(DisplayCells(dpy, scr)));
+ }
+%}.
+ ^ nil
+
+ "
+ Display queryCells
+ "
+!
+
+queryDPSExtension
+%{ /* NOCONTEXT */
+
+#ifdef DPS
+ if (ISCONNECTED) {
+ Display *dpy;
+ int dummy;
+
+ dpy = myDpy;
+
+ if (XQueryExtension(dpy, "DPSExtension", &dummy, &dummy, &dummy)) {
+ RETURN ( true );
+ }
+ }
+#endif
+%}.
+ ^ false
+
+ "
+ Display queryDPSExtension
+ "
+!
+
+queryDefaultScreen
+%{ /* NOCONTEXT */
+
+ if (ISCONNECTED) {
+ Display *dpy;
+
+ dpy = myDpy;
+ RETURN ( __MKSMALLINT(DefaultScreen(dpy)));
+ }
+%}.
+ ^ nil
+
+ "
+ Display queryDefaultScreen
+ "
+!
+
+queryDefaultVisualType
+%{ /* NOCONTEXT */
+
+ if (ISCONNECTED) {
+ Display *dpy;
+ Visual *visual;
+
+ dpy = myDpy;
+ visual = DefaultVisualOfScreen(DefaultScreenOfDisplay(dpy));
+ switch (visual->class) {
+ case StaticGray:
+ RETURN ( @symbol(StaticGray) );
+ case GrayScale:
+ RETURN ( @symbol(GrayScale) );
+ case StaticColor:
+ RETURN ( @symbol(StaticColor) );
+ case PseudoColor:
+ RETURN ( @symbol(PseudoColor) );
+ case TrueColor:
+ RETURN ( @symbol(TrueColor) );
+ case DirectColor:
+ RETURN ( @symbol(DirectColor) );
+ }
+ }
+%}.
+ ^ nil
+
+ "
+ Display queryDefaultVisualType
+ "
+!
+
+queryDepth
+%{ /* NOCONTEXT */
+
+ if (ISCONNECTED) {
+ Display *dpy;
+ int scr;
+
+ dpy = myDpy;
+ scr = DefaultScreen(dpy);
+ RETURN ( __MKSMALLINT(DisplayPlanes(dpy, scr)));
+ }
+%}.
+ ^ nil
+
+ "
+ Display queryDepth
+ "
+!
+
+queryHeight
+%{ /* NOCONTEXT */
+
+ if (ISCONNECTED) {
+ Display *dpy;
+ int scr;
+
+ dpy = myDpy;
+ scr = DefaultScreen(dpy);
+ RETURN ( __MKSMALLINT(DisplayHeight(dpy, scr)));
+ }
+%}.
+ ^ nil
+
+ "
+ Display queryHeight
+ "
+!
+
+queryHeightMM
+%{ /* NOCONTEXT */
+
+ if (ISCONNECTED) {
+ Display *dpy;
+ int scr;
+
+ dpy = myDpy;
+ scr = DefaultScreen(dpy);
+ RETURN ( __MKSMALLINT(DisplayHeightMM(dpy, scr)));
+ }
+%}.
+ ^ nil
+
+ "
+ Display queryHeightMM
+ "
+!
+
+queryMBUFExtension
+%{ /* NOCONTEXT */
+
+#ifdef MBUF
+ if (ISCONNECTED) {
+ Display *dpy;
+ int dummy;
+
+ dpy = myDpy;
+
+ if (XQueryExtension(dpy, "Multi-Buffering", &dummy, &dummy, &dummy)) {
+ RETURN ( true );
+ }
+ }
+#endif
+%}.
+ ^ false
+
+ "
+ Display queryMBUFExtension
+ "
+!
+
+queryPEXExtension
+%{ /* NOCONTEXT */
+
+#ifdef PEX5
+ if (ISCONNECTED) {
+ Display *dpy;
+ int dummy;
+
+ dpy = myDpy;
+
+ if (XQueryExtension(dpy, PEX_NAME_STRING, &dummy, &dummy, &dummy)) {
+ RETURN ( true );
+ }
+ }
+#endif
+%}.
+ ^ false
+
+ "
+ Display queryPEXExtension
+ "
+!
+
+queryRGBMasks
+%{ /* NOCONTEXT */
+
+ if (ISCONNECTED) {
+ Display *dpy;
+ Visual *visual;
+ OBJ redMask, greenMask, blueMask, bprgb;
+
+ dpy = myDpy;
+ visual = DefaultVisualOfScreen(DefaultScreenOfDisplay(dpy));
+ redMask = __MKSMALLINT(visual->red_mask);
+ greenMask = __MKSMALLINT(visual->green_mask);
+ blueMask = __MKSMALLINT(visual->blue_mask);
+ bprgb = __MKSMALLINT(visual->bits_per_rgb);
+ RETURN ( __ARRAY_WITH4(redMask, greenMask, blueMask, bprgb) );
+ }
+%}.
+ ^ nil
+
+ "
+ Display queryRGBMasks
+ "
+!
+
+querySHMExtension
+%{ /* NOCONTEXT */
+
+#ifdef xxSHM
+ if (ISCONNECTED) {
+ Display *dpy;
+ int dummy;
+
+ dpy = myDpy;
+
+ if (XQueryExtension(dpy, "MIT_SHM", &dummy, &dummy, &dummy)) {
+ RETURN ( true );
+ }
+ }
+#endif
+%}.
+ ^ false
+
+ "
+ Display querySHMExtension
+ "
+!
+
+queryShapeExtension
+%{ /* NOCONTEXT */
+
+#ifdef SHAPE
+ if (ISCONNECTED) {
+ Display *dpy;
+ int dummy;
+
+ dpy = myDpy;
+
+ if (XShapeQueryExtension(dpy, &dummy, &dummy)) {
+ RETURN ( true );
+ }
+ }
+#endif
+%}.
+ ^ false
+
+ "
+ Display queryShapeExtension
+ "
+!
+
+queryWhitePixel
+%{ /* NOCONTEXT */
+
+ if (ISCONNECTED) {
+ Display *dpy;
+ int scr;
+
+ dpy = myDpy;
+ scr = DefaultScreen(dpy);
+ RETURN ( __MKSMALLINT(WhitePixel(dpy, scr)));
+ }
+%}.
+ ^ nil
+
+ "
+ Display queryWhitePixel
+ "
+!
+
+queryWidth
+%{ /* NOCONTEXT */
+
+ if (ISCONNECTED) {
+ Display *dpy;
+ int scr;
+
+ dpy = myDpy;
+ scr = DefaultScreen(dpy);
+ RETURN ( __MKSMALLINT(DisplayWidth(dpy, scr)));
+ }
+%}.
+ ^ nil
+
+ "
+ Display queryWidth
+ "
+!
+
+queryWidthMM
+%{ /* NOCONTEXT */
+
+ if (ISCONNECTED) {
+ Display *dpy;
+ int scr;
+
+ dpy = myDpy;
+ scr = DefaultScreen(dpy);
+ RETURN ( __MKSMALLINT(DisplayWidthMM(dpy, scr)));
+ }
+%}.
+ ^ nil
+
+ "
+ Display queryWidthMM
+ "
+!
+
+queryXIEExtension
+%{ /* NOCONTEXT */
+
+#ifdef XIE
+ if (ISCONNECTED) {
+ Display *dpy;
+ int dummy;
+
+ dpy = myDpy;
+
+ if (XQueryExtension(dpy, xieExtName, &dummy, &dummy, &dummy)) {
+ RETURN ( true );
+ }
+ }
+#endif
+%}.
+ ^ false
+
+ "
+ Display queryXIEExtension
+ "
+!
+
+queryXIExtension
+%{ /* NOCONTEXT */
+
+#ifdef XI
+ if (ISCONNECTED) {
+ Display *dpy;
+ int dummy;
+
+ dpy = myDpy;
+
+ if (XQueryExtension(dpy, "XInputExtension", &dummy, &dummy, &dummy)) {
+ RETURN ( true );
+ }
+ }
+#endif
+%}.
+ ^ false
+
+ "
+ Display queryXIExtension
+ "
+!
+
+queryXVideoExtension
+%{ /* NOCONTEXT */
+
+#ifdef XVIDEO
+ if (ISCONNECTED) {
+ Display *dpy;
+ int dummy;
+
+ dpy = myDpy;
+
+ if (XQueryExtension(dpy, "XVideo", &dummy, &dummy, &dummy)) {
+ RETURN ( true );
+ }
+ }
+#endif
+%}.
+ ^ false
+
+ "
+ Display queryXVideoExtension
+ "
+!
+
reinitialize
virtualRootId := rootId := nil.
@@ -11572,6 +11572,6 @@
!XWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.397 2001-09-05 18:18:14 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.398 2001-09-11 20:49:36 cg Exp $'
! !
XWorkstation initialize!