diff options
| author | Tom Tromey <tom@tromey.com> | 2020-02-22 11:48:26 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2020-02-22 11:48:38 -0700 |
| commit | 935c78c0468215e2f034f39b8285fa8bb17729b8 (patch) | |
| tree | d40264042515b73c2bb8ebc02f98b937c00c23d0 | |
| parent | 0240c8f11b06a33a043bacbe2b9e723ae6ad573c (diff) | |
| download | binutils-935c78c0468215e2f034f39b8285fa8bb17729b8.zip binutils-935c78c0468215e2f034f39b8285fa8bb17729b8.tar.gz binutils-935c78c0468215e2f034f39b8285fa8bb17729b8.tar.bz2 | |
Remove tui_set_win_with_focus
I noticed that the TUI had two functions with similar names:
tui_set_win_focus_to and tui_set_win_with_focus.
However, one was just an implementation detail of the latter. So,
this patch removes tui_set_win_with_focus entirely, to avoid any
temptation to call it.
gdb/ChangeLog
2020-02-22 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
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/tui/tui-data.c | 12 | ||||
| -rw-r--r-- | gdb/tui/tui-data.h | 1 | ||||
| -rw-r--r-- | gdb/tui/tui-win.c | 15 |
4 files changed, 16 insertions, 19 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fe86927..474825b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2020-02-22 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. + +2020-02-22 Tom Tromey <tom@tromey.com> + * tui/tui-layout.c (make_standard_window, get_locator_window): New functions. (known_window_types): New global. diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index db637d8..8f7d257 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -23,6 +23,7 @@ #include "symtab.h" #include "tui/tui.h" #include "tui/tui-data.h" +#include "tui/tui-win.h" #include "tui/tui-wingeneral.h" #include "tui/tui-winsource.h" #include "gdb_curses.h" @@ -59,11 +60,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 51208b1..60c588e 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -251,7 +251,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 ac314d7..51d0365 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) { |