398fdd6086
The TUI execution info window is unusual in that it is always linked to a source or disassembly window. Even updates of its content are handled by the source window, so it really has no life of its own. This patch removes this window entirely and puts its functionality directly into the source window. This simplifies the code somewhat. This is a user-visible change, because now the box around the source (or disassembly) window encloses the execution info as well. I consider this an improvement as well, though. Note that this patch caused ncurses to start emitting the "CSI Z" sequence, so I've added this to the test suite terminal implementation. gdb/ChangeLog 2019-08-16 Tom Tromey <tom@tromey.com> * tui/tui.h (enum tui_win_type) <EXEC_INFO_WIN>: Remove. * tui/tui-winsource.h (struct tui_exec_info_window): Remove. (struct tui_source_window_base) <make_visible, refresh_window, resize>: Remove methods. <execution_info>: Remove field. * tui/tui-winsource.c (tui_source_window_base::do_erase_source_content) (tui_show_source_line, tui_source_window_base) (~tui_source_window_base): Update. (tui_source_window_base::resize) (tui_source_window_base::make_visible) (tui_source_window_base::refresh_window): Remove. (tui_source_window_base::update_exec_info): Update. * tui/tui-source.c (tui_source_window::set_contents): Update. * tui/tui-disasm.c (tui_disasm_window::set_contents): Update. gdb/testsuite/ChangeLog 2019-08-16 Tom Tromey <tom@tromey.com> * lib/tuiterm.exp (_csi_Z): New proc. * gdb.tui/basic.exp: Update window positions. * gdb.tui/empty.exp: Update window positions.
93 lines
2.4 KiB
C
93 lines
2.4 KiB
C
/* External/Public TUI Header File.
|
|
|
|
Copyright (C) 1998-2019 Free Software Foundation, Inc.
|
|
|
|
Contributed by Hewlett-Packard Company.
|
|
|
|
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/>. */
|
|
|
|
#ifndef TUI_TUI_H
|
|
#define TUI_TUI_H
|
|
|
|
struct ui_file;
|
|
|
|
extern void strcat_to_buf (char *, int, const char *);
|
|
|
|
/* Types of error returns. */
|
|
enum tui_status
|
|
{
|
|
TUI_SUCCESS,
|
|
TUI_FAILURE
|
|
};
|
|
|
|
/* Types of windows. */
|
|
enum tui_win_type
|
|
{
|
|
SRC_WIN = 0,
|
|
DISASSEM_WIN,
|
|
DATA_WIN,
|
|
CMD_WIN,
|
|
/* This must ALWAYS be AFTER the major windows last. */
|
|
MAX_MAJOR_WINDOWS,
|
|
/* Auxiliary windows. */
|
|
LOCATOR_WIN,
|
|
DATA_ITEM_WIN
|
|
};
|
|
|
|
/* GENERAL TUI FUNCTIONS */
|
|
/* tui.c */
|
|
extern CORE_ADDR tui_get_low_disassembly_address (struct gdbarch *,
|
|
CORE_ADDR, CORE_ADDR);
|
|
extern void tui_show_assembly (struct gdbarch *gdbarch, CORE_ADDR addr);
|
|
extern bool tui_is_window_visible (enum tui_win_type type);
|
|
extern int tui_get_command_dimension (unsigned int *width,
|
|
unsigned int *height);
|
|
|
|
/* Initialize readline and configure the keymap for the switching
|
|
key shortcut. */
|
|
extern void tui_initialize_readline (void);
|
|
|
|
/* Enter in the tui mode (curses). */
|
|
extern void tui_enable (void);
|
|
|
|
/* Leave the tui mode. */
|
|
extern void tui_disable (void);
|
|
|
|
enum tui_key_mode
|
|
{
|
|
/* Plain command mode to enter gdb commands. */
|
|
TUI_COMMAND_MODE,
|
|
|
|
/* SingleKey mode with some keys bound to gdb commands. */
|
|
TUI_SINGLE_KEY_MODE,
|
|
|
|
/* Read/edit one command and return to SingleKey after it's
|
|
processed. */
|
|
TUI_ONE_COMMAND_MODE
|
|
};
|
|
|
|
extern enum tui_key_mode tui_current_key_mode;
|
|
|
|
/* Change the TUI key mode by installing the appropriate readline
|
|
keymap. */
|
|
extern void tui_set_key_mode (enum tui_key_mode mode);
|
|
|
|
extern int tui_active;
|
|
|
|
extern void tui_show_source (const char *fullname, int line);
|
|
|
|
#endif /* TUI_TUI_H */
|