Consoles (2/3)

[Eric Pouech]

now it's winedbg's turn
A+

-- 
Eric Pouech
-------------- next part --------------
Name:          wd_xt
ChangeLog:     removed no longer needed UseXTerm internal variable
License:       X11
GenDate:       2003/02/26 19:49:18 UTC
ModifiedFiles: programs/winedbg/intvar.h programs/winedbg/winedbg.c documentation/debugger.sgml
AddedFiles:    
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winedbg/intvar.h,v
retrieving revision 1.1
diff -u -u -r1.1 intvar.h
--- programs/winedbg/intvar.h	13 Sep 2002 17:54:28 -0000	1.1
+++ programs/winedbg/intvar.h	1 Feb 2003 16:45:45 -0000
@@ -27,10 +27,9 @@
 INTERNAL_VAR(BreakOnDllLoad,		FALSE, 		NULL, 			DT_BASIC_CONST_INT)
 INTERNAL_VAR(CanDeferOnBPByAddr,        FALSE,          NULL,                   DT_BASIC_CONST_INT)
 
-   /* output handling */
+   /* console handling */
 INTERNAL_VAR(ConChannelMask,		DBG_CHN_MESG,	NULL,  			DT_BASIC_CONST_INT)
 INTERNAL_VAR(StdChannelMask,		0,		NULL,  			DT_BASIC_CONST_INT)
-INTERNAL_VAR(UseXTerm,			TRUE,		NULL,  			DT_BASIC_CONST_INT)
 
    /* debugging debugger */
 INTERNAL_VAR(ExtDbgOnInvalidAddress,	FALSE,		NULL,  			DT_BASIC_CONST_INT)
Index: programs/winedbg/winedbg.c
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winedbg/winedbg.c,v
retrieving revision 1.6
diff -u -u -r1.6 winedbg.c
--- programs/winedbg/winedbg.c	24 Feb 2003 20:38:44 -0000	1.6
+++ programs/winedbg/winedbg.c	24 Feb 2003 21:02:00 -0000
@@ -1003,15 +1003,6 @@
 
 static void DEBUG_InitConsole(void)
 {
-    /* keep it as a cuiexe for now, so that Wine won't touch the Unix stdin,
-     * stdout and stderr streams
-     */
-    if (DBG_IVAR(UseXTerm))
-    {
-	FreeConsole();
-	AllocConsole();
-    }
-
     /* set our control-C handler */
     SetConsoleCtrlHandler(DEBUG_CtrlCHandler, TRUE);
 
@@ -1045,7 +1036,6 @@
             if (local_mode != none_mode) return DEBUG_Usage();
             local_mode = automatic_mode;
             /* force some internal variables */
-            DBG_IVAR(UseXTerm) = 0;
             DBG_IVAR(BreakOnDllLoad) = 0;
             DBG_IVAR(ConChannelMask) = 0;
             DBG_IVAR(StdChannelMask) = DBG_CHN_MESG;
Index: documentation/debugger.sgml
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/documentation/debugger.sgml,v
retrieving revision 1.17
diff -u -u -r1.17 debugger.sgml
--- documentation/debugger.sgml	30 Jan 2003 00:24:18 -0000	1.17
+++ documentation/debugger.sgml	1 Feb 2003 16:52:04 -0000
@@ -1176,22 +1176,10 @@
                 </para>
               </listitem>
             </varlistentry>
-            <varlistentry>
-              <term><varname>UseXTerm</varname></term>
-              <listitem>
-                <para>
-                  Set to <literal>TRUE</literal> if the debugger uses
-                  its own <command>xterm</command> window for console
-                  input/output.  Set to <literal>FALSE</literal> if
-                  the debugger uses the current Unix console for
-                  input/output
-                </para>
-              </listitem>
-            </varlistentry>
           </variablelist>
 
           <para>
-            Those last 3 variables are jointly used in two generic ways:
+            Those last 2 variables are jointly used in two generic ways:
           </para>
 
           <orderedlist>
@@ -1200,11 +1188,13 @@
               <programlisting>
 ConChannelMask = DBG_CHN_MESG (1)
 StdChannelMask = 0
-UseXTerm = 1
               </programlisting>
               <para>
-                In this case, all input/output goes into a specific
-                <command>xterm</command> window (but all debug
+                In this case, all input/output goes into the
+                debugger's console (either the standard unix console
+                if winedbg is started from the command line, or a
+                specific windowed-console if the debugger is started
+                upon an exception in a running program. All debug
                 messages <function>TRACE</function>,
                 <function>WARN</function>... still goes to tty where
                 wine is run from).
@@ -1212,38 +1202,16 @@
             </listitem>
             <listitem>
               <para>
-                to have all input/output go into the tty where Wine
+                To have all input/output go into the tty where Wine
                 was started from (to be used in a X11-free
                 environment)
               </para>
               <screen>
 ConChannelMask = 0
 StdChannelMask = DBG_CHN_MESG (1)
-UseXTerm = 1
               </screen>
             </listitem>
           </orderedlist>
-          <para>
-            Those variables also allow, for example for debugging
-            purposes, to use:
-          </para>
-          <screen>
-ConChannelMask = 0xfff
-StdChannelMask = 0xfff
-UseXTerm = 1
-          </screen>
-          <para>
-            This allows to redirect all <function>WineDbg</function>
-            output to both tty Wine was started from, and
-            <command>xterm</command> debugging window. If Wine (or
-            <command>WineDbg</command>) was started with a redirection
-            of <filename>stdout</filename> and/or
-            <filename>stderr</filename> to a file (with for
-            example &gt;& shell redirect command), you'll get in that
-            file both outputs. It may be interesting to look in the
-            relay trace for specific values which the process segv'ed
-            on.
-          </para>
         </sect3>
 
         <sect3>