espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-30 09:09:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Introduce tui_win_info::make_visible_with_new_height

Browse Source 
This changes make_visible_with_new_height to be a method on
tui_win_info, letting us remove a spot that checks the window type.

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

	* tui/tui-win.c (tui_source_window_base::update_tab_width): Call
	make_visible_with_new_height method.
	(tui_win_info::make_visible_with_new_height): New method.
	(tui_source_window_base::do_make_visible_with_new_height)
	(tui_data_window::do_make_visible_with_new_height)
	(tui_cmd_window::do_make_visible_with_new_height): New methods.
	(make_visible_with_new_height): Remove.
	(tui_resize_all, tui_adjust_win_heights): Use
	make_visible_with_new_height method.
	* tui/tui-data.h (struct tui_win_info)
	<do_make_visible_with_new_height, make_visible_with_new_height>:
	New methods.
	(struct tui_source_window_base, struct tui_data_window)
	(struct tui_cmd_window) <do_make_visible_with_new_height>: New
	methods.
This commit is contained in:
Tom Tromey
2019-06-17 21:11:56 -06:00
parent d83f1fe65d
commit 5fcee43a96
3 changed files with 105 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gdb/ChangeLog
View File

@ -1,3 +1,21 @@
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-win.c (tui_source_window_base::update_tab_width): Call
make_visible_with_new_height method.
(tui_win_info::make_visible_with_new_height): New method.
(tui_source_window_base::do_make_visible_with_new_height)
(tui_data_window::do_make_visible_with_new_height)
(tui_cmd_window::do_make_visible_with_new_height): New methods.
(make_visible_with_new_height): Remove.
(tui_resize_all, tui_adjust_win_heights): Use
make_visible_with_new_height method.
* tui/tui-data.h (struct tui_win_info)
<do_make_visible_with_new_height, make_visible_with_new_height>:
New methods.
(struct tui_source_window_base, struct tui_data_window)
(struct tui_cmd_window) <do_make_visible_with_new_height>: New
methods.
2019-06-25 Tom Tromey <tom@tromey.com> 2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-win.c (tui_source_window_base::update_tab_width): New * tui/tui-win.c (tui_source_window_base::update_tab_width): New

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

@ -273,6 +273,10 @@ protected:
left_scroll and right_scroll. */ left_scroll and right_scroll. */
virtual void do_scroll_horizontal (int num_to_scroll) = 0; virtual void do_scroll_horizontal (int num_to_scroll) = 0;
/* Called after make_visible_with_new_height sets the new height.
Should update the window. */
virtual void do_make_visible_with_new_height () = 0;
public: public:
~tui_win_info () override ~tui_win_info () override
@ -311,6 +315,9 @@ public:
{ {
} }
/* Make the window visible after the height has been changed. */
void make_visible_with_new_height ();
/* Set whether this window is highglighted. */ /* Set whether this window is highglighted. */
void set_highlight (bool highlight) void set_highlight (bool highlight)
{ {
@ -343,6 +350,7 @@ protected:
DISABLE_COPY_AND_ASSIGN (tui_source_window_base); DISABLE_COPY_AND_ASSIGN (tui_source_window_base);
void do_scroll_horizontal (int num_to_scroll) override; void do_scroll_horizontal (int num_to_scroll) override;
void do_make_visible_with_new_height () override;
public: public:
@ -465,6 +473,7 @@ protected:
void do_scroll_horizontal (int num_to_scroll) override void do_scroll_horizontal (int num_to_scroll) override
{ {
} }
void do_make_visible_with_new_height () override;
}; };
struct tui_cmd_window : public tui_win_info struct tui_cmd_window : public tui_win_info
@ -505,6 +514,8 @@ protected:
void do_scroll_horizontal (int num_to_scroll) override void do_scroll_horizontal (int num_to_scroll) override
{ {
} }
void do_make_visible_with_new_height () override;
}; };
extern int tui_win_is_auxillary (enum tui_win_type win_type); extern int tui_win_is_auxillary (enum tui_win_type win_type);

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

@ -55,7 +55,6 @@
/******************************* /*******************************
** Static Local Decls ** 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 *, static void make_invisible_and_set_new_height (struct tui_win_info *,
int); int);
static enum tui_status tui_adjust_win_heights (struct tui_win_info *, static enum tui_status tui_adjust_win_heights (struct tui_win_info *,
@ -616,8 +615,8 @@ tui_resize_all (void)
TUI_CMD_WIN->width += width_diff; TUI_CMD_WIN->width += width_diff;
new_height = screenheight - TUI_CMD_WIN->origin.y; new_height = screenheight - TUI_CMD_WIN->origin.y;
make_invisible_and_set_new_height (TUI_CMD_WIN, new_height); make_invisible_and_set_new_height (TUI_CMD_WIN, new_height);
make_visible_with_new_height (first_win); first_win->make_visible_with_new_height ();
make_visible_with_new_height (TUI_CMD_WIN); TUI_CMD_WIN->make_visible_with_new_height ();
if (first_win->content_size <= 0) if (first_win->content_size <= 0)
tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT); tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT);
break; break;
@ -678,9 +677,9 @@ tui_resize_all (void)
make_invisible_and_set_new_height (TUI_CMD_WIN, make_invisible_and_set_new_height (TUI_CMD_WIN,
TUI_CMD_WIN->height TUI_CMD_WIN->height
+ cmd_split_diff); + cmd_split_diff);
make_visible_with_new_height (first_win); first_win->make_visible_with_new_height ();
make_visible_with_new_height (second_win); second_win->make_visible_with_new_height ();
make_visible_with_new_height (TUI_CMD_WIN); TUI_CMD_WIN->make_visible_with_new_height ();
if (first_win->content_size <= 0) if (first_win->content_size <= 0)
tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT); tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT);
if (second_win->content_size <= 0) if (second_win->content_size <= 0)
@ -933,7 +932,7 @@ tui_source_window_base::update_tab_width ()
and redisplay of the window's contents, which will take and redisplay of the window's contents, which will take
the new tab width into account. */ the new tab width into account. */
make_invisible_and_set_new_height (this, height); make_invisible_and_set_new_height (this, height);
make_visible_with_new_height (this); make_visible_with_new_height ();
} }
/* After the tab width is set, call this to update the relevant /* After the tab width is set, call this to update the relevant
@ -1126,8 +1125,8 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info,
make_invisible_and_set_new_height (win_info, make_invisible_and_set_new_height (win_info,
win_info->height + diff); win_info->height + diff);
TUI_CMD_WIN->origin.y = locator->origin.y + 1; TUI_CMD_WIN->origin.y = locator->origin.y + 1;
make_visible_with_new_height (win_info); win_info->make_visible_with_new_height ();
make_visible_with_new_height (primary_win_info); primary_win_info->make_visible_with_new_height ();
if (src_win_info->content_size <= 0) if (src_win_info->content_size <= 0)
tui_erase_source_content (src_win_info, EMPTY_SOURCE_PROMPT); tui_erase_source_content (src_win_info, EMPTY_SOURCE_PROMPT);
} }
@ -1228,9 +1227,9 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info,
make_invisible_and_set_new_height (TUI_CMD_WIN, make_invisible_and_set_new_height (TUI_CMD_WIN,
TUI_CMD_WIN->height + diff); TUI_CMD_WIN->height + diff);
} }
make_visible_with_new_height (TUI_CMD_WIN); TUI_CMD_WIN->make_visible_with_new_height ();
make_visible_with_new_height (second_win); second_win->make_visible_with_new_height ();
make_visible_with_new_height (first_win); first_win->make_visible_with_new_height ();
if (first_win->content_size <= 0) if (first_win->content_size <= 0)
tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT); tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT);
if (second_win->content_size <= 0) if (second_win->content_size <= 0)
@ -1301,82 +1300,81 @@ make_invisible_and_set_new_height (struct tui_win_info *win_info,
} }
/* Function to make the windows with new heights visible. This means /* See tui-data.h. */
re-creating the windows' content since the window had to be
destroyed to be made invisible. */ void
static void tui_win_info::make_visible_with_new_height ()
make_visible_with_new_height (struct tui_win_info *win_info)
{ {
struct symtab *s; make_visible (true);
tui_check_and_display_highlight_if_needed (this);
do_make_visible_with_new_height ();
}
tui_make_visible (win_info); /* See tui-data.h. */
tui_check_and_display_highlight_if_needed (win_info);
tui_source_window_base *base; void
switch (win_info->type) tui_source_window_base::do_make_visible_with_new_height ()
{
tui_free_win_content (execution_info);
tui_make_visible (execution_info);
if (content != NULL)
{ {
case SRC_WIN: struct tui_line_or_address line_or_addr;
case DISASSEM_WIN: struct symtab_and_line cursal
base = (tui_source_window_base *) win_info; = get_current_source_symtab_and_line ();
tui_free_win_content (base->execution_info);
tui_make_visible (base->execution_info);
if (win_info->content != NULL)
{
struct gdbarch *gdbarch = base->gdbarch;
struct tui_line_or_address line_or_addr;
struct symtab_and_line cursal
= get_current_source_symtab_and_line ();
line_or_addr = base->start_line_or_addr; line_or_addr = start_line_or_addr;
tui_free_win_content (win_info); tui_free_win_content (this);
tui_update_source_window (base, gdbarch, tui_update_source_window (this, gdbarch,
cursal.symtab, line_or_addr, TRUE); cursal.symtab, line_or_addr, TRUE);
} }
else if (deprecated_safe_get_selected_frame () != NULL) else if (deprecated_safe_get_selected_frame () != NULL)
{ {
struct tui_line_or_address line; struct tui_line_or_address line;
struct symtab_and_line cursal struct symtab_and_line cursal
= get_current_source_symtab_and_line (); = get_current_source_symtab_and_line ();
struct frame_info *frame = deprecated_safe_get_selected_frame (); struct frame_info *frame = deprecated_safe_get_selected_frame ();
struct gdbarch *gdbarch = get_frame_arch (frame); struct gdbarch *gdbarch = get_frame_arch (frame);
s = find_pc_line_symtab (get_frame_pc (frame)); struct symtab *s = find_pc_line_symtab (get_frame_pc (frame));
if (win_info->type == SRC_WIN) if (type == SRC_WIN)
{
line.loa = LOA_LINE;
line.u.line_no = cursal.line;
}
else
{
line.loa = LOA_ADDRESS;
find_line_pc (s, cursal.line, &line.u.addr);
}
tui_update_source_window (base, gdbarch, s, line, TRUE);
}
if (win_info->has_locator ())
{ {
tui_make_visible (tui_locator_win_info_ptr ()); line.loa = LOA_LINE;
tui_show_locator_content (); line.u.line_no = cursal.line;
} }
break; else
case DATA_WIN: {
tui_display_all_data (); line.loa = LOA_ADDRESS;
break; find_line_pc (s, cursal.line, &line.u.addr);
case CMD_WIN: }
#ifdef HAVE_WRESIZE tui_update_source_window (this, gdbarch, s, line, TRUE);
wresize (TUI_CMD_WIN->handle, }
TUI_CMD_WIN->height, if (has_locator ())
TUI_CMD_WIN->width); {
#endif tui_make_visible (tui_locator_win_info_ptr ());
mvwin (TUI_CMD_WIN->handle, tui_show_locator_content ();
TUI_CMD_WIN->origin.y,
TUI_CMD_WIN->origin.x);
wmove (win_info->handle, 0, 0);
break;
default:
break;
} }
} }
/* See tui-data.h. */
void
tui_data_window::do_make_visible_with_new_height ()
{
tui_display_all_data ();
}
/* See tui-data.h. */
void
tui_cmd_window::do_make_visible_with_new_height ()
{
#ifdef HAVE_WRESIZE
wresize (handle, height, width);
#endif
mvwin (handle, origin.y, origin.x);
wmove (handle, 0, 0);
}
/* See tui-data.h. */ /* See tui-data.h. */