[09/11] Derive tui_locator_window from tui_win_info
diff mbox series

Message ID 20200618021523.10681-10-tom@tromey.com
State New
Headers show
Series
  • TUI cleanups
Related show

Commit Message

Tom Tromey June 18, 2020, 2:15 a.m. 
tui_locator_window is the last remaining concrete child class of
tui_gen_win_info.  It seems a bit cleaner to me to flatten the
hierarchy a bit; this patch prepares for that by changing
tui_locator_window to derive from tui_win_info.

2020-06-17  Tom Tromey  <tom@tromey.com>

	* tui/tui-stack.h (struct tui_locator_window): Derive from
	tui_win_info.
	<do_scroll_horizontal, do_scroll_vertical>: New methods.
	<can_box>: New method.
---
 gdb/ChangeLog       |  7 +++++++
 gdb/tui/tui-stack.h | 17 ++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

-- 
2.17.2

Comments

Simon Marchi Sept. 20, 2020, 12:58 a.m. | #1 
On 2020-06-17 10:15 p.m., Tom Tromey wrote:
> tui_locator_window is the last remaining concrete child class of

> tui_gen_win_info.  It seems a bit cleaner to me to flatten the

> hierarchy a bit; this patch prepares for that by changing

> tui_locator_window to derive from tui_win_info.


Hi Tom,

I stumbled on a behavior change in the TUI that I think is unexpected,
introduced by this patch.  I filed a bug here:

https://sourceware.org/bugzilla/show_bug.cgi?id=26638

Simon

Patch
diff mbox series 

diff --git a/gdb/tui/tui-stack.h b/gdb/tui/tui-stack.h
index 0253767ad98..564ac22495c 100644
--- a/gdb/tui/tui-stack.h
+++ b/gdb/tui/tui-stack.h
@@ -28,7 +28,7 @@  struct frame_info;
 
 /* Locator window class.  */
 
-struct tui_locator_window : public tui_gen_win_info
+struct tui_locator_window : public tui_win_info
 {
   tui_locator_window () = default;
 
@@ -42,6 +42,11 @@  struct tui_locator_window : public tui_gen_win_info
     return 1;
   }
 
+  bool can_box () const override
+  {
+    return false;
+  }
+
   void rerender () override;
 
   /* Update the locator, with the provided arguments.
@@ -62,6 +67,16 @@  struct tui_locator_window : public tui_gen_win_info
   /* Architecture associated with code at this location.  */
   struct gdbarch *gdbarch = nullptr;
 
+protected:
+
+  void do_scroll_vertical (int n) override
+  {
+  }
+
+  void do_scroll_horizontal (int n) override
+  {
+  }
+
 private:
 
   /* Create the status line to display as much information as we can