--- a/XWorkstation.st Tue Oct 01 19:41:57 1996 +0200
+++ b/XWorkstation.st Wed Oct 02 13:39:30 1996 +0200
@@ -408,7 +408,7 @@
errorStringOfLastError
%{
- RETURN ( __MKSTRING(lastErrorMsg COMMA_CON) );
+ RETURN ( __MKSTRING(lastErrorMsg) );
%}
!
@@ -598,7 +598,7 @@
(to avoid bugs in certain implementations)"
%{
if (ISCONNECTED) {
- RETURN ( __MKSTRING(XServerVendor(myDpy) COMMA_CON) );
+ RETURN ( __MKSTRING(XServerVendor(myDpy)) );
}
RETURN (nil);
%}
@@ -2531,7 +2531,7 @@
points = qPoints;
for (i=0; i<num; i++) {
- point = __AT_(aPolygon COMMA_CON, __MKSMALLINT(i+1));
+ point = __AT_(aPolygon, __MKSMALLINT(i+1));
if (! __isPoint(point)) goto fail;
x = _point_X(point);
y = _point_Y(point);
@@ -2953,7 +2953,7 @@
} else
points = qPoints;
for (i=0; i<num; i++) {
- point = __AT_(aPolygon COMMA_CON, __MKSMALLINT(i+1));
+ point = __AT_(aPolygon, __MKSMALLINT(i+1));
if (! __isPoint(point)) goto fail;
x = _point_X(point);
y = _point_Y(point);
@@ -3217,7 +3217,7 @@
}
windowID = __MKOBJ(ae->window);
- theView = (*vid.ilc_func)(self, @symbol(viewFromId:) COMMA_CON, nil, &vid, windowID);
+ theView = (*vid.ilc_func)(self, @symbol(viewFromId:), nil, &vid, windowID);
if ((theView == nil) && (ev->type != MappingNotify)) {
RETURN (nil);
@@ -3322,7 +3322,7 @@
arg = __MKSYMBOL(keySymString, (OBJ *)0, __context);
#else
__PROTECT__(theView);
- arg = __MKSTRING(keySymString COMMA_CON);
+ arg = __MKSTRING(keySymString);
__UNPROTECT__(theView);
#endif
}
@@ -3333,7 +3333,7 @@
break;
}
- (*(*ipS).ilc_func)(self, symS COMMA_CON, nil, ipS,
+ (*(*ipS).ilc_func)(self, symS, nil, ipS,
arg,
__MKSMALLINT(ke->x),
__MKSMALLINT(ke->y),
@@ -3395,8 +3395,7 @@
(*(*ipS).ilc_func)(self,
- symS
- COMMA_CON, nil, ipS,
+ symS, nil, ipS,
butt,
__MKSMALLINT(ke->x),
__MKSMALLINT(ke->y),
@@ -3422,8 +3421,7 @@
__INST(ctrlDown) = (me->state & ControlMask) ? true : false;
(*motS.ilc_func)(self,
- @symbol(buttonMotion:x:y:view:)
- COMMA_CON, nil, &motS,
+ @symbol(buttonMotion:x:y:view:), nil, &motS,
__MKSMALLINT(me->state),
__MKSMALLINT(me->x),
__MKSMALLINT(me->y),
@@ -3432,15 +3430,13 @@
case FocusIn:
(*focInS.ilc_func)(self,
- @symbol(focusInView:)
- COMMA_CON, nil, &focInS,
+ @symbol(focusInView:), nil, &focInS,
theView);
break;
case FocusOut:
(*focOutS.ilc_func)(self,
- @symbol(focusOutView:)
- COMMA_CON, nil, &focOutS,
+ @symbol(focusOutView:), nil, &focOutS,
theView);
break;
@@ -3456,8 +3452,7 @@
__INST(ctrlDown) = (ewe->state & ControlMask) ? true : false;
(*peS.ilc_func)(self,
- @symbol(pointerEnter:x:y:view:)
- COMMA_CON, nil, &peS,
+ @symbol(pointerEnter:x:y:view:), nil, &peS,
__MKSMALLINT(ewe->state),
__MKSMALLINT(ewe->x),
__MKSMALLINT(ewe->y),
@@ -3466,16 +3461,14 @@
case LeaveNotify:
(*plS.ilc_func)(self,
- @symbol(pointerLeave:view:)
- COMMA_CON, nil, &plS,
+ @symbol(pointerLeave:view:), nil, &plS,
__MKSMALLINT(lwe->state),
theView);
break;
case GraphicsExpose:
(*gexpS.ilc_func)(self,
- @symbol(graphicExposeX:y:width:height:view:)
- COMMA_CON, nil, &gexpS,
+ @symbol(graphicExposeX:y:width:height:view:), nil, &gexpS,
__MKSMALLINT(ee->x),
__MKSMALLINT(ee->y),
__MKSMALLINT(ee->width),
@@ -3489,15 +3482,13 @@
case NoExpose:
(*nexpS.ilc_func)(self,
- @symbol(noExposeView:)
- COMMA_CON, nil, &nexpS,
+ @symbol(noExposeView:), nil, &nexpS,
theView);
break;
case Expose:
(*expS.ilc_func)(self,
- @symbol(exposeX:y:width:height:view:)
- COMMA_CON, nil, &expS,
+ @symbol(exposeX:y:width:height:view:), nil, &expS,
__MKSMALLINT(ee->x),
__MKSMALLINT(ee->y),
__MKSMALLINT(ee->width),
@@ -3508,13 +3499,11 @@
case ConfigureNotify:
if (ce->above != None) {
siblingID = __MKOBJ(ce->above);
- sibling = (*vid.ilc_func)(self, @symbol(viewFromId:)
- COMMA_CON, nil, &vid, siblingID);
+ sibling = (*vid.ilc_func)(self, @symbol(viewFromId:), nil, &vid, siblingID);
}
(*confS.ilc_func)(self,
- @symbol(configureX:y:width:height:view:)
- COMMA_CON, nil, &confS,
+ @symbol(configureX:y:width:height:view:), nil, &confS,
__MKSMALLINT(ce->x),
__MKSMALLINT(ce->y),
__MKSMALLINT(ce->width),
@@ -3522,8 +3511,7 @@
theView);
if (sibling != nil) {
(*coveredS.ilc_func)(self,
- @symbol(coveredBy:view:)
- COMMA_CON, nil, &coveredS,
+ @symbol(coveredBy:view:), nil, &coveredS,
theView,
sibling);
}
@@ -3534,14 +3522,13 @@
if ((ev->xclient.data.l[0] == (int) _AtomVal(__INST(quitAppAtom)))
|| (ev->xclient.data.l[0] == (int) _AtomVal(__INST(deleteWindowAtom)))) {
(*termS.ilc_func)(self,
- @symbol(terminateView:)
- COMMA_CON, nil, &termS, theView);
+ @symbol(terminateView:), nil, &termS, theView);
break;
}
if (ev->xclient.data.l[0] == (int) _AtomVal(__INST(saveYourselfAtom))) {
(*savtermS.ilc_func)(self,
@symbol(saveAndTerminateView:)
- COMMA_CON, nil, &savtermS, theView);
+ , nil, &savtermS, theView);
break;
}
}
@@ -3549,24 +3536,24 @@
case DestroyNotify:
(*destrS.ilc_func)(self, @symbol(destroyedView:)
- COMMA_CON, nil, &destrS, theView);
+ , nil, &destrS, theView);
break;
case UnmapNotify:
(*unmapS.ilc_func)(self, @symbol(unmappedView:)
- COMMA_CON, nil, &unmapS, theView);
+ , nil, &unmapS, theView);
break;
case MapNotify:
(*mapS.ilc_func)(self,
@symbol(mappedView:)
- COMMA_CON, nil, &mapS, theView);
+ , nil, &mapS, theView);
break;
case KeymapNotify:
(*keymap.ilc_func)(theView,
@symbol(keyMapChange)
- COMMA_CON, nil, &keymap);
+ , nil, &keymap);
break;
case VisibilityNotify:
@@ -3581,28 +3568,28 @@
arg = @symbol(fullyObscured);
break;
}
- (*vis.ilc_func)(theView, @symbol(visibilityChange:) COMMA_CON, nil, &vis, arg);
+ (*vis.ilc_func)(theView, @symbol(visibilityChange:), nil, &vis, arg);
break;
case CreateNotify:
- (*created.ilc_func)(theView, @symbol(created) COMMA_CON, nil, &created);
+ (*created.ilc_func)(theView, @symbol(created), nil, &created);
break;
case MapRequest:
- (*mapReq.ilc_func)(theView, @symbol(mapRequest) COMMA_CON, nil, &mapReq);
+ (*mapReq.ilc_func)(theView, @symbol(mapRequest), nil, &mapReq);
break;
case ReparentNotify:
- (*repar.ilc_func)(theView, @symbol(reparented) COMMA_CON, nil, &repar);
+ (*repar.ilc_func)(theView, @symbol(reparented), nil, &repar);
break;
case ConfigureRequest:
- (*confReq.ilc_func)(theView, @symbol(configRequest) COMMA_CON, nil, &confReq);
+ (*confReq.ilc_func)(theView, @symbol(configRequest), nil, &confReq);
break;
case GravityNotify:
case ResizeRequest:
- (*resReq.ilc_func)(theView, @symbol(resizeRequest) COMMA_CON, nil, &resReq);
+ (*resReq.ilc_func)(theView, @symbol(resizeRequest), nil, &resReq);
break;
case CirculateNotify:
@@ -3612,14 +3599,14 @@
case PropertyNotify:
(*prop.ilc_func)(theView,
@symbol(propertyChange)
- COMMA_CON, nil, &prop);
+ , nil, &prop);
break;
case SelectionClear:
selectionID = __MKATOMOBJ(ev->xselectionclear.selection);
(*selClear.ilc_func)(theView,
@symbol(selectionClear:)
- COMMA_CON, nil, &selClear,
+ , nil, &selClear,
selectionID);
break;
@@ -3637,7 +3624,7 @@
requestorID = __MKOBJ(ev->xselection.requestor);
(*selNotify.ilc_func)(theView,
@symbol(selectionNotify:target:selection:from:)
- COMMA_CON, nil, &selNotify,
+ , nil, &selNotify,
propertyID, targetID, selectionID, requestorID);
break;
@@ -3657,14 +3644,14 @@
requestorID = __MKOBJ(ev->xselectionrequest.requestor);
(*selReq.ilc_func)(theView,
@symbol(selectionRequest:target:selection:from:)
- COMMA_CON, nil, &selReq,
+ , nil, &selReq,
propertyID, targetID, selectionID, requestorID);
break;
case ColormapNotify:
(*colormap.ilc_func)(theView,
@symbol(colorMapChange)
- COMMA_CON, nil, &colormap);
+ , nil, &colormap);
break;
case MappingNotify:
@@ -3684,7 +3671,7 @@
}
(*mapping.ilc_func)(self,
@symbol(mappingChanged:event:)
- COMMA_CON, nil, &mapping, arg, eB);
+ , nil, &mapping, arg, eB);
break;
}
#undef ae
@@ -4403,7 +4390,7 @@
if (prop->name == XA_FULL_NAME) {
cp = XGetAtomName(myDpy, prop->card32);
if (cp) {
- fullName = __MKSTRING(cp COMMA_CON);
+ fullName = __MKSTRING(cp);
#ifdef SUPERDEBUG
printf(" FULL_NAME -> %s\n", cp);
#endif
@@ -4412,7 +4399,7 @@
} else if (prop->name == fontAtom) {
cp = XGetAtomName(myDpy, prop->card32);
if (cp) {
- fontName = __MKSTRING(cp COMMA_CON);
+ fontName = __MKSTRING(cp);
#ifdef SUPERDEBUG
printf(" FONT -> %s\n", cp);
#endif
@@ -4421,7 +4408,7 @@
} else if (prop->name == encodingAtom) {
cp = XGetAtomName(myDpy, prop->card32);
if (cp) {
- encoding = __MKSTRING(cp COMMA_CON);
+ encoding = __MKSTRING(cp);
#ifdef SUPERDEBUG
printf(" ENCODING -> %s\n", cp);
#endif
@@ -4430,7 +4417,7 @@
} else if (prop->name == registryAtom) {
cp = XGetAtomName(myDpy, prop->card32);
if (cp) {
- registry = __MKSTRING(cp COMMA_CON);
+ registry = __MKSTRING(cp);
#ifdef SUPERDEBUG
printf(" REGISTRY -> %s\n", cp);
#endif
@@ -4439,7 +4426,7 @@
} else if (prop->name == charSetCollAtom) {
cp = XGetAtomName(myDpy, prop->card32);
if (cp) {
- charSetCollections = __MKSTRING(cp COMMA_CON);
+ charSetCollections = __MKSTRING(cp);
#ifdef SUPERDEBUG
printf(" CHARSET_COLLECTIONS -> %s\n", cp);
#endif
@@ -4656,7 +4643,7 @@
if (prop->name == XA_FULL_NAME) {
cp = XGetAtomName(myDpy, prop->card32);
if (cp) {
- fullName = __MKSTRING(cp COMMA_CON);
+ fullName = __MKSTRING(cp);
#ifdef SUPERDEBUG
printf(" FULL_NAME -> %s\n", cp);
#endif
@@ -4666,7 +4653,7 @@
if (prop->name == fontAtom) {
cp = XGetAtomName(myDpy, prop->card32);
if (cp) {
- fontName = __MKSTRING(cp COMMA_CON);
+ fontName = __MKSTRING(cp);
#ifdef SUPERDEBUG
printf(" FONT -> %s\n", cp);
#endif
@@ -4721,7 +4708,7 @@
*/
for (i=0; i<available; i++) {
__PROTECT__(arr);
- str = __MKSTRING(fonts[i] COMMA_CON);
+ str = __MKSTRING(fonts[i]);
__UNPROTECT__(arr);
__ArrayInstPtr(arr)->a_element[i] = str; __STORE(arr, str);
}
@@ -5928,7 +5915,7 @@
if (__isString(dpyName))
nm = (char *)_stringVal(dpyName);
else {
- dpyName = __MKSTRING((char *)getenv("DISPLAY") COMMA_CON);
+ dpyName = __MKSTRING((char *)getenv("DISPLAY"));
nm = NULL;
}
dpy = XOpenDisplay(nm);
@@ -6846,7 +6833,7 @@
if (name == 0) {
RETURN (nil);
}
- str = __MKSTRING(name COMMA_CON);
+ str = __MKSTRING(name);
XFree(name);
RETURN ( str );
}
@@ -6893,7 +6880,7 @@
rslt = XGetDefault(myDpy, (char *)_stringVal(cls),
(char *)_stringVal(name));
END_INTERRUPTSBLOCKED
- RETURN (rslt ? __MKSTRING(rslt COMMA_CON) : nil );
+ RETURN (rslt ? __MKSTRING(rslt) : nil );
}
%}.
self primitiveFailed.
@@ -7160,7 +7147,7 @@
if (ok) {
if (actual_type == XA_STRING) {
cp[nread] = '\0';
- val = __MKSTRING_L(cp, nread COMMA_CON);
+ val = __MKSTRING_L(cp, nread);
} else {
val = __new(nread + OHDR_SIZE);
val->o_class = cls;
@@ -8160,6 +8147,6 @@
!XWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.175 1996-09-24 11:40:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.176 1996-10-02 11:39:30 cg Exp $'
! !
XWorkstation initialize!