--- a/Color.st Wed Feb 15 11:36:19 1995 +0100
+++ b/Color.st Thu Feb 16 04:07:02 1995 +0100
@@ -26,7 +26,7 @@
COPYRIGHT (c) 1992 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/Color.st,v 1.16 1995-02-06 00:30:10 claus Exp $
+$Header: /cvs/stx/stx/libview/Color.st,v 1.17 1995-02-16 03:06:35 claus Exp $
'!
!Color class methodsFor:'documentation'!
@@ -47,7 +47,7 @@
version
"
-$Header: /cvs/stx/stx/libview/Color.st,v 1.16 1995-02-06 00:30:10 claus Exp $
+$Header: /cvs/stx/stx/libview/Color.st,v 1.17 1995-02-16 03:06:35 claus Exp $
"
!
@@ -485,6 +485,18 @@
^ self red:0 green:100 blue:100
!
+pink
+ "return pink - ST-80 compatibility"
+
+ ^ self red:100 green:0 blue:100
+!
+
+orange
+ "return orange - ST-80 compatibility"
+
+ ^ self red:75 green:50 blue:0
+!
+
magenta
"return magenta - ST-80 compatibility"
--- a/DevWorkst.st Wed Feb 15 11:36:19 1995 +0100
+++ b/DevWorkst.st Thu Feb 16 04:07:02 1995 +0100
@@ -34,7 +34,7 @@
COPYRIGHT (c) 1993 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/Attic/DevWorkst.st,v 1.24 1995-02-08 03:18:30 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/DevWorkst.st,v 1.25 1995-02-16 03:06:44 claus Exp $
'!
!DeviceWorkstation class methodsFor:'documentation'!
@@ -55,7 +55,7 @@
version
"
-$Header: /cvs/stx/stx/libview/Attic/DevWorkst.st,v 1.24 1995-02-08 03:18:30 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/DevWorkst.st,v 1.25 1995-02-16 03:06:44 claus Exp $
"
!
@@ -447,23 +447,30 @@
^ nil
!
+platformName
+ "return a string describing the display systems platform.
+ Returns a dummy here."
+
+ ^ 'unknown'
+!
+
serverVendor
- "return a string describing the server vendor
- - returns a dummy here"
+ "return a string describing the display systems server vendor.
+ Returns a dummy here"
^ 'generic'
!
vendorRelease
- "return a workstation release number
- - returns a dummy here"
+ "return the display systems release number.
+ Returns a dummy here."
^ 0
!
protocolVersion
- "return a protocol version number
- - returns a dummy here"
+ "return the display systems protocol version number.
+ Returns a dummy here"
^ 0
!
--- a/DeviceWorkstation.st Wed Feb 15 11:36:19 1995 +0100
+++ b/DeviceWorkstation.st Thu Feb 16 04:07:02 1995 +0100
@@ -34,7 +34,7 @@
COPYRIGHT (c) 1993 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.24 1995-02-08 03:18:30 claus Exp $
+$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.25 1995-02-16 03:06:44 claus Exp $
'!
!DeviceWorkstation class methodsFor:'documentation'!
@@ -55,7 +55,7 @@
version
"
-$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.24 1995-02-08 03:18:30 claus Exp $
+$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.25 1995-02-16 03:06:44 claus Exp $
"
!
@@ -447,23 +447,30 @@
^ nil
!
+platformName
+ "return a string describing the display systems platform.
+ Returns a dummy here."
+
+ ^ 'unknown'
+!
+
serverVendor
- "return a string describing the server vendor
- - returns a dummy here"
+ "return a string describing the display systems server vendor.
+ Returns a dummy here"
^ 'generic'
!
vendorRelease
- "return a workstation release number
- - returns a dummy here"
+ "return the display systems release number.
+ Returns a dummy here."
^ 0
!
protocolVersion
- "return a protocol version number
- - returns a dummy here"
+ "return the display systems protocol version number.
+ Returns a dummy here"
^ 0
!
--- a/Form.st Wed Feb 15 11:36:19 1995 +0100
+++ b/Form.st Thu Feb 16 04:07:02 1995 +0100
@@ -26,7 +26,7 @@
COPYRIGHT (c) 1989 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/Form.st,v 1.15 1995-02-06 00:36:22 claus Exp $
+$Header: /cvs/stx/stx/libview/Form.st,v 1.16 1995-02-16 03:06:40 claus Exp $
'!
!Form class methodsFor:'documentation'!
@@ -47,7 +47,7 @@
version
"
-$Header: /cvs/stx/stx/libview/Form.st,v 1.15 1995-02-06 00:36:22 claus Exp $
+$Header: /cvs/stx/stx/libview/Form.st,v 1.16 1995-02-16 03:06:40 claus Exp $
"
!
@@ -277,6 +277,12 @@
^ #copy
!
+paint
+ "return a constant usable as bitblt-combinationrule"
+
+ ^ #copy
+!
+
under
"return a constant usable as bitblt-combinationrule"
@@ -316,6 +322,13 @@
^ (self extent:ext) offset:anOffset.
!
+extent:ext fromArray:data
+ "create a new form, take dimensions from ext, bits from data.
+ Smalltalk-80 compatibility."
+
+ ^ self width:(ext x) height:(ext y) offset:0@0 fromArray:data
+!
+
extent:ext fromArray:data offset:offs
"create a new form, take dimensions from ext, bits from data.
Smalltalk-80 compatibility."
@@ -1619,6 +1632,13 @@
^ self displayOn:aGC at:0@0 rule:rule
!
+displayOn:aGC at:aPoint
+ "draw in aGC.
+ Smalltalk-80 (2.x) compatibility"
+
+ ^ self displayOn:aGC at:aPoint rule:#copy
+!
+
displayOn:aGC at:aPoint rule:rule
"draw in aGC.
Smalltalk-80 (2.x) compatibility"
@@ -1629,17 +1649,18 @@
aGC function:rule.
aGC displayOpaqueForm:self x:aPoint x y:aPoint y.
aGC function:f.
-!
-
-displayOn:aGC at:aPoint
- "draw in aGC.
- Smalltalk-80 (2.x) compatibility"
-
- ^ self displayOn:aGC at:aPoint rule:#copy
! !
!Form methodsFor:'accessing'!
+valueAt:aPoint
+ ^ self at:aPoint
+!
+
+valueAt:aPoint put:value
+ ^ self at:aPoint put:value
+!
+
colorMap
"return the receivers colormap"
--- a/NXWorkst.st Wed Feb 15 11:36:19 1995 +0100
+++ b/NXWorkst.st Thu Feb 16 04:07:02 1995 +0100
@@ -1,6 +1,6 @@
"
COPYRIGHT (c) 1992 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -22,7 +22,7 @@
NeXTWorkstation comment:'
COPYRIGHT (c) 1992 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
this class provides the interface to NeXTStep; since we cannot include
objc-code here (due to define conflicts with Class, nil ...) we call
@@ -30,7 +30,7 @@
All non-monochrome stuff is untested (I only have a monochroome station)
-$Header: /cvs/stx/stx/libview/Attic/NXWorkst.st,v 1.7 1995-02-15 10:36:11 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/NXWorkst.st,v 1.8 1995-02-16 03:06:48 claus Exp $
written spring 92 by claus
'!
@@ -53,9 +53,9 @@
drawable = (id)(_intVal(drawableId));
if (drawable != lastDrawable) {
- if (lastDrawable) {
+ if (lastDrawable) {
_objc_unlockFocus(lastDrawable);
- }
+ }
_objc_lockFocus(drawable);
lastDrawable = drawable;
}
@@ -95,31 +95,31 @@
_INST(heightMM) = _MKSMALLINT(222);
if (strcmp(visual, "StaticGray") == 0) {
- _INST(hasColors) = false;
- _INST(hasGreyscales) = true;
+ _INST(hasColors) = false;
+ _INST(hasGreyscales) = true;
_INST(bitsPerRGB) = _MKSMALLINT(2);
- if (depth == 2)
- _INST(ncells) = _MKSMALLINT(4);
+ if (depth == 2)
+ _INST(ncells) = _MKSMALLINT(4);
_INST(monitorType) = _monochrome;
} else if (strcmp(visual, "TrueColor") == 0) {
- _INST(hasColors) = true;
- _INST(hasGreyscales) = true;
+ _INST(hasColors) = true;
+ _INST(hasGreyscales) = true;
/*
* does this exist ?"
*
- if (depth == 8) {
- _INST(ncells) = _MKSMALLINT(256);
+ if (depth == 8) {
+ _INST(ncells) = _MKSMALLINT(256);
}
*
*/
/* should work for colorStation */
- if (depth == 12) {
- _INST(ncells) = _MKSMALLINT(4096);
+ if (depth == 12) {
+ _INST(ncells) = _MKSMALLINT(4096);
_INST(bitsPerRGB) = _MKSMALLINT(4);
}
/* should work for nextDimension */
- if (depth == 24) {
- _INST(ncells) = _MKSMALLINT(4096 * 4096);
+ if (depth == 24) {
+ _INST(ncells) = _MKSMALLINT(4096 * 4096);
_INST(bitsPerRGB) = _MKSMALLINT(8);
}
_INST(monitorType) = _color;
@@ -148,9 +148,9 @@
"add the View aView with Id:aNumber to the list of known views/id's"
knownViews isNil ifTrue:[
- knownViews := (VariableArray new:100) grow:0.
- knownIds := (VariableArray new:100) grow:0.
- knownDrawableIds := (VariableArray new:100) grow:0
+ knownViews := (VariableArray new:100) grow:0.
+ knownIds := (VariableArray new:100) grow:0.
+ knownDrawableIds := (VariableArray new:100) grow:0
].
knownViews add:aView.
knownIds add:aNumber.
@@ -193,6 +193,10 @@
^ nil
!
+platformName
+ ^ 'NeXTStep'
+!
+
serverVendor
^ 'NeXT'
!
@@ -286,22 +290,22 @@
wsuperView := aView superView.
wsuperView notNil ifTrue:[
- wsuperViewId := wsuperView id
+ wsuperViewId := wsuperView id
].
wlabel := aView label.
wcursor := aView cursor.
wsuperView isNil ifTrue:[
- ext := aView minExtent.
- ext notNil ifTrue:[
- minWidth := ext x.
- minHeight := ext y
- ].
- ext := aView maxExtent.
- ext notNil ifTrue:[
- maxWidth := ext x.
- maxHeight := ext y
- ].
+ ext := aView minExtent.
+ ext notNil ifTrue:[
+ minWidth := ext x.
+ minHeight := ext y
+ ].
+ ext := aView maxExtent.
+ ext notNil ifTrue:[
+ maxWidth := ext x.
+ maxHeight := ext y
+ ].
].
%{
@@ -322,15 +326,15 @@
win = _NX_create_window(_intVal(xpos), _intVal(ypos),
w, h, resizable);
if (! win)
- return nil;
+ return nil;
/*
* define its name
*/
if (_isString(wlabel))
- _objc_setTitle(win, _stringVal(wlabel));
+ _objc_setTitle(win, _stringVal(wlabel));
else
- _objc_setTitle(win, "untitled");
+ _objc_setTitle(win, "untitled");
view = _objc_contentView(win);
_objc_setFlipped_(view, 1);
@@ -381,14 +385,14 @@
listOfAvailableFonts
"return a list with all available font names on this display"
%{
- char **names;
+ char **names;
char **cp;
int count, i;
static struct inlineCache dummy1 = _DUMMYILC1;
extern OBJ _new_;
OBJ arr;
- names = (char **) _objc_availableFonts(_FontManager_new());
+ names = (char **) _objc_availableFonts(_FontManager_new());
/* count them */
for (cp = names; *cp; cp++) ;;
count = cp - names;
@@ -541,10 +545,10 @@
NXColor clr;
if (__isSmallInteger(aColorId)) {
- id = _intVal(aColorId);
- ir = (id >> 16) & 0xFF;
- ig = (id >> 8) & 0xFF;
- ib = id & 0xFF;
+ id = _intVal(aColorId);
+ ir = (id >> 16) & 0xFF;
+ ig = (id >> 8) & 0xFF;
+ ib = id & 0xFF;
/* scale from 0 .. 255 to 0.0 .. 1.0 */
r = (float)ir / 255.0;
g = (float)ig / 255.0;
@@ -750,22 +754,22 @@
float fx, fy;
do {
- if (__isSmallInteger(x))
+ if (__isSmallInteger(x))
fx = (float)_intVal(x);
- else if (_isFloat(x))
+ else if (_isFloat(x))
fx = _floatVal(x);
- else break;
- if (__isSmallInteger(y))
+ else break;
+ if (__isSmallInteger(y))
fy = (float)_intVal(y);
- else if (_isFloat(y))
+ else if (_isFloat(y))
fy = _floatVal(y);
- else break;
- setDrawable(aDrawableId);
- PSmoveto(fx, fy);
- PSshow((char *)_stringVal(aString));
+ else break;
+ setDrawable(aDrawableId);
+ PSmoveto(fx, fy);
+ PSshow((char *)_stringVal(aString));
if (_INST(buffered) == false)
NXPing();
- RETURN ( self );
+ RETURN ( self );
} while (1);
%}
.
@@ -803,37 +807,37 @@
float fx0, fy0, fx1, fy1;
do {
- if (__isSmallInteger(x0))
+ if (__isSmallInteger(x0))
fx0 = _intVal(x0);
- else if (_isFloat(x0))
+ else if (_isFloat(x0))
fx0 = _floatVal(x0);
- else break;
- if (__isSmallInteger(y0))
+ else break;
+ if (__isSmallInteger(y0))
fy0 = _intVal(y0);
- else if (_isFloat(y0))
+ else if (_isFloat(y0))
fy0 = _floatVal(y0);
- else break;
- if (__isSmallInteger(x1))
+ else break;
+ if (__isSmallInteger(x1))
fx1 = _intVal(x1);
- else if (_isFloat(x1))
+ else if (_isFloat(x1))
fx1 = _floatVal(x1);
- else break;
- if (__isSmallInteger(y1))
+ else break;
+ if (__isSmallInteger(y1))
fy1 = _intVal(y1);
- else if (_isFloat(y1))
+ else if (_isFloat(y1))
fy1 = _floatVal(y1);
- else break;
+ else break;
- setDrawable(aDrawableId);
- PSsetlinewidth(0.0);
- PSnewpath();
- PSmoveto(fx0, fy0);
- PSlineto(fx1, fy1);
- PSstroke();
+ setDrawable(aDrawableId);
+ PSsetlinewidth(0.0);
+ PSnewpath();
+ PSmoveto(fx0, fy0);
+ PSlineto(fx1, fy1);
+ PSstroke();
if (_INST(buffered) == false)
NXPing();
- RETURN ( self );
+ RETURN ( self );
} while (1);
%}
.
@@ -853,28 +857,28 @@
!
copyFromId:sourceId x:srcX y:srcY to:destId x:dstX y:dstY
- width:w height:h with:aGCId
+ width:w height:h with:aGCId
"do a bit-blt"
^ self primitiveFailed
!
copyPlaneFromId:sourceId x:srcX y:srcY to:destId x:dstX y:dstY
- width:w height:h with:aGCId
+ width:w height:h with:aGCId
"do a bit-blt"
^ self primitiveFailed
!
displayArcX:x y:y w:width h:height from:startAngle angle:angle
- in:aDrawableId with:aGCId
+ in:aDrawableId with:aGCId
"draw an arc"
^ self primitiveFailed
!
fillArcX:x y:y w:width h:height from:startAngle angle:angle
- in:aDrawableId with:aGCId
+ in:aDrawableId with:aGCId
"fill an arc"
^ self primitiveFailed
@@ -887,37 +891,37 @@
float fx, fy, fw, fh;
do {
- if (__isSmallInteger(x))
+ if (__isSmallInteger(x))
fx = (float)_intVal(x);
- else if (_isFloat(x))
+ else if (_isFloat(x))
fx = _floatVal(x);
- else break;
- if (__isSmallInteger(y))
+ else break;
+ if (__isSmallInteger(y))
fy = (float)_intVal(y);
- else if (_isFloat(y))
+ else if (_isFloat(y))
fy = _floatVal(y);
- else break;
+ else break;
- if (__isSmallInteger(w))
+ if (__isSmallInteger(w))
fw = (float)_intVal(w);
- else if (_isFloat(w))
+ else if (_isFloat(w))
fw = _floatVal(w);
- else break;
- if (__isSmallInteger(h))
+ else break;
+ if (__isSmallInteger(h))
fh = (float)_intVal(h);
- else if (_isFloat(h))
+ else if (_isFloat(h))
fh = _floatVal(h);
- else break;
+ else break;
- setDrawable(aDrawableId);
- PSnewpath();
- PSmoveto(fx, fy);
- PSlineto(fx + fw, fy);
- PSlineto(fx + fx, fy + fh);
- PSlineto(fx, fy + fh);
- PSlineto(fx, fy);
- PSclosepath();
- PSfill();
+ setDrawable(aDrawableId);
+ PSnewpath();
+ PSmoveto(fx, fy);
+ PSlineto(fx + fw, fy);
+ PSlineto(fx + fx, fy + fh);
+ PSlineto(fx, fy + fh);
+ PSlineto(fx, fy);
+ PSclosepath();
+ PSfill();
if (_INST(buffered) == false)
NXPing();
RETURN ( self );
@@ -932,8 +936,8 @@
!
drawBits:imageBits depth:imageDepth width:imageWidth height:imageHeight
- x:srcx y:srcy
- into:aDrawableId x:dstx y:dsty width:w height:h with:aGCId
+ x:srcx y:srcy
+ into:aDrawableId x:dstx y:dsty width:w height:h with:aGCId
"draw a bitimage which has depth id, width iw and height ih into
the drawable. draw a region of w/h pixels from srcx/srcy to dstx/dsty.
It has to be checked elsewhere, that server can do it with the given
--- a/NeXTWorkstation.st Wed Feb 15 11:36:19 1995 +0100
+++ b/NeXTWorkstation.st Thu Feb 16 04:07:02 1995 +0100
@@ -1,6 +1,6 @@
"
COPYRIGHT (c) 1992 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -22,7 +22,7 @@
NeXTWorkstation comment:'
COPYRIGHT (c) 1992 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
this class provides the interface to NeXTStep; since we cannot include
objc-code here (due to define conflicts with Class, nil ...) we call
@@ -30,7 +30,7 @@
All non-monochrome stuff is untested (I only have a monochroome station)
-$Header: /cvs/stx/stx/libview/NeXTWorkstation.st,v 1.7 1995-02-15 10:36:11 claus Exp $
+$Header: /cvs/stx/stx/libview/NeXTWorkstation.st,v 1.8 1995-02-16 03:06:48 claus Exp $
written spring 92 by claus
'!
@@ -53,9 +53,9 @@
drawable = (id)(_intVal(drawableId));
if (drawable != lastDrawable) {
- if (lastDrawable) {
+ if (lastDrawable) {
_objc_unlockFocus(lastDrawable);
- }
+ }
_objc_lockFocus(drawable);
lastDrawable = drawable;
}
@@ -95,31 +95,31 @@
_INST(heightMM) = _MKSMALLINT(222);
if (strcmp(visual, "StaticGray") == 0) {
- _INST(hasColors) = false;
- _INST(hasGreyscales) = true;
+ _INST(hasColors) = false;
+ _INST(hasGreyscales) = true;
_INST(bitsPerRGB) = _MKSMALLINT(2);
- if (depth == 2)
- _INST(ncells) = _MKSMALLINT(4);
+ if (depth == 2)
+ _INST(ncells) = _MKSMALLINT(4);
_INST(monitorType) = _monochrome;
} else if (strcmp(visual, "TrueColor") == 0) {
- _INST(hasColors) = true;
- _INST(hasGreyscales) = true;
+ _INST(hasColors) = true;
+ _INST(hasGreyscales) = true;
/*
* does this exist ?"
*
- if (depth == 8) {
- _INST(ncells) = _MKSMALLINT(256);
+ if (depth == 8) {
+ _INST(ncells) = _MKSMALLINT(256);
}
*
*/
/* should work for colorStation */
- if (depth == 12) {
- _INST(ncells) = _MKSMALLINT(4096);
+ if (depth == 12) {
+ _INST(ncells) = _MKSMALLINT(4096);
_INST(bitsPerRGB) = _MKSMALLINT(4);
}
/* should work for nextDimension */
- if (depth == 24) {
- _INST(ncells) = _MKSMALLINT(4096 * 4096);
+ if (depth == 24) {
+ _INST(ncells) = _MKSMALLINT(4096 * 4096);
_INST(bitsPerRGB) = _MKSMALLINT(8);
}
_INST(monitorType) = _color;
@@ -148,9 +148,9 @@
"add the View aView with Id:aNumber to the list of known views/id's"
knownViews isNil ifTrue:[
- knownViews := (VariableArray new:100) grow:0.
- knownIds := (VariableArray new:100) grow:0.
- knownDrawableIds := (VariableArray new:100) grow:0
+ knownViews := (VariableArray new:100) grow:0.
+ knownIds := (VariableArray new:100) grow:0.
+ knownDrawableIds := (VariableArray new:100) grow:0
].
knownViews add:aView.
knownIds add:aNumber.
@@ -193,6 +193,10 @@
^ nil
!
+platformName
+ ^ 'NeXTStep'
+!
+
serverVendor
^ 'NeXT'
!
@@ -286,22 +290,22 @@
wsuperView := aView superView.
wsuperView notNil ifTrue:[
- wsuperViewId := wsuperView id
+ wsuperViewId := wsuperView id
].
wlabel := aView label.
wcursor := aView cursor.
wsuperView isNil ifTrue:[
- ext := aView minExtent.
- ext notNil ifTrue:[
- minWidth := ext x.
- minHeight := ext y
- ].
- ext := aView maxExtent.
- ext notNil ifTrue:[
- maxWidth := ext x.
- maxHeight := ext y
- ].
+ ext := aView minExtent.
+ ext notNil ifTrue:[
+ minWidth := ext x.
+ minHeight := ext y
+ ].
+ ext := aView maxExtent.
+ ext notNil ifTrue:[
+ maxWidth := ext x.
+ maxHeight := ext y
+ ].
].
%{
@@ -322,15 +326,15 @@
win = _NX_create_window(_intVal(xpos), _intVal(ypos),
w, h, resizable);
if (! win)
- return nil;
+ return nil;
/*
* define its name
*/
if (_isString(wlabel))
- _objc_setTitle(win, _stringVal(wlabel));
+ _objc_setTitle(win, _stringVal(wlabel));
else
- _objc_setTitle(win, "untitled");
+ _objc_setTitle(win, "untitled");
view = _objc_contentView(win);
_objc_setFlipped_(view, 1);
@@ -381,14 +385,14 @@
listOfAvailableFonts
"return a list with all available font names on this display"
%{
- char **names;
+ char **names;
char **cp;
int count, i;
static struct inlineCache dummy1 = _DUMMYILC1;
extern OBJ _new_;
OBJ arr;
- names = (char **) _objc_availableFonts(_FontManager_new());
+ names = (char **) _objc_availableFonts(_FontManager_new());
/* count them */
for (cp = names; *cp; cp++) ;;
count = cp - names;
@@ -541,10 +545,10 @@
NXColor clr;
if (__isSmallInteger(aColorId)) {
- id = _intVal(aColorId);
- ir = (id >> 16) & 0xFF;
- ig = (id >> 8) & 0xFF;
- ib = id & 0xFF;
+ id = _intVal(aColorId);
+ ir = (id >> 16) & 0xFF;
+ ig = (id >> 8) & 0xFF;
+ ib = id & 0xFF;
/* scale from 0 .. 255 to 0.0 .. 1.0 */
r = (float)ir / 255.0;
g = (float)ig / 255.0;
@@ -750,22 +754,22 @@
float fx, fy;
do {
- if (__isSmallInteger(x))
+ if (__isSmallInteger(x))
fx = (float)_intVal(x);
- else if (_isFloat(x))
+ else if (_isFloat(x))
fx = _floatVal(x);
- else break;
- if (__isSmallInteger(y))
+ else break;
+ if (__isSmallInteger(y))
fy = (float)_intVal(y);
- else if (_isFloat(y))
+ else if (_isFloat(y))
fy = _floatVal(y);
- else break;
- setDrawable(aDrawableId);
- PSmoveto(fx, fy);
- PSshow((char *)_stringVal(aString));
+ else break;
+ setDrawable(aDrawableId);
+ PSmoveto(fx, fy);
+ PSshow((char *)_stringVal(aString));
if (_INST(buffered) == false)
NXPing();
- RETURN ( self );
+ RETURN ( self );
} while (1);
%}
.
@@ -803,37 +807,37 @@
float fx0, fy0, fx1, fy1;
do {
- if (__isSmallInteger(x0))
+ if (__isSmallInteger(x0))
fx0 = _intVal(x0);
- else if (_isFloat(x0))
+ else if (_isFloat(x0))
fx0 = _floatVal(x0);
- else break;
- if (__isSmallInteger(y0))
+ else break;
+ if (__isSmallInteger(y0))
fy0 = _intVal(y0);
- else if (_isFloat(y0))
+ else if (_isFloat(y0))
fy0 = _floatVal(y0);
- else break;
- if (__isSmallInteger(x1))
+ else break;
+ if (__isSmallInteger(x1))
fx1 = _intVal(x1);
- else if (_isFloat(x1))
+ else if (_isFloat(x1))
fx1 = _floatVal(x1);
- else break;
- if (__isSmallInteger(y1))
+ else break;
+ if (__isSmallInteger(y1))
fy1 = _intVal(y1);
- else if (_isFloat(y1))
+ else if (_isFloat(y1))
fy1 = _floatVal(y1);
- else break;
+ else break;
- setDrawable(aDrawableId);
- PSsetlinewidth(0.0);
- PSnewpath();
- PSmoveto(fx0, fy0);
- PSlineto(fx1, fy1);
- PSstroke();
+ setDrawable(aDrawableId);
+ PSsetlinewidth(0.0);
+ PSnewpath();
+ PSmoveto(fx0, fy0);
+ PSlineto(fx1, fy1);
+ PSstroke();
if (_INST(buffered) == false)
NXPing();
- RETURN ( self );
+ RETURN ( self );
} while (1);
%}
.
@@ -853,28 +857,28 @@
!
copyFromId:sourceId x:srcX y:srcY to:destId x:dstX y:dstY
- width:w height:h with:aGCId
+ width:w height:h with:aGCId
"do a bit-blt"
^ self primitiveFailed
!
copyPlaneFromId:sourceId x:srcX y:srcY to:destId x:dstX y:dstY
- width:w height:h with:aGCId
+ width:w height:h with:aGCId
"do a bit-blt"
^ self primitiveFailed
!
displayArcX:x y:y w:width h:height from:startAngle angle:angle
- in:aDrawableId with:aGCId
+ in:aDrawableId with:aGCId
"draw an arc"
^ self primitiveFailed
!
fillArcX:x y:y w:width h:height from:startAngle angle:angle
- in:aDrawableId with:aGCId
+ in:aDrawableId with:aGCId
"fill an arc"
^ self primitiveFailed
@@ -887,37 +891,37 @@
float fx, fy, fw, fh;
do {
- if (__isSmallInteger(x))
+ if (__isSmallInteger(x))
fx = (float)_intVal(x);
- else if (_isFloat(x))
+ else if (_isFloat(x))
fx = _floatVal(x);
- else break;
- if (__isSmallInteger(y))
+ else break;
+ if (__isSmallInteger(y))
fy = (float)_intVal(y);
- else if (_isFloat(y))
+ else if (_isFloat(y))
fy = _floatVal(y);
- else break;
+ else break;
- if (__isSmallInteger(w))
+ if (__isSmallInteger(w))
fw = (float)_intVal(w);
- else if (_isFloat(w))
+ else if (_isFloat(w))
fw = _floatVal(w);
- else break;
- if (__isSmallInteger(h))
+ else break;
+ if (__isSmallInteger(h))
fh = (float)_intVal(h);
- else if (_isFloat(h))
+ else if (_isFloat(h))
fh = _floatVal(h);
- else break;
+ else break;
- setDrawable(aDrawableId);
- PSnewpath();
- PSmoveto(fx, fy);
- PSlineto(fx + fw, fy);
- PSlineto(fx + fx, fy + fh);
- PSlineto(fx, fy + fh);
- PSlineto(fx, fy);
- PSclosepath();
- PSfill();
+ setDrawable(aDrawableId);
+ PSnewpath();
+ PSmoveto(fx, fy);
+ PSlineto(fx + fw, fy);
+ PSlineto(fx + fx, fy + fh);
+ PSlineto(fx, fy + fh);
+ PSlineto(fx, fy);
+ PSclosepath();
+ PSfill();
if (_INST(buffered) == false)
NXPing();
RETURN ( self );
@@ -932,8 +936,8 @@
!
drawBits:imageBits depth:imageDepth width:imageWidth height:imageHeight
- x:srcx y:srcy
- into:aDrawableId x:dstx y:dsty width:w height:h with:aGCId
+ x:srcx y:srcy
+ into:aDrawableId x:dstx y:dsty width:w height:h with:aGCId
"draw a bitimage which has depth id, width iw and height ih into
the drawable. draw a region of w/h pixels from srcx/srcy to dstx/dsty.
It has to be checked elsewhere, that server can do it with the given
--- a/View.st Wed Feb 15 11:36:19 1995 +0100
+++ b/View.st Thu Feb 16 04:07:02 1995 +0100
@@ -45,7 +45,7 @@
COPYRIGHT (c) 1989 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/View.st,v 1.27 1995-02-08 03:18:36 claus Exp $
+$Header: /cvs/stx/stx/libview/View.st,v 1.28 1995-02-16 03:06:50 claus Exp $
'!
"this flag controls (globally) how views look - it will vanish"
@@ -70,7 +70,7 @@
version
"
-$Header: /cvs/stx/stx/libview/View.st,v 1.27 1995-02-08 03:18:36 claus Exp $
+$Header: /cvs/stx/stx/libview/View.st,v 1.28 1995-02-16 03:06:50 claus Exp $
"
!
@@ -100,7 +100,7 @@
relativeExtent <Number> relative extent in percent within superview
originRule <Block> rule to compute origin if superview changes size
extentRule <Block> rule to compute extent if superview changes size
- shown <Boolean> true if visible (false if iconified)
+ shown <Boolean> true if visible (false if iconified, unmapped or covered)
hidden <Boolean> dont show automatically when superview is realized
name <String> my name (future use for resources)
level <Number> 3D level relative to superview
@@ -1993,7 +1993,7 @@
!
originChanged:delta
- "this one is sent, after my origin changed -
+ "this one is sent, after the origin of my contents has changed -
tell dependents (i.e. scrollers) about this"
self changed:#originOfContents with:delta
@@ -3106,8 +3106,7 @@
drawableId notNil ifTrue:[
device unmapWindow:drawableId
].
- realized := false.
- shown := false
+ realized := shown := false.
]
!
--- a/XWorkstat.st Wed Feb 15 11:36:19 1995 +0100
+++ b/XWorkstat.st Thu Feb 16 04:07:02 1995 +0100
@@ -30,7 +30,7 @@
COPYRIGHT (c) 1989 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.31 1995-02-15 10:36:19 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.32 1995-02-16 03:07:02 claus Exp $
'!
!XWorkstation class methodsFor:'documentation'!
@@ -51,7 +51,7 @@
version
"
-$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.31 1995-02-15 10:36:19 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.32 1995-02-16 03:07:02 claus Exp $
"
!
@@ -694,6 +694,10 @@
%}
!
+platformName
+ ^ 'X'
+!
+
serverVendor
"return the X-server vendor string - this should normally not be of
any interrest, but can be for special cases
--- a/XWorkstation.st Wed Feb 15 11:36:19 1995 +0100
+++ b/XWorkstation.st Thu Feb 16 04:07:02 1995 +0100
@@ -30,7 +30,7 @@
COPYRIGHT (c) 1989 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.31 1995-02-15 10:36:19 claus Exp $
+$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.32 1995-02-16 03:07:02 claus Exp $
'!
!XWorkstation class methodsFor:'documentation'!
@@ -51,7 +51,7 @@
version
"
-$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.31 1995-02-15 10:36:19 claus Exp $
+$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.32 1995-02-16 03:07:02 claus Exp $
"
!
@@ -694,6 +694,10 @@
%}
!
+platformName
+ ^ 'X'
+!
+
serverVendor
"return the X-server vendor string - this should normally not be of
any interrest, but can be for special cases