From patchwork Thu Jul 4 17:02:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33548 Received: (qmail 105784 invoked by alias); 4 Jul 2019 17:03:29 -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 105234 invoked by uid 89); 4 Jul 2019 17:03:25 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.2 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=5116, 511, 6 X-HELO: gateway23.websitewelcome.com Received: from gateway23.websitewelcome.com (HELO gateway23.websitewelcome.com) (192.185.49.104) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 Jul 2019 17:03:20 +0000 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway23.websitewelcome.com (Postfix) with ESMTP id 7A214117FF for ; Thu, 4 Jul 2019 12:03:19 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id j58hhF0J890onj58hhBMWF; Thu, 04 Jul 2019 12:03:19 -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=aQbjPpzf5ssZNdWu2oxxJFyJYHgtt195uOIVRTTarmg=; b=DPKF7dsRYc2Q+/s/KZ1LrQvIpe nVFA99RvQybYMBhCIde10HxbOUma9M3T9U2/jzdu5R+Lz71OAE3Jm8LT3s+YEbzajEBNwnC8LwPe/ ZYy2vf7cBT9FftStxbarAqBhS; 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 1hj58h-002sDI-8Z; Thu, 04 Jul 2019 12:03:19 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 14/61] Introduce tui_data_window::erase_data_content method Date: Thu, 4 Jul 2019 11:02:24 -0600 Message-Id: <20190704170311.15982-15-tom@tromey.com> In-Reply-To: <20190704170311.15982-1-tom@tromey.com> References: <20190704170311.15982-1-tom@tromey.com> This changes tui_erase_data_content to be a method on tui_data_window, allowing for the removal of some uses of the TUI_DATA_WIN global. 2019-07-04 Tom Tromey * tui/tui-windata.h (tui_erase_data_content): Don't declare. * tui/tui-windata.c (tui_data_window::erase_data_content): Rename from tui_erase_data_content. (tui_data_window::display_all_data) (tui_data_window::refresh_all) (tui_data_window::do_scroll_vertical): Update. * tui/tui-regs.c (tui_show_registers): Update. * tui/tui-data.h (struct tui_data_window) : New method. --- gdb/ChangeLog | 12 ++++++++++++ gdb/tui/tui-data.h | 2 ++ gdb/tui/tui-regs.c | 2 +- gdb/tui/tui-windata.c | 25 +++++++++++-------------- gdb/tui/tui-windata.h | 2 -- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 9a908115231..e1c85df31bf 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -511,6 +511,8 @@ struct tui_data_window : public tui_win_info is usually done when the data window is scrolled. */ void delete_data_content_windows (); + void erase_data_content (const char *prompt); + protected: void do_scroll_vertical (int num_to_scroll) override; diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 59933639f6f..9b396e429e2 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -146,7 +146,7 @@ tui_show_registers (struct reggroup *group) if (ret == TUI_FAILURE) { TUI_DATA_WIN->current_group = 0; - tui_erase_data_content (NO_REGS_STRING); + TUI_DATA_WIN->erase_data_content (NO_REGS_STRING); } else { diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c index 02cd6d0b727..abbed3f16a1 100644 --- a/gdb/tui/tui-windata.c +++ b/gdb/tui/tui-windata.c @@ -72,25 +72,22 @@ tui_data_window::delete_data_content_windows () void -tui_erase_data_content (const char *prompt) +tui_data_window::erase_data_content (const char *prompt) { - werase (TUI_DATA_WIN->handle); - tui_check_and_display_highlight_if_needed (TUI_DATA_WIN); + werase (handle); + tui_check_and_display_highlight_if_needed (this); if (prompt != NULL) { - int half_width = (TUI_DATA_WIN->width - 2) / 2; + int half_width = (width - 2) / 2; int x_pos; if (strlen (prompt) >= half_width) x_pos = 1; else x_pos = half_width - strlen (prompt); - mvwaddstr (TUI_DATA_WIN->handle, - (TUI_DATA_WIN->height / 2), - x_pos, - (char *) prompt); + mvwaddstr (handle, (height / 2), x_pos, (char *) prompt); } - wrefresh (TUI_DATA_WIN->handle); + wrefresh (handle); } @@ -100,10 +97,10 @@ void tui_data_window::display_all_data () { if (regs_content.empty ()) - tui_erase_data_content (NO_DATA_STRING); + erase_data_content (NO_DATA_STRING); else { - tui_erase_data_content (NULL); + erase_data_content (NULL); delete_data_content_windows (); tui_check_and_display_highlight_if_needed (this); tui_display_registers_from (0); @@ -115,7 +112,7 @@ tui_data_window::display_all_data () void tui_data_window::refresh_all () { - tui_erase_data_content (NULL); + erase_data_content (NULL); if (!regs_content.empty ()) { int first_element = first_data_item_displayed (); @@ -129,7 +126,7 @@ tui_data_window::refresh_all () if (first_line >= 0) { - tui_erase_data_content (NULL); + erase_data_content (NULL); tui_display_registers_from_line (first_line); } } @@ -155,7 +152,7 @@ tui_data_window::do_scroll_vertical (int num_to_scroll) if (first_line >= 0) { first_line += num_to_scroll; - tui_erase_data_content (NULL); + erase_data_content (NULL); delete_data_content_windows (); tui_display_registers_from_line (first_line); } diff --git a/gdb/tui/tui-windata.h b/gdb/tui/tui-windata.h index 419b22f3658..3b89eefabc0 100644 --- a/gdb/tui/tui-windata.h +++ b/gdb/tui/tui-windata.h @@ -24,6 +24,4 @@ #include "tui/tui-data.h" -extern void tui_erase_data_content (const char *); - #endif /* TUI_TUI_WINDATA_H */