Fix MinGW TUI build
gdb/ 2015-01-22 Eli Zaretskii <eliz@gnu.org> * gdb/tui/tui.c (tui_enable) [__MINGW32__]: If the call to 'newterm' fails with the 1st arg NULL, try again with "unknown". Don't test the "cup" capability: it isn't supported by the Windows port of ncurses, but the Windows console driver is still capable of supporting TUI.
This commit is contained in:
parent
4b62a76e0c
commit
6b8a872ff1
|
@ -1,3 +1,11 @@
|
||||||
|
2015-01-22 Eli Zaretskii <eliz@gnu.org>
|
||||||
|
|
||||||
|
* gdb/tui/tui.c (tui_enable) [__MINGW32__]: If the call to 'newterm'
|
||||||
|
fails with the 1st arg NULL, try again with "unknown". Don't test
|
||||||
|
the "cup" capability: it isn't supported by the Windows port of
|
||||||
|
ncurses, but the Windows console driver is still capable of
|
||||||
|
supporting TUI.
|
||||||
|
|
||||||
2015-01-22 Jan Kratochvil <jan.kratochvil@redhat.com>
|
2015-01-22 Jan Kratochvil <jan.kratochvil@redhat.com>
|
||||||
|
|
||||||
* compile/compile.c (_initialize_compile): Use -fPIE for compile_args.
|
* compile/compile.c (_initialize_compile): Use -fPIE for compile_args.
|
||||||
|
|
|
@ -425,6 +425,12 @@ tui_enable (void)
|
||||||
error (_("Cannot enable the TUI when output is not a terminal"));
|
error (_("Cannot enable the TUI when output is not a terminal"));
|
||||||
|
|
||||||
s = newterm (NULL, stdout, stdin);
|
s = newterm (NULL, stdout, stdin);
|
||||||
|
#ifdef __MINGW32__
|
||||||
|
/* The MinGW port of ncurses requires $TERM to be unset in order
|
||||||
|
to activate the Windows console driver. */
|
||||||
|
if (s == NULL)
|
||||||
|
s = newterm ("unknown", stdout, stdin);
|
||||||
|
#endif
|
||||||
if (s == NULL)
|
if (s == NULL)
|
||||||
{
|
{
|
||||||
error (_("Cannot enable the TUI: error opening terminal [TERM=%s]"),
|
error (_("Cannot enable the TUI: error opening terminal [TERM=%s]"),
|
||||||
|
@ -432,7 +438,9 @@ tui_enable (void)
|
||||||
}
|
}
|
||||||
w = stdscr;
|
w = stdscr;
|
||||||
|
|
||||||
/* Check required terminal capabilities. */
|
/* Check required terminal capabilities. The MinGW port of
|
||||||
|
ncurses does have them, but doesn't expose them through "cup". */
|
||||||
|
#ifndef __MINGW32__
|
||||||
cap = tigetstr ("cup");
|
cap = tigetstr ("cup");
|
||||||
if (cap == NULL || cap == (char *) -1 || *cap == '\0')
|
if (cap == NULL || cap == (char *) -1 || *cap == '\0')
|
||||||
{
|
{
|
||||||
|
@ -442,6 +450,7 @@ tui_enable (void)
|
||||||
"terminal doesn't support cursor addressing [TERM=%s]"),
|
"terminal doesn't support cursor addressing [TERM=%s]"),
|
||||||
gdb_getenv_term ());
|
gdb_getenv_term ());
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
cbreak ();
|
cbreak ();
|
||||||
noecho ();
|
noecho ();
|
||||||
|
|
Loading…
Reference in New Issue