From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 3FA5F3858002 for ; Mon, 22 May 2023 13:15:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3FA5F3858002 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 68E9B1FF0E; Mon, 22 May 2023 13:15:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1684761344; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sjlRcSSUe++chn9lKrYGWmm+n//X+d1kW34NIdmYGXg=; b=qHccXLKbVwUJDAUnbc9d2lmh1Fdf0rlnSKTem73y9mUEwyueY3kxCyiAAnj5QILMjf2fCk JuCXDe/PM81h/B2hSk3Dlf/7rtsz4+vamIWKs7SHu2ZBiDMA1ZFJFTL59dnVts/rv/mX0o TBB2M/QfGWnj74kR0ooCryoyVlfzTDY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1684761344; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sjlRcSSUe++chn9lKrYGWmm+n//X+d1kW34NIdmYGXg=; b=JuQJ7fKYZNZ9tnulacX6hTXyC2EGqJPIitJoz+vSBWToAh2RuLMBa87wNAcQN0AwMyIe7S rofjbfkAEOcx37CQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5279613776; Mon, 22 May 2023 13:15:44 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id gPwVEwBra2RvdAAAMHmgww (envelope-from ); Mon, 22 May 2023 13:15:44 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 2/6] [gdb/testsuite] Factor out Term::_wrap_cursor Date: Mon, 22 May 2023 15:15:41 +0200 Message-Id: <20230522131545.12291-4-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230522131545.12291-1-tdevries@suse.de> References: <20230522131545.12291-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 List-Id: Factor out new proc Term::_wrap_cursor out of proc Term::_insert. Tested on x86_64-linux. --- gdb/testsuite/lib/tuiterm.exp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp index 5c0be85ee73..e52cb3e5b6d 100644 --- a/gdb/testsuite/lib/tuiterm.exp +++ b/gdb/testsuite/lib/tuiterm.exp @@ -609,6 +609,18 @@ namespace eval Term { } } + # Set cursor to col 0 on the next line. If we run off screen, error out. + proc _wrap_cursor {} { + variable _cur_col + variable _cur_row + variable _rows + set _cur_col 0 + incr _cur_row + if {$_cur_row >= $_rows} { + error "FIXME scroll" + } + } + # Insert string at the cursor location. proc _insert {str} { _log_cur "Inserted string '$str'" { @@ -616,7 +628,6 @@ namespace eval Term { variable _cur_col variable _cur_row - variable _rows variable _cols variable _attrs variable _chars @@ -626,11 +637,7 @@ namespace eval Term { set _chars($_cur_col,$_cur_row) [list $char $lattr] incr _cur_col if {$_cur_col >= $_cols} { - set _cur_col 0 - incr _cur_row - if {$_cur_row >= $_rows} { - error "FIXME scroll" - } + _wrap_cursor } } } -- 2.35.3