From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 18/24] Remove tui_set_win_focus_to
Date: Sat, 04 Jan 2020 18:34:00 -0000 [thread overview]
Message-ID: <20200104183410.17114-19-tom@tromey.com> (raw)
In-Reply-To: <20200104183410.17114-1-tom@tromey.com>
I noticed that the TUI had two functions with similar names:
tui_set_win_focus_to and tui_set_win_with_focus.
However, the former was just an implementation detail of the latter.
So, this patch removes the former entirely, to avoid any temptation to
call it.
2020-01-04 Tom Tromey <tom@tromey.com>
* tui/tui-win.c (tui_set_win_focus_to): Move to tui-data.c.
* tui/tui-data.h (tui_set_win_with_focus): Don't declare.
* tui/tui-data.c (tui_set_win_with_focus): Remove.
(tui_set_win_focus_to): Move from tui-win.c.
Change-Id: Idffddab773436bdf80d55480906d76b292981ef2
---
gdb/ChangeLog | 7 +++++++
gdb/tui/tui-data.c | 11 ++++++++---
gdb/tui/tui-data.h | 1 -
gdb/tui/tui-win.c | 15 ---------------
4 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index db637d8fbe6..1d822c9090f 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -59,11 +59,16 @@ tui_win_with_focus (void)
}
-/* Set the window that has the logical focus. */
+/* Set the logical focus to win_info. */
void
-tui_set_win_with_focus (struct tui_win_info *win_info)
+tui_set_win_focus_to (struct tui_win_info *win_info)
{
- win_with_focus = win_info;
+ if (win_info != NULL)
+ {
+ tui_unhighlight_win (win_with_focus);
+ win_with_focus = win_info;
+ tui_highlight_win (win_info);
+ }
}
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 56600926636..0583c4a5c99 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -244,7 +244,6 @@ extern int tui_term_width (void);
extern void tui_set_term_width_to (int);
extern struct tui_locator_window *tui_locator_win_info_ptr (void);
extern struct tui_win_info *tui_win_with_focus (void);
-extern void tui_set_win_with_focus (struct tui_win_info *);
extern bool tui_win_resized ();
extern void tui_set_win_resized_to (bool);
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index f8a57732cca..1cd0878b1b9 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -452,21 +452,6 @@ tui_update_gdb_sizes (void)
}
-/* Set the logical focus to win_info. */
-void
-tui_set_win_focus_to (struct tui_win_info *win_info)
-{
- if (win_info != NULL)
- {
- struct tui_win_info *win_with_focus = tui_win_with_focus ();
-
- tui_unhighlight_win (win_with_focus);
- tui_set_win_with_focus (win_info);
- tui_highlight_win (win_info);
- }
-}
-
-
void
tui_win_info::forward_scroll (int num_to_scroll)
{
--
2.17.2
next prev parent reply other threads:[~2020-01-04 18:34 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-04 18:34 [PATCH 00/24] Horizontal TUI layout + windows in Python Tom Tromey
2020-01-04 18:34 ` [PATCH 14/24] Handle ambiguity in tui_partial_win_by_name Tom Tromey
2020-01-04 18:34 ` [PATCH 23/24] Add "usage" text to all TUI command help Tom Tromey
2020-01-04 18:34 ` [PATCH 03/24] Fix latent display bug in tui_data_window Tom Tromey
2020-01-04 18:34 ` [PATCH 16/24] TUI windows do not need to store their type Tom Tromey
2020-01-04 18:34 ` [PATCH 13/24] Reimplement tui_next_win and tui_prev_win Tom Tromey
2020-01-04 18:34 ` [PATCH 05/24] Reimplement TUI "C-x 1" binding Tom Tromey
2020-01-04 18:34 ` Tom Tromey [this message]
2020-01-04 18:34 ` [PATCH 24/24] Fix cast in TUI_DISASM_WIN Tom Tromey
2020-01-04 18:34 ` [PATCH 08/24] Add the "tui new-layout" command Tom Tromey
2020-01-04 18:44 ` Eli Zaretskii
2020-01-04 18:34 ` [PATCH 22/24] Use error_no_arg in TUI Tom Tromey
2020-01-04 18:34 ` [PATCH 11/24] Add horizontal splitting to TUI layout Tom Tromey
2020-01-04 18:47 ` Eli Zaretskii
2020-01-04 18:34 ` [PATCH 06/24] Reimplement "tui reg" command Tom Tromey
2020-01-04 18:34 ` [PATCH 10/24] Change return type of tui_layout_base::adjust_size Tom Tromey
2020-01-04 18:34 ` [PATCH 04/24] Simplify TUI C-x 2 binding Tom Tromey
2020-01-04 18:34 ` [PATCH 20/24] Allow TUI windows in Python Tom Tromey
2020-01-04 18:57 ` Eli Zaretskii
2020-02-22 19:57 ` Tom Tromey
2020-02-22 20:18 ` Eli Zaretskii
2020-03-10 22:23 ` Simon Marchi
2020-03-11 0:23 ` Tom Tromey
2020-03-11 4:47 ` Simon Marchi
2020-03-11 5:07 ` Simon Marchi
2020-03-11 18:05 ` Tom Tromey
2020-01-04 18:34 ` [PATCH 21/24] Make some tui_source_window_base members "protected" Tom Tromey
2020-01-04 18:34 ` [PATCH 07/24] Remove hard-coded TUI layouts Tom Tromey
2020-01-04 18:34 ` [PATCH 01/24] Use TUI_DISASM_WIN instead of tui_win_list array Tom Tromey
2020-01-04 18:34 ` [PATCH 09/24] Allow TUI sub-layouts in "new-layout" command Tom Tromey
2020-01-04 18:34 ` [PATCH 02/24] Simplify tui_add_win_to_layout Tom Tromey
2020-01-04 18:34 ` [PATCH 12/24] Change TUI window iteration Tom Tromey
2020-01-04 18:34 ` [PATCH 19/24] Remove the TUI annotation hack Tom Tromey
2020-01-04 18:34 ` [PATCH 15/24] Remove tui_delete_invisible_windows and tui_make_all_invisible Tom Tromey
2020-01-04 18:54 ` [PATCH 17/24] Change how TUI windows are instantiated Tom Tromey
2020-02-22 20:22 ` [PATCH 00/24] Horizontal TUI layout + windows in Python 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=20200104183410.17114-19-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