/* TUI window generic functions.
- Copyright (C) 1998-2017 Free Software Foundation, Inc.
+ Copyright (C) 1998-2020 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
#include "breakpoint.h"
#include "frame.h"
#include "cli/cli-cmds.h"
+#include "cli/cli-style.h"
#include "top.h"
#include "source.h"
#include "event-loop.h"
+#include "gdbcmd.h"
#include "tui/tui.h"
#include "tui/tui-io.h"
+#include "tui/tui-command.h"
#include "tui/tui-data.h"
+#include "tui/tui-layout.h"
#include "tui/tui-wingeneral.h"
#include "tui/tui-stack.h"
#include "tui/tui-regs.h"
#include "tui/tui-disasm.h"
#include "tui/tui-source.h"
#include "tui/tui-winsource.h"
-#include "tui/tui-windata.h"
#include "tui/tui-win.h"
#include "gdb_curses.h"
#include <ctype.h>
#include "readline/readline.h"
+#include "gdbsupport/gdb_string_view.h"
#include <signal.h>
-/*******************************
-** Static Local Decls
-********************************/
-static void make_visible_with_new_height (struct tui_win_info *);
-static void make_invisible_and_set_new_height (struct tui_win_info *,
- int);
-static enum tui_status tui_adjust_win_heights (struct tui_win_info *,
- int);
-static int new_height_ok (struct tui_win_info *, int);
static void tui_set_tab_width_command (const char *, int);
static void tui_refresh_all_command (const char *, int);
-static void tui_set_win_height_command (const char *, int);
static void tui_all_windows_info (const char *, int);
-static void tui_set_focus_command (const char *, int);
static void tui_scroll_forward_command (const char *, int);
static void tui_scroll_backward_command (const char *, int);
static void tui_scroll_left_command (const char *, int);
int *);
-/***************************************
-** DEFINITIONS
-***************************************/
-#define WIN_HEIGHT_USAGE "Usage: winheight <win_name> [+ | -] <#lines>\n"
-#define XDBWIN_HEIGHT_USAGE "Usage: w <#lines>\n"
-#define FOCUS_USAGE "Usage: focus {<win> | next | prev}\n"
-
-/***************************************
-** PUBLIC FUNCTIONS
-***************************************/
+#define WIN_HEIGHT_USAGE "Usage: winheight WINDOW-NAME [+ | -] NUM-LINES\n"
+#define FOCUS_USAGE "Usage: focus [WINDOW-NAME | next | prev]\n"
#ifndef ACS_LRCORNER
# define ACS_LRCORNER '+'
/* Translation table for border-mode variables.
The list of values must be terminated by a NULL.
After the NULL value, an entry defines the default. */
-struct tui_translate tui_border_mode_translate[] = {
+static struct tui_translate tui_border_mode_translate[] = {
{ "normal", A_NORMAL },
{ "standout", A_STANDOUT },
{ "reverse", A_REVERSE },
character (see wborder, border curses operations).
-1 is used to indicate the ACS because ACS characters
are determined at run time by curses (depends on terminal). */
-struct tui_translate tui_border_kind_translate_vline[] = {
+static struct tui_translate tui_border_kind_translate_vline[] = {
{ "space", ' ' },
{ "ascii", '|' },
{ "acs", -1 },
{ "ascii", '|' }
};
-struct tui_translate tui_border_kind_translate_hline[] = {
+static struct tui_translate tui_border_kind_translate_hline[] = {
{ "space", ' ' },
{ "ascii", '-' },
{ "acs", -1 },
{ "ascii", '-' }
};
-struct tui_translate tui_border_kind_translate_ulcorner[] = {
+static struct tui_translate tui_border_kind_translate_ulcorner[] = {
{ "space", ' ' },
{ "ascii", '+' },
{ "acs", -1 },
{ "ascii", '+' }
};
-struct tui_translate tui_border_kind_translate_urcorner[] = {
+static struct tui_translate tui_border_kind_translate_urcorner[] = {
{ "space", ' ' },
{ "ascii", '+' },
{ "acs", -1 },
{ "ascii", '+' }
};
-struct tui_translate tui_border_kind_translate_llcorner[] = {
+static struct tui_translate tui_border_kind_translate_llcorner[] = {
{ "space", ' ' },
{ "ascii", '+' },
{ "acs", -1 },
{ "ascii", '+' }
};
-struct tui_translate tui_border_kind_translate_lrcorner[] = {
+static struct tui_translate tui_border_kind_translate_lrcorner[] = {
{ "space", ' ' },
{ "ascii", '+' },
{ "acs", -1 },
/* Tui configuration variables controlled with set/show command. */
-const char *tui_active_border_mode = "bold-standout";
+static const char *tui_active_border_mode = "bold-standout";
static void
show_tui_active_border_mode (struct ui_file *file,
int from_tty,
value);
}
-const char *tui_border_mode = "normal";
+static const char *tui_border_mode = "normal";
static void
show_tui_border_mode (struct ui_file *file,
int from_tty,
value);
}
-const char *tui_border_kind = "acs";
+static const char *tui_border_kind = "acs";
static void
show_tui_border_kind (struct ui_file *file,
int from_tty,
/* Update the tui internal configuration according to gdb settings.
Returns 1 if the configuration has changed and the screen should
be redrawn. */
-int
-tui_update_variables (void)
+bool
+tui_update_variables ()
{
- int need_redraw = 0;
+ bool need_redraw = false;
struct tui_translate *entry;
entry = translate (tui_border_mode, tui_border_mode_translate);
if (tui_border_attrs != entry->value)
{
tui_border_attrs = entry->value;
- need_redraw = 1;
+ need_redraw = true;
}
entry = translate (tui_active_border_mode, tui_border_mode_translate);
if (tui_active_border_attrs != entry->value)
{
tui_active_border_attrs = entry->value;
- need_redraw = 1;
+ need_redraw = true;
}
/* If one corner changes, all characters are changed.
if (tui_border_lrcorner != (chtype) entry->value)
{
tui_border_lrcorner = (entry->value < 0) ? ACS_LRCORNER : entry->value;
- need_redraw = 1;
+ need_redraw = true;
}
entry = translate (tui_border_kind, tui_border_kind_translate_llcorner);
tui_border_llcorner = (entry->value < 0) ? ACS_LLCORNER : entry->value;
/* The set_func hook of "set tui ..." commands that affect the window
borders on the TUI display. */
-void
+
+static void
tui_set_var_cmd (const char *null_args,
int from_tty, struct cmd_list_element *c)
{
tui_rehighlight_all ();
}
+\f
+
+/* True if TUI resizes should print a message. This is used by the
+ test suite. */
+
+static bool resize_message;
+
+static void
+show_tui_resize_message (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c, const char *value)
+{
+ fprintf_filtered (file, _("TUI resize messaging is %s.\n"), value);
+}
+
+\f
+
/* Generic window name completion function. Complete window name pointed
to by TEXT and WORD. If INCLUDE_NEXT_PREV_P is true then the special
window names 'next' and 'prev' will also be considered as possible
int include_next_prev_p,
const char *text, const char *word)
{
- VEC (const_char_ptr) *completion_name_vec = NULL;
- int win_type;
+ std::vector<const char *> completion_name_vec;
- for (win_type = SRC_WIN; win_type < MAX_MAJOR_WINDOWS; win_type++)
+ for (tui_win_info *win_info : all_tui_windows ())
{
const char *completion_name = NULL;
/* We can't focus on an invisible window. */
- if (tui_win_list[win_type] == NULL
- || !tui_win_list[win_type]->generic.is_visible)
+ if (!win_info->is_visible ())
continue;
- completion_name = tui_win_name (&tui_win_list [win_type]->generic);
+ completion_name = win_info->name ();
gdb_assert (completion_name != NULL);
- VEC_safe_push (const_char_ptr, completion_name_vec, completion_name);
+ completion_name_vec.push_back (completion_name);
}
/* If no windows are considered visible then the TUI has not yet been
initialized. But still "focus src" and "focus cmd" will work because
invoking the focus command will entail initializing the TUI which sets the
default layout to SRC_COMMAND. */
- if (VEC_length (const_char_ptr, completion_name_vec) == 0)
+ if (completion_name_vec.empty ())
{
- VEC_safe_push (const_char_ptr, completion_name_vec, SRC_NAME);
- VEC_safe_push (const_char_ptr, completion_name_vec, CMD_NAME);
+ completion_name_vec.push_back (SRC_NAME);
+ completion_name_vec.push_back (CMD_NAME);
}
if (include_next_prev_p)
{
- VEC_safe_push (const_char_ptr, completion_name_vec, "next");
- VEC_safe_push (const_char_ptr, completion_name_vec, "prev");
+ completion_name_vec.push_back ("next");
+ completion_name_vec.push_back ("prev");
}
- VEC_safe_push (const_char_ptr, completion_name_vec, NULL);
- complete_on_enum (tracker,
- VEC_address (const_char_ptr, completion_name_vec),
- text, word);
- VEC_free (const_char_ptr, completion_name_vec);
+ completion_name_vec.push_back (NULL);
+ complete_on_enum (tracker, completion_name_vec.data (), text, word);
}
/* Complete possible window names to focus on. TEXT is the complete text
window_name_completer (tracker, 0, text, word);
}
-/* Function to initialize gdb commands, for tui window
- manipulation. */
-
-void
-_initialize_tui_win (void)
-{
- static struct cmd_list_element *tui_setlist;
- static struct cmd_list_element *tui_showlist;
- struct cmd_list_element *cmd;
-
- /* Define the classes of commands.
- They will appear in the help list in the reverse of this order. */
- add_prefix_cmd ("tui", class_tui, set_tui_cmd,
- _("TUI configuration variables"),
- &tui_setlist, "set tui ",
- 0 /* allow-unknown */, &setlist);
- add_prefix_cmd ("tui", class_tui, show_tui_cmd,
- _("TUI configuration variables"),
- &tui_showlist, "show tui ",
- 0 /* allow-unknown */, &showlist);
-
- add_com ("refresh", class_tui, tui_refresh_all_command,
- _("Refresh the terminal display.\n"));
- add_com ("tabset", class_tui, tui_set_tab_width_command, _("\
-Set the width (in characters) of tab stops.\n\
-Usage: tabset <n>\n"));
- cmd = add_com ("winheight", class_tui, tui_set_win_height_command, _("\
-Set or modify the height of a specified window.\n\
-Usage: winheight <win_name> [+ | -] <#lines>\n\
-Window names are:\n\
-src : the source window\n\
-cmd : the command window\n\
-asm : the disassembly window\n\
-regs : the register display\n"));
- add_com_alias ("wh", "winheight", class_tui, 0);
- set_cmd_completer (cmd, winheight_completer);
- add_info ("win", tui_all_windows_info,
- _("List of all displayed windows.\n"));
- cmd = add_com ("focus", class_tui, tui_set_focus_command, _("\
-Set focus to named window or next/prev window.\n\
-Usage: focus {<win> | next | prev}\n\
-Valid Window names are:\n\
-src : the source window\n\
-asm : the disassembly window\n\
-regs : the register display\n\
-cmd : the command window\n"));
- add_com_alias ("fs", "focus", class_tui, 0);
- set_cmd_completer (cmd, focus_completer);
- add_com ("+", class_tui, tui_scroll_forward_command, _("\
-Scroll window forward.\n\
-Usage: + [win] [n]\n"));
- add_com ("-", class_tui, tui_scroll_backward_command, _("\
-Scroll window backward.\n\
-Usage: - [win] [n]\n"));
- add_com ("<", class_tui, tui_scroll_left_command, _("\
-Scroll window text to the left.\n\
-Usage: < [win] [n]\n"));
- add_com (">", class_tui, tui_scroll_right_command, _("\
-Scroll window text to the right.\n\
-Usage: > [win] [n]\n"));
-
- /* Define the tui control variables. */
- add_setshow_enum_cmd ("border-kind", no_class, tui_border_kind_enums,
- &tui_border_kind, _("\
-Set the kind of border for TUI windows."), _("\
-Show the kind of border for TUI windows."), _("\
-This variable controls the border of TUI windows:\n\
-space use a white space\n\
-ascii use ascii characters + - | for the border\n\
-acs use the Alternate Character Set"),
- tui_set_var_cmd,
- show_tui_border_kind,
- &tui_setlist, &tui_showlist);
-
- add_setshow_enum_cmd ("border-mode", no_class, tui_border_mode_enums,
- &tui_border_mode, _("\
-Set the attribute mode to use for the TUI window borders."), _("\
-Show the attribute mode to use for the TUI window borders."), _("\
-This variable controls the attributes to use for the window borders:\n\
-normal normal display\n\
-standout use highlight mode of terminal\n\
-reverse use reverse video mode\n\
-half use half bright\n\
-half-standout use half bright and standout mode\n\
-bold use extra bright or bold\n\
-bold-standout use extra bright or bold with standout mode"),
- tui_set_var_cmd,
- show_tui_border_mode,
- &tui_setlist, &tui_showlist);
-
- add_setshow_enum_cmd ("active-border-mode", no_class, tui_border_mode_enums,
- &tui_active_border_mode, _("\
-Set the attribute mode to use for the active TUI window border."), _("\
-Show the attribute mode to use for the active TUI window border."), _("\
-This variable controls the attributes to use for the active window border:\n\
-normal normal display\n\
-standout use highlight mode of terminal\n\
-reverse use reverse video mode\n\
-half use half bright\n\
-half-standout use half bright and standout mode\n\
-bold use extra bright or bold\n\
-bold-standout use extra bright or bold with standout mode"),
- tui_set_var_cmd,
- show_tui_active_border_mode,
- &tui_setlist, &tui_showlist);
-}
-
/* Update gdb's knowledge of the terminal size. */
void
tui_update_gdb_sizes (void)
if (tui_active)
{
- width = TUI_CMD_WIN->generic.width;
- height = TUI_CMD_WIN->generic.height;
+ width = TUI_CMD_WIN->width;
+ height = TUI_CMD_WIN->height;
}
else
{
{
struct tui_win_info *win_with_focus = tui_win_with_focus ();
- if (win_with_focus != NULL
- && win_with_focus->generic.type != CMD_WIN)
- tui_unhighlight_win (win_with_focus);
+ tui_unhighlight_win (win_with_focus);
tui_set_win_with_focus (win_info);
- if (win_info->generic.type != CMD_WIN)
- tui_highlight_win (win_info);
+ tui_highlight_win (win_info);
}
}
void
-tui_scroll_forward (struct tui_win_info *win_to_scroll,
- int num_to_scroll)
+tui_win_info::forward_scroll (int num_to_scroll)
{
- if (win_to_scroll != TUI_CMD_WIN)
- {
- int _num_to_scroll = num_to_scroll;
-
- if (num_to_scroll == 0)
- _num_to_scroll = win_to_scroll->generic.height - 3;
-
- /* If we are scrolling the source or disassembly window, do a
- "psuedo" scroll since not all of the source is in memory,
- only what is in the viewport. If win_to_scroll is the
- command window do nothing since the term should handle
- it. */
- if (win_to_scroll == TUI_SRC_WIN)
- tui_vertical_source_scroll (FORWARD_SCROLL, _num_to_scroll);
- else if (win_to_scroll == TUI_DISASM_WIN)
- tui_vertical_disassem_scroll (FORWARD_SCROLL, _num_to_scroll);
- else if (win_to_scroll == TUI_DATA_WIN)
- tui_vertical_data_scroll (FORWARD_SCROLL, _num_to_scroll);
- }
-}
+ if (num_to_scroll == 0)
+ num_to_scroll = height - 3;
-void
-tui_scroll_backward (struct tui_win_info *win_to_scroll,
- int num_to_scroll)
-{
- if (win_to_scroll != TUI_CMD_WIN)
- {
- int _num_to_scroll = num_to_scroll;
-
- if (num_to_scroll == 0)
- _num_to_scroll = win_to_scroll->generic.height - 3;
-
- /* If we are scrolling the source or disassembly window, do a
- "psuedo" scroll since not all of the source is in memory,
- only what is in the viewport. If win_to_scroll is the
- command window do nothing since the term should handle
- it. */
- if (win_to_scroll == TUI_SRC_WIN)
- tui_vertical_source_scroll (BACKWARD_SCROLL, _num_to_scroll);
- else if (win_to_scroll == TUI_DISASM_WIN)
- tui_vertical_disassem_scroll (BACKWARD_SCROLL, _num_to_scroll);
- else if (win_to_scroll == TUI_DATA_WIN)
- tui_vertical_data_scroll (BACKWARD_SCROLL, _num_to_scroll);
- }
+ do_scroll_vertical (num_to_scroll);
}
-
void
-tui_scroll_left (struct tui_win_info *win_to_scroll,
- int num_to_scroll)
+tui_win_info::backward_scroll (int num_to_scroll)
{
- if (win_to_scroll != TUI_CMD_WIN)
- {
- int _num_to_scroll = num_to_scroll;
-
- if (_num_to_scroll == 0)
- _num_to_scroll = 1;
-
- /* If we are scrolling the source or disassembly window, do a
- "psuedo" scroll since not all of the source is in memory,
- only what is in the viewport. If win_to_scroll is the command
- window do nothing since the term should handle it. */
- if (win_to_scroll == TUI_SRC_WIN
- || win_to_scroll == TUI_DISASM_WIN)
- tui_horizontal_source_scroll (win_to_scroll, LEFT_SCROLL,
- _num_to_scroll);
- }
+ if (num_to_scroll == 0)
+ num_to_scroll = height - 3;
+
+ do_scroll_vertical (-num_to_scroll);
}
void
-tui_scroll_right (struct tui_win_info *win_to_scroll,
- int num_to_scroll)
+tui_win_info::left_scroll (int num_to_scroll)
{
- if (win_to_scroll != TUI_CMD_WIN)
- {
- int _num_to_scroll = num_to_scroll;
-
- if (_num_to_scroll == 0)
- _num_to_scroll = 1;
-
- /* If we are scrolling the source or disassembly window, do a
- "psuedo" scroll since not all of the source is in memory,
- only what is in the viewport. If win_to_scroll is the command
- window do nothing since the term should handle it. */
- if (win_to_scroll == TUI_SRC_WIN
- || win_to_scroll == TUI_DISASM_WIN)
- tui_horizontal_source_scroll (win_to_scroll, RIGHT_SCROLL,
- _num_to_scroll);
- }
+ if (num_to_scroll == 0)
+ num_to_scroll = 1;
+
+ do_scroll_horizontal (num_to_scroll);
}
-/* Scroll a window. Arguments are passed through a va_list. */
void
-tui_scroll (enum tui_scroll_direction direction,
- struct tui_win_info *win_to_scroll,
- int num_to_scroll)
+tui_win_info::right_scroll (int num_to_scroll)
{
- switch (direction)
- {
- case FORWARD_SCROLL:
- tui_scroll_forward (win_to_scroll, num_to_scroll);
- break;
- case BACKWARD_SCROLL:
- tui_scroll_backward (win_to_scroll, num_to_scroll);
- break;
- case LEFT_SCROLL:
- tui_scroll_left (win_to_scroll, num_to_scroll);
- break;
- case RIGHT_SCROLL:
- tui_scroll_right (win_to_scroll, num_to_scroll);
- break;
- default:
- break;
- }
+ if (num_to_scroll == 0)
+ num_to_scroll = 1;
+
+ do_scroll_horizontal (-num_to_scroll);
}
void
tui_refresh_all_win (void)
{
- int type;
-
clearok (curscr, TRUE);
- tui_refresh_all (tui_win_list);
- for (type = SRC_WIN; type < MAX_MAJOR_WINDOWS; type++)
- {
- if (tui_win_list[type]
- && tui_win_list[type]->generic.is_visible)
- {
- switch (type)
- {
- case SRC_WIN:
- case DISASSEM_WIN:
- tui_show_source_content (tui_win_list[type]);
- tui_check_and_display_highlight_if_needed (tui_win_list[type]);
- tui_erase_exec_info_content (tui_win_list[type]);
- tui_update_exec_info (tui_win_list[type]);
- break;
- case DATA_WIN:
- tui_refresh_data_win ();
- break;
- default:
- break;
- }
- }
- }
- tui_show_locator_content ();
+ tui_refresh_all ();
}
void
tui_rehighlight_all (void)
{
- int type;
-
- for (type = SRC_WIN; type < MAX_MAJOR_WINDOWS; type++)
- tui_check_and_display_highlight_if_needed (tui_win_list[type]);
+ for (tui_win_info *win_info : all_tui_windows ())
+ win_info->check_and_display_highlight_if_needed ();
}
/* Resize all the windows based on the terminal size. This function
- gets called from within the readline sinwinch handler. */
+ gets called from within the readline SIGWINCH handler. */
void
tui_resize_all (void)
{
height_diff = screenheight - tui_term_height ();
if (height_diff || width_diff)
{
- enum tui_layout_type cur_layout = tui_current_layout ();
struct tui_win_info *win_with_focus = tui_win_with_focus ();
- struct tui_win_info *first_win;
- struct tui_win_info *second_win;
- struct tui_gen_win_info *locator = tui_locator_win_info_ptr ();
- int win_type;
- int new_height, split_diff, cmd_split_diff, num_wins_displayed = 2;
#ifdef HAVE_RESIZE_TERM
resize_term (screenheight, screenwidth);
#endif
/* Turn keypad off while we resize. */
if (win_with_focus != TUI_CMD_WIN)
- keypad (TUI_CMD_WIN->generic.handle, FALSE);
+ keypad (TUI_CMD_WIN->handle.get (), FALSE);
tui_update_gdb_sizes ();
tui_set_term_height_to (screenheight);
tui_set_term_width_to (screenwidth);
- if (cur_layout == SRC_DISASSEM_COMMAND
- || cur_layout == SRC_DATA_COMMAND
- || cur_layout == DISASSEM_DATA_COMMAND)
- num_wins_displayed++;
- split_diff = height_diff / num_wins_displayed;
- cmd_split_diff = split_diff;
- if (height_diff % num_wins_displayed)
- {
- if (height_diff < 0)
- cmd_split_diff--;
- else
- cmd_split_diff++;
- }
- /* Now adjust each window. */
+
/* erase + clearok are used instead of a straightforward clear as
AIX 5.3 does not define clear. */
erase ();
clearok (curscr, TRUE);
- refresh ();
- switch (cur_layout)
- {
- case SRC_COMMAND:
- case DISASSEM_COMMAND:
- first_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
- first_win->generic.width += width_diff;
- locator->width += width_diff;
- /* Check for invalid heights. */
- if (height_diff == 0)
- new_height = first_win->generic.height;
- else if ((first_win->generic.height + split_diff) >=
- (screenheight - MIN_CMD_WIN_HEIGHT - 1))
- new_height = screenheight - MIN_CMD_WIN_HEIGHT - 1;
- else if ((first_win->generic.height + split_diff) <= 0)
- new_height = MIN_WIN_HEIGHT;
- else
- new_height = first_win->generic.height + split_diff;
-
- locator->origin.y = new_height + 1;
- make_invisible_and_set_new_height (first_win, new_height);
- TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
- TUI_CMD_WIN->generic.width += width_diff;
- new_height = screenheight - TUI_CMD_WIN->generic.origin.y;
- make_invisible_and_set_new_height (TUI_CMD_WIN, new_height);
- make_visible_with_new_height (first_win);
- make_visible_with_new_height (TUI_CMD_WIN);
- if (first_win->generic.content_size <= 0)
- tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT);
- break;
- default:
- if (cur_layout == SRC_DISASSEM_COMMAND)
- {
- first_win = TUI_SRC_WIN;
- first_win->generic.width += width_diff;
- second_win = TUI_DISASM_WIN;
- second_win->generic.width += width_diff;
- }
- else
- {
- first_win = TUI_DATA_WIN;
- first_win->generic.width += width_diff;
- second_win = (struct tui_win_info *)
- (tui_source_windows ())->list[0];
- second_win->generic.width += width_diff;
- }
- /* Change the first window's height/width. */
- /* Check for invalid heights. */
- if (height_diff == 0)
- new_height = first_win->generic.height;
- else if ((first_win->generic.height +
- second_win->generic.height + (split_diff * 2)) >=
- (screenheight - MIN_CMD_WIN_HEIGHT - 1))
- new_height = (screenheight - MIN_CMD_WIN_HEIGHT - 1) / 2;
- else if ((first_win->generic.height + split_diff) <= 0)
- new_height = MIN_WIN_HEIGHT;
- else
- new_height = first_win->generic.height + split_diff;
- make_invisible_and_set_new_height (first_win, new_height);
-
- locator->width += width_diff;
-
- /* Change the second window's height/width. */
- /* Check for invalid heights. */
- if (height_diff == 0)
- new_height = second_win->generic.height;
- else if ((first_win->generic.height +
- second_win->generic.height + (split_diff * 2)) >=
- (screenheight - MIN_CMD_WIN_HEIGHT - 1))
- {
- new_height = screenheight - MIN_CMD_WIN_HEIGHT - 1;
- if (new_height % 2)
- new_height = (new_height / 2) + 1;
- else
- new_height /= 2;
- }
- else if ((second_win->generic.height + split_diff) <= 0)
- new_height = MIN_WIN_HEIGHT;
- else
- new_height = second_win->generic.height + split_diff;
- second_win->generic.origin.y = first_win->generic.height - 1;
- make_invisible_and_set_new_height (second_win, new_height);
-
- /* Change the command window's height/width. */
- TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
- make_invisible_and_set_new_height (TUI_CMD_WIN,
- TUI_CMD_WIN->generic.height
- + cmd_split_diff);
- make_visible_with_new_height (first_win);
- make_visible_with_new_height (second_win);
- make_visible_with_new_height (TUI_CMD_WIN);
- if (first_win->generic.content_size <= 0)
- tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT);
- if (second_win->generic.content_size <= 0)
- tui_erase_source_content (second_win, EMPTY_SOURCE_PROMPT);
- break;
- }
- /* Now remove all invisible windows, and their content so that
- they get created again when called for with the new size. */
- for (win_type = SRC_WIN; (win_type < MAX_MAJOR_WINDOWS); win_type++)
- {
- if (win_type != CMD_WIN
- && (tui_win_list[win_type] != NULL)
- && !tui_win_list[win_type]->generic.is_visible)
- {
- tui_free_window (tui_win_list[win_type]);
- tui_win_list[win_type] = NULL;
- }
- }
+ tui_apply_current_layout ();
+ tui_delete_invisible_windows ();
/* Turn keypad back on, unless focus is in the command
window. */
if (win_with_focus != TUI_CMD_WIN)
- keypad (TUI_CMD_WIN->generic.handle, TRUE);
+ keypad (TUI_CMD_WIN->handle.get (), TRUE);
}
}
tui_sigwinch_handler (int signal)
{
mark_async_signal_handler (tui_sigwinch_token);
- tui_set_win_resized_to (TRUE);
+ tui_set_win_resized_to (true);
}
/* Callback for asynchronously resizing TUI following a SIGWINCH signal. */
}
else
{
- tui_set_win_resized_to (FALSE);
+ tui_set_win_resized_to (false);
tui_resize_all ();
tui_refresh_all_win ();
tui_update_gdb_sizes ();
+ if (resize_message)
+ {
+ static int count;
+ printf_unfiltered ("@@ resize done %d, size = %dx%d\n", count,
+ tui_term_width (), tui_term_height ());
+ ++count;
+ }
tui_redisplay_readline ();
}
}
}
-/*************************
-** STATIC LOCAL FUNCTIONS
-**************************/
-
-
static void
tui_scroll_forward_command (const char *arg, int from_tty)
{
/* Make sure the curses mode is enabled. */
tui_enable ();
- if (arg == (char *) NULL)
- parse_scrolling_args (arg, &win_to_scroll, (int *) NULL);
+ if (arg == NULL)
+ parse_scrolling_args (arg, &win_to_scroll, NULL);
else
parse_scrolling_args (arg, &win_to_scroll, &num_to_scroll);
- tui_scroll (FORWARD_SCROLL, win_to_scroll, num_to_scroll);
+ win_to_scroll->forward_scroll (num_to_scroll);
}
/* Make sure the curses mode is enabled. */
tui_enable ();
- if (arg == (char *) NULL)
- parse_scrolling_args (arg, &win_to_scroll, (int *) NULL);
+ if (arg == NULL)
+ parse_scrolling_args (arg, &win_to_scroll, NULL);
else
parse_scrolling_args (arg, &win_to_scroll, &num_to_scroll);
- tui_scroll (BACKWARD_SCROLL, win_to_scroll, num_to_scroll);
+ win_to_scroll->backward_scroll (num_to_scroll);
}
/* Make sure the curses mode is enabled. */
tui_enable ();
parse_scrolling_args (arg, &win_to_scroll, &num_to_scroll);
- tui_scroll (LEFT_SCROLL, win_to_scroll, num_to_scroll);
+ win_to_scroll->left_scroll (num_to_scroll);
}
/* Make sure the curses mode is enabled. */
tui_enable ();
parse_scrolling_args (arg, &win_to_scroll, &num_to_scroll);
- tui_scroll (RIGHT_SCROLL, win_to_scroll, num_to_scroll);
+ win_to_scroll->right_scroll (num_to_scroll);
}
+/* Answer the window represented by name. */
+static struct tui_win_info *
+tui_partial_win_by_name (gdb::string_view name)
+{
+ if (name != NULL)
+ {
+ for (tui_win_info *item : all_tui_windows ())
+ {
+ const char *cur_name = item->name ();
+
+ if (startswith (cur_name, name))
+ return item;
+ }
+ }
+
+ return NULL;
+}
+
/* Set focus to the window named by 'arg'. */
static void
-tui_set_focus (const char *arg, int from_tty)
+tui_set_focus_command (const char *arg, int from_tty)
{
- if (arg != (char *) NULL)
+ tui_enable ();
+
+ if (arg != NULL)
{
- char *buf_ptr = (char *) xstrdup (arg);
- int i;
struct tui_win_info *win_info = NULL;
- for (i = 0; (i < strlen (buf_ptr)); i++)
- buf_ptr[i] = tolower (arg[i]);
-
- if (subset_compare (buf_ptr, "next"))
+ if (subset_compare (arg, "next"))
win_info = tui_next_win (tui_win_with_focus ());
- else if (subset_compare (buf_ptr, "prev"))
+ else if (subset_compare (arg, "prev"))
win_info = tui_prev_win (tui_win_with_focus ());
else
- win_info = tui_partial_win_by_name (buf_ptr);
+ win_info = tui_partial_win_by_name (arg);
- if (win_info == (struct tui_win_info *) NULL
- || !win_info->generic.is_visible)
- warning (_("Invalid window specified. \n\
-The window name specified must be valid and visible.\n"));
- else
- {
- tui_set_win_focus_to (win_info);
- keypad (TUI_CMD_WIN->generic.handle, (win_info != TUI_CMD_WIN));
- }
+ if (win_info == NULL)
+ error (_("Unrecognized window name \"%s\""), arg);
+ if (!win_info->is_visible ())
+ error (_("Window \"%s\" is not visible"), arg);
- if (TUI_DATA_WIN && TUI_DATA_WIN->generic.is_visible)
- tui_refresh_data_win ();
- xfree (buf_ptr);
+ tui_set_win_focus_to (win_info);
+ keypad (TUI_CMD_WIN->handle.get (), win_info != TUI_CMD_WIN);
printf_filtered (_("Focus set to %s window.\n"),
- tui_win_name (&tui_win_with_focus ()->generic));
+ tui_win_with_focus ()->name ());
}
else
- warning (_("Incorrect Number of Arguments.\n%s"), FOCUS_USAGE);
+ error (_("Incorrect Number of Arguments.\n%s"), FOCUS_USAGE);
}
-static void
-tui_set_focus_command (const char *arg, int from_tty)
-{
- /* Make sure the curses mode is enabled. */
- tui_enable ();
- tui_set_focus (arg, from_tty);
-}
-
-
static void
tui_all_windows_info (const char *arg, int from_tty)
{
- int type;
+ if (!tui_active)
+ {
+ printf_filtered (_("The TUI is not active.\n"));
+ return;
+ }
+
struct tui_win_info *win_with_focus = tui_win_with_focus ();
+ struct ui_out *uiout = current_uiout;
- for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); type++)
- if (tui_win_list[type]
- && tui_win_list[type]->generic.is_visible)
+ ui_out_emit_table table_emitter (uiout, 3, -1, "tui-windows");
+ uiout->table_header (10, ui_left, "name", "Name");
+ uiout->table_header (5, ui_right, "lines", "Lines");
+ uiout->table_header (10, ui_left, "focus", "Focus");
+ uiout->table_body ();
+
+ for (tui_win_info *win_info : all_tui_windows ())
+ if (win_info->is_visible ())
{
- if (win_with_focus == tui_win_list[type])
- printf_filtered (" %s\t(%d lines) <has focus>\n",
- tui_win_name (&tui_win_list[type]->generic),
- tui_win_list[type]->generic.height);
+ ui_out_emit_tuple tuple_emitter (uiout, nullptr);
+
+ uiout->field_string ("name", win_info->name ());
+ uiout->field_signed ("lines", win_info->height);
+ if (win_with_focus == win_info)
+ uiout->field_string ("focus", _("(has focus)"));
else
- printf_filtered (" %s\t(%d lines)\n",
- tui_win_name (&tui_win_list[type]->generic),
- tui_win_list[type]->generic.height);
+ uiout->field_skip ("focus");
+ uiout->text ("\n");
}
}
tui_refresh_all_win ();
}
+/* The tab width that should be used by the TUI. */
+
+unsigned int tui_tab_width = DEFAULT_TAB_LEN;
+
+/* The tab width as set by the user. */
+
+static unsigned int internal_tab_width = DEFAULT_TAB_LEN;
+
+/* After the tab width is set, call this to update the relevant
+ windows. */
-/* Set the tab width of the specified window. */
static void
-tui_set_tab_width_command (const char *arg, int from_tty)
+update_tab_width ()
{
- /* Make sure the curses mode is enabled. */
- tui_enable ();
- if (arg != (char *) NULL)
+ for (tui_win_info *win_info : all_tui_windows ())
{
- int ts;
-
- ts = atoi (arg);
- if (ts > 0)
- {
- tui_set_default_tab_len (ts);
- /* We don't really change the height of any windows, but
- calling these 2 functions causes a complete regeneration
- and redisplay of the window's contents, which will take
- the new tab width into account. */
- if (tui_win_list[SRC_WIN]
- && tui_win_list[SRC_WIN]->generic.is_visible)
- {
- make_invisible_and_set_new_height (TUI_SRC_WIN,
- TUI_SRC_WIN->generic.height);
- make_visible_with_new_height (TUI_SRC_WIN);
- }
- if (tui_win_list[DISASSEM_WIN]
- && tui_win_list[DISASSEM_WIN]->generic.is_visible)
- {
- make_invisible_and_set_new_height (TUI_DISASM_WIN,
- TUI_DISASM_WIN->generic.height);
- make_visible_with_new_height (TUI_DISASM_WIN);
- }
- }
- else
- warning (_("Tab widths greater than 0 must be specified."));
+ if (win_info->is_visible ())
+ win_info->update_tab_width ();
}
}
+/* Callback for "set tui tab-width". */
-/* Set the height of the specified window. */
static void
-tui_set_win_height (const char *arg, int from_tty)
+tui_set_tab_width (const char *ignore,
+ int from_tty, struct cmd_list_element *c)
{
- /* Make sure the curses mode is enabled. */
- tui_enable ();
- if (arg != (char *) NULL)
+ if (internal_tab_width == 0)
{
- std::string copy = arg;
- char *buf = ©[0];
- char *buf_ptr = buf;
- char *wname = NULL;
- int new_height, i;
- struct tui_win_info *win_info;
-
- wname = buf_ptr;
- buf_ptr = strchr (buf_ptr, ' ');
- if (buf_ptr != (char *) NULL)
- {
- *buf_ptr = (char) 0;
-
- /* Validate the window name. */
- for (i = 0; i < strlen (wname); i++)
- wname[i] = tolower (wname[i]);
- win_info = tui_partial_win_by_name (wname);
-
- if (win_info == (struct tui_win_info *) NULL
- || !win_info->generic.is_visible)
- warning (_("Invalid window specified. \n\
-The window name specified must be valid and visible.\n"));
- else
- {
- /* Process the size. */
- while (*(++buf_ptr) == ' ')
- ;
-
- if (*buf_ptr != (char) 0)
- {
- int negate = FALSE;
- int fixed_size = TRUE;
- int input_no;;
-
- if (*buf_ptr == '+' || *buf_ptr == '-')
- {
- if (*buf_ptr == '-')
- negate = TRUE;
- fixed_size = FALSE;
- buf_ptr++;
- }
- input_no = atoi (buf_ptr);
- if (input_no > 0)
- {
- if (negate)
- input_no *= (-1);
- if (fixed_size)
- new_height = input_no;
- else
- new_height = win_info->generic.height + input_no;
-
- /* Now change the window's height, and adjust
- all other windows around it. */
- if (tui_adjust_win_heights (win_info,
- new_height) == TUI_FAILURE)
- warning (_("Invalid window height specified.\n%s"),
- WIN_HEIGHT_USAGE);
- else
- tui_update_gdb_sizes ();
- }
- else
- warning (_("Invalid window height specified.\n%s"),
- WIN_HEIGHT_USAGE);
- }
- }
- }
- else
- printf_filtered (WIN_HEIGHT_USAGE);
+ internal_tab_width = tui_tab_width;
+ error (_("Tab width must not be 0"));
}
- else
- printf_filtered (WIN_HEIGHT_USAGE);
+
+ tui_tab_width = internal_tab_width;
+ update_tab_width ();
}
-/* Set the height of the specified window, with va_list. */
+/* Callback for "show tui tab-width". */
+
static void
-tui_set_win_height_command (const char *arg, int from_tty)
+tui_show_tab_width (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c, const char *value)
{
- /* Make sure the curses mode is enabled. */
- tui_enable ();
- tui_set_win_height (arg, from_tty);
+ fprintf_filtered (gdb_stdout, _("TUI tab width is %s spaces.\n"), value);
+
}
-/* Function to adjust all window heights around the primary. */
-static enum tui_status
-tui_adjust_win_heights (struct tui_win_info *primary_win_info,
- int new_height)
-{
- enum tui_status status = TUI_FAILURE;
+/* See tui-win.h. */
- if (new_height_ok (primary_win_info, new_height))
- {
- status = TUI_SUCCESS;
- if (new_height != primary_win_info->generic.height)
- {
- int diff;
- struct tui_win_info *win_info;
- struct tui_gen_win_info *locator = tui_locator_win_info_ptr ();
- enum tui_layout_type cur_layout = tui_current_layout ();
-
- diff = (new_height - primary_win_info->generic.height) * (-1);
- if (cur_layout == SRC_COMMAND
- || cur_layout == DISASSEM_COMMAND)
- {
- struct tui_win_info *src_win_info;
-
- make_invisible_and_set_new_height (primary_win_info, new_height);
- if (primary_win_info->generic.type == CMD_WIN)
- {
- win_info = (tui_source_windows ())->list[0];
- src_win_info = win_info;
- }
- else
- {
- win_info = tui_win_list[CMD_WIN];
- src_win_info = primary_win_info;
- }
- make_invisible_and_set_new_height (win_info,
- win_info->generic.height + diff);
- TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
- make_visible_with_new_height (win_info);
- make_visible_with_new_height (primary_win_info);
- if (src_win_info->generic.content_size <= 0)
- tui_erase_source_content (src_win_info, EMPTY_SOURCE_PROMPT);
- }
- else
- {
- struct tui_win_info *first_win;
- struct tui_win_info *second_win;
+bool compact_source = false;
- if (cur_layout == SRC_DISASSEM_COMMAND)
- {
- first_win = TUI_SRC_WIN;
- second_win = TUI_DISASM_WIN;
- }
- else
- {
- first_win = TUI_DATA_WIN;
- second_win = (tui_source_windows ())->list[0];
- }
- if (primary_win_info == TUI_CMD_WIN)
- { /* Split the change in height accross the 1st & 2nd
- windows, adjusting them as well. */
- /* Subtract the locator. */
- int first_split_diff = diff / 2;
- int second_split_diff = first_split_diff;
-
- if (diff % 2)
- {
- if (first_win->generic.height >
- second_win->generic.height)
- if (diff < 0)
- first_split_diff--;
- else
- first_split_diff++;
- else
- {
- if (diff < 0)
- second_split_diff--;
- else
- second_split_diff++;
- }
- }
- /* Make sure that the minimum hieghts are
- honored. */
- while ((first_win->generic.height + first_split_diff) < 3)
- {
- first_split_diff++;
- second_split_diff--;
- }
- while ((second_win->generic.height + second_split_diff) < 3)
- {
- second_split_diff++;
- first_split_diff--;
- }
- make_invisible_and_set_new_height (
- first_win,
- first_win->generic.height + first_split_diff);
- second_win->generic.origin.y = first_win->generic.height - 1;
- make_invisible_and_set_new_height (second_win,
- second_win->generic.height
- + second_split_diff);
- TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
- make_invisible_and_set_new_height (TUI_CMD_WIN, new_height);
- }
- else
- {
- if ((TUI_CMD_WIN->generic.height + diff) < 1)
- { /* If there is no way to increase the command
- window take real estate from the 1st or 2nd
- window. */
- if ((TUI_CMD_WIN->generic.height + diff) < 1)
- {
- int i;
-
- for (i = TUI_CMD_WIN->generic.height + diff;
- (i < 1); i++)
- if (primary_win_info == first_win)
- second_win->generic.height--;
- else
- first_win->generic.height--;
- }
- }
- if (primary_win_info == first_win)
- make_invisible_and_set_new_height (first_win, new_height);
- else
- make_invisible_and_set_new_height (
- first_win,
- first_win->generic.height);
- second_win->generic.origin.y = first_win->generic.height - 1;
- if (primary_win_info == second_win)
- make_invisible_and_set_new_height (second_win, new_height);
- else
- make_invisible_and_set_new_height (
- second_win, second_win->generic.height);
- TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
- if ((TUI_CMD_WIN->generic.height + diff) < 1)
- make_invisible_and_set_new_height (TUI_CMD_WIN, 1);
- else
- make_invisible_and_set_new_height (TUI_CMD_WIN,
- TUI_CMD_WIN->generic.height + diff);
- }
- make_visible_with_new_height (TUI_CMD_WIN);
- make_visible_with_new_height (second_win);
- make_visible_with_new_height (first_win);
- if (first_win->generic.content_size <= 0)
- tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT);
- if (second_win->generic.content_size <= 0)
- tui_erase_source_content (second_win, EMPTY_SOURCE_PROMPT);
- }
- }
- }
+/* Callback for "set tui compact-source". */
- return status;
+static void
+tui_set_compact_source (const char *ignore, int from_tty,
+ struct cmd_list_element *c)
+{
+ if (TUI_SRC_WIN != nullptr)
+ TUI_SRC_WIN->refill ();
}
+/* Callback for "show tui compact-source". */
-/* Function make the target window (and auxillary windows associated
- with the targer) invisible, and set the new height and
- location. */
static void
-make_invisible_and_set_new_height (struct tui_win_info *win_info,
- int height)
+tui_show_compact_source (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c, const char *value)
{
- int i;
- struct tui_gen_win_info *gen_win_info;
-
- tui_make_invisible (&win_info->generic);
- win_info->generic.height = height;
- if (height > 1)
- win_info->generic.viewport_height = height - 1;
- else
- win_info->generic.viewport_height = height;
- if (win_info != TUI_CMD_WIN)
- win_info->generic.viewport_height--;
-
- /* Now deal with the auxillary windows associated with win_info. */
- switch (win_info->generic.type)
- {
- case SRC_WIN:
- case DISASSEM_WIN:
- gen_win_info = win_info->detail.source_info.execution_info;
- tui_make_invisible (gen_win_info);
- gen_win_info->height = height;
- gen_win_info->origin.y = win_info->generic.origin.y;
- if (height > 1)
- gen_win_info->viewport_height = height - 1;
- else
- gen_win_info->viewport_height = height;
- if (win_info != TUI_CMD_WIN)
- gen_win_info->viewport_height--;
-
- if (tui_win_has_locator (win_info))
- {
- gen_win_info = tui_locator_win_info_ptr ();
- tui_make_invisible (gen_win_info);
- gen_win_info->origin.y = win_info->generic.origin.y + height;
- }
- break;
- case DATA_WIN:
- /* Delete all data item windows. */
- for (i = 0; i < win_info->generic.content_size; i++)
- {
- gen_win_info = (struct tui_gen_win_info *)
- &((struct tui_win_element *)
- win_info->generic.content[i])->which_element.data_window;
- tui_delete_win (gen_win_info->handle);
- gen_win_info->handle = NULL;
- }
- break;
- default:
- break;
- }
+ printf_filtered (_("TUI source window compactness is %s.\n"), value);
}
-
-/* Function to make the windows with new heights visible. This means
- re-creating the windows' content since the window had to be
- destroyed to be made invisible. */
+/* Set the tab width of the specified window. */
static void
-make_visible_with_new_height (struct tui_win_info *win_info)
+tui_set_tab_width_command (const char *arg, int from_tty)
{
- struct symtab *s;
-
- tui_make_visible (&win_info->generic);
- tui_check_and_display_highlight_if_needed (win_info);
- switch (win_info->generic.type)
+ /* Make sure the curses mode is enabled. */
+ tui_enable ();
+ if (arg != NULL)
{
- case SRC_WIN:
- case DISASSEM_WIN:
- tui_free_win_content (win_info->detail.source_info.execution_info);
- tui_make_visible (win_info->detail.source_info.execution_info);
- if (win_info->generic.content != NULL)
- {
- struct gdbarch *gdbarch = win_info->detail.source_info.gdbarch;
- struct tui_line_or_address line_or_addr;
- struct symtab_and_line cursal
- = get_current_source_symtab_and_line ();
-
- line_or_addr = win_info->detail.source_info.start_line_or_addr;
- tui_free_win_content (&win_info->generic);
- tui_update_source_window (win_info, gdbarch,
- cursal.symtab, line_or_addr, TRUE);
- }
- else if (deprecated_safe_get_selected_frame () != NULL)
- {
- struct tui_line_or_address line;
- struct symtab_and_line cursal
- = get_current_source_symtab_and_line ();
- struct frame_info *frame = deprecated_safe_get_selected_frame ();
- struct gdbarch *gdbarch = get_frame_arch (frame);
-
- s = find_pc_line_symtab (get_frame_pc (frame));
- if (win_info->generic.type == SRC_WIN)
- {
- line.loa = LOA_LINE;
- line.u.line_no = cursal.line;
- }
- else
- {
- line.loa = LOA_ADDRESS;
- find_line_pc (s, cursal.line, &line.u.addr);
- }
- tui_update_source_window (win_info, gdbarch, s, line, TRUE);
- }
- if (tui_win_has_locator (win_info))
+ int ts;
+
+ ts = atoi (arg);
+ if (ts <= 0)
+ warning (_("Tab widths greater than 0 must be specified."));
+ else
{
- tui_make_visible (tui_locator_win_info_ptr ());
- tui_show_locator_content ();
+ internal_tab_width = ts;
+ tui_tab_width = ts;
+
+ update_tab_width ();
}
- break;
- case DATA_WIN:
- tui_display_all_data ();
- break;
- case CMD_WIN:
-#ifdef HAVE_WRESIZE
- wresize (TUI_CMD_WIN->generic.handle,
- TUI_CMD_WIN->generic.height,
- TUI_CMD_WIN->generic.width);
-#endif
- mvwin (TUI_CMD_WIN->generic.handle,
- TUI_CMD_WIN->generic.origin.y,
- TUI_CMD_WIN->generic.origin.x);
- wmove (win_info->generic.handle, 0, 0);
- break;
- default:
- break;
}
}
-static int
-new_height_ok (struct tui_win_info *primary_win_info,
- int new_height)
+/* Set the height of the specified window. */
+static void
+tui_set_win_height_command (const char *arg, int from_tty)
{
- int ok = (new_height < tui_term_height ());
-
- if (ok)
+ /* Make sure the curses mode is enabled. */
+ tui_enable ();
+ if (arg != NULL)
{
- int diff;
- enum tui_layout_type cur_layout = tui_current_layout ();
+ const char *buf = arg;
+ const char *buf_ptr = buf;
+ int new_height;
+ struct tui_win_info *win_info;
- diff = (new_height - primary_win_info->generic.height) * (-1);
- if (cur_layout == SRC_COMMAND || cur_layout == DISASSEM_COMMAND)
- {
- ok = ((primary_win_info->generic.type == CMD_WIN
- && new_height <= (tui_term_height () - 4)
- && new_height >= MIN_CMD_WIN_HEIGHT)
- || (primary_win_info->generic.type != CMD_WIN
- && new_height <= (tui_term_height () - 2)
- && new_height >= MIN_WIN_HEIGHT));
- if (ok)
- { /* Check the total height. */
- struct tui_win_info *win_info;
-
- if (primary_win_info == TUI_CMD_WIN)
- win_info = (tui_source_windows ())->list[0];
- else
- win_info = TUI_CMD_WIN;
- ok = ((new_height +
- (win_info->generic.height + diff)) <= tui_term_height ());
- }
- }
- else
+ buf_ptr = strchr (buf_ptr, ' ');
+ if (buf_ptr != NULL)
{
- int cur_total_height, total_height, min_height = 0;
- struct tui_win_info *first_win;
- struct tui_win_info *second_win;
+ /* Validate the window name. */
+ gdb::string_view wname (buf, buf_ptr - buf);
+ win_info = tui_partial_win_by_name (wname);
- if (cur_layout == SRC_DISASSEM_COMMAND)
- {
- first_win = TUI_SRC_WIN;
- second_win = TUI_DISASM_WIN;
- }
- else
- {
- first_win = TUI_DATA_WIN;
- second_win = (tui_source_windows ())->list[0];
- }
- /* We could simply add all the heights to obtain the same
- result but below is more explicit since we subtract 1 for
- the line that the first and second windows share, and add
- one for the locator. */
- total_height = cur_total_height =
- (first_win->generic.height + second_win->generic.height - 1)
- + TUI_CMD_WIN->generic.height + 1; /* Locator. */
- if (primary_win_info == TUI_CMD_WIN)
+ if (win_info == NULL)
+ error (_("Unrecognized window name \"%s\""), arg);
+ if (!win_info->is_visible ())
+ error (_("Window \"%s\" is not visible"), arg);
+
+ /* Process the size. */
+ buf_ptr = skip_spaces (buf_ptr);
+
+ if (*buf_ptr != '\0')
{
- /* Locator included since first & second win share a line. */
- ok = ((first_win->generic.height +
- second_win->generic.height + diff) >=
- (MIN_WIN_HEIGHT * 2)
- && new_height >= MIN_CMD_WIN_HEIGHT);
- if (ok)
+ bool negate = false;
+ bool fixed_size = true;
+ int input_no;;
+
+ if (*buf_ptr == '+' || *buf_ptr == '-')
{
- total_height = new_height +
- (first_win->generic.height +
- second_win->generic.height + diff);
- min_height = MIN_CMD_WIN_HEIGHT;
- }
- }
- else
- {
- min_height = MIN_WIN_HEIGHT;
-
- /* First see if we can increase/decrease the command
- window. And make sure that the command window is at
- least 1 line. */
- ok = ((TUI_CMD_WIN->generic.height + diff) > 0);
- if (!ok)
- { /* Looks like we have to increase/decrease one of
- the other windows. */
- if (primary_win_info == first_win)
- ok = (second_win->generic.height + diff) >= min_height;
- else
- ok = (first_win->generic.height + diff) >= min_height;
+ if (*buf_ptr == '-')
+ negate = true;
+ fixed_size = false;
+ buf_ptr++;
}
- if (ok)
+ input_no = atoi (buf_ptr);
+ if (input_no > 0)
{
- if (primary_win_info == first_win)
- total_height = new_height +
- second_win->generic.height +
- TUI_CMD_WIN->generic.height + diff;
+ if (negate)
+ input_no *= (-1);
+ if (fixed_size)
+ new_height = input_no;
else
- total_height = new_height +
- first_win->generic.height +
- TUI_CMD_WIN->generic.height + diff;
+ new_height = win_info->height + input_no;
+
+ /* Now change the window's height, and adjust
+ all other windows around it. */
+ tui_adjust_window_height (win_info, new_height);
+ tui_update_gdb_sizes ();
}
+ else
+ warning (_("Invalid window height specified.\n%s"),
+ WIN_HEIGHT_USAGE);
}
- /* Now make sure that the proposed total height doesn't
- exceed the old total height. */
- if (ok)
- ok = (new_height >= min_height
- && total_height <= cur_total_height);
}
+ else
+ printf_filtered (WIN_HEIGHT_USAGE);
}
-
- return ok;
+ else
+ printf_filtered (WIN_HEIGHT_USAGE);
}
+/* See tui-data.h. */
+
+int
+tui_win_info::max_height () const
+{
+ return tui_term_height () - 2;
+}
static void
parse_scrolling_args (const char *arg,
/* First set up the default window to scroll, in case there is no
window name arg. */
- if (arg != (char *) NULL)
+ if (arg != NULL)
{
char *buf_ptr;
num_str = buf_ptr;
buf_ptr = strchr (buf_ptr, ' ');
- if (buf_ptr != (char *) NULL)
+ if (buf_ptr != NULL)
{
- *buf_ptr = (char) 0;
+ *buf_ptr = '\0';
if (num_to_scroll)
*num_to_scroll = atoi (num_str);
buf_ptr++;
}
/* Process the window name if one is specified. */
- if (buf_ptr != (char *) NULL)
+ if (buf_ptr != NULL)
{
const char *wname;
- if (*buf_ptr == ' ')
- while (*(++buf_ptr) == ' ')
- ;
+ wname = skip_spaces (buf_ptr);
- if (*buf_ptr != (char) 0)
+ if (*wname != '\0')
{
- /* Validate the window name. */
- for (char *p = buf_ptr; *p != '\0'; p++)
- *p = tolower (*p);
-
- wname = buf_ptr;
+ *win_to_scroll = tui_partial_win_by_name (wname);
+
+ if (*win_to_scroll == NULL)
+ error (_("Unrecognized window `%s'"), wname);
+ if (!(*win_to_scroll)->is_visible ())
+ error (_("Window is not visible"));
+ else if (*win_to_scroll == TUI_CMD_WIN)
+ *win_to_scroll = *(tui_source_windows ().begin ());
}
- else
- wname = "?";
-
- *win_to_scroll = tui_partial_win_by_name (wname);
-
- if (*win_to_scroll == (struct tui_win_info *) NULL
- || !(*win_to_scroll)->generic.is_visible)
- error (_("Invalid window specified. \n\
-The window name specified must be valid and visible.\n"));
- else if (*win_to_scroll == TUI_CMD_WIN)
- *win_to_scroll = (tui_source_windows ())->list[0];
}
}
}
+
+/* Function to initialize gdb commands, for tui window
+ manipulation. */
+
+void
+_initialize_tui_win (void)
+{
+ static struct cmd_list_element *tui_setlist;
+ static struct cmd_list_element *tui_showlist;
+ struct cmd_list_element *cmd;
+
+ /* Define the classes of commands.
+ They will appear in the help list in the reverse of this order. */
+ add_prefix_cmd ("tui", class_tui, set_tui_cmd,
+ _("TUI configuration variables."),
+ &tui_setlist, "set tui ",
+ 0 /* allow-unknown */, &setlist);
+ add_prefix_cmd ("tui", class_tui, show_tui_cmd,
+ _("TUI configuration variables."),
+ &tui_showlist, "show tui ",
+ 0 /* allow-unknown */, &showlist);
+
+ add_com ("refresh", class_tui, tui_refresh_all_command,
+ _("Refresh the terminal display."));
+
+ cmd = add_com ("tabset", class_tui, tui_set_tab_width_command, _("\
+Set the width (in characters) of tab stops.\n\
+Usage: tabset N"));
+ deprecate_cmd (cmd, "set tui tab-width");
+
+ cmd = add_com ("winheight", class_tui, tui_set_win_height_command, _("\
+Set or modify the height of a specified window.\n"
+WIN_HEIGHT_USAGE
+"Window names are:\n\
+ src : the source window\n\
+ cmd : the command window\n\
+ asm : the disassembly window\n\
+ regs : the register display"));
+ add_com_alias ("wh", "winheight", class_tui, 0);
+ set_cmd_completer (cmd, winheight_completer);
+ add_info ("win", tui_all_windows_info,
+ _("List of all displayed windows."));
+ cmd = add_com ("focus", class_tui, tui_set_focus_command, _("\
+Set focus to named window or next/prev window.\n"
+FOCUS_USAGE
+"Valid Window names are:\n\
+ src : the source window\n\
+ asm : the disassembly window\n\
+ regs : the register display\n\
+ cmd : the command window"));
+ add_com_alias ("fs", "focus", class_tui, 0);
+ set_cmd_completer (cmd, focus_completer);
+ add_com ("+", class_tui, tui_scroll_forward_command, _("\
+Scroll window forward.\n\
+Usage: + [WIN] [N]"));
+ add_com ("-", class_tui, tui_scroll_backward_command, _("\
+Scroll window backward.\n\
+Usage: - [WIN] [N]"));
+ add_com ("<", class_tui, tui_scroll_left_command, _("\
+Scroll window text to the left.\n\
+Usage: < [WIN] [N]"));
+ add_com (">", class_tui, tui_scroll_right_command, _("\
+Scroll window text to the right.\n\
+Usage: > [WIN] [N]"));
+
+ /* Define the tui control variables. */
+ add_setshow_enum_cmd ("border-kind", no_class, tui_border_kind_enums,
+ &tui_border_kind, _("\
+Set the kind of border for TUI windows."), _("\
+Show the kind of border for TUI windows."), _("\
+This variable controls the border of TUI windows:\n\
+ space use a white space\n\
+ ascii use ascii characters + - | for the border\n\
+ acs use the Alternate Character Set"),
+ tui_set_var_cmd,
+ show_tui_border_kind,
+ &tui_setlist, &tui_showlist);
+
+ add_setshow_enum_cmd ("border-mode", no_class, tui_border_mode_enums,
+ &tui_border_mode, _("\
+Set the attribute mode to use for the TUI window borders."), _("\
+Show the attribute mode to use for the TUI window borders."), _("\
+This variable controls the attributes to use for the window borders:\n\
+ normal normal display\n\
+ standout use highlight mode of terminal\n\
+ reverse use reverse video mode\n\
+ half use half bright\n\
+ half-standout use half bright and standout mode\n\
+ bold use extra bright or bold\n\
+ bold-standout use extra bright or bold with standout mode"),
+ tui_set_var_cmd,
+ show_tui_border_mode,
+ &tui_setlist, &tui_showlist);
+
+ add_setshow_enum_cmd ("active-border-mode", no_class, tui_border_mode_enums,
+ &tui_active_border_mode, _("\
+Set the attribute mode to use for the active TUI window border."), _("\
+Show the attribute mode to use for the active TUI window border."), _("\
+This variable controls the attributes to use for the active window border:\n\
+ normal normal display\n\
+ standout use highlight mode of terminal\n\
+ reverse use reverse video mode\n\
+ half use half bright\n\
+ half-standout use half bright and standout mode\n\
+ bold use extra bright or bold\n\
+ bold-standout use extra bright or bold with standout mode"),
+ tui_set_var_cmd,
+ show_tui_active_border_mode,
+ &tui_setlist, &tui_showlist);
+
+ add_setshow_zuinteger_cmd ("tab-width", no_class,
+ &internal_tab_width, _("\
+Set the tab width, in characters, for the TUI."), _("\
+Show the tab witdh, in characters, for the TUI."), _("\
+This variable controls how many spaces are used to display a tab character."),
+ tui_set_tab_width, tui_show_tab_width,
+ &tui_setlist, &tui_showlist);
+
+ add_setshow_boolean_cmd ("tui-resize-message", class_maintenance,
+ &resize_message, _("\
+Set TUI resize messaging."), _("\
+Show TUI resize messaging."), _("\
+When enabled GDB will print a message when the terminal is resized."),
+ nullptr,
+ show_tui_resize_message,
+ &maintenance_set_cmdlist,
+ &maintenance_show_cmdlist);
+
+ add_setshow_boolean_cmd ("compact-source", class_tui,
+ &compact_source, _("\
+Set whether the TUI source window is compact."), _("\
+Show whether the TUI source window is compact."), _("\
+This variable controls whether the TUI source window is shown\n\
+in a compact form. The compact form puts the source closer to\n\
+the line numbers and uses less horizontal space."),
+ tui_set_compact_source, tui_show_compact_source,
+ &tui_setlist, &tui_showlist);
+
+ tui_border_style.changed.attach (tui_rehighlight_all);
+ tui_active_border_style.changed.attach (tui_rehighlight_all);
+}
projects / deliverable / binutils-gdb.git / blobdiff