diff --git a/documentation/debugger.sgml b/documentation/debugger.sgml index 4dbf8ce119e..3568faecea6 100644 --- a/documentation/debugger.sgml +++ b/documentation/debugger.sgml @@ -1176,22 +1176,10 @@ set $BreakAllThreadsStartup = 1 - - UseXTerm - - - Set to TRUE if the debugger uses - its own xterm window for console - input/output. Set to FALSE if - the debugger uses the current Unix console for - input/output - - - - Those last 3 variables are jointly used in two generic ways: + Those last 2 variables are jointly used in two generic ways: @@ -1200,11 +1188,13 @@ set $BreakAllThreadsStartup = 1 ConChannelMask = DBG_CHN_MESG (1) StdChannelMask = 0 -UseXTerm = 1 - In this case, all input/output goes into a specific - xterm 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 TRACE, WARN... still goes to tty where wine is run from). @@ -1212,38 +1202,16 @@ UseXTerm = 1 - 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) ConChannelMask = 0 StdChannelMask = DBG_CHN_MESG (1) -UseXTerm = 1 - - Those variables also allow, for example for debugging - purposes, to use: - - -ConChannelMask = 0xfff -StdChannelMask = 0xfff -UseXTerm = 1 - - - This allows to redirect all WineDbg - output to both tty Wine was started from, and - xterm debugging window. If Wine (or - WineDbg) was started with a redirection - of stdout and/or - stderr to a file (with for - example >& 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. - diff --git a/programs/winedbg/intvar.h b/programs/winedbg/intvar.h index eee89adf4d3..370e939c620 100644 --- a/programs/winedbg/intvar.h +++ b/programs/winedbg/intvar.h @@ -27,10 +27,9 @@ INTERNAL_VAR(BreakOnFirstChance, TRUE, NULL, DT_BASIC_CONST_INT) 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) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 9967876fad8..0297f2efada 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -1003,15 +1003,6 @@ static BOOL WINAPI DEBUG_CtrlCHandler(DWORD dwCtrlType) 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 @@ int main(int argc, char** argv) 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;