[33/61] Remove tui_set_focus

Message ID 20190704170311.15982-34-tom@tromey.com
State New
Headers show
Series
  • More TUI refactorings
Related show

Commit Message

Tom Tromey July 4, 2019, 5:02 p.m.
tui_set_focus_command is a simple wrapper for tui_set_focus, so rename
the latter and remove the wrapper function.

2019-07-04  Tom Tromey  <tom@tromey.com>

	* tui/tui-win.c (tui_set_focus_command): Rename from
	tui_set_focus.  Call tui_enable.
	(tui_set_focus_command): Remove.
---
 gdb/ChangeLog     |  6 ++++++
 gdb/tui/tui-win.c | 14 +++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

-- 
2.17.2

Patch

diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 52f0c51f320..083f046cafa 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -63,7 +63,6 @@  static int new_height_ok (struct tui_win_info *, int);
 static void tui_set_tab_width_command (const char *, int);
 static void tui_refresh_all_command (const char *, int);
 static void tui_all_windows_info (const char *, int);
-static void tui_set_focus_command (const char *, int);
 static void tui_scroll_forward_command (const char *, int);
 static void tui_scroll_backward_command (const char *, int);
 static void tui_scroll_left_command (const char *, int);
@@ -829,8 +828,10 @@  tui_scroll_right_command (const char *arg, int from_tty)
 
 /* Set focus to the window named by 'arg'.  */
 static void
-tui_set_focus (const char *arg, int from_tty)
+tui_set_focus_command (const char *arg, int from_tty)
 {
+  tui_enable ();
+
   if (arg != NULL)
     {
       char *buf_ptr = xstrdup (arg);
@@ -866,15 +867,6 @@  The window name specified must be valid and visible.\n"));
     warning (_("Incorrect Number of Arguments.\n%s"), FOCUS_USAGE);
 }
 
-static void
-tui_set_focus_command (const char *arg, int from_tty)
-{
-  /* Make sure the curses mode is enabled.  */
-  tui_enable ();
-  tui_set_focus (arg, from_tty);
-}
-
-
 static void
 tui_all_windows_info (const char *arg, int from_tty)
 {