7bd0be3a9b
The layout command supports the layout names $FREGS, $GREGS, $SREGS, and $REGS. The intention of these layout names was to display the tui register window with a specific set of registers. First, these layout names no longer work, and haven't for a while, using any of them will just result in switching to the general register view. Second there is already the command 'tui reg GROUP' command to set the displayed register set to GROUP, so making the layout command also control the register set feels like unnecessary overloading of the layout command. This commit removes all code relating to supporting the register set specific names from the layout command. Afterwards the user can select an available layout using the layout command, and control the choice of register set using the 'tui reg GROUP' command. gdb/ChangeLog: * tui/tui-layout.c (tui_set_layout): Remove tui_register_display_type parameter. Remove all checking of this parameter, and reindent function. Update header comment. (tui_set_layout_for_display_command): Rename to... (tui_set_layout_by_name): ...this, and don't check for different register class types, don't pass a tui_register_display_type to tui_set_layout. Update header comment. (layout_names): Remove register set specific names. * tui/tui-layout.h (tui_set_layout): Remove tui_register_display_type parameter. * tui/tui.c (tui_rl_change_windows): Don't pass a tui_register_display_type to tui_set_layout. (tui_rl_delete_other_windows): Likewise. (tui_enable): Likewise. * tui/tui-data.h (TUI_FLOAT_REGS_NAME): Remove. (TUI_FLOAT_REGS_NAME_LOWER): Remove. (TUI_GENERAL_REGS_NAME): Remove. (TUI_GENERAL_REGS_NAME_LOWER): Remove. (TUI_SPECIAL_REGS_NAME): Remove. (TUI_SPECIAL_REGS_NAME_LOWER): Remove. (TUI_GENERAL_SPECIAL_REGS_NAME): Remove. (TUI_GENERAL_SPECIAL_REGS_NAME_LOWER): Remove. (enum tui_register_display_type): Remove. (struct tui_layout_def): Remove regs_display_type and float_regs_display_type fields. (struct tui_data_info): Remove regs_display_type field. (tui_layout_command): Use new name for tui_set_layout_for_display_command. * tui/tui-data.c (layout_def): Don't initialise removed fields. (tui_clear_win_detail): Don't initialise removed fields of win_info. * tui/tui-regs.c (tui_show_registers): Use new name for tui_set_layout_for_display_command. * tui/tui.h (tui_set_layout_for_display_command): Rename declaration to... (tui_set_layout_by_name): ...this. * printcmd.c (display_command): Remove tui related layout call, and reindent.
102 lines
2.6 KiB
C
102 lines
2.6 KiB
C
/* External/Public TUI Header File.
|
|
|
|
Copyright (C) 1998-2015 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_H
|
|
#define 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,
|
|
/* Auxillary windows. */
|
|
LOCATOR_WIN,
|
|
EXEC_INFO_WIN,
|
|
DATA_ITEM_WIN,
|
|
/* This must ALWAYS be next to last. */
|
|
MAX_WINDOWS,
|
|
UNDEFINED_WIN /* LAST */
|
|
};
|
|
|
|
/* 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 int 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);
|
|
|
|
extern struct ui_out *tui_out_new (struct ui_file *stream);
|
|
|
|
/* tui-layout.c */
|
|
extern enum tui_status tui_set_layout_by_name (const char *);
|
|
|
|
#endif
|