From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway22.websitewelcome.com (gateway22.websitewelcome.com [192.185.47.48]) by sourceware.org (Postfix) with ESMTPS id D00743851C0C for ; Fri, 12 Jun 2020 00:26:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D00743851C0C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway22.websitewelcome.com (Postfix) with ESMTP id 4E0814B16 for ; Thu, 11 Jun 2020 19:26:13 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id jXWPjC6UxhmVTjXWPj5q4h; Thu, 11 Jun 2020 19:26:13 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: 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=yb1jw/4mCezwCYfcqMsMbaV3K5PCda72z+fiGV6OsbA=; b=vWkq756sX91/Cqf36M+/qEzteC Ta4/X2OFITOX5n32K+vgIWrvmDuSUb88PM95VGLga1ePwZbwYs/AMM1oF6+VlSZkno4CV7K5VmLwu 3obhvvSNp4oTSzxNyzGh82/zx; Received: from 174-16-104-48.hlrn.qwest.net ([174.16.104.48]:56342 helo=bapiya) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jjXWO-001axa-UZ; Thu, 11 Jun 2020 18:26:13 -0600 From: Tom Tromey To: Christian Biesinger Cc: Tom Tromey , gdb-patches Subject: Re: [PATCH 1/2] Fix C-x 1 from gdb prompt References: <20200606201301.19145-1-tom@tromey.com> <20200606201301.19145-2-tom@tromey.com> X-Attribution: Tom Date: Thu, 11 Jun 2020 18:26:11 -0600 In-Reply-To: (Christian Biesinger's message of "Mon, 8 Jun 2020 12:57:55 -0500") Message-ID: <87r1ulm8nw.fsf@tromey.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: 174.16.104.48 X-Source-L: No X-Exim-ID: 1jjXWO-001axa-UZ X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-104-48.hlrn.qwest.net (bapiya) [174.16.104.48]:56342 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3036.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_SBL_CSS, SPF_HELO_PASS, SPF_NEUTRAL, TXREP, URIBL_CSS, URIBL_CSS_A autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Fri, 12 Jun 2020 00:26:17 -0000 >>>>> "Christian" == Christian Biesinger writes: Christian> On Sat, Jun 6, 2020 at 3:13 PM Tom Tromey wrote: >> + else if (strcmp (this_name, name) == 0 >> + || strcmp (this_name, "cmd") == 0 >> + || strcmp (this_name, "status") == 0) Christian> Maybe those strings should be constants somewhere? Most of them were constants in tui-data.h already. I thought I'd tack this patch on to the end of the series. Tom commit 9aaf1b1b02745ee803dcfa2b7bf91add2cf0a6ea Author: Tom Tromey Date: Thu Jun 11 18:19:12 2020 -0600 Use macros for TUI window names Christian pointed out that tui-layout.c hard-codes various window names. This patch changes the code to use the macros from tui-data.h instead. For each window, I searched for uses of the name; but I only found any in tui-layout.c. This also adds a new macro to account for the "status" window. gdb/ChangeLog 2020-06-11 Tom Tromey * tui/tui-data.h (STATUS_NAME): New macro. * tui/tui-layout.c (tui_remove_some_windows) (initialize_known_windows, tui_register_window) (tui_layout_split::remove_windows, initialize_layouts) (tui_new_layout_command): Don't use hard-coded window names. diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cd6ff0b8fe8..f674fef7e16 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2020-06-11 Tom Tromey + + * tui/tui-data.h (STATUS_NAME): New macro. + * tui/tui-layout.c (tui_remove_some_windows) + (initialize_known_windows, tui_register_window) + (tui_layout_split::remove_windows, initialize_layouts) + (tui_new_layout_command): Don't use hard-coded window names. + 2020-06-06 Tom Tromey PR tui/25348: diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 2dc73b963da..abe77272291 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -130,6 +130,7 @@ struct tui_gen_win_info #define CMD_NAME "cmd" #define DATA_NAME "regs" #define DISASSEM_NAME "asm" +#define STATUS_NAME "status" #define MIN_WIN_HEIGHT 3 #define MIN_CMD_WIN_HEIGHT 3 diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index b87d21eb6de..8164b346370 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -255,7 +255,7 @@ tui_remove_some_windows () { tui_win_info *focus = tui_win_with_focus (); - if (strcmp (focus->name (), "cmd") == 0) + if (strcmp (focus->name (), CMD_NAME) == 0) { /* Try leaving the source or disassembly window. If neither exists, just do nothing. */ @@ -373,18 +373,18 @@ initialize_known_windows () { known_window_types = new std::unordered_map; - known_window_types->emplace ("src", + known_window_types->emplace (SRC_NAME, make_standard_window); - known_window_types->emplace ("cmd", + known_window_types->emplace (CMD_NAME, make_standard_window); - known_window_types->emplace ("regs", + known_window_types->emplace (DATA_NAME, make_standard_window); - known_window_types->emplace ("asm", + known_window_types->emplace (DISASSEM_NAME, make_standard_window); - known_window_types->emplace ("status", get_locator_window); + known_window_types->emplace (STATUS_NAME, get_locator_window); } /* See tui-layout.h. */ @@ -394,8 +394,8 @@ tui_register_window (const char *name, window_factory &&factory) { std::string name_copy = name; - if (name_copy == "src" || name_copy == "cmd" || name_copy == "regs" - || name_copy == "asm" || name_copy == "status") + if (name_copy == SRC_NAME || name_copy == CMD_NAME || name_copy == DATA_NAME + || name_copy == DISASSEM_NAME || name_copy == STATUS_NAME) error (_("Window type \"%s\" is built-in"), name); known_window_types->emplace (std::move (name_copy), @@ -791,8 +791,8 @@ tui_layout_split::remove_windows (const char *name) if (this_name == nullptr) m_splits[i].layout->remove_windows (name); else if (strcmp (this_name, name) == 0 - || strcmp (this_name, "cmd") == 0 - || strcmp (this_name, "status") == 0) + || strcmp (this_name, CMD_NAME) == 0 + || strcmp (this_name, STATUS_NAME) == 0) { /* Keep. */ } @@ -888,37 +888,37 @@ initialize_layouts () tui_layout_split *layout; layout = new tui_layout_split (); - layout->add_window ("src", 2); - layout->add_window ("status", 0); - layout->add_window ("cmd", 1); - add_layout_command ("src", layout); + layout->add_window (SRC_NAME, 2); + layout->add_window (STATUS_NAME, 0); + layout->add_window (CMD_NAME, 1); + add_layout_command (SRC_NAME, layout); layout = new tui_layout_split (); - layout->add_window ("asm", 2); - layout->add_window ("status", 0); - layout->add_window ("cmd", 1); - add_layout_command ("asm", layout); + layout->add_window (DISASSEM_NAME, 2); + layout->add_window (STATUS_NAME, 0); + layout->add_window (CMD_NAME, 1); + add_layout_command (DISASSEM_NAME, layout); layout = new tui_layout_split (); - layout->add_window ("src", 1); - layout->add_window ("asm", 1); - layout->add_window ("status", 0); - layout->add_window ("cmd", 1); + layout->add_window (SRC_NAME, 1); + layout->add_window (DISASSEM_NAME, 1); + layout->add_window (STATUS_NAME, 0); + layout->add_window (CMD_NAME, 1); add_layout_command ("split", layout); layout = new tui_layout_split (); - layout->add_window ("regs", 1); - layout->add_window ("src", 1); - layout->add_window ("status", 0); - layout->add_window ("cmd", 1); + layout->add_window (DATA_NAME, 1); + layout->add_window (SRC_NAME, 1); + layout->add_window (STATUS_NAME, 0); + layout->add_window (CMD_NAME, 1); layouts.emplace_back (layout); src_regs_layout = layout; layout = new tui_layout_split (); - layout->add_window ("regs", 1); - layout->add_window ("asm", 1); - layout->add_window ("status", 0); - layout->add_window ("cmd", 1); + layout->add_window (DATA_NAME, 1); + layout->add_window (DISASSEM_NAME, 1); + layout->add_window (STATUS_NAME, 0); + layout->add_window (CMD_NAME, 1); layouts.emplace_back (layout); asm_regs_layout = layout; } @@ -1010,8 +1010,8 @@ tui_new_layout_command (const char *spec, int from_tty) error (_("Missing '}' in layout specification")); if (seen_windows.empty ()) error (_("New layout does not contain any windows")); - if (seen_windows.find ("cmd") == seen_windows.end ()) - error (_("New layout does not contain the \"cmd\" window")); + if (seen_windows.find (CMD_NAME) == seen_windows.end ()) + error (_("New layout does not contain the \"" CMD_NAME "\" window")); gdb::unique_xmalloc_ptr cmd_name = make_unique_xstrdup (new_name.c_str ());