From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 26/66] Introduce set_new_height method
Date: Sun, 23 Jun 2019 22:44:00 -0000 [thread overview]
Message-ID: <20190623224329.16060-27-tom@tromey.com> (raw)
In-Reply-To: <20190623224329.16060-1-tom@tromey.com>
This introduces tui_win_info::set_new_height and implements it in the
subclasses as appropriate. This removes another switch on the window
type.
gdb/ChangeLog
2019-06-23 Tom Tromey <tom@tromey.com>
* tui/tui-win.c (tui_source_window_base::set_new_height)
(tui_data_window::set_new_height): New methods.
(make_invisible_and_set_new_height): Call set_new_height method.
* tui/tui-data.h (struct tui_win_info)
(struct tui_source_window_base, struct tui_data_window)
<set_new_height>: New method.
---
gdb/ChangeLog | 9 ++++++
gdb/tui/tui-data.h | 10 ++++++
gdb/tui/tui-win.c | 78 ++++++++++++++++++++++------------------------
3 files changed, 57 insertions(+), 40 deletions(-)
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index e838c0e1622..e0d94d645be 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -267,6 +267,12 @@ public:
{
}
+ /* Called after a TUI window is given a new height; this updates any
+ related auxiliary windows. */
+ virtual void set_new_height (int height)
+ {
+ }
+
/* Methods to scroll the contents of this window. Note that they
are named with "_scroll" coming at the end because the more
obvious "scroll_forward" is defined as a macro in term.h. */
@@ -318,6 +324,8 @@ public:
/* Set the location of the execution point. */
void set_is_exec_point_at (struct tui_line_or_address l);
+ void set_new_height (int height) override;
+
/* Does locator belongs to this window? */
bool m_has_locator = false;
/* Execution information window. */
@@ -380,6 +388,8 @@ struct tui_data_window : public tui_win_info
void clear_detail () override;
void refresh_all () override;
+ void set_new_height (int height) override;
+
/* Start of data display content. */
tui_win_content data_content = NULL;
int data_content_count = 0;
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 383487e5f7a..fe1e901c741 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -1242,6 +1242,43 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info,
}
+/* See tui-data.h. */
+
+void
+tui_source_window_base::set_new_height (int height)
+{
+ tui_make_invisible (execution_info);
+ execution_info->height = height;
+ execution_info->origin.y = generic.origin.y;
+ if (height > 1)
+ execution_info->viewport_height = height - 1;
+ else
+ execution_info->viewport_height = height;
+ execution_info->viewport_height--;
+
+ if (has_locator ())
+ {
+ tui_gen_win_info *gen_win_info = tui_locator_win_info_ptr ();
+ tui_make_invisible (gen_win_info);
+ gen_win_info->origin.y = generic.origin.y + height;
+ }
+}
+
+/* See tui-data.h. */
+
+void
+tui_data_window::set_new_height (int height)
+{
+ /* Delete all data item windows. */
+ for (int i = 0; i < generic.content_size; i++)
+ {
+ struct tui_gen_win_info *gen_win_info
+ = &generic.content[i]->which_element.data_window;
+ tui_delete_win (gen_win_info->handle);
+ gen_win_info->handle = NULL;
+ }
+}
+
/* Function make the target window (and auxillary windows associated
with the targer) invisible, and set the new height and
location. */
@@ -1249,9 +1286,6 @@ static void
make_invisible_and_set_new_height (struct tui_win_info *win_info,
int height)
{
- int i;
- struct tui_gen_win_info *gen_win_info;
-
tui_make_invisible (&win_info->generic);
win_info->generic.height = height;
if (height > 1)
@@ -1262,43 +1296,7 @@ make_invisible_and_set_new_height (struct tui_win_info *win_info,
win_info->generic.viewport_height--;
/* Now deal with the auxillary windows associated with win_info. */
- tui_source_window_base *base;
- switch (win_info->generic.type)
- {
- case SRC_WIN:
- case DISASSEM_WIN:
- base = (tui_source_window_base *) win_info;
- gen_win_info = base->execution_info;
- tui_make_invisible (gen_win_info);
- gen_win_info->height = height;
- gen_win_info->origin.y = win_info->generic.origin.y;
- if (height > 1)
- gen_win_info->viewport_height = height - 1;
- else
- gen_win_info->viewport_height = height;
- if (win_info != TUI_CMD_WIN)
- gen_win_info->viewport_height--;
-
- if (win_info->has_locator ())
- {
- gen_win_info = tui_locator_win_info_ptr ();
- tui_make_invisible (gen_win_info);
- gen_win_info->origin.y = win_info->generic.origin.y + height;
- }
- break;
- case DATA_WIN:
- /* Delete all data item windows. */
- for (i = 0; i < win_info->generic.content_size; i++)
- {
- gen_win_info
- = &win_info->generic.content[i]->which_element.data_window;
- tui_delete_win (gen_win_info->handle);
- gen_win_info->handle = NULL;
- }
- break;
- default:
- break;
- }
+ win_info->set_new_height (height);
}
--
2.17.2
next prev parent reply other threads:[~2019-06-23 22:44 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-23 22:43 [PATCH 00/66] Clean up the TUI Tom Tromey
2019-06-23 22:43 ` [PATCH 12/66] Don't use TUI_DISASM_WIN in tui_disasm_window method Tom Tromey
2019-06-23 22:43 ` [PATCH 08/66] Remove tui_list Tom Tromey
2019-06-24 14:12 ` Pedro Alves
2019-06-24 15:12 ` Ruslan Kabatsayev
2019-06-24 16:05 ` Pedro Alves
2019-06-24 20:47 ` Tom Tromey
2019-06-23 22:43 ` [PATCH 01/66] Use new and delete for TUI windows Tom Tromey
2019-06-23 22:43 ` [PATCH 13/66] Remove tui_clear_win_detail Tom Tromey
2019-06-23 22:43 ` [PATCH 10/66] Create tui_disasm_window Tom Tromey
2019-06-23 22:43 ` [PATCH 05/66] Simplify command window creation Tom Tromey
2019-06-23 22:44 ` [PATCH 17/66] Remove struct tui_data_info Tom Tromey
2019-06-23 22:44 ` [PATCH 02/66] Add destructor to tui_win_info Tom Tromey
2019-06-23 22:44 ` [PATCH 09/66] Split the tui_win_info destructor Tom Tromey
2019-06-23 22:44 ` [PATCH 04/66] Remove an unnecessary NULL check from the TUI Tom Tromey
2019-06-23 22:44 ` [PATCH 25/66] Introduce the refresh_all method Tom Tromey
2019-06-23 22:44 ` [PATCH 21/66] Introduce make_visible method Tom Tromey
2019-06-23 22:44 ` Tom Tromey [this message]
2019-06-23 22:44 ` [PATCH 24/66] Introduce two TUI source window methods Tom Tromey
2019-06-23 22:44 ` [PATCH 27/66] Introduce max_height method Tom Tromey
2019-06-23 22:44 ` [PATCH 16/66] Remove struct tui_command_info Tom Tromey
2019-06-23 22:44 ` [PATCH 06/66] Simplify source and disassembly window creation Tom Tromey
2019-06-23 22:44 ` [PATCH 22/66] Use bool for visibility Tom Tromey
2019-06-23 22:44 ` [PATCH 14/66] Introduce has_locator method Tom Tromey
2019-06-24 14:13 ` Pedro Alves
2019-06-24 20:50 ` Tom Tromey
2019-06-23 22:44 ` [PATCH 28/66] Remove redundant check from make_visible Tom Tromey
2019-06-23 22:44 ` [PATCH 19/66] Inline constructors and initializers Tom Tromey
2019-06-23 22:44 ` [PATCH 18/66] Change tui_data_window::display_regs to bool Tom Tromey
2019-06-23 22:44 ` [PATCH 15/66] Remove struct tui_source_info Tom Tromey
2019-06-23 22:44 ` [PATCH 20/66] Remove an unneeded NULL check Tom Tromey
2019-06-23 22:44 ` [PATCH 23/66] Introduce the refresh method Tom Tromey
2019-06-23 22:44 ` [PATCH 03/66] Create subclasses for different window types Tom Tromey
2019-06-24 22:21 ` Pedro Alves
2019-06-25 13:51 ` Tom Tromey
2019-06-23 22:44 ` [PATCH 11/66] Introduce methods for scrolling Tom Tromey
2019-06-23 22:44 ` [PATCH 07/66] Introduce tui_win_info::clear_detail method Tom Tromey
2019-06-23 22:44 ` [PATCH 29/66] Introduce set_highlight method Tom Tromey
2019-06-23 23:25 ` [PATCH 45/66] Introduce tui_win_info::update_tab_width Tom Tromey
2019-06-23 23:25 ` [PATCH 34/66] Change tui_update_source_window for better type safety Tom Tromey
2019-06-23 23:25 ` [PATCH 35/66] Introduce tui_gen_win_info::name method Tom Tromey
2019-06-23 23:25 ` [PATCH 40/66] Remove tui_scroll_direction enum Tom Tromey
2019-06-24 14:13 ` Pedro Alves
2019-06-24 20:51 ` Tom Tromey
2019-06-23 23:25 ` [PATCH 41/66] Move make_visible method to tui_gen_win_info Tom Tromey
2019-06-23 23:25 ` [PATCH 42/66] Introduce tui_gen_win_info::reset method Tom Tromey
2019-06-23 23:26 ` [PATCH 33/66] Introduce refresh_window method Tom Tromey
2019-06-23 23:26 ` [PATCH 39/66] Change more TUI functions to take a tui_source_window_base Tom Tromey
2019-06-23 23:26 ` [PATCH 30/66] Change tui_which_element::data_window to be a pointer Tom Tromey
2019-06-23 23:26 ` [PATCH 37/66] Remove NULL check from tui_set_exec_info_content Tom Tromey
2019-06-23 23:26 ` [PATCH 36/66] Change tui_alloc_source_buffer return type to void Tom Tromey
2019-06-23 23:26 ` [PATCH 46/66] Introduce tui_win_info::make_visible_with_new_height Tom Tromey
2019-06-23 23:26 ` [PATCH 43/66] Remove some TUI static allocations Tom Tromey
2019-06-23 23:26 ` [PATCH 38/66] Change tui_set_exec_info_content to return void Tom Tromey
2019-06-23 23:26 ` [PATCH 32/66] Derive tui_win_info from tui_gen_win_info Tom Tromey
2019-06-23 23:26 ` [PATCH 44/66] Introduce enum tui_box Tom Tromey
2019-06-23 23:26 ` [PATCH 47/66] Don't check window type in tui_set_win_focus_to Tom Tromey
2019-06-23 23:26 ` [PATCH 31/66] Use new and delete for tui_gen_win_info Tom Tromey
2019-06-23 23:26 ` [PATCH 49/66] Separate out execution-info window Tom Tromey
2019-06-24 14:13 ` Pedro Alves
2019-06-24 20:52 ` Tom Tromey
2019-06-23 23:26 ` [PATCH 48/66] Remove tui_alloc_win_info Tom Tromey
2019-06-24 14:23 ` [PATCH 00/66] Clean up the TUI Pedro Alves
2019-06-24 16:47 ` Tom Tromey
2019-06-24 17:46 ` Pedro Alves
2019-06-24 18:54 ` Tom Tromey
2019-06-24 22:23 ` Pedro Alves
2019-06-25 13:51 ` Tom Tromey
2019-06-24 18:49 ` [PATCH 50/66] Separate out locator window Tom Tromey
2019-06-24 18:48 ` [PATCH 53/66] Remove two unused enum constants from tui_win_type Tom Tromey
2019-06-24 18:48 ` [PATCH 55/66] Remove tui_init_generic_part Tom Tromey
2019-06-24 18:49 ` [PATCH 59/66] Fix "auxiliary" typo Tom Tromey
2019-06-24 18:49 ` [PATCH 56/66] Turn tui_first_data_item_displayed into a method Tom Tromey
2019-06-24 18:49 ` [PATCH 63/66] Remove NULL checks before xfree Tom Tromey
2019-06-24 18:49 ` [PATCH 60/66] Use bool for is_exec_point Tom Tromey
2019-06-24 18:49 ` [PATCH 58/66] Separate out data window Tom Tromey
2019-06-24 18:49 ` [PATCH 54/66] Separate out data item window Tom Tromey
2019-06-24 18:49 ` [PATCH 52/66] Remove command from tui_which_element Tom Tromey
2019-06-24 18:49 ` [PATCH 62/66] Remove union tui_which_element Tom Tromey
2019-06-24 18:49 ` [PATCH 65/66] Make tui_gen_win_info constructor protected Tom Tromey
2019-06-24 18:49 ` [PATCH 57/66] Remove "data_content" and "data_content_count" from TUI data window Tom Tromey
2019-06-24 18:49 ` [PATCH 64/66] Fix latent bug in set_is_exec_point_at Tom Tromey
2019-06-24 18:49 ` [PATCH 61/66] More type safety for TUI source window functions Tom Tromey
2019-06-24 18:49 ` [PATCH 66/66] Tidy tui_delete_win Tom Tromey
2019-06-24 18:49 ` [PATCH 51/66] Remove layout_def::split Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190623224329.16060-27-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox