From patchwork Wed Aug 21 02:25:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 34213 Received: (qmail 29668 invoked by alias); 21 Aug 2019 02:25:55 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 29015 invoked by uid 89); 21 Aug 2019 02:25:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway21.websitewelcome.com Received: from gateway21.websitewelcome.com (HELO gateway21.websitewelcome.com) (192.185.45.176) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 21 Aug 2019 02:25:40 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway21.websitewelcome.com (Postfix) with ESMTP id 84B10400CD796 for ; Tue, 20 Aug 2019 21:25:39 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 0GJficrW64FKp0GJfiiVIP; Tue, 20 Aug 2019 21:25:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type: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=hRxHwyUYRBOLBnOGd5juj0dnFKcHIj8I44FDO9NtqDI=; b=ZJm1HEfhdGZBUNOd68G57gyIGG CYNznJIBZsoli6wCmg+qF+9ytGm38h5OaFsPaB4HJicPY6GtrvzE7B2MNg9QQqHjlanKCvEZHA3wD QeXKIdCnHe8/YVJKKFrso6add; Received: from 97-122-178-82.hlrn.qwest.net ([97.122.178.82]:48672 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1i0GJf-001K6n-AR; Tue, 20 Aug 2019 21:25:39 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 05/15] Private data members in tui_data_window Date: Tue, 20 Aug 2019 20:25:25 -0600 Message-Id: <20190821022535.9762-6-tom@tromey.com> In-Reply-To: <20190821022535.9762-1-tom@tromey.com> References: <20190821022535.9762-1-tom@tromey.com> This changes tui_data_window so that the data members are private. This required the addition of a simple accessor method in one case. gdb/ChangeLog 2019-08-20 Tom Tromey * tui/tui-regs.h (struct tui_data_window) : Move later. Now private. : New method. * tui/tui-regs.c (tui_reg_command): Update. * tui/tui-layout.c (tui_set_layout): Update. --- gdb/ChangeLog | 8 ++++++++ gdb/tui/tui-layout.c | 2 +- gdb/tui/tui-regs.c | 2 +- gdb/tui/tui-regs.h | 15 ++++++++++----- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 01d50e437e5..387a4f51aff 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -189,7 +189,7 @@ tui_set_layout (enum tui_layout_type layout_type) tui_update_source_windows_with_addr (gdbarch, addr); if (new_layout == SRC_DATA_COMMAND || new_layout == DISASSEM_DATA_COMMAND) - TUI_DATA_WIN->show_registers (TUI_DATA_WIN->current_group); + TUI_DATA_WIN->show_registers (TUI_DATA_WIN->get_current_group ()); } } diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 4a09a590446..98096e2cdc4 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -622,7 +622,7 @@ tui_reg_command (const char *args, int from_tty) if (TUI_DATA_WIN == NULL || !TUI_DATA_WIN->is_visible ()) tui_reg_layout (); - struct reggroup *current_group = TUI_DATA_WIN->current_group; + struct reggroup *current_group = TUI_DATA_WIN->get_current_group (); if (strncmp (args, "next", len) == 0) match = tui_reg_next (current_group, gdbarch); else if (strncmp (args, "prev", len) == 0) diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h index fa76cae0b18..2606c39f5a1 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -63,15 +63,15 @@ struct tui_data_window : public tui_win_info return DATA_NAME; } - /* Windows that are used to display registers. */ - std::vector regs_content; - int regs_column_count = 0; - struct reggroup *current_group = nullptr; - void check_register_values (struct frame_info *frame); void show_registers (struct reggroup *group); + struct reggroup *get_current_group () const + { + return current_group; + } + protected: void do_scroll_vertical (int num_to_scroll) override; @@ -126,6 +126,11 @@ private: void delete_data_content_windows (); void erase_data_content (const char *prompt); + + /* Windows that are used to display registers. */ + std::vector regs_content; + int regs_column_count = 0; + struct reggroup *current_group = nullptr; }; #endif /* TUI_TUI_REGS_H */