--- a/XWorkstat.st Thu Mar 25 15:56:25 1999 +0100
+++ b/XWorkstat.st Fri Mar 26 10:16:44 1999 +0100
@@ -1064,7 +1064,7 @@
int status;
ENTER_XLIB();
- status = XGetIconSizes(myDpy, RootWindow(dpy, screen), &sizeList, &cnt);
+ status = XGetIconSizes(dpy, RootWindow(dpy, screen), &sizeList, &cnt);
LEAVE_XLIB();
if (status > 0) {
xIconSizes = __MKEXTERNALBYTES(sizeList);
@@ -1993,7 +1993,9 @@
}
if (ISCONNECTED) {
- vRootWin = rootWin = RootWindow(myDpy, screen);
+ Display *dpy = myDpy;
+
+ vRootWin = rootWin = RootWindow(dpy, screen);
#ifndef IRIS
BEGIN_INTERRUPTSBLOCKED
/*
@@ -2011,10 +2013,10 @@
Window* children = (Window *)0;
unsigned int numChildren;
- if (XQueryTree(myDpy, rootWin,
+ if (XQueryTree(dpy, rootWin,
&rootReturn, &parentReturn,
&children, &numChildren)) {
- vRootAtom = XInternAtom(myDpy, "__SWM_VROOT", True );
+ vRootAtom = XInternAtom(dpy, "__SWM_VROOT", True );
if (vRootAtom != None) {
for (i=0; i < numChildren; i++) {
Atom actual_type;
@@ -2023,12 +2025,12 @@
Window* newRoot = (Window*) 0;
if (children[i]) {
- if (XGetWindowProperty(myDpy, children[i], vRootAtom,
- 0L, 1L, False, XA_WINDOW,
- &actual_type, &actual_format,
- &nitems, &bytesafter,
- (unsigned char**) &newRoot
- ) == Success && newRoot) {
+ if (XGetWindowProperty(dpy, children[i], vRootAtom,
+ 0L, 1L, False, XA_WINDOW,
+ &actual_type, &actual_format,
+ &nitems, &bytesafter,
+ (unsigned char**) &newRoot
+ ) == Success && newRoot) {
vRootWin = *newRoot;
XFree(newRoot); /* XXX */
break;
@@ -3091,15 +3093,16 @@
&& __isExternalAddress(aDrawableId)
&& __bothSmallInteger(x0, y0)
&& __bothSmallInteger(x1, y1)) {
+ Display *dpy = myDpy;
gc = _GCVal(aGCId);
win = _WindowVal(aDrawableId);
ENTER_XLIB();
if ((x0 == x1) && (y0 == y1)) {
- XDrawPoint(myDpy, win, gc, __intVal(x0), __intVal(y0));
+ XDrawPoint(dpy, win, gc, __intVal(x0), __intVal(y0));
} else {
- XDrawLine(myDpy, win, gc, __intVal(x0), __intVal(y0),
- __intVal(x1), __intVal(y1));
+ XDrawLine(dpy, win, gc, __intVal(x0), __intVal(y0),
+ __intVal(x1), __intVal(y1));
}
LEAVE_XLIB();
RETURN ( self );
@@ -3375,6 +3378,7 @@
&& __isNonNilObject(aString)
&& __bothSmallInteger(index1, index2)
&& __bothSmallInteger(x, y)) {
+ Display *dpy = myDpy;
gc = _GCVal(aGCId);
win = _WindowVal(aDrawableId);
cls = __qClass(aString);
@@ -3396,9 +3400,9 @@
if (l > 1000) l = 1000;
ENTER_XLIB();
if (opaque == true)
- XDrawImageString(myDpy, win, gc, __intVal(x), __intVal(y), cp, l);
+ XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
else
- XDrawString(myDpy, win, gc, __intVal(x), __intVal(y), cp, l);
+ XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
LEAVE_XLIB();
RETURN ( self );
}
@@ -3415,9 +3419,9 @@
if (l > 1000) l = 1000;
ENTER_XLIB();
if (opaque == true)
- XDrawImageString(myDpy, win, gc, __intVal(x), __intVal(y), cp, l);
+ XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
else
- XDrawString(myDpy, win, gc, __intVal(x), __intVal(y), cp, l);
+ XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
LEAVE_XLIB();
RETURN ( self );
}
@@ -3462,9 +3466,9 @@
ENTER_XLIB();
if (opaque == true)
- XDrawImageString16(myDpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
+ XDrawImageString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
else
- XDrawString16(myDpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
+ XDrawString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
LEAVE_XLIB();
if (mustFree) {
@@ -3503,6 +3507,7 @@
&& __isExternalAddress(aDrawableId)
&& __isNonNilObject(aString)
&& __bothSmallInteger(x, y)) {
+ Display *dpy = myDpy;
gc = _GCVal(aGCId);
win = _WindowVal(aDrawableId);
cls = __qClass(aString);
@@ -3514,9 +3519,9 @@
if (n > 1000) n = 1000;
ENTER_XLIB();
if (opaque == true)
- XDrawImageString(myDpy, win, gc, __intVal(x), __intVal(y), cp, n);
+ XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
else
- XDrawString(myDpy, win, gc, __intVal(x), __intVal(y), cp, n);
+ XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
LEAVE_XLIB();
RETURN ( self );
}
@@ -3530,9 +3535,9 @@
if (n > 1000) n = 1000;
ENTER_XLIB();
if (opaque == true)
- XDrawImageString(myDpy, win, gc, __intVal(x), __intVal(y), cp, n);
+ XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
else
- XDrawString(myDpy, win, gc, __intVal(x), __intVal(y), cp, n);
+ XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
LEAVE_XLIB();
RETURN ( self );
}
@@ -3574,9 +3579,9 @@
ENTER_XLIB();
if (opaque == true)
- XDrawImageString16(myDpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, n);
+ XDrawImageString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, n);
else
- XDrawString16(myDpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, n);
+ XDrawString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, n);
LEAVE_XLIB();
@@ -5545,7 +5550,7 @@
ev.xkey.window = target;
ev.xkey.same_screen = 1;
ev.xkey.subwindow = 0;
- ev.xkey.root = RootWindow(myDpy, screen);
+ ev.xkey.root = RootWindow(dpy, screen);
ev.xkey.x = __intVal(xPos);
ev.xkey.y = __intVal(yPos);
ev.xkey.state = state;
@@ -6970,10 +6975,12 @@
%{ /* NOCONTEXT */
if (ISCONNECTED) {
+ Display *dpy = myDpy;
+
BEGIN_INTERRUPTSBLOCKED
ENTER_XLIB();
- XUngrabKeyboard(myDpy, CurrentTime);
- XSync(myDpy, 0);
+ XUngrabKeyboard(dpy, CurrentTime);
+ XSync(dpy, 0);
LEAVE_XLIB();
END_INTERRUPTSBLOCKED
}
@@ -6987,10 +6994,12 @@
%{ /* NOCONTEXT */
if (ISCONNECTED) {
+ Display *dpy = myDpy;
+
BEGIN_INTERRUPTSBLOCKED
ENTER_XLIB();
- XUngrabPointer(myDpy, CurrentTime);
- XSync(myDpy, 0);
+ XUngrabPointer(dpy, CurrentTime);
+ XSync(dpy, 0);
LEAVE_XLIB();
END_INTERRUPTSBLOCKED
}
@@ -7291,6 +7300,8 @@
if (ISCONNECTED) {
if (__isExternalAddress(aGCId)
&& __isSmallInteger(aNumber)) {
+ Display *dpy = myDpy;
+
if (lineStyle == @symbol(solid)) {
x_dashes = (char *)0;
x_style = LineSolid;
@@ -7329,9 +7340,9 @@
ENTER_XLIB();
if (x_dashes) {
- XSetDashes(myDpy, _GCVal(aGCId), 0, x_dashes, x_nDash);
+ XSetDashes(dpy, _GCVal(aGCId), 0, x_dashes, x_nDash);
}
- XSetLineAttributes(myDpy,
+ XSetLineAttributes(dpy,
_GCVal(aGCId), __intVal(aNumber),
x_style, x_cap, x_join);
LEAVE_XLIB();
@@ -7955,7 +7966,7 @@
if (ISCONNECTED) {
Display *dpy = myDpy;
- if ((modmap = XGetModifierMapping(myDpy)) != 0) {
+ if ((modmap = XGetModifierMapping(dpy)) != 0) {
maxKeyPerMod = __MKSMALLINT(modmap->max_keypermod);
modifierKeyMap = __BYTEARRAY_UNINITIALIZED_NEW_INT(modmap->max_keypermod * 8);
if (modifierKeyMap != nil) {
@@ -8006,7 +8017,7 @@
if (ISCONNECTED && __isSmallInteger(code)) {
Display *dpy = myDpy;
- if ((keysym = XKeycodeToKeysym(myDpy, __intVal(code), 0)) != NoSymbol &&
+ if ((keysym = XKeycodeToKeysym(dpy, __intVal(code), 0)) != NoSymbol &&
(keystring = XKeysymToString(keysym)) != 0)
str = __MKSTRING(keystring);
}
@@ -8248,7 +8259,7 @@
BEGIN_INTERRUPTSBLOCKED
#ifdef VIRTUAL_ROOT
- w = getRootWindow(myDpy, screen);
+ w = getRootWindow(dpy, screen);
#else
w = RootWindow(dpy, screen);
#endif
@@ -8323,7 +8334,7 @@
BEGIN_INTERRUPTSBLOCKED
#ifdef VIRTUAL_ROOT
- w = getRootWindow(myDpy, screen);
+ w = getRootWindow(dpy, screen);
#else
w = RootWindow(dpy, screen);
#endif
@@ -10158,6 +10169,6 @@
!XWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.305 1999-03-24 19:14:09 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.306 1999-03-26 09:16:44 cg Exp $'
! !
XWorkstation initialize!
--- a/XWorkstation.st Thu Mar 25 15:56:25 1999 +0100
+++ b/XWorkstation.st Fri Mar 26 10:16:44 1999 +0100
@@ -1064,7 +1064,7 @@
int status;
ENTER_XLIB();
- status = XGetIconSizes(myDpy, RootWindow(dpy, screen), &sizeList, &cnt);
+ status = XGetIconSizes(dpy, RootWindow(dpy, screen), &sizeList, &cnt);
LEAVE_XLIB();
if (status > 0) {
xIconSizes = __MKEXTERNALBYTES(sizeList);
@@ -1993,7 +1993,9 @@
}
if (ISCONNECTED) {
- vRootWin = rootWin = RootWindow(myDpy, screen);
+ Display *dpy = myDpy;
+
+ vRootWin = rootWin = RootWindow(dpy, screen);
#ifndef IRIS
BEGIN_INTERRUPTSBLOCKED
/*
@@ -2011,10 +2013,10 @@
Window* children = (Window *)0;
unsigned int numChildren;
- if (XQueryTree(myDpy, rootWin,
+ if (XQueryTree(dpy, rootWin,
&rootReturn, &parentReturn,
&children, &numChildren)) {
- vRootAtom = XInternAtom(myDpy, "__SWM_VROOT", True );
+ vRootAtom = XInternAtom(dpy, "__SWM_VROOT", True );
if (vRootAtom != None) {
for (i=0; i < numChildren; i++) {
Atom actual_type;
@@ -2023,12 +2025,12 @@
Window* newRoot = (Window*) 0;
if (children[i]) {
- if (XGetWindowProperty(myDpy, children[i], vRootAtom,
- 0L, 1L, False, XA_WINDOW,
- &actual_type, &actual_format,
- &nitems, &bytesafter,
- (unsigned char**) &newRoot
- ) == Success && newRoot) {
+ if (XGetWindowProperty(dpy, children[i], vRootAtom,
+ 0L, 1L, False, XA_WINDOW,
+ &actual_type, &actual_format,
+ &nitems, &bytesafter,
+ (unsigned char**) &newRoot
+ ) == Success && newRoot) {
vRootWin = *newRoot;
XFree(newRoot); /* XXX */
break;
@@ -3091,15 +3093,16 @@
&& __isExternalAddress(aDrawableId)
&& __bothSmallInteger(x0, y0)
&& __bothSmallInteger(x1, y1)) {
+ Display *dpy = myDpy;
gc = _GCVal(aGCId);
win = _WindowVal(aDrawableId);
ENTER_XLIB();
if ((x0 == x1) && (y0 == y1)) {
- XDrawPoint(myDpy, win, gc, __intVal(x0), __intVal(y0));
+ XDrawPoint(dpy, win, gc, __intVal(x0), __intVal(y0));
} else {
- XDrawLine(myDpy, win, gc, __intVal(x0), __intVal(y0),
- __intVal(x1), __intVal(y1));
+ XDrawLine(dpy, win, gc, __intVal(x0), __intVal(y0),
+ __intVal(x1), __intVal(y1));
}
LEAVE_XLIB();
RETURN ( self );
@@ -3375,6 +3378,7 @@
&& __isNonNilObject(aString)
&& __bothSmallInteger(index1, index2)
&& __bothSmallInteger(x, y)) {
+ Display *dpy = myDpy;
gc = _GCVal(aGCId);
win = _WindowVal(aDrawableId);
cls = __qClass(aString);
@@ -3396,9 +3400,9 @@
if (l > 1000) l = 1000;
ENTER_XLIB();
if (opaque == true)
- XDrawImageString(myDpy, win, gc, __intVal(x), __intVal(y), cp, l);
+ XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
else
- XDrawString(myDpy, win, gc, __intVal(x), __intVal(y), cp, l);
+ XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
LEAVE_XLIB();
RETURN ( self );
}
@@ -3415,9 +3419,9 @@
if (l > 1000) l = 1000;
ENTER_XLIB();
if (opaque == true)
- XDrawImageString(myDpy, win, gc, __intVal(x), __intVal(y), cp, l);
+ XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
else
- XDrawString(myDpy, win, gc, __intVal(x), __intVal(y), cp, l);
+ XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, l);
LEAVE_XLIB();
RETURN ( self );
}
@@ -3462,9 +3466,9 @@
ENTER_XLIB();
if (opaque == true)
- XDrawImageString16(myDpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
+ XDrawImageString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
else
- XDrawString16(myDpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
+ XDrawString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, l);
LEAVE_XLIB();
if (mustFree) {
@@ -3503,6 +3507,7 @@
&& __isExternalAddress(aDrawableId)
&& __isNonNilObject(aString)
&& __bothSmallInteger(x, y)) {
+ Display *dpy = myDpy;
gc = _GCVal(aGCId);
win = _WindowVal(aDrawableId);
cls = __qClass(aString);
@@ -3514,9 +3519,9 @@
if (n > 1000) n = 1000;
ENTER_XLIB();
if (opaque == true)
- XDrawImageString(myDpy, win, gc, __intVal(x), __intVal(y), cp, n);
+ XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
else
- XDrawString(myDpy, win, gc, __intVal(x), __intVal(y), cp, n);
+ XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
LEAVE_XLIB();
RETURN ( self );
}
@@ -3530,9 +3535,9 @@
if (n > 1000) n = 1000;
ENTER_XLIB();
if (opaque == true)
- XDrawImageString(myDpy, win, gc, __intVal(x), __intVal(y), cp, n);
+ XDrawImageString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
else
- XDrawString(myDpy, win, gc, __intVal(x), __intVal(y), cp, n);
+ XDrawString(dpy, win, gc, __intVal(x), __intVal(y), cp, n);
LEAVE_XLIB();
RETURN ( self );
}
@@ -3574,9 +3579,9 @@
ENTER_XLIB();
if (opaque == true)
- XDrawImageString16(myDpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, n);
+ XDrawImageString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, n);
else
- XDrawString16(myDpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, n);
+ XDrawString16(dpy, win, gc, __intVal(x), __intVal(y), (XChar2b *)cp, n);
LEAVE_XLIB();
@@ -5545,7 +5550,7 @@
ev.xkey.window = target;
ev.xkey.same_screen = 1;
ev.xkey.subwindow = 0;
- ev.xkey.root = RootWindow(myDpy, screen);
+ ev.xkey.root = RootWindow(dpy, screen);
ev.xkey.x = __intVal(xPos);
ev.xkey.y = __intVal(yPos);
ev.xkey.state = state;
@@ -6970,10 +6975,12 @@
%{ /* NOCONTEXT */
if (ISCONNECTED) {
+ Display *dpy = myDpy;
+
BEGIN_INTERRUPTSBLOCKED
ENTER_XLIB();
- XUngrabKeyboard(myDpy, CurrentTime);
- XSync(myDpy, 0);
+ XUngrabKeyboard(dpy, CurrentTime);
+ XSync(dpy, 0);
LEAVE_XLIB();
END_INTERRUPTSBLOCKED
}
@@ -6987,10 +6994,12 @@
%{ /* NOCONTEXT */
if (ISCONNECTED) {
+ Display *dpy = myDpy;
+
BEGIN_INTERRUPTSBLOCKED
ENTER_XLIB();
- XUngrabPointer(myDpy, CurrentTime);
- XSync(myDpy, 0);
+ XUngrabPointer(dpy, CurrentTime);
+ XSync(dpy, 0);
LEAVE_XLIB();
END_INTERRUPTSBLOCKED
}
@@ -7291,6 +7300,8 @@
if (ISCONNECTED) {
if (__isExternalAddress(aGCId)
&& __isSmallInteger(aNumber)) {
+ Display *dpy = myDpy;
+
if (lineStyle == @symbol(solid)) {
x_dashes = (char *)0;
x_style = LineSolid;
@@ -7329,9 +7340,9 @@
ENTER_XLIB();
if (x_dashes) {
- XSetDashes(myDpy, _GCVal(aGCId), 0, x_dashes, x_nDash);
+ XSetDashes(dpy, _GCVal(aGCId), 0, x_dashes, x_nDash);
}
- XSetLineAttributes(myDpy,
+ XSetLineAttributes(dpy,
_GCVal(aGCId), __intVal(aNumber),
x_style, x_cap, x_join);
LEAVE_XLIB();
@@ -7955,7 +7966,7 @@
if (ISCONNECTED) {
Display *dpy = myDpy;
- if ((modmap = XGetModifierMapping(myDpy)) != 0) {
+ if ((modmap = XGetModifierMapping(dpy)) != 0) {
maxKeyPerMod = __MKSMALLINT(modmap->max_keypermod);
modifierKeyMap = __BYTEARRAY_UNINITIALIZED_NEW_INT(modmap->max_keypermod * 8);
if (modifierKeyMap != nil) {
@@ -8006,7 +8017,7 @@
if (ISCONNECTED && __isSmallInteger(code)) {
Display *dpy = myDpy;
- if ((keysym = XKeycodeToKeysym(myDpy, __intVal(code), 0)) != NoSymbol &&
+ if ((keysym = XKeycodeToKeysym(dpy, __intVal(code), 0)) != NoSymbol &&
(keystring = XKeysymToString(keysym)) != 0)
str = __MKSTRING(keystring);
}
@@ -8248,7 +8259,7 @@
BEGIN_INTERRUPTSBLOCKED
#ifdef VIRTUAL_ROOT
- w = getRootWindow(myDpy, screen);
+ w = getRootWindow(dpy, screen);
#else
w = RootWindow(dpy, screen);
#endif
@@ -8323,7 +8334,7 @@
BEGIN_INTERRUPTSBLOCKED
#ifdef VIRTUAL_ROOT
- w = getRootWindow(myDpy, screen);
+ w = getRootWindow(dpy, screen);
#else
w = RootWindow(dpy, screen);
#endif
@@ -10158,6 +10169,6 @@
!XWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.305 1999-03-24 19:14:09 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.306 1999-03-26 09:16:44 cg Exp $'
! !
XWorkstation initialize!