From patchwork Sun Dec 17 19:50:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 82348 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 CCA45385801E for ; Sun, 17 Dec 2023 19:51:27 +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 DF1C93858424 for ; Sun, 17 Dec 2023 19:50:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DF1C93858424 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 DF1C93858424 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=1702842632; cv=none; b=w48lYZyoQXoD+1FU30+KBtPlYfbmfQMcuWSymCaD6JfJN5zWqYXXoUIHEEff+qwVRQHWOdDForYbtdYSVZN9DglinWqzq4/ct/J1b9GD39KFA6274/veyjEpSMSBfqS0PWuduo8EjB/VKOyk5TgUWHD+zDbDYEDULoccyDJvD88= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702842632; c=relaxed/simple; bh=ey7yERQfeiQEZ0ksF3cxEy785GxzxY4N1uOP+9ubJUI=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=O6Fv31HXuna/B4VOgH82VOK4/SGAShF1QoUYcQ21Y+TrWrSSoP9ShMe/YOqP6FLJKb9gkFTLdON2ik+rOrPiT2Wh1m0+RzaS5LpiQwCbOSoDlFL64NsBVpOiK9EtT1klH3LVIodhzJGsJOoAD5viUGI+D4ZBLCcGTxVSQo4ANO8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5009a.ext.cloudfilter.net ([10.0.29.176]) by cmsmtp with ESMTPS id EvR1rfQd2jtZ3Ex9srNcEO; Sun, 17 Dec 2023 19:50:40 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id Ex9hr9fHf97pzEx9iryMbv; Sun, 17 Dec 2023 19:50:30 +0000 X-Authority-Analysis: v=2.4 cv=ULDOoQTy c=1 sm=1 tr=0 ts=657f5106 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=l3qQevOvjjoXdUdkTKAA:9 a=QEXdDO2ut3YA:10 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=8rQKysR/LQio402y2w7yx7I+1U02i1x6oRGQInjfwss=; b=RER92lS1VpStEaK3P11qXWXRZE 4onm2oC7H9IYQft12eyEarvFb1Conptn6GGQxYMp76Mqjqb6Jf1HyxJOvOhWljeHC8O2rqS810DtT Cs162lilYK4FdtlB8rRwuhLMv; Received: from 71-211-161-25.hlrn.qwest.net ([71.211.161.25]:40716 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 1rEx9h-004MyY-1X for gdb-patches@sourceware.org; Sun, 17 Dec 2023 12:50:29 -0700 From: Tom Tromey Date: Sun, 17 Dec 2023 12:50:34 -0700 Subject: [PATCH 09/14] Simplify tui_data_win::erase_data_content MIME-Version: 1.0 Message-Id: <20231217-tui-regs-cleanup-v1-9-67bd0ea1e8be@tromey.com> References: <20231217-tui-regs-cleanup-v1-0-67bd0ea1e8be@tromey.com> In-Reply-To: <20231217-tui-regs-cleanup-v1-0-67bd0ea1e8be@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: 1rEx9h-004MyY-1X 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]:40716 X-Source-Auth: tom+tromey.com X-Email-Count: 10 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfPmitwPqPWlCgCmprq47Fz4waz+oJaDlbezwgyUUnmnP0JnhpuqbKFbG4oUtuG//9JueSYeb1nBKrM4E41sazhybqGjuqh2XdbS6b9yhOArVuFFAcvzl 14ixwTX4Aq61O6FKRVU8lIETFTsutBUkGGZCzMRqmj5uOWidglU7+TFifIxYmOc8QKwzzGvcWYupofAMp7k0e7tcMq3HigBhC2Y= X-Spam-Status: No, score=-3022.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, 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 There's only a single call to tui_data_win::erase_data_content now, so remove the parameter and make it just render the "empty window" text. --- gdb/tui/tui-regs.c | 22 ++++++++++------------ gdb/tui/tui-regs.h | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 5726dc3fea8..bf752c267ff 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -348,21 +348,19 @@ tui_data_window::first_data_item_displayed () } void -tui_data_window::erase_data_content (const char *prompt) +tui_data_window::erase_data_content () { werase (handle.get ()); check_and_display_highlight_if_needed (); - if (prompt != NULL) - { - int half_width = (width - box_size ()) / 2; - int x_pos; - if (strlen (prompt) >= half_width) - x_pos = 1; - else - x_pos = half_width - strlen (prompt); - display_string (height / 2, x_pos, prompt); - } + const char *prompt = _("[ Register Values Unavailable ]"); + int half_width = (width - box_size ()) / 2; + int x_pos; + if (strlen (prompt) >= half_width) + x_pos = 1; + else + x_pos = half_width - strlen (prompt); + display_string (height / 2, x_pos, prompt); } /* See tui-regs.h. */ @@ -371,7 +369,7 @@ void tui_data_window::rerender () { if (m_regs_content.empty ()) - erase_data_content (_("[ Register Values Unavailable ]")); + erase_data_content (); else display_registers_from (0); tui_wrefresh (handle.get ()); diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h index b31a5a3e5b8..29518a6f714 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -128,7 +128,7 @@ struct tui_data_window : public tui_win_info done when the data window is scrolled. */ void delete_data_content_windows (); - void erase_data_content (const char *prompt); + void erase_data_content (); /* Information about each register in the current register group. */ std::vector m_regs_content;