Mercurial Mercurial > hg > stx-libview / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Fri, 10 Nov 1995 18:01:33 +0100
changeset 216 f4fd44038317
parent 215 4b9bebf59812
child 217 8066057d91a8
*** empty log message ***
GLXWorkstat.st file | annotate | diff | comparison | revisions
GLXWorkstation.st file | annotate | diff | comparison | revisions
XWorkstat.st file | annotate | diff | comparison | revisions
XWorkstation.st file | annotate | diff | comparison | revisions 
--- a/GLXWorkstat.st	Fri Nov 10 16:10:06 1995 +0100
+++ b/GLXWorkstat.st	Fri Nov 10 18:01:33 1995 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Attic/GLXWorkstat.st,v 1.34 1995-11-10 11:38:36 cg Exp $
+$Header: /cvs/stx/stx/libview/Attic/GLXWorkstat.st,v 1.35 1995-11-10 17:00:56 cg Exp $
 '!
 
 !GLXWorkstation class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Attic/GLXWorkstat.st,v 1.34 1995-11-10 11:38:36 cg Exp $
+$Header: /cvs/stx/stx/libview/Attic/GLXWorkstat.st,v 1.35 1995-11-10 17:00:56 cg Exp $
 "
 !
 
@@ -1050,7 +1050,7 @@
 
 errorStringOfLastError
 %{
-    RETURN ( _MKSTRING(lastErrorMsg, __context) );
+    RETURN ( __MKSTRING(lastErrorMsg COMMA_CON) );
 %}
 ! !
 
@@ -1125,16 +1125,14 @@
      on the returned string."
 
 %{  /* NOCONTEXT */
-    extern OBJ _MKSTRING_INIT();
-
 #ifdef VGL
-    RETURN (_MKSTRING_INIT("vogl"));
+    RETURN (__MKSTRING("vogl" COMMA_CON));
 #else
     char buffer[128];
 
     if (_INST(glOK) == true) {
 	gversion(buffer);
-	RETURN (_MKSTRING_INIT(buffer));
+	RETURN (__MKSTRING(buffer COMMA_CON));
     } else {
 	RETURN (nil);
     }
--- a/GLXWorkstation.st	Fri Nov 10 16:10:06 1995 +0100
+++ b/GLXWorkstation.st	Fri Nov 10 18:01:33 1995 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.34 1995-11-10 11:38:36 cg Exp $
+$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.35 1995-11-10 17:00:56 cg Exp $
 '!
 
 !GLXWorkstation class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.34 1995-11-10 11:38:36 cg Exp $
+$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.35 1995-11-10 17:00:56 cg Exp $
 "
 !
 
@@ -1050,7 +1050,7 @@
 
 errorStringOfLastError
 %{
-    RETURN ( _MKSTRING(lastErrorMsg, __context) );
+    RETURN ( __MKSTRING(lastErrorMsg COMMA_CON) );
 %}
 ! !
 
@@ -1125,16 +1125,14 @@
      on the returned string."
 
 %{  /* NOCONTEXT */
-    extern OBJ _MKSTRING_INIT();
-
 #ifdef VGL
-    RETURN (_MKSTRING_INIT("vogl"));
+    RETURN (__MKSTRING("vogl" COMMA_CON));
 #else
     char buffer[128];
 
     if (_INST(glOK) == true) {
 	gversion(buffer);
-	RETURN (_MKSTRING_INIT(buffer));
+	RETURN (__MKSTRING(buffer COMMA_CON));
     } else {
 	RETURN (nil);
     }
--- a/XWorkstat.st	Fri Nov 10 16:10:06 1995 +0100
+++ b/XWorkstat.st	Fri Nov 10 18:01:33 1995 +0100
@@ -36,7 +36,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.70 1995-11-10 15:10:06 cg Exp $
+$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.71 1995-11-10 17:01:33 cg Exp $
 '!
 
 !XWorkstation class methodsFor:'documentation'!
@@ -57,7 +57,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.70 1995-11-10 15:10:06 cg Exp $
+$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.71 1995-11-10 17:01:33 cg Exp $
 "
 !
 
@@ -362,7 +362,7 @@
 
 errorStringOfLastError
 %{
-    RETURN ( _MKSTRING(lastErrorMsg COMMA_CON) );
+    RETURN ( __MKSTRING(lastErrorMsg COMMA_CON) );
 %}
 !
 
@@ -940,7 +940,7 @@
      (to avoid bugs in certain implementations)"
 %{
     if (ISCONNECTED) {
-	RETURN ( _MKSTRING(XServerVendor(myDpy) COMMA_CON) );
+	RETURN ( __MKSTRING(XServerVendor(myDpy) COMMA_CON) );
     }
     RETURN (nil);
 %}
@@ -2173,7 +2173,7 @@
 	rslt = XGetDefault(myDpy, (char *)_stringVal(cls),
 				  (char *)_stringVal(name));
 	END_INTERRUPTSBLOCKED
-	RETURN (rslt ? _MKSTRING(rslt,  __context) : nil );
+	RETURN (rslt ? __MKSTRING(rslt COMMA_CON) : nil );
     }
 %}
 .
@@ -2343,7 +2343,7 @@
 	if (ok) {
 	    if (actual_type == XA_STRING) {
 		cp[nread] = '\0';
-		val = _MKSTRING(cp COMMA_CON);
+		val = __MKSTRING_L(cp, nread COMMA_CON);
 	    } else {
 		val = __new(nread + OHDR_SIZE);
 		val->o_class = cls;
@@ -2527,7 +2527,7 @@
 	    if (name == 0) {
 		RETURN (nil);
 	    }
-	    str = _MKSTRING(name COMMA_CON);
+	    str = __MKSTRING(name COMMA_CON);
 	    XFree(name);
 	    RETURN ( str );
 	}
@@ -2884,7 +2884,7 @@
 !
 
 getAvailableFontsMatching:pattern
-    "return anArray filled with font names patching aPattern"
+    "return an Array filled with font names matching aPattern"
 
 %{  /* UNLIMITEDSTACK */
 
@@ -2893,7 +2893,6 @@
     char **fonts;
     OBJ arr, str;
     int i;
-    extern OBJ _MKSTRING_INIT();
 
     if (ISCONNECTED) {
 	if (__isString(pattern)) {
@@ -2906,16 +2905,22 @@
 	    if (fonts == NULL) {
 		RETURN ( nil );
 	    }
+	    /*
+	     * now, that we know the number of font names,
+	     * create the array ...
+	     */
 	    arr = __ARRAY_NEW_INT(available);
 	    if (! arr) {
 		RETURN (nil);
 	    }
+	    /*
+	     * ... and fill it
+	     */
 	    for (i=0; i<available; i++) {
 		PROTECT(arr);
-		str = _MKSTRING_INIT(fonts[i]);
+		str = __MKSTRING(fonts[i] COMMA_CON);
 		UNPROTECT(arr);
-		__ArrayInstPtr(arr)->a_element[i] = str;
-		__STORE(arr, str);
+		__ArrayInstPtr(arr)->a_element[i] = str; __STORE(arr, str);
 	    }
 	    RETURN (arr);
 	}
@@ -6697,9 +6702,9 @@
     RETURN ( false );
 %}
 !
+
 eventPending:anEventSymbol for:aWindowIdOrNil
     "return true, if a specific event is pending"
 
     ^ self eventsPending:(self eventMaskFor:anEventSymbol) for:aWindowIdOrNil
 ! !
-
--- a/XWorkstation.st	Fri Nov 10 16:10:06 1995 +0100
+++ b/XWorkstation.st	Fri Nov 10 18:01:33 1995 +0100
@@ -36,7 +36,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.70 1995-11-10 15:10:06 cg Exp $
+$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.71 1995-11-10 17:01:33 cg Exp $
 '!
 
 !XWorkstation class methodsFor:'documentation'!
@@ -57,7 +57,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.70 1995-11-10 15:10:06 cg Exp $
+$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.71 1995-11-10 17:01:33 cg Exp $
 "
 !
 
@@ -362,7 +362,7 @@
 
 errorStringOfLastError
 %{
-    RETURN ( _MKSTRING(lastErrorMsg COMMA_CON) );
+    RETURN ( __MKSTRING(lastErrorMsg COMMA_CON) );
 %}
 !
 
@@ -940,7 +940,7 @@
      (to avoid bugs in certain implementations)"
 %{
     if (ISCONNECTED) {
-	RETURN ( _MKSTRING(XServerVendor(myDpy) COMMA_CON) );
+	RETURN ( __MKSTRING(XServerVendor(myDpy) COMMA_CON) );
     }
     RETURN (nil);
 %}
@@ -2173,7 +2173,7 @@
 	rslt = XGetDefault(myDpy, (char *)_stringVal(cls),
 				  (char *)_stringVal(name));
 	END_INTERRUPTSBLOCKED
-	RETURN (rslt ? _MKSTRING(rslt,  __context) : nil );
+	RETURN (rslt ? __MKSTRING(rslt COMMA_CON) : nil );
     }
 %}
 .
@@ -2343,7 +2343,7 @@
 	if (ok) {
 	    if (actual_type == XA_STRING) {
 		cp[nread] = '\0';
-		val = _MKSTRING(cp COMMA_CON);
+		val = __MKSTRING_L(cp, nread COMMA_CON);
 	    } else {
 		val = __new(nread + OHDR_SIZE);
 		val->o_class = cls;
@@ -2527,7 +2527,7 @@
 	    if (name == 0) {
 		RETURN (nil);
 	    }
-	    str = _MKSTRING(name COMMA_CON);
+	    str = __MKSTRING(name COMMA_CON);
 	    XFree(name);
 	    RETURN ( str );
 	}
@@ -2884,7 +2884,7 @@
 !
 
 getAvailableFontsMatching:pattern
-    "return anArray filled with font names patching aPattern"
+    "return an Array filled with font names matching aPattern"
 
 %{  /* UNLIMITEDSTACK */
 
@@ -2893,7 +2893,6 @@
     char **fonts;
     OBJ arr, str;
     int i;
-    extern OBJ _MKSTRING_INIT();
 
     if (ISCONNECTED) {
 	if (__isString(pattern)) {
@@ -2906,16 +2905,22 @@
 	    if (fonts == NULL) {
 		RETURN ( nil );
 	    }
+	    /*
+	     * now, that we know the number of font names,
+	     * create the array ...
+	     */
 	    arr = __ARRAY_NEW_INT(available);
 	    if (! arr) {
 		RETURN (nil);
 	    }
+	    /*
+	     * ... and fill it
+	     */
 	    for (i=0; i<available; i++) {
 		PROTECT(arr);
-		str = _MKSTRING_INIT(fonts[i]);
+		str = __MKSTRING(fonts[i] COMMA_CON);
 		UNPROTECT(arr);
-		__ArrayInstPtr(arr)->a_element[i] = str;
-		__STORE(arr, str);
+		__ArrayInstPtr(arr)->a_element[i] = str; __STORE(arr, str);
 	    }
 	    RETURN (arr);
 	}
@@ -6697,9 +6702,9 @@
     RETURN ( false );
 %}
 !
+
 eventPending:anEventSymbol for:aWindowIdOrNil
     "return true, if a specific event is pending"
 
     ^ self eventsPending:(self eventMaskFor:anEventSymbol) for:aWindowIdOrNil
 ! !
-
hg/stx-libview