--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/d_win32.rc Sat Sep 12 16:46:30 1998 +0200
@@ -0,0 +1,39 @@
+"*
+ * $Header$
+ *
+ * ST/X startup configuration file:
+ * display configuration - windowsNT / windows95
+ *"
+
+"/
+"/ here, fixup the keyboard mapping for
+"/ windows feel - especially, change
+"/ cut/copy/paste from ALT-[XCV] into CTRL-[XCV]
+"/ HOME-key from BeginOfText to BeginOfLine
+"/ END-key from EndOfText to EndOfLine
+"/ F1-key from Again to Help
+"/ UserInterrupt now on PAUSE
+"/ F8 now on PAUSE
+
+|map|
+
+map := Display keyboardMap.
+
+'d_win32.rc [info]: changing keyboard to win95 defaults...' infoPrintCR.
+'d_win32.rc [info]: (CTRL-C is now COPY - unix ST/X users should have a look at d_win32.rc)' infoPrintCR.
+
+map bindValue:#UserInterrupt to:#Pause.
+map bindValue:#Copy to:#Ctrlc.
+map bindValue:#Cut to:#Ctrlx.
+map bindValue:#Paste to:#Ctrlv.
+map bindValue:#BeginOfLine to:#Home.
+map bindValue:#EndOfLine to:#End.
+
+map bindValue:#Help to:#F1.
+map bindValue:#Again to:#F8.
+
+map bindValue:#Cmdc to:#Cmdc.
+map bindValue:#Cmdx to:#Cmdx.
+map bindValue:#Cmdv to:#Cmdv.
+!
+
--- a/d_windows.rc Sat Sep 12 15:49:17 1998 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-"*
- * $Header$
- *
- * ST/X startup configuration file:
- * display configuration - windowsNT / windows95
- *"
-
-"/
-"/ here, fixup the keyboard mapping for
-"/ windows feel - especially, change
-"/ cut/copy/paste from ALT-[XCV] into CTRL-[XCV]
-"/ HOME-key from BeginOfText to BeginOfLine
-"/ END-key from EndOfText to EndOfLine
-"/ F1-key from Again to Help
-"/ UserInterrupt now on PAUSE
-"/ F8 now on PAUSE
-
-|map|
-
-map := Display keyboardMap.
-
-'d_windows.rc [info]: changing keyboard to win95 defaults...' infoPrintCR.
-'d_windows.rc [info]: (CTRL-C is now COPY - unix ST/X users should have a look at d_windows.rc)' infoPrintCR.
-
-map bindValue:#UserInterrupt to:#Pause.
-map bindValue:#Copy to:#Ctrlc.
-map bindValue:#Cut to:#Ctrlx.
-map bindValue:#Paste to:#Ctrlv.
-map bindValue:#BeginOfLine to:#Home.
-map bindValue:#EndOfLine to:#End.
-
-map bindValue:#Help to:#F1.
-map bindValue:#Again to:#F8.
-
-map bindValue:#Cmdc to:#Cmdc.
-map bindValue:#Cmdx to:#Cmdx.
-map bindValue:#Cmdv to:#Cmdv.
-!
-
--- a/display.rc Sat Sep 12 15:49:17 1998 +0200
+++ b/display.rc Sat Sep 12 16:46:30 1998 +0200
@@ -238,14 +238,14 @@
display := displayVar.
-(displayVar notNil or:[Display platformName = 'WIN32']) ifTrue:[
+(displayVar notNil or:[isWindowsDisplay]) ifTrue:[
"/ figure out the hostname of the display,
"/ to read d_<hostname>.rc
- ((displayVar startsWith:':0')
+ (isWindowsDisplay
+ or:[(displayVar startsWith:':0')
or:[(displayVar startsWith:'unix:')
- or:[displayVar startsWith:'shm:'
- or:[isWindowsDisplay]]]) ifTrue:[
+ or:[displayVar startsWith:'shm:']]]) ifTrue:[
"running on a local display"
display := OperatingSystem getHostName.
] ifFalse:[
@@ -264,7 +264,7 @@
display isNil ifTrue:[
isWindowsDisplay ifTrue:[
- display := 'windows'
+ display := 'win32'
]
].
@@ -374,13 +374,11 @@
displayType isNil ifTrue:[
"use type of machine smalltalk is running on as default ..."
- (displayVar startsWith:':0') ifTrue:[
+ (isWindowsDisplay
+ or:[displayVar startsWith:':0'
+ or:[displayVar startsWith:(OperatingSystem getHostName , ':0')]])
+ ifTrue:[
displayType := OperatingSystem getSystemType.
- ] ifFalse:[
- ((displayVar startsWith:(OperatingSystem getHostName , ':0'))
- or:[isWindowsDisplay]) ifTrue:[
- displayType := OperatingSystem getSystemType.
- ]
]
]
].