public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Tom de Vries <vries@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/tui] Show focus window in status line Date: Fri, 8 Dec 2023 22:02:26 +0000 (GMT) [thread overview] Message-ID: <20231208220226.6B74E3858CD1@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=612f120d41e81056bf29db07f494f0cdf27b545d commit 612f120d41e81056bf29db07f494f0cdf27b545d Author: Tom de Vries <tdevries@suse.de> Date: Fri Dec 8 23:02:31 2023 +0100 [gdb/tui] Show focus window in status line The focused window is highlighted by using active-border-kind instead of border-kind. But if the focused window is the cmd window (which is an unboxed window), then no highlighting is done, and it's not obvious from looking at the screen which window has the focus. Instead, you have to notice the absence of highlighting on boxed windows, and then infer that the focus is on the unboxed window. That approach stops working if there are multiple unboxed windows. Likewise if highlighting is switched off by setting active-border-kind to the same value as border-kind. Make it more explicit which window has the focus by mentioning it in the status window, like so: ... native process 8282 (src) In: main L7 PC: 0x400525 ... Tested on x86_64-linux and ppc64le-linux. Tested-By: Alexandra Petlanova Hajkova <ahajkova@redhat.com> Reviewed-By: Eli Zaretskii <eliz@gnu.org> Approved-By: Tom Tromey <tom@tromey.com> Diff: --- gdb/doc/gdb.texinfo | 3 +++ gdb/testsuite/gdb.tui/single-key.exp | 4 ++-- gdb/tui/tui-data.c | 2 ++ gdb/tui/tui-stack.c | 16 ++++++++++++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 15c71998d28..58685a77fd4 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -30340,6 +30340,9 @@ Indicates the current @value{GDBN} target. Gives the current process or thread number. When no process is being debugged, this field is set to @code{No process}. +@item focus +Shows the name of the TUI window that has the focus. + @item function Gives the current function name for the selected frame. The name is demangled if demangling is turned on (@pxref{Print Settings}). diff --git a/gdb/testsuite/gdb.tui/single-key.exp b/gdb/testsuite/gdb.tui/single-key.exp index 07c9b00cce5..3925a8142c1 100644 --- a/gdb/testsuite/gdb.tui/single-key.exp +++ b/gdb/testsuite/gdb.tui/single-key.exp @@ -25,12 +25,12 @@ set status_win { 0 15 80 1 } set command_win { 0 16 80 8 } # Check that the status window doesn't show Singlekey. -set re "No process In:" +set re [string_to_regexp "No process (src) In:"] Term::check_region_contents "status window: initial" {*}$status_win $re # Enter single-key mode. Check that the status window does show Singlekey. send_gdb "\030s" -set re "No process \\(SingleKey\\) In:" +set re [string_to_regexp "No process (SingleKey) (src) In:"] gdb_assert { [Term::wait_for_region_contents {*}$status_win $re] } \ "status window: single-key mode" diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index c51bd118165..f5a98233ea0 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -26,6 +26,7 @@ #include "tui/tui-win.h" #include "tui/tui-wingeneral.h" #include "tui/tui-winsource.h" +#include "tui/tui-stack.h" #include "gdb_curses.h" #include <algorithm> @@ -69,6 +70,7 @@ tui_set_win_focus_to (struct tui_win_info *win_info) tui_unhighlight_win (win_with_focus); win_with_focus = win_info; tui_highlight_win (win_info); + tui_show_locator_content (); } } diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c index 723d6268aad..8bf65ea3556 100644 --- a/gdb/tui/tui-stack.c +++ b/gdb/tui/tui-stack.c @@ -106,6 +106,12 @@ tui_locator_window::make_status_line () const const char *pc_buf = pc_out.c_str (); int pc_width = pc_out.size (); + /* Width of the field showing the window with current focus. For a window + named "src" we show "(src)". */ + int focus_width = (tui_win_with_focus () != nullptr + ? 1 + strlen (tui_win_with_focus ()->name ()) + 1 + : 0); + /* First determine the amount of proc name width we have available. The +1 are for a space separator between fields. */ proc_width = (status_size @@ -116,6 +122,9 @@ tui_locator_window::make_status_line () const - (PC_PREFIX.size () + pc_width + 1) - (tui_current_key_mode == TUI_SINGLE_KEY_MODE ? (SINGLE_KEY.size () + 1) + : 0) + - (focus_width > 0 + ? focus_width + 1 : 0)); /* If there is no room to print the function name, try by removing @@ -159,6 +168,13 @@ tui_locator_window::make_status_line () const string.puts (" "); } + if (tui_win_with_focus () != nullptr) + { + string.puts ("("); + string.puts (tui_win_with_focus ()->name ()); + string.puts (") "); + } + /* Procedure/class name. */ if (proc_width > 0) {
reply other threads:[~2023-12-08 22:02 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20231208220226.6B74E3858CD1@sourceware.org \ --to=vries@sourceware.org \ --cc=gdb-cvs@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: linkBe 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; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).