From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id EC3033858CD1 for ; Fri, 23 Jun 2023 11:15:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EC3033858CD1 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-out1.suse.de (Postfix) with ESMTPS id 25E9D21B12; Fri, 23 Jun 2023 11:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1687518932; 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=uEQeKvrGfAX52M6ideFUPjESdutJK9IIu3CzzRfYMSE=; b=PQWREYuO1d2kX1Oe5buFlAvwbMOy6Fc+36d9QUl0aW73ZwRfBWqy/L6Aq77vbpSdkMkQ52 oWfLCPhJcV/w10+g7ZDjulmg0WZDE9Nj0CvZjbefdVa3IAD2wA+ItaXnDIL2ouSPzK5i8X mIYmsB3E1u5Rirkn2vMv6UttI0e8d4c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1687518932; 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=uEQeKvrGfAX52M6ideFUPjESdutJK9IIu3CzzRfYMSE=; b=4x1usRzyZFFr5dITpPOjcF8ajf/IFB69vPqp9dPwM+z+FBz3MobdiH4QfU6EaKOs40A+pg 2v8kqCQ+H3N11GDQ== 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 0A47F1331F; Fri, 23 Jun 2023 11:15:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id WDNzAdR+lWSBFQAAMHmgww (envelope-from ); Fri, 23 Jun 2023 11:15:32 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 3/4] [gdb/tui] Merge tui border-kind corner translation tables Date: Fri, 23 Jun 2023 13:15:35 +0200 Message-Id: <20230623111536.1623-3-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230623111536.1623-1-tdevries@suse.de> References: <20230623111536.1623-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.9 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: The tables: - tui_border_kind_translate_ulcorner - tui_border_kind_translate_urcorner - tui_border_kind_translate_llcorner - tui_border_kind_translate_lrcorner are identical. Merge and rename to tui_border_kind_translate_corner. Tested on x86_64-linux. --- gdb/tui/tui-win.c | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 1406e072c43..2cc81778f3a 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -128,8 +128,8 @@ static struct tui_translate tui_border_mode_translate[] = { { 0, 0 } }; -/* Translation tables for border-kind (acs excluded), one for each border - character (see wborder, border curses operations). */ +/* Translation tables for border-kind (acs excluded), one for vline, hline and + corners (see wborder, border curses operations). */ static struct tui_translate tui_border_kind_translate_vline[] = { { "space", ' ' }, { "ascii", '|' }, @@ -142,25 +142,7 @@ static struct tui_translate tui_border_kind_translate_hline[] = { { 0, 0 } }; -static struct tui_translate tui_border_kind_translate_ulcorner[] = { - { "space", ' ' }, - { "ascii", '+' }, - { 0, 0 } -}; - -static struct tui_translate tui_border_kind_translate_urcorner[] = { - { "space", ' ' }, - { "ascii", '+' }, - { 0, 0 } -}; - -static struct tui_translate tui_border_kind_translate_llcorner[] = { - { "space", ' ' }, - { "ascii", '+' }, - { 0, 0 } -}; - -static struct tui_translate tui_border_kind_translate_lrcorner[] = { +static struct tui_translate tui_border_kind_translate_corner[] = { { "space", ' ' }, { "ascii", '+' }, { 0, 0 } @@ -287,20 +269,20 @@ tui_update_variables () /* If one corner changes, all characters are changed. Only check the first one. */ - int val = translate_acs (tui_border_kind, tui_border_kind_translate_lrcorner, + int val = translate_acs (tui_border_kind, tui_border_kind_translate_corner, ACS_LRCORNER); need_redraw |= assign_return_if_changed (tui_border_lrcorner, val); tui_border_llcorner - = translate_acs (tui_border_kind, tui_border_kind_translate_llcorner, + = translate_acs (tui_border_kind, tui_border_kind_translate_corner, ACS_LLCORNER); tui_border_ulcorner - = translate_acs (tui_border_kind, tui_border_kind_translate_ulcorner, + = translate_acs (tui_border_kind, tui_border_kind_translate_corner, ACS_ULCORNER); tui_border_urcorner = - translate_acs (tui_border_kind, tui_border_kind_translate_urcorner, + translate_acs (tui_border_kind, tui_border_kind_translate_corner, ACS_URCORNER); tui_border_hline -- 2.35.3