mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-15 04:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Introduce has_locator method

Browse Source 
This changes tui_win_has_locator to be a method on tui_win_info, and
changes the locator code to use bool rather than int.

gdb/ChangeLog
2019-06-25  Tom Tromey  <tom@tromey.com>

	* tui/tui-win.c (make_invisible_and_set_new_height)
	(make_visible_with_new_height): Call has_locator method.
	* tui/tui-layout.c (show_source_disasm_command, show_data)
	(show_source_or_disasm_and_command): Update for bool change.
	* tui/tui-data.h (struct tui_source_info) <has_locator>: Now bool.
	(tui_win_info) <has_locator>: New method.
	(struct tui_source_window_base) <has_locator>: New method.
	(tui_win_has_locator): Don't declare.
	* tui/tui-data.c (tui_source_window_base::has_locator): Rename
	from tui_win_has_locator.
	(tui_source_window_base): Use false, not FALSE.
This commit is contained in:
Tom Tromey 2019-06-16 11:37:49 -06:00
parent 7778b9128f
commit 44f0e208eb
5 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gdb/ChangeLog
View File

@ -1,3 +1,17 @@
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-win.c (make_invisible_and_set_new_height)
(make_visible_with_new_height): Call has_locator method.
* tui/tui-layout.c (show_source_disasm_command, show_data)
(show_source_or_disasm_and_command): Update for bool change.
* tui/tui-data.h (struct tui_source_info) <has_locator>: Now bool.
(tui_win_info) <has_locator>: New method.
(struct tui_source_window_base) <has_locator>: New method.
(tui_win_has_locator): Don't declare.
* tui/tui-data.c (tui_source_window_base::has_locator): Rename
from tui_win_has_locator.
(tui_source_window_base): Use false, not FALSE.
2019-06-25 Tom Tromey <tom@tromey.com> 2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-data.h (tui_clear_win_detail): Don't declare. * tui/tui-data.h (tui_clear_win_detail): Don't declare.

11
gdb/tui/tui-data.c
View File

@ -75,11 +75,12 @@ tui_win_is_auxillary (enum tui_win_type win_type)
return (win_type > MAX_MAJOR_WINDOWS); return (win_type > MAX_MAJOR_WINDOWS);
} }
int /* See tui-data.h. */
tui_win_has_locator (struct tui_win_info *win_info)
bool
tui_source_window_base::has_locator () const
{ {
return (win_info != NULL return detail.source_info.has_locator;
&& win_info->detail.source_info.has_locator);
} }
void void
@ -499,7 +500,7 @@ tui_source_window_base::tui_source_window_base (enum tui_win_type type)
{ {
gdb_assert (type == SRC_WIN || type == DISASSEM_WIN); gdb_assert (type == SRC_WIN || type == DISASSEM_WIN);
detail.source_info.execution_info = NULL; detail.source_info.execution_info = NULL;
detail.source_info.has_locator = FALSE; detail.source_info.has_locator = false;
detail.source_info.horizontal_offset = 0; detail.source_info.horizontal_offset = 0;
detail.source_info.gdbarch = NULL; detail.source_info.gdbarch = NULL;
detail.source_info.start_line_or_addr.loa = LOA_ADDRESS; detail.source_info.start_line_or_addr.loa = LOA_ADDRESS;

13
gdb/tui/tui-data.h
View File

@ -240,7 +240,8 @@ struct tui_data_info
struct tui_source_info struct tui_source_info
{ {
int has_locator; /* Does locator belongs to this window? */ /* Does the locator belong to this window? */
bool has_locator;
/* Execution information window. */ /* Execution information window. */
struct tui_gen_win_info *execution_info; struct tui_gen_win_info *execution_info;
int horizontal_offset; /* Used for horizontal scroll. */ int horizontal_offset; /* Used for horizontal scroll. */
@ -285,6 +286,12 @@ struct tui_win_info
/* Clear the pertinent detail in the window. */ /* Clear the pertinent detail in the window. */
virtual void clear_detail () = 0; virtual void clear_detail () = 0;
/* Return true if this window has the locator. */
virtual bool has_locator () const
{
return false;
}
/* Methods to scroll the contents of this window. Note that they /* Methods to scroll the contents of this window. Note that they
are named with "_scroll" coming at the end because the more are named with "_scroll" coming at the end because the more
obvious "scroll_forward" is defined as a macro in term.h. */ obvious "scroll_forward" is defined as a macro in term.h. */
@ -325,6 +332,9 @@ struct tui_source_window_base : public tui_win_info
public: public:
void clear_detail () override; void clear_detail () override;
/* Return true if this window has the locator. */
bool has_locator () const override;
}; };
/* A TUI source window. */ /* A TUI source window. */
@ -401,7 +411,6 @@ struct tui_cmd_window : public tui_win_info
extern int tui_win_is_source_type (enum tui_win_type win_type); extern int tui_win_is_source_type (enum tui_win_type win_type);
extern int tui_win_is_auxillary (enum tui_win_type win_type); extern int tui_win_is_auxillary (enum tui_win_type win_type);
extern int tui_win_has_locator (struct tui_win_info *win_info);
extern void tui_set_win_highlight (struct tui_win_info *win_info, extern void tui_set_win_highlight (struct tui_win_info *win_info,
int highlight); int highlight);

14
gdb/tui/tui-layout.c
View File

@ -640,7 +640,7 @@ show_source_disasm_command (void)
0); 0);
tui_make_visible (&TUI_SRC_WIN->generic); tui_make_visible (&TUI_SRC_WIN->generic);
tui_make_visible (TUI_SRC_WIN->detail.source_info.execution_info); tui_make_visible (TUI_SRC_WIN->detail.source_info.execution_info);
TUI_SRC_WIN->detail.source_info.has_locator = FALSE;; TUI_SRC_WIN->detail.source_info.has_locator = false;
} }
struct tui_gen_win_info *locator = tui_locator_win_info_ptr (); struct tui_gen_win_info *locator = tui_locator_win_info_ptr ();
@ -667,7 +667,7 @@ show_source_disasm_command (void)
tui_term_width (), tui_term_width (),
0, 0,
(src_height + asm_height) - 1); (src_height + asm_height) - 1);
TUI_DISASM_WIN->detail.source_info.has_locator = TRUE; TUI_DISASM_WIN->detail.source_info.has_locator = true;
init_gen_win_info (&TUI_DISASM_WIN->generic, init_gen_win_info (&TUI_DISASM_WIN->generic,
TUI_DISASM_WIN->generic.type, TUI_DISASM_WIN->generic.type,
asm_height, asm_height,
@ -684,8 +684,8 @@ show_source_disasm_command (void)
tui_make_visible (&TUI_DISASM_WIN->generic); tui_make_visible (&TUI_DISASM_WIN->generic);
tui_make_visible (TUI_DISASM_WIN->detail.source_info.execution_info); tui_make_visible (TUI_DISASM_WIN->detail.source_info.execution_info);
} }
TUI_SRC_WIN->detail.source_info.has_locator = FALSE; TUI_SRC_WIN->detail.source_info.has_locator = false;
TUI_DISASM_WIN->detail.source_info.has_locator = TRUE; TUI_DISASM_WIN->detail.source_info.has_locator = true;
tui_make_visible (locator); tui_make_visible (locator);
tui_show_locator_content (); tui_show_locator_content ();
tui_show_source_content (TUI_DISASM_WIN); tui_show_source_content (TUI_DISASM_WIN);
@ -772,7 +772,7 @@ show_data (enum tui_layout_type new_layout)
0, 0,
total_height - 1); total_height - 1);
} }
tui_win_list[win_type]->detail.source_info.has_locator = TRUE; tui_win_list[win_type]->detail.source_info.has_locator = true;
tui_make_visible (locator); tui_make_visible (locator);
tui_show_locator_content (); tui_show_locator_content ();
tui_add_to_source_windows (tui_win_list[win_type]); tui_add_to_source_windows (tui_win_list[win_type]);
@ -924,7 +924,7 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type)
tui_term_width (), tui_term_width (),
0, 0,
src_height - 1); src_height - 1);
(*win_info_ptr)->detail.source_info.has_locator = TRUE; (*win_info_ptr)->detail.source_info.has_locator = true;
init_gen_win_info (&(*win_info_ptr)->generic, init_gen_win_info (&(*win_info_ptr)->generic,
(*win_info_ptr)->generic.type, (*win_info_ptr)->generic.type,
src_height - 1, src_height - 1,
@ -943,7 +943,7 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type)
} }
if ((*win_info_ptr) != NULL) if ((*win_info_ptr) != NULL)
{ {
(*win_info_ptr)->detail.source_info.has_locator = TRUE; (*win_info_ptr)->detail.source_info.has_locator = true;
tui_make_visible (locator); tui_make_visible (locator);
tui_show_locator_content (); tui_show_locator_content ();
tui_show_source_content (*win_info_ptr); tui_show_source_content (*win_info_ptr);

4
gdb/tui/tui-win.c
View File

@ -1283,7 +1283,7 @@ make_invisible_and_set_new_height (struct tui_win_info *win_info,
if (win_info != TUI_CMD_WIN) if (win_info != TUI_CMD_WIN)
gen_win_info->viewport_height--; gen_win_info->viewport_height--;
if (tui_win_has_locator (win_info)) if (win_info->has_locator ())
{ {
gen_win_info = tui_locator_win_info_ptr (); gen_win_info = tui_locator_win_info_ptr ();
tui_make_invisible (gen_win_info); tui_make_invisible (gen_win_info);
@ -1355,7 +1355,7 @@ make_visible_with_new_height (struct tui_win_info *win_info)
} }
tui_update_source_window (win_info, gdbarch, s, line, TRUE); tui_update_source_window (win_info, gdbarch, s, line, TRUE);
} }
if (tui_win_has_locator (win_info)) if (win_info->has_locator ())
{ {
tui_make_visible (tui_locator_win_info_ptr ()); tui_make_visible (tui_locator_win_info_ptr ());
tui_show_locator_content (); tui_show_locator_content ();