From patchwork Wed Dec 13 20:03:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 82082 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BDB30385E010 for ; Wed, 13 Dec 2023 20:03:33 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta034.useast.a.cloudfilter.net (omta034.useast.a.cloudfilter.net [44.202.169.33]) by sourceware.org (Postfix) with ESMTPS id 93AB13858019 for ; Wed, 13 Dec 2023 20:03:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 93AB13858019 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 93AB13858019 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702497799; cv=none; b=wttM1Orw0QhsxW8FPGbZsfa0jKRsIjijglfQLAqFiOYb7nn2Hlky/gUxDDJzNAEUoJLubGiLPQfFQnNzFGZ5CUxpTNOHpHt20M8sv+qUmRgSvdGkogFstT4B4qCtLNQ5z8AiYM7itskouBjUp4L8APrDFfEfsHJA8I7GtgHBzMg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702497799; c=relaxed/simple; bh=J5laZi/J7O4VNwMumpdezRRbRRXifB/K8LP0Hbm5jsk=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=A2MGiPKxqU0BkbKvmCGj8WmUsyoO//whhkOQ+JaNHFxbCc2Q2g07FZMprYQOehiZTRB1sGM1oGSDgA74CV8CENl6C6FdJK6QEdI4RSD/xA/XBy1/KaNBjWzie3uXIEc+cWERixjvRtjvNQS7/gCn1udxrE6n8p7XmGR+IsvwQTk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5007a.ext.cloudfilter.net ([10.0.29.141]) by cmsmtp with ESMTPS id DUcnrNGcWjtZ3DVS2rsz00; Wed, 13 Dec 2023 20:03:26 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id DVRsrbxRcqkaTDVRsrEcGt; Wed, 13 Dec 2023 20:03:16 +0000 X-Authority-Analysis: v=2.4 cv=bY547cDB c=1 sm=1 tr=0 ts=657a0e04 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=e2cXIFwxEfEA:10 a=Qbun_eYptAEA:10 a=mDV3o1hIAAAA:8 a=jP8hV0WzAizY2I1wcS4A:9 a=QEXdDO2ut3YA:10 a=_ti-tbV0aed-dsTcou1v:22 a=_FVE-zBwftR9WsbkzFJk:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=C3ICe5qnHYrilUh3fkm54PqXnJX+YT2Esojfb1tcM9E=; b=Vm0M3pCjWnr5uR3sEAnqQHemYZ EoCPZnPmIjVa3NT4LZpQ1uuhFy430Ic2SoDqM4ZwTLhg42FibCRo49BzfhiPihdz1m4W4hm2AXcNZ 5DXR0/DXv8yTgkfYPtWXKFles; Received: from 71-211-161-25.hlrn.qwest.net ([71.211.161.25]:57894 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rDVRr-000rk7-2m for gdb-patches@sourceware.org; Wed, 13 Dec 2023 13:03:15 -0700 From: Tom Tromey Date: Wed, 13 Dec 2023 13:03:15 -0700 Subject: [PATCH v2 2/2] Rename TUI locator window -> status MIME-Version: 1.0 Message-Id: <20231213-tui-status-rename-v2-2-e87cbf6d1d2b@tromey.com> References: <20231213-tui-status-rename-v2-0-e87cbf6d1d2b@tromey.com> In-Reply-To: <20231213-tui-status-rename-v2-0-e87cbf6d1d2b@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.161.25 X-Source-L: No X-Exim-ID: 1rDVRr-000rk7-2m X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-161-25.hlrn.qwest.net ([192.168.0.21]) [71.211.161.25]:57894 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfCG6171vAk1LeOGiTYp3TGB2l/weDNOabddWv0VhDVBZk/pGsH85B5BLUm9GxQ5kVsQ9O1GDQ6QSW2eEP56x6M+cBB/1T/j6ISLWoecyVG44v/Wphupe NgQ1Ln+qdy7BODOceyY+1c0LtcPuDlUcjBRRbVdqJJBuEACH4bAXI3JPyRW7bYZcWpzWWeFkpSxyWqdhIXj4Owd1LVnaBTM8Z70= X-Spam-Status: No, score=-3023.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org The TUI status window is called the "locator" in the source, but "status" in the documentation. Whenever I've needed to find the code, I've had to search to "locate" it (ha, ha). This patch renames the window to match the public name of the window. --- gdb/tui/tui-data.c | 2 +- gdb/tui/tui-data.h | 2 +- gdb/tui/tui-layout.c | 4 ++-- gdb/tui/tui-location.c | 4 ++-- gdb/tui/tui-location.h | 6 +++--- gdb/tui/tui-status.c | 26 +++++++++++++------------- gdb/tui/tui-status.h | 14 +++++++------- gdb/tui/tui.c | 2 +- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index bdc1eff473b..ee7d158b27c 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -70,7 +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 (); + tui_show_status_content (); } } diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 76d0de3a3f0..847ad6da714 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -298,7 +298,7 @@ extern struct tui_win_info *tui_win_list[MAX_MAJOR_WINDOWS]; #define TUI_CMD_WIN \ (gdb::checked_static_cast (tui_win_list[CMD_WIN])) #define TUI_STATUS_WIN \ - (gdb::checked_static_cast (tui_win_list[STATUS_WIN])) + (gdb::checked_static_cast (tui_win_list[STATUS_WIN])) /* All the windows that are currently instantiated, in layout order. */ diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 71e0961ca18..f194fa95864 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -306,7 +306,7 @@ tui_win_info::resize (int height_, int width_, -/* Helper function to create one of the built-in (non-locator) +/* Helper function to create one of the built-in (non-status) windows. */ template @@ -369,7 +369,7 @@ initialize_known_windows () tui_disasm_window>); known_window_types.emplace (STATUS_NAME, make_standard_window); + tui_status_window>); } /* See tui-layout.h. */ diff --git a/gdb/tui/tui-location.c b/gdb/tui/tui-location.c index da41d63631e..759719816c3 100644 --- a/gdb/tui/tui-location.c +++ b/gdb/tui/tui-location.c @@ -48,7 +48,7 @@ tui_location_tracker::set_location (struct gdbarch *gdbarch, m_gdbarch = gdbarch; if (location_changed_p) - tui_show_locator_content (); + tui_show_status_content (); return location_changed_p; } @@ -61,7 +61,7 @@ tui_location_tracker::set_location (struct symtab *symtab) bool location_changed_p = set_fullname (symtab); if (location_changed_p) - tui_show_locator_content (); + tui_show_status_content (); return location_changed_p; } diff --git a/gdb/tui/tui-location.h b/gdb/tui/tui-location.h index 514d2da5b8f..ebe493ecc9f 100644 --- a/gdb/tui/tui-location.h +++ b/gdb/tui/tui-location.h @@ -32,9 +32,9 @@ struct tui_location_tracker { - /* Update the current location with the provided arguments. Returns true - if any of the locator's fields were actually changed, and false - otherwise. */ + /* Update the current location with the provided arguments. Returns + true if any of the status window's fields were actually changed, + and false otherwise. */ bool set_location (struct gdbarch *gdbarch, const struct symtab_and_line &sal, const char *procname); diff --git a/gdb/tui/tui-status.c b/gdb/tui/tui-status.c index 3e11ff97089..dab22f29245 100644 --- a/gdb/tui/tui-status.c +++ b/gdb/tui/tui-status.c @@ -1,4 +1,4 @@ -/* TUI display locator. +/* TUI status line. Copyright (C) 1998-2023 Free Software Foundation, Inc. @@ -58,7 +58,7 @@ static const std::string SINGLE_KEY = "(SingleKey)"; std::string -tui_locator_window::make_status_line () const +tui_status_window::make_status_line () const { char line_buf[50]; int status_size; @@ -152,7 +152,7 @@ tui_locator_window::make_status_line () const } } - /* Now create the locator line from the string version of the + /* Now create the status line from the string version of the elements. */ string_file string; @@ -242,7 +242,7 @@ tui_get_function_from_frame (frame_info_ptr fi) } void -tui_locator_window::rerender () +tui_status_window::rerender () { gdb_assert (handle != NULL); @@ -271,7 +271,7 @@ tui_locator_window::rerender () bool tui_show_frame_info (frame_info_ptr fi) { - bool locator_changed_p; + bool status_changed_p; if (fi != nullptr) { @@ -285,13 +285,13 @@ tui_show_frame_info (frame_info_ptr fi) else func_name = _(""); - locator_changed_p + status_changed_p = tui_location.set_location (get_frame_arch (fi), sal, func_name); - /* If the locator information has not changed, then frame information has + /* If the status information has not changed, then frame information has not changed. If frame information has not changed, then the windows' contents will not change. So don't bother refreshing the windows. */ - if (!locator_changed_p) + if (!status_changed_p) return false; for (struct tui_source_window_base *win_info : tui_source_windows ()) @@ -304,9 +304,9 @@ tui_show_frame_info (frame_info_ptr fi) { symtab_and_line sal {}; - locator_changed_p = tui_location.set_location (NULL, sal, ""); + status_changed_p = tui_location.set_location (NULL, sal, ""); - if (!locator_changed_p) + if (!status_changed_p) return false; for (struct tui_source_window_base *win_info : tui_source_windows ()) @@ -317,7 +317,7 @@ tui_show_frame_info (frame_info_ptr fi) } void -tui_show_locator_content () +tui_show_status_content () { if (tui_is_window_visible (STATUS_WIN)) TUI_STATUS_WIN->rerender (); @@ -338,7 +338,7 @@ void _initialize_tui_stack () { add_com ("update", class_tui, tui_update_command, - _("Update the source window and locator to " - "display the current execution point.\n\ + _("\ +Update the source window to display the current execution point.\n\ Usage: update")); } diff --git a/gdb/tui/tui-status.h b/gdb/tui/tui-status.h index ca95b2bf78a..31e9643ae35 100644 --- a/gdb/tui/tui-status.h +++ b/gdb/tui/tui-status.h @@ -1,4 +1,4 @@ -/* TUI display locator. +/* TUI status line. Copyright (C) 1998-2023 Free Software Foundation, Inc. @@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef TUI_TUI_STACK_H -#define TUI_TUI_STACK_H +#ifndef TUI_TUI_STATUS_H +#define TUI_TUI_STATUS_H #include "tui/tui-data.h" @@ -28,11 +28,11 @@ class frame_info_ptr; /* Locator window class. */ -struct tui_locator_window +struct tui_status_window : public tui_nofocus_window, tui_noscroll_window, tui_oneline_window, tui_nobox_window { - tui_locator_window () = default; + tui_status_window () = default; const char *name () const override { @@ -50,7 +50,7 @@ struct tui_locator_window std::string make_status_line () const; }; -extern void tui_show_locator_content (void); +extern void tui_show_status_content (void); extern bool tui_show_frame_info (frame_info_ptr); -#endif /* TUI_TUI_STACK_H */ +#endif /* TUI_TUI_STATUS_H */ diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index 647fa07dce3..4c180f73436 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -291,7 +291,7 @@ tui_set_key_mode (enum tui_key_mode mode) tui_current_key_mode = mode; rl_set_keymap (mode == TUI_SINGLE_KEY_MODE ? tui_keymap : tui_readline_standard_keymap); - tui_show_locator_content (); + tui_show_status_content (); } /* Initialize readline and configure the keymap for the switching