X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-win.c;h=cbeff1f3a2d0d693927edd1f8dc15a82e3da564e;hb=eb4c3f4aaae2ee1b27c210e951260a7e699133b4;hp=9b858336946ae4d8dc5b8be258e4529b96124e1e;hpb=206415a3eac4f69d24cf872f880f554d3d43f1bb;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 9b85833694..cbeff1f3a2 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
- Free Software Foundation, Inc.
+ Copyright (C) 1998-2017 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
@@ -9,7 +8,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -18,9 +17,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* This module contains procedures for handling tui window functions
like resize, scrolling, scrolling, changing focus, etc.
@@ -35,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"
@@ -45,39 +44,43 @@
#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"
+#include
+
/*******************************
** 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 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 (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 *, 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);
+static void tui_scroll_right_command (const char *, int);
+static void parse_scrolling_args (const char *,
+ struct tui_win_info **,
+ int *);
/***************************************
** 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 [+ | -] <#lines>\n"
+#define XDBWIN_HEIGHT_USAGE "Usage: w <#lines>\n"
+#define FOCUS_USAGE "Usage: focus { | next | prev}\n"
/***************************************
** PUBLIC FUNCTIONS
@@ -103,7 +106,7 @@ static void parse_scrolling_args (char *, struct tui_win_info * *, int *);
#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",
@@ -111,7 +114,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",
@@ -199,8 +202,10 @@ struct tui_translate tui_border_kind_translate_lrcorner[] = {
/* Tui configuration variables controlled with set/show command. */
const char *tui_active_border_mode = "bold-standout";
static void
-show_tui_active_border_mode (struct ui_file *file, int from_tty,
- struct cmd_list_element *c, const char *value)
+show_tui_active_border_mode (struct ui_file *file,
+ int from_tty,
+ struct cmd_list_element *c,
+ const char *value)
{
fprintf_filtered (file, _("\
The attribute mode to use for the active TUI window border is \"%s\".\n"),
@@ -209,8 +214,10 @@ The attribute mode to use for the active TUI window border is \"%s\".\n"),
const char *tui_border_mode = "normal";
static void
-show_tui_border_mode (struct ui_file *file, int from_tty,
- struct cmd_list_element *c, const char *value)
+show_tui_border_mode (struct ui_file *file,
+ int from_tty,
+ struct cmd_list_element *c,
+ const char *value)
{
fprintf_filtered (file, _("\
The attribute mode to use for the TUI window borders is \"%s\".\n"),
@@ -219,16 +226,18 @@ The attribute mode to use for the TUI window borders is \"%s\".\n"),
const char *tui_border_kind = "acs";
static void
-show_tui_border_kind (struct ui_file *file, int from_tty,
- struct cmd_list_element *c, const char *value)
+show_tui_border_kind (struct ui_file *file,
+ int from_tty,
+ struct cmd_list_element *c,
+ const char *value)
{
fprintf_filtered (file, _("The kind of border for TUI windows is \"%s\".\n"),
value);
}
-/* Tui internal configuration variables. These variables are
- updated by tui_update_variables to reflect the tui configuration
+/* Tui internal configuration variables. These variables are updated
+ by tui_update_variables to reflect the tui configuration
variables. */
chtype tui_border_vline;
chtype tui_border_hline;
@@ -307,23 +316,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 **
@@ -336,34 +345,123 @@ 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
+tui_set_var_cmd (const char *null_args,
+ int from_tty, struct cmd_list_element *c)
+{
+ if (tui_update_variables () && tui_active)
+ tui_rehighlight_all ();
+}
+
+/* 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. */
+
+static void
+window_name_completer (completion_tracker &tracker,
+ int include_next_prev_p,
+ const char *text, const char *word)
+{
+ VEC (const_char_ptr) *completion_name_vec = NULL;
+ int win_type;
+
+ for (win_type = SRC_WIN; win_type < MAX_MAJOR_WINDOWS; win_type++)
+ {
+ 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)
+ continue;
+
+ completion_name = tui_win_name (&tui_win_list [win_type]->generic);
+ gdb_assert (completion_name != NULL);
+ VEC_safe_push (const_char_ptr, completion_name_vec, 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)
+ {
+ VEC_safe_push (const_char_ptr, completion_name_vec, SRC_NAME);
+ VEC_safe_push (const_char_ptr, completion_name_vec, 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");
+ }
+
+ 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);
+}
+
+/* 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);
+}
+
+/* Function to initialize gdb commands, for tui window
+ manipulation. */
+
void
_initialize_tui_win (void)
{
- struct cmd_list_element *c;
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);
+ 0 /* allow-unknown */, &setlist);
add_prefix_cmd ("tui", class_tui, show_tui_cmd,
_("TUI configuration variables"),
&tui_showlist, "show tui ",
- 0/*allow-unknown*/, &showlist);
+ 0 /* allow-unknown */, &showlist);
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\
+ cmd = add_com ("winheight", class_tui, tui_set_win_height_command, _("\
+Set or modify the height of a specified window.\n\
Usage: winheight [+ | -] <#lines>\n\
Window names are:\n\
src : the source window\n\
@@ -371,9 +469,10 @@ 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"));
- add_com ("focus", class_tui, tui_set_focus_command, _("\
+ cmd = 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\
@@ -382,6 +481,7 @@ 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"));
@@ -389,15 +489,11 @@ Usage: + [win] [n]\n"));
Scroll window backward.\n\
Usage: - [win] [n]\n"));
add_com ("<", class_tui, tui_scroll_left_command, _("\
-Scroll window forward.\n\
+Scroll window text to the left.\n\
Usage: < [win] [n]\n"));
add_com (">", class_tui, tui_scroll_right_command, _("\
-Scroll window backward.\n\
+Scroll window text to the right.\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"));
/* Define the tui control variables. */
add_setshow_enum_cmd ("border-kind", no_class, tui_border_kind_enums,
@@ -408,7 +504,7 @@ 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,
+ tui_set_var_cmd,
show_tui_border_kind,
&tui_setlist, &tui_showlist);
@@ -424,7 +520,7 @@ 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,
+ tui_set_var_cmd,
show_tui_border_mode,
&tui_setlist, &tui_showlist);
@@ -440,7 +536,7 @@ 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,
+ tui_set_var_cmd,
show_tui_active_border_mode,
&tui_setlist, &tui_showlist);
}
@@ -449,25 +545,30 @@ bold-standout use extra bright or bold with standout mode"),
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);
}
-/* Set the logical focus to win_info. */
+/* Set the logical focus to win_info. */
void
-tui_set_win_focus_to (struct tui_win_info * win_info)
+tui_set_win_focus_to (struct tui_win_info *win_info)
{
if (win_info != NULL)
{
- struct tui_win_info * win_with_focus = tui_win_with_focus ();
+ struct tui_win_info *win_with_focus = tui_win_with_focus ();
if (win_with_focus != NULL
&& win_with_focus->generic.type != CMD_WIN)
@@ -480,7 +581,8 @@ 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_scroll_forward (struct tui_win_info *win_to_scroll,
+ int num_to_scroll)
{
if (win_to_scroll != TUI_CMD_WIN)
{
@@ -488,12 +590,12 @@ tui_scroll_forward (struct tui_win_info * win_to_scroll, int 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 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)
@@ -504,7 +606,8 @@ tui_scroll_forward (struct tui_win_info * win_to_scroll, int num_to_scroll)
}
void
-tui_scroll_backward (struct tui_win_info * win_to_scroll, int num_to_scroll)
+tui_scroll_backward (struct tui_win_info *win_to_scroll,
+ int num_to_scroll)
{
if (win_to_scroll != TUI_CMD_WIN)
{
@@ -512,12 +615,12 @@ tui_scroll_backward (struct tui_win_info * win_to_scroll, int 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 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)
@@ -529,7 +632,8 @@ tui_scroll_backward (struct tui_win_info * win_to_scroll, int num_to_scroll)
void
-tui_scroll_left (struct tui_win_info * win_to_scroll, int num_to_scroll)
+tui_scroll_left (struct tui_win_info *win_to_scroll,
+ int num_to_scroll)
{
if (win_to_scroll != TUI_CMD_WIN)
{
@@ -537,20 +641,22 @@ tui_scroll_left (struct tui_win_info * win_to_scroll, int 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 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);
}
}
void
-tui_scroll_right (struct tui_win_info * win_to_scroll, int num_to_scroll)
+tui_scroll_right (struct tui_win_info *win_to_scroll,
+ int num_to_scroll)
{
if (win_to_scroll != TUI_CMD_WIN)
{
@@ -558,22 +664,23 @@ tui_scroll_right (struct tui_win_info * win_to_scroll, int 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 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);
}
}
-/* Scroll a window. Arguments are passed through a va_list. */
+/* 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,
+ struct tui_win_info *win_to_scroll,
int num_to_scroll)
{
switch (direction)
@@ -599,13 +706,14 @@ tui_scroll (enum tui_scroll_direction direction,
void
tui_refresh_all_win (void)
{
- enum tui_win_type type;
+ 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)
+ if (tui_win_list[type]
+ && tui_win_list[type]->generic.is_visible)
{
switch (type)
{
@@ -627,9 +735,17 @@ tui_refresh_all_win (void)
tui_show_locator_content ();
}
+void
+tui_rehighlight_all (void)
+{
+ int type;
-/* Resize all the windows based on the the terminal size. This
- function gets called from within the readline sinwinch handler. */
+ 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 terminal size. This function
+ gets called from within the readline sinwinch handler. */
void
tui_resize_all (void)
{
@@ -642,24 +758,25 @@ tui_resize_all (void)
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 *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 ();
- enum tui_win_type win_type;
+ 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 */
+ /* Turn keypad off while we resize. */
if (win_with_focus != TUI_CMD_WIN)
keypad (TUI_CMD_WIN->generic.handle, 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)
+ 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;
@@ -668,19 +785,22 @@ tui_resize_all (void)
if (height_diff < 0)
cmd_split_diff--;
else
- cmd_split_diff++;
- }
- /* now adjust each window */
- clear ();
+ 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 */
+ /* Check for invalid heights. */
if (height_diff == 0)
new_height = first_win->generic.height;
else if ((first_win->generic.height + split_diff) >=
@@ -691,6 +811,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;
@@ -713,11 +834,12 @@ 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 = (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 */
+ /* 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 +
@@ -732,8 +854,8 @@ tui_resize_all (void)
locator->width += width_diff;
- /* Change the second window's height/width */
- /* check for invalid heights */
+ /* 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 +
@@ -753,10 +875,11 @@ tui_resize_all (void)
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 */
+ /* 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);
@@ -766,40 +889,90 @@ tui_resize_all (void)
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
- */
+ /* 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)
+ 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] = (struct tui_win_info *) NULL;
+ tui_win_list[win_type] = NULL;
}
}
- tui_set_win_resized_to (TRUE);
- /* turn keypad back on, unless focus is in the command window */
+ /* 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);
}
}
+#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);
}
+/* 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;
+#ifdef SA_RESTART
+ old_winch.sa_flags = SA_RESTART;
+#endif
+ sigaction (SIGWINCH, &old_winch, NULL);
+#else
+ signal (SIGWINCH, &tui_sigwinch_handler);
+#endif
+ }
+#endif
+}
/*************************
@@ -808,10 +981,10 @@ tui_sigwinch_handler (int signal)
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;
+ struct tui_win_info *win_to_scroll;
/* Make sure the curses mode is enabled. */
tui_enable ();
@@ -824,10 +997,10 @@ tui_scroll_forward_command (char *arg, int from_tty)
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;
+ struct tui_win_info *win_to_scroll;
/* Make sure the curses mode is enabled. */
tui_enable ();
@@ -840,10 +1013,10 @@ tui_scroll_backward_command (char *arg, int from_tty)
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;
+ struct tui_win_info *win_to_scroll;
/* Make sure the curses mode is enabled. */
tui_enable ();
@@ -853,10 +1026,10 @@ tui_scroll_left_command (char *arg, int from_tty)
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;
+ struct tui_win_info *win_to_scroll;
/* Make sure the curses mode is enabled. */
tui_enable ();
@@ -867,25 +1040,26 @@ tui_scroll_right_command (char *arg, int from_tty)
/* 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)
{
char *buf_ptr = (char *) 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 == (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
@@ -898,14 +1072,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 ();
@@ -914,13 +1088,14 @@ 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;
- struct tui_win_info * win_with_focus = tui_win_with_focus ();
+ int type;
+ struct tui_win_info *win_with_focus = tui_win_with_focus ();
for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); type++)
- if (tui_win_list[type] && tui_win_list[type]->generic.is_visible)
+ if (tui_win_list[type]
+ && tui_win_list[type]->generic.is_visible)
{
if (win_with_focus == tui_win_list[type])
printf_filtered (" %s\t(%d lines) \n",
@@ -935,7 +1110,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 ();
@@ -944,9 +1119,9 @@ tui_refresh_all_command (char *arg, int from_tty)
}
-/* Set the height of the specified window. */
+/* 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 ();
@@ -956,26 +1131,47 @@ tui_set_tab_width_command (char *arg, int from_tty)
ts = atoi (arg);
if (ts > 0)
- tui_set_default_tab_len (ts);
+ {
+ 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."));
}
}
-/* Set the height of the specified window. */
+/* 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)
{
- 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;
+ struct tui_win_info *win_info;
wname = buf_ptr;
buf_ptr = strchr (buf_ptr, ' ');
@@ -983,19 +1179,18 @@ tui_set_win_height (char *arg, int from_tty)
{
*buf_ptr = (char) 0;
- /*
- ** Validate the window name
- */
+ /* 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 == (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 */
+ /* Process the size. */
while (*(++buf_ptr) == ' ')
;
@@ -1021,10 +1216,9 @@ The window name specified must be valid and visible.\n"));
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
- */
+
+ /* 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"),
@@ -1040,64 +1234,24 @@ 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);
}
-/* Set the height of the specified window, with va_list. */
+/* 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, int new_height)
+tui_adjust_win_heights (struct tui_win_info *primary_win_info,
+ int new_height)
{
enum tui_status status = TUI_FAILURE;
@@ -1107,14 +1261,15 @@ tui_adjust_win_heights (struct tui_win_info * primary_win_info, int new_height)
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 ();
+ 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)
+ if (cur_layout == SRC_COMMAND
+ || cur_layout == DISASSEM_COMMAND)
{
- struct tui_win_info * src_win_info;
+ 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)
@@ -1151,11 +1306,10 @@ tui_adjust_win_heights (struct tui_win_info * primary_win_info, int new_height)
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.
- */
- int first_split_diff = diff / 2; /* subtract the locator */
+ { /* 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)
@@ -1174,7 +1328,8 @@ tui_adjust_win_heights (struct tui_win_info * primary_win_info, int new_height)
second_split_diff++;
}
}
- /* make sure that the minimum hieghts are honored */
+ /* Make sure that the minimum hieghts are
+ honored. */
while ((first_win->generic.height + first_split_diff) < 3)
{
first_split_diff++;
@@ -1189,21 +1344,22 @@ tui_adjust_win_heights (struct tui_win_info * primary_win_info, int 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);
+ 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 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)
@@ -1228,8 +1384,8 @@ tui_adjust_win_heights (struct tui_win_info * primary_win_info, int new_height)
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);
@@ -1247,12 +1403,14 @@ tui_adjust_win_heights (struct tui_win_info * primary_win_info, int new_height)
/* Function make the target window (and auxillary windows associated
- with the targer) invisible, and set the new height and location. */
+ 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)
+make_invisible_and_set_new_height (struct tui_win_info *win_info,
+ int height)
{
int i;
- struct tui_gen_win_info * gen_win_info;
+ struct tui_gen_win_info *gen_win_info;
tui_make_invisible (&win_info->generic);
win_info->generic.height = height;
@@ -1263,7 +1421,7 @@ make_invisible_and_set_new_height (struct tui_win_info * win_info, int height)
if (win_info != TUI_CMD_WIN)
win_info->generic.viewport_height--;
- /* Now deal with the auxillary windows associated with win_info */
+ /* Now deal with the auxillary windows associated with win_info. */
switch (win_info->generic.type)
{
case SRC_WIN:
@@ -1287,13 +1445,14 @@ make_invisible_and_set_new_height (struct tui_win_info * win_info, int height)
}
break;
case DATA_WIN:
- /* delete all data item windows */
+ /* 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 = (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 = (WINDOW *) NULL;
+ gen_win_info->handle = NULL;
}
break;
default:
@@ -1306,7 +1465,7 @@ make_invisible_and_set_new_height (struct tui_win_info * win_info, int height)
re-creating the windows' content since the window had to be
destroyed to be made invisible. */
static void
-make_visible_with_new_height (struct tui_win_info * win_info)
+make_visible_with_new_height (struct tui_win_info *win_info)
{
struct symtab *s;
@@ -1320,21 +1479,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;
@@ -1345,7 +1508,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))
{
@@ -1357,11 +1520,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;
@@ -1370,7 +1537,8 @@ make_visible_with_new_height (struct tui_win_info * win_info)
static int
-new_height_ok (struct tui_win_info * primary_win_info, int new_height)
+new_height_ok (struct tui_win_info *primary_win_info,
+ int new_height)
{
int ok = (new_height < tui_term_height ());
@@ -1382,15 +1550,15 @@ new_height_ok (struct tui_win_info * primary_win_info, int new_height)
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));
+ 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;
+ { /* Check the total height. */
+ struct tui_win_info *win_info;
if (primary_win_info == TUI_CMD_WIN)
win_info = (tui_source_windows ())->list[0];
@@ -1416,43 +1584,39 @@ new_height_ok (struct tui_win_info * primary_win_info, int new_height)
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.
- */
+ /* 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 */ ;
+ + TUI_CMD_WIN->generic.height + 1; /* Locator. */
if (primary_win_info == TUI_CMD_WIN)
{
- /* locator included since first & second win share a line */
+ /* 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);
+ (MIN_WIN_HEIGHT * 2)
+ && new_height >= MIN_CMD_WIN_HEIGHT);
if (ok)
{
- total_height = new_height + (first_win->generic.height +
- second_win->generic.height + diff);
+ 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
- */
+
+ /* 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
- */
+ { /* 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
@@ -1470,12 +1634,11 @@ new_height_ok (struct tui_win_info * primary_win_info, int new_height)
TUI_CMD_WIN->generic.height + diff;
}
}
- /*
- ** Now make sure that the proposed total height doesn't exceed
- ** the old total height.
- */
+ /* 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);
+ ok = (new_height >= min_height
+ && total_height <= cur_total_height);
}
}
@@ -1484,23 +1647,23 @@ new_height_ok (struct tui_win_info * primary_win_info, int new_height)
static void
-parse_scrolling_args (char *arg, struct tui_win_info * * win_to_scroll,
+parse_scrolling_args (const char *arg,
+ struct tui_win_info **win_to_scroll,
int *num_to_scroll)
{
if (num_to_scroll)
*num_to_scroll = 0;
*win_to_scroll = tui_win_with_focus ();
- /*
- ** First set up the default window to scroll, in case there is no
- ** window name arg
- */
+ /* First set up the default window to scroll, in case there is no
+ window name arg. */
if (arg != (char *) NULL)
{
- char *buf, *buf_ptr;
+ char *buf_ptr;
- /* process the number of lines to scroll */
- buf = buf_ptr = xstrdup (arg);
+ /* Process the number of lines to scroll. */
+ std::string copy = arg;
+ buf_ptr = ©[0];
if (isdigit (*buf_ptr))
{
char *num_str;
@@ -1518,33 +1681,34 @@ parse_scrolling_args (char *arg, struct tui_win_info * * win_to_scroll,
*num_to_scroll = atoi (num_str);
}
- /* process the window name if one is specified */
+ /* Process the window name if one is specified. */
if (buf_ptr != (char *) 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 ||
- !(*win_to_scroll)->generic.is_visible)
+ 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];
}
- xfree (buf);
}
}