From patchwork Fri Dec 15 11:37:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 82223 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 47C3B384DEEF for ; Fri, 15 Dec 2023 11:37:44 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id B3440386186C for ; Fri, 15 Dec 2023 11:37:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B3440386186C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B3440386186C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702640250; cv=none; b=ZCJRdOPFre7tJGIY/c/aD9erBzoSjsKHBoOQorHd70R4dqI5mEMeGkgAwEFviViQ2EEXzcIfzsY/l+J9myrToQSxbdZUpUlihF1tc0D01U8eCvMxcghHn1apEdSpiDZup5JUWWcvT2ad9ThvshN9284SxjvHziuqaxuI8NO0d7o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702640250; c=relaxed/simple; bh=dCt/d+Ff5CvugpDA/YE5XgGM5sO/AlAMSVBz3FLNrlc=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=cCLdWIfv59xbgJCRPJiH1HT5vsLmxxgRJhjuegthU03qIltLfAgA+xyNTzZzkyxoWw2SO2B3LwATdVBSd3uAgwA6g6twNnq/RXqvqqXvBhqeMnzGMgFxiZeYgzUvCt2qLfiaWO9IEpbVdcKfSo26Knz09MppjTfSN26aMzbM5RA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id A0A63220CA for ; Fri, 15 Dec 2023 11:37:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702640247; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5SnWLkUpneU9VH5nuGiabdAt6yBPuk6U6yjb26CVNK4=; b=iTxms/zhza1EWJDGEbt7FxO9xb6DNYSClGSx/6cY8lVmepw4pltOA1d8DS379uWPmza7zm 9wlrFUNdOtKUd5XSxkAEKv0KUHSUVE2+Bbah1A8+lNvJlMOnA7GEND6J5vTkubMYzPkQ3V 8QpOB1dXRfnADDVMvTemIFkjot92mrE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702640247; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5SnWLkUpneU9VH5nuGiabdAt6yBPuk6U6yjb26CVNK4=; b=L0BoasJDW3wFvS47g30sATNBOy3Q1rs+bq7+rEXfd2YyAhPtYM4/vwCK1Ss6iYOF3Bq8UV AILnSTRg8c09OaCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702640247; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5SnWLkUpneU9VH5nuGiabdAt6yBPuk6U6yjb26CVNK4=; b=iTxms/zhza1EWJDGEbt7FxO9xb6DNYSClGSx/6cY8lVmepw4pltOA1d8DS379uWPmza7zm 9wlrFUNdOtKUd5XSxkAEKv0KUHSUVE2+Bbah1A8+lNvJlMOnA7GEND6J5vTkubMYzPkQ3V 8QpOB1dXRfnADDVMvTemIFkjot92mrE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702640247; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5SnWLkUpneU9VH5nuGiabdAt6yBPuk6U6yjb26CVNK4=; b=L0BoasJDW3wFvS47g30sATNBOy3Q1rs+bq7+rEXfd2YyAhPtYM4/vwCK1Ss6iYOF3Bq8UV AILnSTRg8c09OaCg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 7DDA513726 for ; Fri, 15 Dec 2023 11:37:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 6QNHHXc6fGVfdAAAD6G6ig (envelope-from ) for ; Fri, 15 Dec 2023 11:37:27 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/tui] Use more box_width in tui-regs.c Date: Fri, 15 Dec 2023 12:37:52 +0100 Message-Id: <20231215113752.29375-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Score: 3.72 X-Spam-Flag: NO X-Spamd-Result: default: False [4.90 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.00)[41.80%] X-Spam-Score: 4.90 Authentication-Results: smtp-out1.suse.de; none X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 While experimenting with can_box () == false by default, I noticed two places in tui-regs.c where we can replace a hardcoded 1 with box_width (). It also turned out to be necessary to set scrollok to false, otherwise writing the last char of the last line with register info will cause a scroll. Tested on x86_64-linux. --- gdb/tui/tui-regs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) base-commit: 8cb16b68584e14aade8de166c75e1d85e38507bd diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 4c6ea8aff0d..ba801ddc050 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -288,7 +288,7 @@ tui_data_window::display_registers_from (int start_element_no) /* Now create each data "sub" window, and write the display into it. */ - int cur_y = 1; + int cur_y = box_width (); while (i < m_regs_content.size () && cur_y <= height - box_size ()) { for (int j = 0; @@ -296,7 +296,7 @@ tui_data_window::display_registers_from (int start_element_no) j++) { /* Create the window if necessary. */ - m_regs_content[i].x = (m_item_width * j) + 1; + m_regs_content[i].x = box_width () + (m_item_width * j); m_regs_content[i].y = cur_y; m_regs_content[i].visible = true; m_regs_content[i].rerender (handle.get (), m_item_width); @@ -487,6 +487,10 @@ tui_data_window::check_register_values (frame_info_ptr frame) void tui_data_item_window::rerender (WINDOW *handle, int field_width) { + /* In case the regs window is not boxed, we'll write the last char in the + last line here, causing a scroll, so prevent that. */ + scrollok (handle, FALSE); + if (highlight) /* We ignore the return value, casting it to void in order to avoid a compiler warning. The warning itself was introduced by a patch