X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-win.c;h=4dad1443352da02bc723c105a4871ad6768cacaf;hb=13446e05a363db17f0140b1450fc7df509d2ca37;hp=f95688223d6885c302b45205001b5e294a722aa1;hpb=9b254dd1ce46c19dde1dde5b8d1e22e862dfacce;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index f95688223d..4dad144335 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -1,7 +1,6 @@ /* TUI window generic functions. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 - Free Software Foundation, Inc. + Copyright (C) 1998-2019 Free Software Foundation, Inc. Contributed by Hewlett-Packard Company. @@ -33,8 +32,10 @@ #include "cli/cli-cmds.h" #include "top.h" #include "source.h" +#include "event-loop.h" #include "tui/tui.h" +#include "tui/tui-io.h" #include "tui/tui-data.h" #include "tui/tui-wingeneral.h" #include "tui/tui-stack.h" @@ -43,10 +44,9 @@ #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 "gdb_string.h" #include #include "readline/readline.h" @@ -61,17 +61,16 @@ static void make_invisible_and_set_new_height (struct tui_win_info *, 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 (char *, int); -static void tui_refresh_all_command (char *, int); -static void tui_set_win_height_command (char *, int); -static void tui_xdb_set_win_height_command (char *, int); -static void tui_all_windows_info (char *, int); -static void tui_set_focus_command (char *, int); -static void tui_scroll_forward_command (char *, int); -static void tui_scroll_backward_command (char *, int); -static void tui_scroll_left_command (char *, int); -static void tui_scroll_right_command (char *, int); -static void parse_scrolling_args (char *, +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); +static void tui_scroll_right_command (const char *, int); +static void parse_scrolling_args (const char *, struct tui_win_info **, int *); @@ -79,9 +78,8 @@ static void parse_scrolling_args (char *, /*************************************** ** DEFINITIONS ***************************************/ -#define WIN_HEIGHT_USAGE "Usage: winheight [+ | -] <#lines>\n" -#define XDBWIN_HEIGHT_USAGE "Usage: w <#lines>\n" -#define FOCUS_USAGE "Usage: focus { | next | prev}\n" +#define WIN_HEIGHT_USAGE "Usage: winheight WINDOW-NAME [+ | -] NUM-LINES\n" +#define FOCUS_USAGE "Usage: focus [WINDOW-NAME | next | prev]\n" /*************************************** ** PUBLIC FUNCTIONS @@ -107,7 +105,7 @@ static void parse_scrolling_args (char *, #endif /* Possible values for tui-border-kind variable. */ -static const char *tui_border_kind_enums[] = { +static const char *const tui_border_kind_enums[] = { "space", "ascii", "acs", @@ -115,7 +113,7 @@ static const char *tui_border_kind_enums[] = { }; /* Possible values for tui-border-mode and tui-active-border-mode. */ -static const char *tui_border_mode_enums[] = { +static const char *const tui_border_mode_enums[] = { "normal", "standout", "reverse", @@ -317,23 +315,23 @@ tui_update_variables (void) } static void -set_tui_cmd (char *args, int from_tty) +set_tui_cmd (const char *args, int from_tty) { } static void -show_tui_cmd (char *args, int from_tty) +show_tui_cmd (const char *args, int from_tty) { } static struct cmd_list_element *tuilist; static void -tui_command (char *args, int from_tty) +tui_command (const char *args, int from_tty) { printf_unfiltered (_("\"tui\" must be followed by the name of a " "tui command.\n")); - help_list (tuilist, "tui ", -1, gdb_stdout); + help_list (tuilist, "tui ", all_commands, gdb_stdout); } struct cmd_list_element ** @@ -346,129 +344,110 @@ tui_get_cmd_list (void) return &tuilist; } -/* Function to initialize gdb commands, for tui window - manipulation. */ +/* The set_func hook of "set tui ..." commands that affect the window + borders on the TUI display. */ void -_initialize_tui_win (void) +tui_set_var_cmd (const char *null_args, + int from_tty, struct cmd_list_element *c) { - struct cmd_list_element *c; - static struct cmd_list_element *tui_setlist; - static struct cmd_list_element *tui_showlist; + if (tui_update_variables () && tui_active) + tui_rehighlight_all (); +} - /* 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); +/* 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 + completions of the window name. */ - add_com ("refresh", class_tui, tui_refresh_all_command, - _("Refresh the terminal display.\n")); - if (xdb_commands) - add_com_alias ("U", "refresh", class_tui, 0); - add_com ("tabset", class_tui, tui_set_tab_width_command, _("\ -Set the width (in characters) of tab stops.\n\ -Usage: tabset \n")); - add_com ("winheight", class_tui, tui_set_win_height_command, _("\ -Set the height of a specified window.\n\ -Usage: winheight [+ | -] <#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); - add_info ("win", tui_all_windows_info, - _("List of all displayed windows.\n")); - add_com ("focus", class_tui, tui_set_focus_command, _("\ -Set focus to named window or next/prev window.\n\ -Usage: focus { | 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); - 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 forward.\n\ -Usage: < [win] [n]\n")); - add_com (">", class_tui, tui_scroll_right_command, _("\ -Scroll window backward.\n\ -Usage: > [win] [n]\n")); - if (xdb_commands) - add_com ("w", class_xdb, tui_xdb_set_win_height_command, _("\ -XDB compatibility command for setting the height of a command window.\n\ -Usage: w <#lines>\n")); +static void +window_name_completer (completion_tracker &tracker, + int include_next_prev_p, + const char *text, const char *word) +{ + std::vector completion_name_vec; + int win_type; - /* 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"), - NULL, - show_tui_border_kind, - &tui_setlist, &tui_showlist); + for (win_type = SRC_WIN; win_type < MAX_MAJOR_WINDOWS; win_type++) + { + const char *completion_name = NULL; - 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"), - NULL, - show_tui_border_mode, - &tui_setlist, &tui_showlist); + /* We can't focus on an invisible window. */ + if (tui_win_list[win_type] == NULL + || !tui_win_list[win_type]->generic.is_visible) + continue; - 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"), - NULL, - show_tui_active_border_mode, - &tui_setlist, &tui_showlist); + completion_name = tui_win_name (&tui_win_list [win_type]->generic); + gdb_assert (completion_name != NULL); + 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 (completion_name_vec.empty ()) + { + completion_name_vec.push_back (SRC_NAME); + completion_name_vec.push_back (CMD_NAME); + } + + if (include_next_prev_p) + { + completion_name_vec.push_back ("next"); + completion_name_vec.push_back ("prev"); + } + + + 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 + entered so far, WORD is the word currently being completed. */ + +static void +focus_completer (struct cmd_list_element *ignore, + completion_tracker &tracker, + const char *text, const char *word) +{ + window_name_completer (tracker, 1, text, word); +} + +/* Complete possible window names for winheight command. TEXT is the + complete text entered so far, WORD is the word currently being + completed. */ + +static void +winheight_completer (struct cmd_list_element *ignore, + completion_tracker &tracker, + const char *text, const char *word) +{ + /* The first word is the window name. That we can complete. Subsequent + words can't be completed. */ + if (word != text) + return; + + window_name_completer (tracker, 0, text, word); } /* Update gdb's knowledge of the terminal size. */ void tui_update_gdb_sizes (void) { - char cmd[50]; - - /* Set to TUI command window dimension or use readline values. */ - sprintf (cmd, "set width %d", - tui_active ? TUI_CMD_WIN->generic.width : tui_term_width()); - execute_command (cmd, 0); - sprintf (cmd, "set height %d", - tui_active ? TUI_CMD_WIN->generic.height : tui_term_height()); - execute_command (cmd, 0); + int width, height; + + if (tui_active) + { + width = TUI_CMD_WIN->generic.width; + height = TUI_CMD_WIN->generic.height; + } + else + { + width = tui_term_width (); + height = tui_term_height (); + } + + set_screen_width_and_height (width, height); } @@ -491,130 +470,48 @@ tui_set_win_focus_to (struct tui_win_info *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 = generic.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 (FORWARD_SCROLL, 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 = generic.height - 3; + + do_scroll_vertical (BACKWARD_SCROLL, 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 (LEFT_SCROLL, 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 (RIGHT_SCROLL, num_to_scroll); } void tui_refresh_all_win (void) { - enum tui_win_type type; + int type; clearok (curscr, TRUE); tui_refresh_all (tui_win_list); @@ -643,9 +540,17 @@ tui_refresh_all_win (void) tui_show_locator_content (); } +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]); +} -/* Resize all the windows based on the the terminal size. This - function gets called from within the readline sinwinch handler. */ +/* Resize all the windows based on the terminal size. This function + gets called from within the readline sinwinch handler. */ void tui_resize_all (void) { @@ -662,7 +567,7 @@ tui_resize_all (void) struct tui_win_info *first_win; struct tui_win_info *second_win; struct tui_gen_win_info *locator = tui_locator_win_info_ptr (); - enum tui_win_type win_type; + int win_type; int new_height, split_diff, cmd_split_diff, num_wins_displayed = 2; #ifdef HAVE_RESIZE_TERM @@ -685,16 +590,19 @@ tui_resize_all (void) if (height_diff < 0) cmd_split_diff--; else - cmd_split_diff++; - } + cmd_split_diff++; + } /* Now adjust each window. */ - clear (); + /* 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 = tui_source_windows ()[0]; first_win->generic.width += width_diff; locator->width += width_diff; /* Check for invalid heights. */ @@ -708,6 +616,7 @@ tui_resize_all (void) 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; @@ -730,7 +639,7 @@ tui_resize_all (void) { first_win = TUI_DATA_WIN; first_win->generic.width += width_diff; - second_win = (struct tui_win_info *) (tui_source_windows ())->list[0]; + second_win = tui_source_windows ()[0]; second_win->generic.width += width_diff; } /* Change the first window's height/width. */ @@ -772,8 +681,9 @@ tui_resize_all (void) /* 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_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); @@ -791,11 +701,10 @@ tui_resize_all (void) && (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] = (struct tui_win_info *) NULL; + delete tui_win_list[win_type]; + tui_win_list[win_type] = NULL; } } - tui_set_win_resized_to (TRUE); /* Turn keypad back on, unless focus is in the command window. */ if (win_with_focus != TUI_CMD_WIN) @@ -803,31 +712,69 @@ tui_resize_all (void) } } +#ifdef SIGWINCH +/* Token for use by TUI's asynchronous SIGWINCH handler. */ +static struct async_signal_handler *tui_sigwinch_token; -/* SIGWINCH signal handler for the tui. This signal handler is always - called, even when the readline package clears signals because it is - set as the old_sigwinch() (TUI only). */ -void +/* TUI's SIGWINCH signal handler. */ +static void tui_sigwinch_handler (int signal) { - /* Say that a resize was done so that the readline can do it later - when appropriate. */ + mark_async_signal_handler (tui_sigwinch_token); tui_set_win_resized_to (TRUE); } -/* Initializes SIGWINCH signal handler for the tui. */ +/* Callback for asynchronously resizing TUI following a SIGWINCH signal. */ +static void +tui_async_resize_screen (gdb_client_data arg) +{ + rl_resize_terminal (); + + if (!tui_active) + { + int screen_height, screen_width; + + rl_get_screen_size (&screen_height, &screen_width); + set_screen_width_and_height (screen_width, screen_height); + + /* win_resized is left set so that the next call to tui_enable() + resizes the TUI windows. */ + } + else + { + tui_set_win_resized_to (FALSE); + tui_resize_all (); + tui_refresh_all_win (); + tui_update_gdb_sizes (); + tui_redisplay_readline (); + } +} +#endif + +/* Initialize TUI's SIGWINCH signal handler. Note that the handler is not + uninstalled when we exit TUI, so the handler should not assume that TUI is + always active. */ void tui_initialize_win (void) { #ifdef SIGWINCH + tui_sigwinch_token + = create_async_signal_handler (tui_async_resize_screen, NULL); + + { #ifdef HAVE_SIGACTION - struct sigaction old_winch; - memset (&old_winch, 0, sizeof (old_winch)); - old_winch.sa_handler = &tui_sigwinch_handler; - sigaction (SIGWINCH, &old_winch, NULL); + struct sigaction old_winch; + + memset (&old_winch, 0, sizeof (old_winch)); + old_winch.sa_handler = &tui_sigwinch_handler; +#ifdef SA_RESTART + old_winch.sa_flags = SA_RESTART; +#endif + sigaction (SIGWINCH, &old_winch, NULL); #else - signal (SIGWINCH, &tui_sigwinch_handler); + signal (SIGWINCH, &tui_sigwinch_handler); #endif + } #endif } @@ -838,39 +785,39 @@ tui_initialize_win (void) static void -tui_scroll_forward_command (char *arg, int from_tty) +tui_scroll_forward_command (const char *arg, int from_tty) { int num_to_scroll = 1; struct tui_win_info *win_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 (FORWARD_SCROLL, win_to_scroll, num_to_scroll); + win_to_scroll->forward_scroll (num_to_scroll); } static void -tui_scroll_backward_command (char *arg, int from_tty) +tui_scroll_backward_command (const char *arg, int from_tty) { int num_to_scroll = 1; struct tui_win_info *win_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); } static void -tui_scroll_left_command (char *arg, int from_tty) +tui_scroll_left_command (const char *arg, int from_tty) { int num_to_scroll; struct tui_win_info *win_to_scroll; @@ -878,12 +825,12 @@ tui_scroll_left_command (char *arg, int from_tty) /* 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); } static void -tui_scroll_right_command (char *arg, int from_tty) +tui_scroll_right_command (const char *arg, int from_tty) { int num_to_scroll; struct tui_win_info *win_to_scroll; @@ -891,32 +838,31 @@ tui_scroll_right_command (char *arg, int from_tty) /* 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); } /* Set focus to the window named by 'arg'. */ static void -tui_set_focus (char *arg, int from_tty) +tui_set_focus (const char *arg, int from_tty) { - if (arg != (char *) NULL) + if (arg != NULL) { - char *buf_ptr = (char *) xstrdup (arg); + char *buf_ptr = xstrdup (arg); int i; - struct tui_win_info *win_info = (struct tui_win_info *) NULL; + struct tui_win_info *win_info = NULL; for (i = 0; (i < strlen (buf_ptr)); i++) - buf_ptr[i] = toupper (arg[i]); + buf_ptr[i] = tolower (arg[i]); - if (subset_compare (buf_ptr, "NEXT")) + if (subset_compare (buf_ptr, "next")) win_info = tui_next_win (tui_win_with_focus ()); - else if (subset_compare (buf_ptr, "PREV")) + else if (subset_compare (buf_ptr, "prev")) win_info = tui_prev_win (tui_win_with_focus ()); else win_info = tui_partial_win_by_name (buf_ptr); - if (win_info == (struct tui_win_info *) NULL - || !win_info->generic.is_visible) + if (win_info == NULL || !win_info->generic.is_visible) warning (_("Invalid window specified. \n\ The window name specified must be valid and visible.\n")); else @@ -929,14 +875,14 @@ The window name specified must be valid and visible.\n")); tui_refresh_data_win (); xfree (buf_ptr); printf_filtered (_("Focus set to %s window.\n"), - tui_win_name ((struct tui_gen_win_info *) tui_win_with_focus ())); + tui_win_name (&tui_win_with_focus ()->generic)); } else warning (_("Incorrect Number of Arguments.\n%s"), FOCUS_USAGE); } static void -tui_set_focus_command (char *arg, int from_tty) +tui_set_focus_command (const char *arg, int from_tty) { /* Make sure the curses mode is enabled. */ tui_enable (); @@ -945,9 +891,9 @@ tui_set_focus_command (char *arg, int from_tty) static void -tui_all_windows_info (char *arg, int from_tty) +tui_all_windows_info (const char *arg, int from_tty) { - enum tui_win_type type; + int type; struct tui_win_info *win_with_focus = tui_win_with_focus (); for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); type++) @@ -967,7 +913,7 @@ tui_all_windows_info (char *arg, int from_tty) static void -tui_refresh_all_command (char *arg, int from_tty) +tui_refresh_all_command (const char *arg, int from_tty) { /* Make sure the curses mode is enabled. */ tui_enable (); @@ -975,53 +921,117 @@ tui_refresh_all_command (char *arg, int from_tty) tui_refresh_all_win (); } +/* The tab width that should be used by the TUI. */ -/* Set the height of the specified window. */ +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. */ + +static void +update_tab_width () +{ + /* 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); + } +} + +/* Callback for "set tui tab-width". */ + +static void +tui_set_tab_width (const char *ignore, + int from_tty, struct cmd_list_element *c) +{ + if (internal_tab_width == 0) + { + internal_tab_width = tui_tab_width; + error (_("Tab width must not be 0")); + } + + tui_tab_width = internal_tab_width; + update_tab_width (); +} + +/* Callback for "show tui tab-width". */ + +static void +tui_show_tab_width (struct ui_file *file, int from_tty, + struct cmd_list_element *c, const char *value) +{ + fprintf_filtered (gdb_stdout, _("TUI tab width is %s spaces.\n"), value); + +} + +/* Set the tab width of the specified window. */ static void -tui_set_tab_width_command (char *arg, int from_tty) +tui_set_tab_width_command (const char *arg, int from_tty) { /* Make sure the curses mode is enabled. */ tui_enable (); - if (arg != (char *) NULL) + if (arg != NULL) { int ts; ts = atoi (arg); - if (ts > 0) - tui_set_default_tab_len (ts); - else + if (ts <= 0) warning (_("Tab widths greater than 0 must be specified.")); + else + { + internal_tab_width = ts; + tui_tab_width = ts; + + update_tab_width (); + } } } /* Set the height of the specified window. */ static void -tui_set_win_height (char *arg, int from_tty) +tui_set_win_height (const char *arg, int from_tty) { /* Make sure the curses mode is enabled. */ tui_enable (); - if (arg != (char *) NULL) + if (arg != NULL) { - char *buf = xstrdup (arg); + std::string copy = arg; + char *buf = ©[0]; char *buf_ptr = buf; - char *wname = (char *) NULL; + 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) + if (buf_ptr != NULL) { *buf_ptr = (char) 0; /* Validate the window name. */ for (i = 0; i < strlen (wname); i++) - wname[i] = toupper (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) + if (win_info == NULL || !win_info->generic.is_visible) warning (_("Invalid window specified. \n\ The window name specified must be valid and visible.\n")); else @@ -1070,9 +1080,6 @@ The window name specified must be valid and visible.\n")); } else printf_filtered (WIN_HEIGHT_USAGE); - - if (buf != (char *) NULL) - xfree (buf); } else printf_filtered (WIN_HEIGHT_USAGE); @@ -1080,52 +1087,13 @@ The window name specified must be valid and visible.\n")); /* Set the height of the specified window, with va_list. */ static void -tui_set_win_height_command (char *arg, int from_tty) +tui_set_win_height_command (const char *arg, int from_tty) { /* Make sure the curses mode is enabled. */ tui_enable (); tui_set_win_height (arg, from_tty); } - -/* XDB Compatibility command for setting the window height. This will - increase or decrease the command window by the specified - amount. */ -static void -tui_xdb_set_win_height (char *arg, int from_tty) -{ - /* Make sure the curses mode is enabled. */ - tui_enable (); - if (arg != (char *) NULL) - { - int input_no = atoi (arg); - - if (input_no > 0) - { /* Add 1 for the locator. */ - int new_height = tui_term_height () - (input_no + 1); - - if (!new_height_ok (tui_win_list[CMD_WIN], new_height) - || tui_adjust_win_heights (tui_win_list[CMD_WIN], - new_height) == TUI_FAILURE) - warning (_("Invalid window height specified.\n%s"), - XDBWIN_HEIGHT_USAGE); - } - else - warning (_("Invalid window height specified.\n%s"), - XDBWIN_HEIGHT_USAGE); - } - else - warning (_("Invalid window height specified.\n%s"), XDBWIN_HEIGHT_USAGE); -} - -/* Set the height of the specified window, with va_list. */ -static void -tui_xdb_set_win_height_command (char *arg, int from_tty) -{ - tui_xdb_set_win_height (arg, from_tty); -} - - /* Function to adjust all window heights around the primary. */ static enum tui_status tui_adjust_win_heights (struct tui_win_info *primary_win_info, @@ -1152,7 +1120,7 @@ tui_adjust_win_heights (struct tui_win_info *primary_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]; + win_info = tui_source_windows ()[0]; src_win_info = win_info; } else @@ -1181,7 +1149,7 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, else { first_win = TUI_DATA_WIN; - second_win = (tui_source_windows ())->list[0]; + second_win = tui_source_windows ()[0]; } if (primary_win_info == TUI_CMD_WIN) { /* Split the change in height accross the 1st & 2nd @@ -1222,8 +1190,9 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, 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); + 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); } @@ -1236,6 +1205,7 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, 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) @@ -1260,8 +1230,8 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, 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_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); @@ -1324,10 +1294,10 @@ make_invisible_and_set_new_height (struct tui_win_info *win_info, /* 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; + gen_win_info + = &win_info->generic.content[i]->which_element.data_window; tui_delete_win (gen_win_info->handle); - gen_win_info->handle = (WINDOW *) NULL; + gen_win_info->handle = NULL; } break; default: @@ -1354,21 +1324,25 @@ make_visible_with_new_height (struct tui_win_info *win_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, cursal.symtab, line_or_addr, TRUE); + 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 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_symtab (get_frame_pc (frame)); + s = find_pc_line_symtab (get_frame_pc (frame)); if (win_info->generic.type == SRC_WIN) { line.loa = LOA_LINE; @@ -1379,7 +1353,7 @@ make_visible_with_new_height (struct tui_win_info *win_info) line.loa = LOA_ADDRESS; find_line_pc (s, cursal.line, &line.u.addr); } - tui_update_source_window (win_info, s, line, TRUE); + tui_update_source_window (win_info, gdbarch, s, line, TRUE); } if (tui_win_has_locator (win_info)) { @@ -1391,11 +1365,15 @@ make_visible_with_new_height (struct tui_win_info *win_info) tui_display_all_data (); break; case CMD_WIN: - win_info->detail.command_info.cur_line = 0; - win_info->detail.command_info.curch = 0; - wmove (win_info->generic.handle, - win_info->detail.command_info.cur_line, - win_info->detail.command_info.curch); +#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; @@ -1428,7 +1406,7 @@ new_height_ok (struct tui_win_info *primary_win_info, struct tui_win_info *win_info; if (primary_win_info == TUI_CMD_WIN) - win_info = (tui_source_windows ())->list[0]; + win_info = tui_source_windows ()[0]; else win_info = TUI_CMD_WIN; ok = ((new_height + @@ -1449,7 +1427,7 @@ new_height_ok (struct tui_win_info *primary_win_info, else { first_win = TUI_DATA_WIN; - second_win = (tui_source_windows ())->list[0]; + second_win = tui_source_windows ()[0]; } /* We could simply add all the heights to obtain the same result but below is more explicit since we subtract 1 for @@ -1514,7 +1492,7 @@ new_height_ok (struct tui_win_info *primary_win_info, static void -parse_scrolling_args (char *arg, +parse_scrolling_args (const char *arg, struct tui_win_info **win_to_scroll, int *num_to_scroll) { @@ -1524,19 +1502,20 @@ parse_scrolling_args (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, *buf_ptr; + char *buf_ptr; /* Process the number of lines to scroll. */ - buf = buf_ptr = xstrdup (arg); + std::string copy = arg; + buf_ptr = ©[0]; if (isdigit (*buf_ptr)) { char *num_str; num_str = buf_ptr; buf_ptr = strchr (buf_ptr, ' '); - if (buf_ptr != (char *) NULL) + if (buf_ptr != NULL) { *buf_ptr = (char) 0; if (num_to_scroll) @@ -1548,32 +1527,151 @@ parse_scrolling_args (char *arg, } /* Process the window name if one is specified. */ - if (buf_ptr != (char *) NULL) + if (buf_ptr != NULL) { - char *wname; - int i; + const char *wname; if (*buf_ptr == ' ') while (*(++buf_ptr) == ' ') ; if (*buf_ptr != (char) 0) - wname = buf_ptr; + { + /* Validate the window name. */ + for (char *p = buf_ptr; *p != '\0'; p++) + *p = tolower (*p); + + wname = buf_ptr; + } else wname = "?"; - /* Validate the window name. */ - for (i = 0; i < strlen (wname); i++) - wname[i] = toupper (wname[i]); *win_to_scroll = tui_partial_win_by_name (wname); - if (*win_to_scroll == (struct tui_win_info *) NULL + if (*win_to_scroll == 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]; + *win_to_scroll = tui_source_windows ()[0]; } - xfree (buf); } } + +/* 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); +}