===================================================================
RCS file: /home/cvs/OpenXM/src/util/ox_pathfinder.c,v
retrieving revision 1.21
retrieving revision 1.26
diff -u -p -r1.21 -r1.26
--- OpenXM/src/util/ox_pathfinder.c	2004/03/03 02:31:51	1.21
+++ OpenXM/src/util/ox_pathfinder.c	2004/03/05 06:26:52	1.26
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.20 2004/03/02 06:23:34 takayama Exp $ */
+/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.25 2004/03/04 12:22:47 takayama Exp $ */
 /* Moved from misc-2003/07/cygwin/test.c */
 
 #include <stdio.h>
@@ -635,7 +635,22 @@ char **getServerEnv(char *oxServer) {
     argv[i] = oxlog; i++; argv[i] = NULL;
     if (!NoX) {
       argv[i] = oxterm ; i++; argv[i] = NULL;
-      argv[i] = oxtermOpt; i++; argv[i] = NULL;
+      if (((char *)getenv("OX_XTERM_GEOMETRY")) != NULL) {
+        /* ex. OX_XTERM_GEOMETRY=80x20+0+0 */
+    	argv[i] = "-geometry"; i++; argv[i] = NULL;
+		argv[i] = (char *) getenv("OX_XTERM_GEOMETRY"); i++; argv[i] = NULL;
+      }else{
+        argv[i] = oxtermOpt; i++; argv[i] = NULL;
+      }
+	  /* dirty hack for buggy international xterm cf. OpenXM FAQ */
+      argv[i] = "-xrm"; i++; argv[i] = NULL;
+      argv[i] = "XTerm*locale:false"; i++; argv[i] = NULL;
+
+	  if (((char *)getenv("OX_XTERM_SCROLL")) != NULL) {
+		argv[i] = "-sb"; i++; argv[i] = NULL;
+		argv[i] = "-sl"; i++; argv[i] = NULL;
+		argv[i] = (char *) getenv("OX_XTERM_SCROLL"); i++; argv[i] = NULL;
+	  }
       argv[i] = "-e"; i++; argv[i] = NULL;
     }
     argv[i] = get_ox_path(); i++; argv[i] = NULL;