From mboxrd@z Thu Jan  1 00:00:00 1970
From: witek@lte5000.fixsoftware.pl
Subject: Re: xdosemu & the _X_... variables in dosemu.conf
Date: Fri, 21 Jun 2002 17:56:40 +0200
Sender: linux-msdos-owner@vger.kernel.org
Message-ID: <20020621155640.GA7578@lte5000.fixsoftware.pl>
References: <20020426215438.875FF3DDE@basket.ball.reliam.net> <20020427140651.14ef07ea.grisxa@mail.ru>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="+QahgC5+KEYLbs62"
Return-path: <linux-msdos-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20020427140651.14ef07ea.grisxa@mail.ru>
List-Id: <linux-msdos.vger.kernel.org>
To: linux-msdos@vger.kernel.org


--+QahgC5+KEYLbs62
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Sat, Apr 27, 2002 at 02:06:51PM +0400, Grigory Batalov wrote:
> On Fri, 26 Apr 2002 23:41:32 +0200
> "Hartmut Figge" <hfigge@uni.de> wrote:
> 
> > For me, i have a very ugly workaround. I have inserted the lines
> > 
> > if ($SURELY_X)
> >   $DOSEMU_STDIN_IS_CONSOLE=(0)
> > endif
> > 
> > just before the earlier mentioned lines, start xdosemu from the menu of
> > the windowmanager with the command 'xdosemu.fake', where 'xdosemu.fake'
> > is a shell-script with the lines
> > 
> > #!/bin/sh
> > export SURELY_X=1
> > xdosemu
> > unset SURELY_X
> 
>   It's no bad =), my patch looks like this:
> ------
> diff -ruN dosemu-1.1.2.orig/src/base/init/config.c dosemu-1.1.2/src/base/init/config.c
> --- dosemu-1.1.2.orig/src/base/init/config.c  Mon Mar 18 23:26:44 2002
> +++ dosemu-1.1.2/src/base/init/config.c       Tue Mar 19 00:54:20 2002
> @@ -611,6 +611,10 @@
>          }
>          buf[j] = 0;
>          setenv("DOSEMU_OPTIONS", buf, 1);
> +	if (usedoptions['X'])
> +	   { strcpy(buf, "0");
> +	     setenv("DOSEMU_STDIN_IS_CONSOLE",buf,1);
> +	    }
>          return;
>      }
>      uname(&unames);

Here is my proposal, which hopefully solve the problem.

-- 
Witold Filipczyk <witekfl@poczta.onet.pl>

--+QahgC5+KEYLbs62
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="dosemu-1.1-global.conf.patch"

--- dosemu-1.1.3/etc/global.conf.orig	Fri Jun 21 12:31:18 2002
+++ dosemu-1.1.3/etc/global.conf	Fri Jun 21 13:10:10 2002
@@ -245,9 +245,6 @@
     else
       $BEING_ON = ""
     endif
-    if ( (strchr($DOSEMU_OPTIONS,"X") >=0) && ($DISPLAY ne "") )
-      $USING_X = (1)
-    endif
     if (strstr("xterm dtterm", $TERM) >= 0)
       $BEING_ON = $BEING_ON, "_xterm"
     else
@@ -261,6 +258,12 @@
     endif
   endif
 
+  if ( (strchr($DOSEMU_OPTIONS,"X") >=0) && ($DISPLAY ne "") )
+    $USING_X = (1)
+  endif
+  if (($BEING_ON eq "console") && ($USING_X))
+    $BEING_ON = ""
+  endif
   warn "dosemu running on ", $BEING_ON;
 
   $xxx = $_term_char_set

--+QahgC5+KEYLbs62--