From patchwork Sat Jan 20 18:23:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 84496 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 272663858431 for ; Sat, 20 Jan 2024 18:25:27 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) by sourceware.org (Postfix) with ESMTPS id E006C385841B for ; Sat, 20 Jan 2024 18:23:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E006C385841B 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 E006C385841B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705775005; cv=none; b=jDPiuIZgyUBw1OQjribIhHjCMVrdoInEpNNFDBQVACw5nb6SOasq555I8OgPkOcZKx8B+3H0KzzQ0R2qpTbpwDvbkqK8kQ+WbVjZ1VrKW44pztE/vZeUQyN+x7qZVg77xY2Mu03P6BLdAKnWi3Rj/xBsrPzQXW+UA74B+j59nxE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705775005; c=relaxed/simple; bh=7xY1AyDD7XlcfHrKgSUTT7OYpibE9WQGwC8mtynYzZA=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=CzpybcLXUmNjBU8fu1i6ISAIy4942U1XgiRJzn9G2lA2LfjW02z0lWU9bGu8X4qxEHNA7uqQFPDesqTI06VW0G6Is0I8ueBIwestgODDOPeCm6EY9jLCHNt2GwoWX37L0c8002WrvKrebkCXFgiq9F3SLFBs/+dM6gQkQDjDaAw= 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 RBtDrY6m3MVQiRG03rUyiF; Sat, 20 Jan 2024 18:23:23 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id RG01rf30dV9xYRG02rjVhG; Sat, 20 Jan 2024 18:23:22 +0000 X-Authority-Analysis: v=2.4 cv=NfP1akP4 c=1 sm=1 tr=0 ts=65ac0f9a a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=dEuoMetlWLkA:10 a=Qbun_eYptAEA:10 a=20KFwNOVAAAA:8 a=sQwJSirdjlXOo4QVnCoA:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To: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=3y+lPndXTb8e/PdZ6h4AwnoSWujYN7fHtHyK+j866MI=; b=vLv/JdoUEzSgZejTzrfL+xQjw1 9ET5QXh0RRrxCl6SD1N+hrU1Y0hP5nQQi84yrsxOyJSni2Jn3+wIimHzuPqBPyht5SmofLm8ezaYT +fEhhaRKEAWR/i5vUUjtLw+BV; Received: from 97-122-68-157.hlrn.qwest.net ([97.122.68.157]:47898 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 1rRG01-0049D4-0o; Sat, 20 Jan 2024 11:23:21 -0700 From: Tom Tromey Date: Sat, 20 Jan 2024 11:23:20 -0700 Subject: [PATCH v2 09/14] Simplify tui_data_win::erase_data_content MIME-Version: 1.0 Message-Id: <20240120-tui-regs-cleanup-v2-9-a3cccc6a3573@tromey.com> References: <20240120-tui-regs-cleanup-v2-0-a3cccc6a3573@tromey.com> In-Reply-To: <20240120-tui-regs-cleanup-v2-0-a3cccc6a3573@tromey.com> To: gdb-patches@sourceware.org Cc: Tom de Vries , Andrew Burgess 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: 97.122.68.157 X-Source-L: No X-Exim-ID: 1rRG01-0049D4-0o X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-68-157.hlrn.qwest.net ([192.168.0.21]) [97.122.68.157]:47898 X-Source-Auth: tom+tromey.com X-Email-Count: 29 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfMRiHGXDCYET/gzNLdsNTgPGSJWdNj3Qgr3crmNzQYuDhtwvXJ1jcVmOnHlMPiehpgkLOJPsofwYsQj4XNvwT+rTQdaysM3hQR3oNxwUtMn9yWh0AXjv lGGkFnQpR7igv6nqt1qfUAH7itvJ3F9IdvqqZKHUQMC0K8hg62vWy4zORRBYmhnriauMt535mFNCTQ31AbhsZHw3/GfKc/oRDMk= X-Spam-Status: No, score=-3022.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, 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. Tested-By: Tom de Vries Reviewed-By: Andrew Burgess --- 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 52cf6b7efdf..10d9bc6ef7d 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -347,21 +347,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. */ @@ -370,7 +368,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 7f1c30ca5d6..880f360bec6 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -130,7 +130,7 @@ struct tui_data_window : public tui_win_info past the register area (-1) is returned. */ int first_reg_element_no_inline (int line_no) const; - 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;