--- a/Make.proto Mon Sep 15 22:04:20 1997 +0200
+++ b/Make.proto Sat Sep 20 23:52:55 1997 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic2/Make.proto,v 1.77 1997-08-14 14:02:34 cg Exp $
+# $Header: /cvs/stx/stx/libbasic2/Make.proto,v 1.78 1997-09-20 21:52:52 cg Exp $
#
# -------------- no need to change anything below ----------
@@ -8,7 +8,7 @@
LIBNAME=libbasic2
STCOPT=$(LIBBASIC2_STCOPT)
-STCLOCALOPT='-package=additional-basic-classes-(stx:libbasic2)' $(COMMONSYMBOLS) $(SEPINITCODE) -varPrefix=$(LIBNAME)
+STCLOCALOPT='-package=stx:libbasic2' $(COMMONSYMBOLS) $(SEPINITCODE) -varPrefix=$(LIBNAME)
LINKOBJRULE=$(SEPINITLINKOBJRULE)
all:: classLibRule
--- a/PrinterStream.st Mon Sep 15 22:04:20 1997 +0200
+++ b/PrinterStream.st Sat Sep 20 23:52:55 1997 +0200
@@ -17,7 +17,7 @@
category:'Streams-External'
!
-PrinterStream class instanceVariableNames:'PrintCommand DefaultCommands PageFormat DefaultPageFormats Landscape'
+PrinterStream class instanceVariableNames:'PrintCommand DefaultCommands PageFormat DefaultPageFormats Landscape PrintDevice DefaultDevices'
!
!PrinterStream class methodsFor:'documentation'!
@@ -70,9 +70,12 @@
See users of the Printer global variable for more examples.
[class variables:]
- PrintCommand <String> the operatingSystem command for printing.
+ PrintCommand <String> UNIX only: the operatingSystem command for printing.
Usually something like 'lp' or 'lpr'
+ PrintDevice <String> VMS only: the printers device.
+ Usually something like 'sys$print:'
+
[author:]
Claus Gittinger
"
@@ -105,9 +108,20 @@
]
]
].
+ OperatingSystem isVMSlike ifTrue:[
+ DefaultDevices isNil ifTrue:[
+ DefaultDevices := #(
+ 'sys$print:'
+ ).
+ ].
+
+ PrintDevice isNil ifTrue:[
+ PrintDevice := 'sys$print:'
+ ]
+ ].
DefaultPageFormats isNil ifTrue:[
- "/ UnitConverter must support all of them.
+ "/ UnitConverter must support all of them.
self defaultPageFormats:#(
'letter'
'legal'
@@ -175,7 +189,8 @@
!
defaultCommands
- "return a list presented as possible commands for printed
+ "UNIX only:
+ return a list presented as possible commands for printing
(in the launchers printer configuration).
This list can be set from the startup script with:
PrinterStream defaultCommands:#( ... )"
@@ -191,7 +206,8 @@
!
defaultCommands:collectionOfCommandStrings
- "set the list which will be presented as possible commands for printing.
+ "UNIX only:
+ set the list which will be presented as possible commands for printing.
(shown in in the launchers printer configuration).
This can be done from the startup script with:
PrinterStream defaultCommands:#( ... )"
@@ -201,6 +217,31 @@
"Created: 23.4.1996 / 18:26:06 / cg"
!
+defaultDevices
+ "VMS only:
+ return a list presented as possible devices for printers.
+ (in the launchers printer configuration).
+ This list can be set from the startup script with:
+ PrinterStream defaultDevices:#( ... )"
+
+ DefaultDevices isNil ifTrue:[
+ self == PrinterStream ifFalse:[
+ ^ self superclass defaultDevices
+ ]
+ ].
+ ^ DefaultDevices
+!
+
+defaultDevices:collectionOfDeviceNameStrings
+ "VMS only:
+ set the list which will be presented as possible devices for printing.
+ (shown in in the launchers printer configuration).
+ This can be done from the startup script with:
+ PrinterStream defaultDevices:#( ... )"
+
+ DefaultDevices := collectionOfDeviceNameStrings
+!
+
defaultPageFormats
"return a list of supported page formats.
This list can be set from the startup script with:
@@ -320,7 +361,8 @@
!
printCommand
- "return the command used for printing (usually 'lp' or 'lpr').
+ "UNIX only:
+ return the command used for printing (usually 'lp' or 'lpr').
This is either set from the startup file, or via the launchers
settings menu."
@@ -335,7 +377,8 @@
!
printCommand:aString
- "set the command for printing (usually 'lp' or 'lpr').
+ "UNIX only:
+ set the command for printing (usually 'lp' or 'lpr').
This is either set from the startup file, or via the launchers
settings menu."
@@ -351,6 +394,32 @@
"Modified: 18.5.1996 / 09:12:48 / cg"
!
+printDevice
+ "VMS only: return the device for printing (usually 'sys$print:')
+ This is either set from the startup file, or via the launchers
+ settings menu."
+
+ PrintDevice isNil ifTrue:[
+ self == PrinterStream ifFalse:[
+ ^ self superclass printDevice
+ ]
+ ].
+ ^ PrintDevice
+!
+
+printDevice:aString
+ "VMS only:
+ set the device for printing (usually 'sys$print:').
+ This is either set from the startup file, or via the launchers
+ settings menu."
+
+ PrintCommand := aString
+
+ "
+ PrinterStream printDevice:'lta1739:'
+ "
+!
+
rightMargin
"return the rightMargin (in inches). Here, no margin is supported,
but its redefined in some printer classes"
@@ -761,6 +830,6 @@
!PrinterStream class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic2/PrinterStream.st,v 1.47 1997-09-10 22:36:50 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/PrinterStream.st,v 1.48 1997-09-20 21:52:53 cg Exp $'
! !
PrinterStream initialize!
--- a/Socket.st Mon Sep 15 22:04:20 1997 +0200
+++ b/Socket.st Sat Sep 20 23:52:55 1997 +0200
@@ -76,6 +76,7 @@
#ifdef __VMS__
# undef WANT__AF_UNIX
+# define WANT_AF_DECnet
#endif
#ifdef LINUX
@@ -323,6 +324,17 @@
# undef AF_BRIDGE
#endif
+#ifdef WANT__AF_BSC /* BISYNC 2780/3780 */
+# ifdef AF_BSC
+# ifndef PF_BSC
+# define PF_BSC AF_BSC
+# endif
+# endif
+#else
+# undef AF_BSC
+#endif
+
+
/*
* now, include what we have to ...
*/
@@ -1579,6 +1591,16 @@
%}.
hasIt ifTrue:[list add:#bridge].
+%{
+#ifdef AF_BSC
+ hasIt = true;
+#else
+ hasIt = false;
+#endif
+%}.
+ hasIt ifTrue:[list add:#bsc].
+
+
^ list
"
@@ -1818,6 +1840,10 @@
if (myDomain == @symbol(bridge)) {
}
# endif
+# if defined(AF_BSC)
+ if (myDomain == @symbol(bsc)) {
+ }
+# endif
# if defined(AF_CCITT) && (AF_CCITT != AF_X25)
if (myDomain == @symbol(ccitt)) {
}
@@ -2446,6 +2472,10 @@
if (myDomain == @symbol(bridge)) {
}
# endif
+# ifdef AF_BSC
+ if (myDomain == @symbol(bsc)) {
+ }
+# endif
# if defined(AF_CCITT) && (AF_CCITT != AF_X25)
if (myDomain == @symbol(ccitt)) {
}
@@ -2668,6 +2698,10 @@
if (__INST(domain) == @symbol(bridge)) {
}
# endif
+# ifdef AF_BSC
+ if (__INST(domain) == @symbol(bsc)) {
+ }
+# endif
# if defined(AF_CCITT) && (AF_CCITT != AF_X25)
if (__INST(domain) == @symbol(ccitt)) {
}
@@ -2806,6 +2840,10 @@
if (__INST(domain) == @symbol(bridge)) {
}
# endif
+# ifdef AF_BSC
+ if (__INST(domain) == @symbol(bsc)) {
+ }
+# endif
# if defined(AF_CCITT) && (AF_CCITT != AF_X25)
if (__INST(domain) == @symbol(ccitt)) {
}
@@ -3149,6 +3187,10 @@
if (myDomain == @symbol(bridge)) {
}
# endif
+# ifdef AF_BSC
+ if (myDomain == @symbol(bsc)) {
+ }
+# endif
# if defined(AF_CCITT) && (AF_CCITT != AF_X25)
if (myDomain == @symbol(ccitt)) {
}
@@ -3492,6 +3534,11 @@
dom = AF_BRIDGE;
}
# endif
+# ifdef AF_BSC
+ if (domainArg == @symbol(bsc)) {
+ dom = AF_BSC;
+ }
+# endif
# if defined(AF_CCITT) && (AF_CCITT != AF_X25)
if (domainArg == @symbol(ccitt)) {
dom = AF_CCITT;
@@ -3912,5 +3959,5 @@
!Socket class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.97 1997-09-04 21:09:35 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.98 1997-09-20 21:52:55 cg Exp $'
! !