Remove tui_wrefresh

This removes tui_wrefresh, moving the code into refresh_window.  We
remove tui_norefresh_window as well, because now the command window's
refresh_window has to do what tui_wrefresh previously did.

diff --git a/gdb/python/py-tui.c b/gdb/python/py-tui.c
index b3544c6c7f2aa5f0e0b941346d5b5bddb711c6ae..8ad2b7d973337bdeea0009f0869ab436350f35c8 100644 (file)
--- a/gdb/python/py-tui.c
+++ b/gdb/python/py-tui.c
@@ -95,7 +95,7 @@ public:
       {
        wnoutrefresh (handle.get ());
        touchwin (m_inner_window.get ());
-       tui_wrefresh (m_inner_window.get ());
+       wnoutrefresh (m_inner_window.get ());
       }
     else
       tui_win_info::refresh_window ();
@@ -275,7 +275,7 @@ tui_py_window::output (const char *text, bool full_window)
       if (full_window)
        check_and_display_highlight_if_needed ();
       else
-       tui_wrefresh (m_inner_window.get ());
+       wnoutrefresh (m_inner_window.get ());
     }
 }
 

diff --git a/gdb/tui/tui-command.c b/gdb/tui/tui-command.c
index b9bc19ee9eeb0199fcb0e7157207cd825d6cfed7..2060a36b0626636c13d2129deadea51567cabefb 100644 (file)
--- a/gdb/tui/tui-command.c
+++ b/gdb/tui/tui-command.c
@@ -57,7 +57,5 @@ tui_cmd_window::resize (int height_, int width_, int origin_x, int origin_y)
 void
 tui_refresh_cmd_win (void)
 {
-  WINDOW *w = tui_cmd_win ()->handle.get ();
-
-  tui_wrefresh (w);
+  tui_cmd_win ()->refresh_window ();
 }

diff --git a/gdb/tui/tui-command.h b/gdb/tui/tui-command.h
index 90b8de7535b5ec9b2f09936ceb201ac723e6a21f..666b8f59c3c83132850f9c376cd66209102382e8 100644 (file)
--- a/gdb/tui/tui-command.h
+++ b/gdb/tui/tui-command.h
@@ -26,8 +26,7 @@
 
 /* The TUI command window.  */
 struct tui_cmd_window
-  : public tui_noscroll_window, tui_nobox_window, tui_norefresh_window,
-    tui_always_visible_window
+  : public tui_noscroll_window, tui_nobox_window, tui_always_visible_window
 {
   tui_cmd_window () = default;
 

diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 14c9b87c8c0722f1df46a8413a5781812b20b800..79a41637d214613be76477dfc8115471881f87d0 100644 (file)
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -253,15 +253,6 @@ struct tui_nobox_window : public virtual tui_win_info
   }
 };
 
-/* A TUI window that is not refreshed.  */
-
-struct tui_norefresh_window : public virtual tui_win_info
-{
-  virtual void refresh_window () final override
-  {
-  }
-};
-
 /* A TUI window that is always visible.  */
 
 struct tui_always_visible_window : public virtual tui_win_info

diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index 963a1658ae51ac89227d32f43c3bd9c70ff7968d..369d1529f94a54547a56d1661fcf976e82c8f9b3 100644 (file)
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -52,19 +52,11 @@ tui_batch_rendering::~tui_batch_rendering ()
 
 /* See tui-data.h.  */
 
-void
-tui_wrefresh (WINDOW *win)
-{
-  wnoutrefresh (win);
-}
-
-/* See tui-data.h.  */
-
 void
 tui_win_info::refresh_window ()
 {
   if (handle != NULL)
-    tui_wrefresh (handle.get ());
+    wnoutrefresh (handle.get ());
 }
 
 /* Draw a border around the window.  */

diff --git a/gdb/tui/tui-wingeneral.h b/gdb/tui/tui-wingeneral.h
index 6387afdcbaafced8cdf67d288efd261d1a761fc9..83ecb7d1645aa75600ceed0f98c5cc3310f90702 100644 (file)
--- a/gdb/tui/tui-wingeneral.h
+++ b/gdb/tui/tui-wingeneral.h
@@ -50,8 +50,4 @@ private:
   bool m_saved_suppress;
 };
 
-/* Call wrefresh on the given window.  However, if output is being
-   suppressed via tui_suppress_output, do not call wrefresh.  */
-extern void tui_wrefresh (WINDOW *win);
-
 #endif /* TUI_TUI_WINGENERAL_H */