From patchwork Wed Jul 12 13:27:43 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: 72553 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 498C938582B7 for ; Wed, 12 Jul 2023 13:28:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 498C938582B7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689168494; bh=oiVJDFc2b4qiKTE9uN3EXXX9RhblUW5vC7l17s3Mts0=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=hN0fNkfhmi2KFtkV9Of/umG7x6SOtqfDGvL/NzrugC72zBwuz2Y8RMLsxS10elDdb GxXb1yWEkSmKInNwcOgLOEIfyXSsjl5QS0VQ5ZTagek0xZ0yCwsaHvcrEHZ8jiC/mQ TcGNZq4cnsR1ZZNY3f8TjQ+Nx7H9Yq5xITe9oY9E= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id BD6193858D20 for ; Wed, 12 Jul 2023 13:27:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BD6193858D20 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 F1DB41F893; Wed, 12 Jul 2023 13:27:50 +0000 (UTC) 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 D27E5133DD; Wed, 12 Jul 2023 13:27:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OERxMVaqrmTsbQAAMHmgww (envelope-from ); Wed, 12 Jul 2023 13:27:50 +0000 To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] [gdb/tui] Assume HAVE_WBORDER Date: Wed, 12 Jul 2023 15:27:43 +0200 Message-Id: <20230712132743.25382-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" The tui border-kind setting allows values acs, ascii and space. The values ascii and space however don't work well with !HAVE_WBORDER. Fix this by removing the !HAVE_WBORDER case, which was introduced for Ultrix support, which is now obsolete. Tested on x86_64-linux. PR tui/30580 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30580 --- gdb/config.in | 3 --- gdb/configure | 2 +- gdb/configure.ac | 2 +- gdb/tui/tui-wingeneral.c | 4 ---- 4 files changed, 2 insertions(+), 9 deletions(-) base-commit: 664ac93fa86a974aaf42497a58bc1c05dde09909 diff --git a/gdb/config.in b/gdb/config.in index a7da88b92d7..bc562669d2c 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -568,9 +568,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_WAIT_H -/* Define to 1 if you have the `wborder' function. */ -#undef HAVE_WBORDER - /* Define to 1 if you have the header file. */ #undef HAVE_WINDOWS_H diff --git a/gdb/configure b/gdb/configure index 5bb2a0795e5..637f9cd7296 100755 --- a/gdb/configure +++ b/gdb/configure @@ -23452,7 +23452,7 @@ for ac_func in getuid getgid \ pipe pread pread64 pwrite resize_term \ getpgid setsid \ sigaction sigsetmask socketpair \ - ttrace wborder wresize setlocale iconvlist libiconvlist btowc \ + ttrace wresize setlocale iconvlist libiconvlist btowc \ setrlimit getrlimit posix_madvise waitpid \ use_default_colors do : diff --git a/gdb/configure.ac b/gdb/configure.ac index fb43cd10d6c..97c6bf0ed5f 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1344,7 +1344,7 @@ AC_CHECK_FUNCS([getuid getgid \ pipe pread pread64 pwrite resize_term \ getpgid setsid \ sigaction sigsetmask socketpair \ - ttrace wborder wresize setlocale iconvlist libiconvlist btowc \ + ttrace wresize setlocale iconvlist libiconvlist btowc \ setrlimit getrlimit posix_madvise waitpid \ use_default_colors]) AM_LANGINFO_CODESET diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index 385e6e5d68d..2b63499683e 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -98,14 +98,10 @@ box_win (struct tui_win_info *win_info, ? tui_active_border_style.style () : tui_border_style.style ())); wattron (win, attrs); -#ifdef HAVE_WBORDER wborder (win, tui_border_vline, tui_border_vline, tui_border_hline, tui_border_hline, tui_border_ulcorner, tui_border_urcorner, tui_border_llcorner, tui_border_lrcorner); -#else - box (win, tui_border_vline, tui_border_hline); -#endif if (!win_info->title.empty ()) { /* Emit "+-TITLE-+" -- so 2 characters on the right and 2 on