espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-07-24 01:51:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename the "reset" method to "resize"

Browse Source 
tui_gen_win_info::reset really just resizes the window.  This patch
renames it to reflect this.

gdb/ChangeLog
2019-08-15  Tom Tromey  <tom@tromey.com>

	* tui/tui-winsource.h (struct tui_source_window_base) <resize>:
	Rename from reset.
	* tui/tui-winsource.c (tui_source_window_base::resize): Rename.
	* tui/tui-layout.c (show_source_disasm_command, show_data):
	Update.
	(tui_gen_win_info::resize): Rename.
	(show_source_or_disasm_and_command): Update.
	* tui/tui-data.h (struct tui_gen_win_info) <resize>: Rename from
	reset.
This commit is contained in:
Tom Tromey
2019-07-06 17:32:45 -06:00
parent 46f438e3d5
commit ee556432c4
5 changed files with 59 additions and 47 deletions

12
gdb/ChangeLog

@ -1,3 +1,15 @@
2019-08-15 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.h (struct tui_source_window_base) <resize>:
Rename from reset.
* tui/tui-winsource.c (tui_source_window_base::resize): Rename.
* tui/tui-layout.c (show_source_disasm_command, show_data):
Update.
(tui_gen_win_info::resize): Rename.
(show_source_or_disasm_and_command): Update.
* tui/tui-data.h (struct tui_gen_win_info) <resize>: Rename from
reset.
2019-08-15 Tom Tromey <tom@tromey.com> 2019-08-15 Tom Tromey <tom@tromey.com>
* tui/tui-stack.c (tui_initialize_static_data): Remove. * tui/tui-stack.c (tui_initialize_static_data): Remove.

6
gdb/tui/tui-data.h

@ -62,10 +62,10 @@ public:
return ""; return "";
} }
/* Reset this window. The parameters are used to set the window's /* Resize this window. The parameters are used to set the window's
size and position. */ size and position. */
virtual void reset (int height, int width, virtual void resize (int height, int width,
int origin_x, int origin_y); int origin_x, int origin_y);
/* Return true if this can be boxed. */ /* Return true if this can be boxed. */
virtual bool can_box () const virtual bool can_box () const

74
gdb/tui/tui-layout.c

@ -510,10 +510,10 @@ show_source_disasm_command (void)
if (TUI_SRC_WIN == NULL) if (TUI_SRC_WIN == NULL)
tui_win_list[SRC_WIN] = new tui_source_window (); tui_win_list[SRC_WIN] = new tui_source_window ();
TUI_SRC_WIN->reset (src_height, TUI_SRC_WIN->resize (src_height,
tui_term_width (), tui_term_width (),
0, 0,
0); 0);
TUI_SRC_WIN->make_visible (true); TUI_SRC_WIN->make_visible (true);
TUI_SRC_WIN->m_has_locator = false; TUI_SRC_WIN->m_has_locator = false;
@ -523,15 +523,15 @@ show_source_disasm_command (void)
TUI_SRC_WIN->show_source_content (); TUI_SRC_WIN->show_source_content ();
if (TUI_DISASM_WIN == NULL) if (TUI_DISASM_WIN == NULL)
tui_win_list[DISASSEM_WIN] = new tui_disasm_window (); tui_win_list[DISASSEM_WIN] = new tui_disasm_window ();
TUI_DISASM_WIN->reset (asm_height, TUI_DISASM_WIN->resize (asm_height,
tui_term_width (), tui_term_width (),
0, 0,
src_height - 1); src_height - 1);
TUI_DISASM_WIN->make_visible (true); TUI_DISASM_WIN->make_visible (true);
locator->reset (2 /* 1 */ , locator->resize (2 /* 1 */ ,
tui_term_width (), tui_term_width (),
0, 0,
(src_height + asm_height) - 1); (src_height + asm_height) - 1);
TUI_SRC_WIN->m_has_locator = false; TUI_SRC_WIN->m_has_locator = false;
TUI_DISASM_WIN->m_has_locator = true; TUI_DISASM_WIN->m_has_locator = true;
locator->make_visible (true); locator->make_visible (true);
@ -540,10 +540,10 @@ show_source_disasm_command (void)
if (TUI_CMD_WIN == NULL) if (TUI_CMD_WIN == NULL)
tui_win_list[CMD_WIN] = new tui_cmd_window (); tui_win_list[CMD_WIN] = new tui_cmd_window ();
TUI_CMD_WIN->reset (cmd_height, TUI_CMD_WIN->resize (cmd_height,
tui_term_width (), tui_term_width (),
0, 0,
tui_term_height () - cmd_height); tui_term_height () - cmd_height);
TUI_CMD_WIN->make_visible (true); TUI_CMD_WIN->make_visible (true);
current_layout = SRC_DISASSEM_COMMAND; current_layout = SRC_DISASSEM_COMMAND;
} }
@ -565,7 +565,7 @@ show_data (enum tui_layout_type new_layout)
src_height = total_height - data_height; src_height = total_height - data_height;
if (tui_win_list[DATA_WIN] == nullptr) if (tui_win_list[DATA_WIN] == nullptr)
tui_win_list[DATA_WIN] = new tui_data_window (); tui_win_list[DATA_WIN] = new tui_data_window ();
tui_win_list[DATA_WIN]->reset (data_height, tui_term_width (), 0, 0); tui_win_list[DATA_WIN]->resize (data_height, tui_term_width (), 0, 0);
tui_win_list[DATA_WIN]->make_visible (true); tui_win_list[DATA_WIN]->make_visible (true);
if (new_layout == SRC_DATA_COMMAND) if (new_layout == SRC_DATA_COMMAND)
@ -583,14 +583,14 @@ show_data (enum tui_layout_type new_layout)
tui_source_window_base *base tui_source_window_base *base
= (tui_source_window_base *) tui_win_list[win_type]; = (tui_source_window_base *) tui_win_list[win_type];
tui_win_list[win_type]->reset (src_height, tui_win_list[win_type]->resize (src_height,
tui_term_width (), tui_term_width (),
0, 0,
data_height - 1); data_height - 1);
locator->reset (2 /* 1 */ , locator->resize (2 /* 1 */ ,
tui_term_width (), tui_term_width (),
0, 0,
total_height - 1); total_height - 1);
base->make_visible (true); base->make_visible (true);
base->m_has_locator = true; base->m_has_locator = true;
locator->make_visible (true); locator->make_visible (true);
@ -601,8 +601,8 @@ show_data (enum tui_layout_type new_layout)
} }
void void
tui_gen_win_info::reset (int height_, int width_, tui_gen_win_info::resize (int height_, int width_,
int origin_x_, int origin_y_) int origin_x_, int origin_y_)
{ {
int h = height_; int h = height_;
@ -648,14 +648,14 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type)
win_info = TUI_DISASM_WIN; win_info = TUI_DISASM_WIN;
} }
locator->reset (2 /* 1 */ , locator->resize (2 /* 1 */ ,
tui_term_width (),
0,
src_height - 1);
win_info->reset (src_height - 1,
tui_term_width (), tui_term_width (),
0, 0,
0); src_height - 1);
win_info->resize (src_height - 1,
tui_term_width (),
0,
0);
win_info->make_visible (true); win_info->make_visible (true);
@ -666,10 +666,10 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type)
if (TUI_CMD_WIN == NULL) if (TUI_CMD_WIN == NULL)
tui_win_list[CMD_WIN] = new tui_cmd_window (); tui_win_list[CMD_WIN] = new tui_cmd_window ();
TUI_CMD_WIN->reset (cmd_height, TUI_CMD_WIN->resize (cmd_height,
tui_term_width (), tui_term_width (),
0, 0,
src_height); src_height);
TUI_CMD_WIN->make_visible (true); TUI_CMD_WIN->make_visible (true);
current_layout = layout_type; current_layout = layout_type;
} }

10
gdb/tui/tui-winsource.c

@ -291,12 +291,12 @@ tui_source_window_base::~tui_source_window_base ()
} }
void void
tui_source_window_base::reset (int height, int width, tui_source_window_base::resize (int height, int width,
int origin_x, int origin_y) int origin_x, int origin_y)
{ {
tui_gen_win_info::reset (height, width - 3, tui_gen_win_info::resize (height, width - 3,
origin_x + 3, origin_y); origin_x + 3, origin_y);
execution_info->reset (height, 3, origin_x, origin_y); execution_info->resize (height, 3, origin_x, origin_y);
} }
/* See tui-data.h. */ /* See tui-data.h. */

4
gdb/tui/tui-winsource.h

@ -124,8 +124,8 @@ public:
virtual bool location_matches_p (struct bp_location *loc, int line_no) = 0; virtual bool location_matches_p (struct bp_location *loc, int line_no) = 0;
void reset (int height, int width, void resize (int height, int width,
int origin_x, int origin_y) override; int origin_x, int origin_y) override;
void show_source_content (); void show_source_content ();