From patchwork Thu Jul 4 17:02:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33544 Received: (qmail 104991 invoked by alias); 4 Jul 2019 17:03:24 -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 104877 invoked by uid 89); 4 Jul 2019 17:03:23 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.0 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=H*RU:esmtpa, H*r:esmtpa X-HELO: gateway36.websitewelcome.com Received: from gateway36.websitewelcome.com (HELO gateway36.websitewelcome.com) (192.185.192.36) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 Jul 2019 17:03:19 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway36.websitewelcome.com (Postfix) with ESMTP id E2DBE400C8BC6 for ; Thu, 4 Jul 2019 11:25:54 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id j58ghGidp2qH7j58ghNq47; Thu, 04 Jul 2019 12:03:18 -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=k0xltp5J3dbMgSCceU3NNQsOKRZ02F+iDmnKFQp9stQ=; b=ae8mD4gOvNGzDfDZYbqOo1uQFx KloYuSTbQk935aFg5zqfiBbCS1teHVM0/79OPOmyOPVdOzU7alVAbcCtebx/U1kuNxkQzLIU9tCHb LoTA4FNfAVyDhn5a8csRYE5f/; Received: from 174-29-58-150.hlrn.qwest.net ([174.29.58.150]:34692 helo=bapiya.Home) by box5379.bluehost.com with esmtpa (Exim 4.92) (envelope-from ) id 1hj58g-002sDI-Cg; Thu, 04 Jul 2019 12:03:18 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 11/61] Introduce tui_data_window::display_all_data method Date: Thu, 4 Jul 2019 11:02:21 -0600 Message-Id: <20190704170311.15982-12-tom@tromey.com> In-Reply-To: <20190704170311.15982-1-tom@tromey.com> References: <20190704170311.15982-1-tom@tromey.com> This changes tui_display_all_data to be a method on tui_data_window. This helps cluster uses of the TUI_DATA_WIN global. 2019-07-04 Tom Tromey * tui/tui-windata.h (tui_display_all_data): Don't declare. * tui/tui-windata.c (tui_data_window::display_all_data): Rename from tui_display_all_data. * tui/tui-win.c (tui_data_window::do_make_visible_with_new_height): Update. * tui/tui-regs.c (tui_show_registers): Update. * tui/tui-layout.c (tui_set_layout): Update. * tui/tui-data.h (struct tui_data_window) : New method. --- gdb/ChangeLog | 12 ++++++++++++ gdb/tui/tui-data.h | 4 ++++ gdb/tui/tui-layout.c | 2 +- gdb/tui/tui-regs.c | 2 +- gdb/tui/tui-win.c | 2 +- gdb/tui/tui-windata.c | 6 +++--- gdb/tui/tui-windata.h | 1 - 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 676345c528a..5cdd7561e62 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -503,6 +503,10 @@ struct tui_data_window : public tui_win_info past the register area (-1) is returned. */ int first_reg_element_no_inline (int line_no) const; + /* This function displays the data that is in the data window's + content. It does not set the content. */ + void display_all_data (); + protected: void do_scroll_vertical (int num_to_scroll) override; diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index d9a1f08ac1f..9e683cfa919 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -215,7 +215,7 @@ tui_set_layout (enum tui_layout_type layout_type) if (!regs_populate && (new_layout == SRC_DATA_COMMAND || new_layout == DISASSEM_DATA_COMMAND)) - tui_display_all_data (); + TUI_DATA_WIN->display_all_data (); tui_update_source_windows_with_addr (gdbarch, addr); diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index ae38d343822..59933639f6f 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -157,7 +157,7 @@ tui_show_registers (struct reggroup *group) data_item_win->highlight = false; } TUI_DATA_WIN->current_group = group; - tui_display_all_data (); + TUI_DATA_WIN->display_all_data (); } } diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 557f8b5d2d6..ee03cf38e14 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -1366,7 +1366,7 @@ tui_source_window_base::do_make_visible_with_new_height () void tui_data_window::do_make_visible_with_new_height () { - tui_display_all_data (); + display_all_data (); } /* See tui-data.h. */ diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c index 722d0a5e26e..dd2daf19332 100644 --- a/gdb/tui/tui-windata.c +++ b/gdb/tui/tui-windata.c @@ -97,15 +97,15 @@ tui_erase_data_content (const char *prompt) /* This function displays the data that is in the data window's content. It does not set the content. */ void -tui_display_all_data (void) +tui_data_window::display_all_data () { - if (TUI_DATA_WIN->regs_content.empty ()) + if (regs_content.empty ()) tui_erase_data_content (NO_DATA_STRING); else { tui_erase_data_content (NULL); tui_delete_data_content_windows (); - tui_check_and_display_highlight_if_needed (TUI_DATA_WIN); + tui_check_and_display_highlight_if_needed (this); tui_display_registers_from (0); } } diff --git a/gdb/tui/tui-windata.h b/gdb/tui/tui-windata.h index 9970cfae547..adffcafacb4 100644 --- a/gdb/tui/tui-windata.h +++ b/gdb/tui/tui-windata.h @@ -25,7 +25,6 @@ #include "tui/tui-data.h" extern void tui_erase_data_content (const char *); -extern void tui_display_all_data (void); extern void tui_delete_data_content_windows (void); extern void tui_refresh_data_win (void);