OpenXM/src/kan96xx/Doc/oxasir-win.sm1 - diff

Return to oxasir-win.sm1 CVS log

Up to [local] / OpenXM / src / kan96xx / Doc

Diff for /OpenXM/src/kan96xx/Doc/oxasir-win.sm1 between version 1.13 and 1.14

-version 1.13, 2002/07/31 02:57:37
+version 1.14, 2002/08/03 06:02:35
 Line 1
 Line 1
 Line 1
- % $OpenXM: OpenXM/src/kan96xx/Doc/oxasir-win.sm1,v 1.12 2002/07/29 05:02:58 takayama Exp $
+ % $OpenXM: OpenXM/src/kan96xx/Doc/oxasir-win.sm1,v 1.13 2002/07/31 02:57:37 takayama Exp $
  % It is empty for now.
  %
  /oxasir.sm1.loaded 1 def
 Line 19  OpenXM_HOME_WIN tag 0 eq {
 Line 19  OpenXM_HOME_WIN tag 0 eq {
 Line 19  OpenXM_HOME_WIN tag 0 eq {
  } { } ifelse
- %% Set constants for windows.
+ ox.ostype 1 get (cygwin) eq {
- [(getenv) (OSTYPE)] extension tag 0 eq {
+   /oxasirpath.oxasir
-   /oxasir.ostype (native-windows) def
+     [ (c:/cygwin) OpenXM_HOME_WIN
- }{
+       (/bin/ox_asir) ] cat
-   [(getenv) (OSTYPE)] extension /oxasir.ostype set
+   def
- } ifelse
+   /oxasirpath.asirlib
+     [ [(getenv) (OpenXM_HOME)] extension
+       (/lib/sm1/oxasir.asir) ] cat
+   def
+   /oxpath.ox
+     (ox)
+   def
+ }{ } ifelse
- oxasir.ostype (cygwin) eq {
+ ox.ostype 1 get (xcygwin) eq {
- /oxasirpath.oxasir
+   /oxasirpath.oxasir
-   [ [(getenv) (OpenXM_HOME)] extension
+     [ [(getenv) (OpenXM_HOME)] extension
-     (/bin/ox_asir) ] cat
+       (/bin/ox_asir) ] cat
- def
+   def
- /oxasirpath.asirlib
+   /oxasirpath.asirlib
-   [ [(getenv) (OpenXM_HOME)] extension
+     [ [(getenv) (OpenXM_HOME)] extension
-     (/lib/sm1/oxasir.asir) ] cat
+       (/lib/sm1/oxasir.asir) ] cat
- def
+   def
- /oxpath.ox
+   /oxpath.ox
-   (ox)
+     (ox)
- def
+   def
- }{
+ }{ } ifelse
+ ox.ostype 1 get (native) eq {
   /oxasirpath.oxasir
    [ OpenXM_HOME_WIN
      (\bin\ox_asir) ] cat
-Line 53  def
+Line 62  def
 Line 53  def
 Line 62  def
      (\bin\ox.exe)
    ] cat
   def
- } ifelse
+ }{ } ifelse
  %% Override asirconnectr
  /asirconnectr {
-  [(getenv) (OSTYPE)] extension tag 0 eq {
+   ox.ostype 1 get (cygwin) eq {
-      asirconnectr_win
+     asirconnectr_cygwin
-  }{
+   }{ } ifelse
-    [(getenv) (OSTYPE)] extension (cygwin) eq
+   ox.ostype 1 get (xcygwin) eq {
-    {
+     asirconnectr_xcygwin
-      asirconnectr_cygwin
+   }{ } ifelse
-    }{
+   ox.ostype 1 get (native) eq {
-      asirconnectr_win
+     asirconnectr_win
-    }ifelse
+   }{ } ifelse
-  } ifelse
  } def
  /asirconnectr_cygwin {
-  [/in-asirconnectr /pass /peer /data /control /oxasir] pushVariables
+  [/in-asirconnectr /pass /peer /data /control /oxasir /sss ] pushVariables
   [
   /pass [(oxGenPass)] extension def
   /peer [(oxGetPort) (localhost)] extension def
   /data peer 1 get toString def
   /control peer 3 get toString def
   peer message
-  [oxpath.xterm
+  [ox.win.start { ( ) } map cat ox_backslash_to_slash
-   oxpath.ox ( -reverse -ox ) oxasirpath.oxasir
+   ( ox ) ( -reverse -ox )
+   oxasirpath.oxasir
    ( -data ) data ( -control ) control  ( -pass ) pass
    ( -wait 5 )
    oxpath.null
-  ] cat system
+  ] cat /sss set
+  sss message sss system
+  [(oxCreateClient2) peer 0 pass] extension /oxasir set
+                      %% 0 means connect from only localhost.
+  oxasir asirinit
+  /arg1 oxasir def
+  ] pop
+  popVariables
+  arg1
+ } def
+ /asirconnectr_xcygwin {
+  [/in-asirconnectr /pass /peer /data /control /oxasir /sss ] pushVariables
+  [
+  /pass [(oxGenPass)] extension def
+  /peer [(oxGetPort) (localhost)] extension def
+  /data peer 1 get toString def
+  /control peer 3 get toString def
+  peer message
+  [(oxlog /usr/X11R6/bin/xterm -iconic -e )
+   ( ox ) ( -reverse -ox )
+   oxasirpath.oxasir
+   ( -data ) data ( -control ) control  ( -pass ) pass
+   ( -wait 5 )
+   oxpath.null
+  ] cat /sss set
+  sss message sss system
   [(oxCreateClient2) peer 0 pass] extension /oxasir set
                       %% 0 means connect from only localhost.
   oxasir asirinit

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>