From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 22/66] Use bool for visibility
Date: Sun, 23 Jun 2019 22:44:00 -0000 [thread overview]
Message-ID: <20190623224329.16060-23-tom@tromey.com> (raw)
In-Reply-To: <20190623224329.16060-1-tom@tromey.com>
This changes the visibility-related functions and data members in the
TUI to use bool rather than int.
gdb/ChangeLog
2019-06-23 Tom Tromey <tom@tromey.com>
* tui/tui.h (tui_is_window_visible): Return bool.
* tui/tui.c (tui_is_window_visible): Return bool.
* tui/tui-wingeneral.c (tui_make_window, make_visible)
(tui_make_visible, tui_make_invisible)
(tui_win_info::make_visible)
(tui_source_window_base::make_visible, make_all_visible)
(tui_make_all_visible, tui_make_all_invisible): Update.
* tui/tui-windata.c (tui_delete_data_content_windows): Update.
* tui/tui-data.h (struct tui_gen_win_info) <is_visible>: Now
bool.
(struct tui_win_info, struct tui_source_window_base)
(struct tui_cmd_window) <make_visible>: Change parameter to bool.
* tui/tui-data.c (tui_init_generic_part): Update.
---
gdb/ChangeLog | 16 ++++++++++++++++
gdb/tui/tui-data.c | 4 ++--
gdb/tui/tui-data.h | 8 ++++----
gdb/tui/tui-windata.c | 2 +-
gdb/tui/tui-wingeneral.c | 22 +++++++++++-----------
gdb/tui/tui.c | 6 +++---
gdb/tui/tui.h | 2 +-
7 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index 39381ea0859..89f65bf974f 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -420,8 +420,8 @@ tui_init_generic_part (struct tui_gen_win_info *win)
win->last_visible_line = 0;
win->handle = NULL;
win->content = NULL;
- win->content_in_use =
- win->is_visible = FALSE;
+ win->content_in_use = FALSE;
+ win->is_visible = false;
win->title = 0;
}
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 249f3cc81f4..34de67757b0 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -49,7 +49,7 @@ struct tui_gen_win_info
int content_in_use; /* Can it be used, or is it already used? */
int viewport_height; /* Viewport height. */
int last_visible_line; /* Index of last visible line. */
- int is_visible; /* Whether the window is visible or not. */
+ bool is_visible; /* Whether the window is visible or not. */
char *title; /* Window title to display. */
};
@@ -256,7 +256,7 @@ public:
}
/* Make this window visible or invisible. */
- virtual void make_visible (int visible);
+ virtual void make_visible (bool visible);
/* Methods to scroll the contents of this window. Note that they
are named with "_scroll" coming at the end because the more
@@ -298,7 +298,7 @@ public:
return m_has_locator;
}
- void make_visible (int visible) override;
+ void make_visible (bool visible) override;
/* Does locator belongs to this window? */
bool m_has_locator = false;
@@ -393,7 +393,7 @@ struct tui_cmd_window : public tui_win_info
void clear_detail () override;
- void make_visible (int visible) override
+ void make_visible (bool visible) override
{
}
diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c
index a0f20c309e1..67228a6c5ee 100644
--- a/gdb/tui/tui-windata.c
+++ b/gdb/tui/tui-windata.c
@@ -78,7 +78,7 @@ tui_delete_data_content_windows (void)
= &TUI_DATA_WIN->generic.content[i]->which_element.data_window;
tui_delete_win (data_item_win_ptr->handle);
data_item_win_ptr->handle = NULL;
- data_item_win_ptr->is_visible = FALSE;
+ data_item_win_ptr->is_visible = false;
}
}
diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index 1308437befd..e802e52ca5b 100644
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -161,7 +161,7 @@ tui_make_window (struct tui_gen_win_info *win_info, int box_it)
{
if (box_it == BOX_WINDOW)
box_win (win_info, NO_HILITE);
- win_info->is_visible = TRUE;
+ win_info->is_visible = true;
scrollok (handle, TRUE);
}
}
@@ -171,7 +171,7 @@ tui_make_window (struct tui_gen_win_info *win_info, int box_it)
delete the entire window when making it visible, and create it
again when making it visible. */
static void
-make_visible (struct tui_gen_win_info *win_info, int visible)
+make_visible (struct tui_gen_win_info *win_info, bool visible)
{
/* Don't tear down/recreate command window. */
if (win_info->type == CMD_WIN)
@@ -184,14 +184,14 @@ make_visible (struct tui_gen_win_info *win_info, int visible)
tui_make_window (win_info,
(win_info->type != CMD_WIN
&& !tui_win_is_auxillary (win_info->type)));
- win_info->is_visible = TRUE;
+ win_info->is_visible = true;
}
}
else if (!visible
&& win_info->is_visible
&& win_info->handle != NULL)
{
- win_info->is_visible = FALSE;
+ win_info->is_visible = false;
tui_delete_win (win_info->handle);
win_info->handle = NULL;
}
@@ -202,19 +202,19 @@ make_visible (struct tui_gen_win_info *win_info, int visible)
void
tui_make_visible (struct tui_gen_win_info *win_info)
{
- make_visible (win_info, 1);
+ make_visible (win_info, true);
}
void
tui_make_invisible (struct tui_gen_win_info *win_info)
{
- make_visible (win_info, 0);
+ make_visible (win_info, false);
}
/* See tui-data.h. */
void
-tui_win_info::make_visible (int visible)
+tui_win_info::make_visible (bool visible)
{
::make_visible (&generic, visible);
}
@@ -222,7 +222,7 @@ tui_win_info::make_visible (int visible)
/* See tui-data.h. */
void
-tui_source_window_base::make_visible (int visible)
+tui_source_window_base::make_visible (bool visible)
{
::make_visible (execution_info, visible);
tui_win_info::make_visible (visible);
@@ -231,7 +231,7 @@ tui_source_window_base::make_visible (int visible)
/* Makes all windows invisible (except the command and locator
windows). */
static void
-make_all_visible (int visible)
+make_all_visible (bool visible)
{
int i;
@@ -247,13 +247,13 @@ make_all_visible (int visible)
void
tui_make_all_visible (void)
{
- make_all_visible (1);
+ make_all_visible (true);
}
void
tui_make_all_invisible (void)
{
- make_all_visible (0);
+ make_all_visible (false);
}
/* Function to refresh all the windows currently displayed. */
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index ce8de72f28d..d7201992ae4 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -655,14 +655,14 @@ tui_show_assembly (struct gdbarch *gdbarch, CORE_ADDR addr)
tui_update_source_windows_with_addr (gdbarch, addr);
}
-int
+bool
tui_is_window_visible (enum tui_win_type type)
{
if (tui_active == 0)
- return 0;
+ return false;
if (tui_win_list[type] == 0)
- return 0;
+ return false;
return tui_win_list[type]->generic.is_visible;
}
diff --git a/gdb/tui/tui.h b/gdb/tui/tui.h
index 5b8be0cd481..8f6ef64f496 100644
--- a/gdb/tui/tui.h
+++ b/gdb/tui/tui.h
@@ -56,7 +56,7 @@ enum tui_win_type
extern CORE_ADDR tui_get_low_disassembly_address (struct gdbarch *,
CORE_ADDR, CORE_ADDR);
extern void tui_show_assembly (struct gdbarch *gdbarch, CORE_ADDR addr);
-extern int tui_is_window_visible (enum tui_win_type type);
+extern bool tui_is_window_visible (enum tui_win_type type);
extern int tui_get_command_dimension (unsigned int *width,
unsigned int *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 10/66] Create tui_disasm_window Tom Tromey
2019-06-23 22:43 ` [PATCH 13/66] Remove tui_clear_win_detail 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 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 05/66] Simplify command window creation Tom Tromey
2019-06-23 22:44 ` [PATCH 25/66] Introduce the refresh_all method Tom Tromey
2019-06-23 22:44 ` [PATCH 02/66] Add destructor to tui_win_info 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 09/66] Split the tui_win_info destructor Tom Tromey
2019-06-23 22:44 ` [PATCH 17/66] Remove struct tui_data_info Tom Tromey
2019-06-23 22:44 ` [PATCH 24/66] Introduce two TUI source window methods Tom Tromey
2019-06-23 22:44 ` [PATCH 21/66] Introduce make_visible method Tom Tromey
2019-06-23 22:44 ` [PATCH 26/66] Introduce set_new_height 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 23/66] Introduce the refresh method Tom Tromey
2019-06-23 22:44 ` [PATCH 28/66] Remove redundant check from make_visible 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 19/66] Inline constructors and initializers 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 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 ` Tom Tromey [this message]
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 27/66] Introduce max_height method Tom Tromey
2019-06-23 22:44 ` [PATCH 29/66] Introduce set_highlight method 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 11/66] Introduce methods for scrolling 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 34/66] Change tui_update_source_window for better type safety 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 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 42/66] Introduce tui_gen_win_info::reset method 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: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 33/66] Introduce refresh_window method 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 46/66] Introduce tui_win_info::make_visible_with_new_height 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 37/66] Remove NULL check from tui_set_exec_info_content 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 48/66] Remove tui_alloc_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 31/66] Use new and delete for 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-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 63/66] Remove NULL checks before xfree Tom Tromey
2019-06-24 18:49 ` [PATCH 54/66] Separate out data item window Tom Tromey
2019-06-24 18:49 ` [PATCH 58/66] Separate out data 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 60/66] Use bool for is_exec_point 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 59/66] Fix "auxiliary" typo 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 64/66] Fix latent bug in set_is_exec_point_at Tom Tromey
2019-06-24 18:49 ` [PATCH 51/66] Remove layout_def::split Tom Tromey
2019-06-24 18:49 ` [PATCH 66/66] Tidy tui_delete_win 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 62/66] Remove union tui_which_element Tom Tromey
2019-06-24 18:49 ` [PATCH 57/66] Remove "data_content" and "data_content_count" from TUI data window 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-23-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