3278a9f568
The TUI terminal state becomes corrupted (e.g. key sequences such as Alt_F and Alt_B no longer work) when one attaches to an inferior process (via "run" or "attach") from within TUI. This terminal corruption remains until you switch out of TUI mode. This happens because the terminal state is not properly saved when switching to and out from TUI mode. Although the functions tui_enable() and tui_disable() both call the function target_terminal_save_ours() to save the terminal state, this function is a no-op unless GDB has already attached to an inferior process. This is because only the "native" target has a useful implementation of target_terminal_save_ours() (namely child_terminal_save_ours()) and we only have the "native" target in our target vector if GDB has already attached to an inferior process. So without an inferior process, switching to and from TUI mode does not actually save the terminal state. Therefore when you attach to an inferior process from within TUI mode, the proper terminal state is not restored (after swapping from the inferior's terminal back to the GDB terminal). To fix this we just have to ensure that the terminal state is always being properly saved when switching from and to TUI mode. To achieve this, this patch removes the polymorphic function target_terminal_save_ours() and replaces it with a regular function gdb_save_tty_state() that always saves the terminal state. Tested on x86_64-unknown-linux-gnu by running "make check", no new regressions. gdb/ChangeLog: * target.h (struct target_ops::to_terminal_save_ours): Remove declaration. (target_terminal_save_ours): Remove macro. * target-delegates.c: Regenerate. * inf-child.c (inf_child_target): Don't set the nonexistent field to_terminal_save_ours. * inferior.h (child_terminal_save_ours): Remove declaration. * terminal.h (gdb_save_tty_state): New declaration. * inflow.c (child_terminal_save_ours): Rename to ... (gdb_save_tty_state): ... this. * tui/tui.c: Include terminal.h. (tui_enable): Use gdb_save_tty_state instead of target_terminal_save_ours. (tui_disable): Likewise.
110 lines
3.3 KiB
C
110 lines
3.3 KiB
C
/* Terminal interface definitions for GDB, the GNU Debugger.
|
|
Copyright (C) 1986-2014 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#if !defined (TERMINAL_H)
|
|
#define TERMINAL_H 1
|
|
|
|
|
|
/* If we're using autoconf, it will define HAVE_TERMIOS_H,
|
|
HAVE_TERMIO_H and HAVE_SGTTY_H for us. One day we can rewrite
|
|
ser-unix.c and inflow.c to inspect those names instead of
|
|
HAVE_TERMIOS, HAVE_TERMIO and the implicit HAVE_SGTTY (when neither
|
|
HAVE_TERMIOS or HAVE_TERMIO is set). Until then, make sure that
|
|
nothing has already defined the one of the names, and do the right
|
|
thing. */
|
|
|
|
#if !defined (HAVE_TERMIOS) && !defined(HAVE_TERMIO) && !defined(HAVE_SGTTY)
|
|
#if defined(HAVE_TERMIOS_H)
|
|
#define HAVE_TERMIOS
|
|
#else /* ! defined (HAVE_TERMIOS_H) */
|
|
#if defined(HAVE_TERMIO_H)
|
|
#define HAVE_TERMIO
|
|
#else /* ! defined (HAVE_TERMIO_H) */
|
|
#if defined(HAVE_SGTTY_H)
|
|
#define HAVE_SGTTY
|
|
#endif /* ! defined (HAVE_SGTTY_H) */
|
|
#endif /* ! defined (HAVE_TERMIO_H) */
|
|
#endif /* ! defined (HAVE_TERMIOS_H) */
|
|
#endif /* !defined (HAVE_TERMIOS) && !defined (HAVE_TERMIO) &&
|
|
!defined (HAVE_SGTTY) */
|
|
|
|
#if defined(HAVE_TERMIOS)
|
|
#include <termios.h>
|
|
#endif
|
|
|
|
#if !defined(_WIN32) && !defined (HAVE_TERMIOS)
|
|
|
|
/* Define a common set of macros -- BSD based -- and redefine whatever
|
|
the system offers to make it look like that. FIXME: serial.h and
|
|
ser-*.c deal with this in a much cleaner fashion; as soon as stuff
|
|
is converted to use them, can get rid of this crap. */
|
|
|
|
#ifdef HAVE_TERMIO
|
|
|
|
#include <termio.h>
|
|
|
|
#undef TIOCGETP
|
|
#define TIOCGETP TCGETA
|
|
#undef TIOCSETN
|
|
#define TIOCSETN TCSETA
|
|
#undef TIOCSETP
|
|
#define TIOCSETP TCSETAF
|
|
#define TERMINAL struct termio
|
|
|
|
#else /* sgtty */
|
|
|
|
#include <fcntl.h>
|
|
#include <sgtty.h>
|
|
#include <sys/ioctl.h>
|
|
#define TERMINAL struct sgttyb
|
|
|
|
#endif /* sgtty */
|
|
#endif
|
|
|
|
struct inferior;
|
|
|
|
extern void new_tty_prefork (const char *);
|
|
|
|
extern void new_tty (void);
|
|
|
|
extern void new_tty_postfork (void);
|
|
|
|
extern void copy_terminal_info (struct inferior *to, struct inferior *from);
|
|
|
|
/* Do we have job control? Can be assumed to always be the same within
|
|
a given run of GDB. In inflow.c. */
|
|
extern int job_control;
|
|
|
|
extern pid_t create_tty_session (void);
|
|
|
|
/* Set the process group of the caller to its own pid, or do nothing if
|
|
we lack job control. */
|
|
extern int gdb_setpgid (void);
|
|
|
|
/* Set up a serial structure describing standard input. In inflow.c. */
|
|
extern void initialize_stdin_serial (void);
|
|
|
|
extern int gdb_has_a_terminal (void);
|
|
|
|
extern void gdb_save_tty_state (void);
|
|
|
|
/* Set the process group of the caller to its own pid, or do nothing
|
|
if we lack job control. */
|
|
extern int gdb_setpgid (void);
|
|
|
|
#endif /* !defined (TERMINAL_H) */
|