From patchwork Sat Aug 3 13:29:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33941 Received: (qmail 95818 invoked by alias); 3 Aug 2019 13:29:38 -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 95420 invoked by uid 89); 3 Aug 2019 13:29:36 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.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=HX-Languages-Length:4399 X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.148.231) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 03 Aug 2019 13:29:33 +0000 Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway34.websitewelcome.com (Postfix) with ESMTP id 8469416DFF for ; Sat, 3 Aug 2019 08:29:32 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id tu6Gh5rzU2PzOtu6GhATiL; Sat, 03 Aug 2019 08:29:32 -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=23kfl5LYynmlxbWZGyfzNePuw/608NsOW7OFZ62HPbA=; b=vhKfIrwlgIKdU11ezMMRertvto llUElonD3kY9faPE0V2K9rV+eM746pE5w3DSUkEBu3w4by/VLZZrECrsjALb6GpeeDm+AhYoozbid ut8R67wdmoEH/cBH/y/KIbZXH; Received: from 97-122-178-82.hlrn.qwest.net ([97.122.178.82]:36980 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1htu6G-003nqS-64; Sat, 03 Aug 2019 08:29:32 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 11/19] Change tui_show_source_content to be a method Date: Sat, 3 Aug 2019 07:29:17 -0600 Message-Id: <20190803132925.25074-12-tom@tromey.com> In-Reply-To: <20190803132925.25074-1-tom@tromey.com> References: <20190803132925.25074-1-tom@tromey.com> This changes tui_show_source_content to be a method on tui_source_window_base. gdb/ChangeLog 2019-08-03 Tom Tromey * tui/tui-winsource.h (struct tui_source_window_base) : Declare. (tui_show_source_content): Don't declare. * tui/tui-winsource.c (tui_update_source_window_as_is): Update. (tui_source_window_base::show_source_content): Rename from tui_show_source_content. (tui_source_window_base::refresh_all): Update. * tui/tui-layout.c (show_source_disasm_command) (show_source_or_disasm_and_command): Update. --- gdb/ChangeLog | 12 ++++++++++++ gdb/tui/tui-layout.c | 6 +++--- gdb/tui/tui-winsource.c | 18 +++++++++--------- gdb/tui/tui-winsource.h | 3 ++- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 2715d322dc7..3683835954d 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -520,7 +520,7 @@ show_source_disasm_command (void) struct tui_locator_window *locator = tui_locator_win_info_ptr (); gdb_assert (locator != nullptr); - tui_show_source_content (TUI_SRC_WIN); + TUI_SRC_WIN->show_source_content (); if (TUI_DISASM_WIN == NULL) tui_win_list[DISASSEM_WIN] = new tui_disasm_window (); TUI_DISASM_WIN->reset (asm_height, @@ -536,7 +536,7 @@ show_source_disasm_command (void) TUI_DISASM_WIN->m_has_locator = true; locator->make_visible (true); tui_show_locator_content (); - tui_show_source_content (TUI_DISASM_WIN); + TUI_DISASM_WIN->show_source_content (); if (TUI_CMD_WIN == NULL) tui_win_list[CMD_WIN] = new tui_cmd_window (); @@ -664,7 +664,7 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type) win_info->m_has_locator = true; locator->make_visible (true); tui_show_locator_content (); - tui_show_source_content (win_info); + win_info->show_source_content (); if (TUI_CMD_WIN == NULL) tui_win_list[CMD_WIN] = new tui_cmd_window (); diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 6a72c6fe74b..bccc345fed9 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -105,7 +105,7 @@ tui_update_source_window_as_is (struct tui_source_window_base *win_info, else { tui_update_breakpoint_info (win_info, nullptr, false); - tui_show_source_content (win_info); + win_info->show_source_content (); tui_update_exec_info (win_info); if (win_info->type == SRC_WIN) { @@ -275,20 +275,20 @@ tui_show_source_line (struct tui_source_window_base *win_info, int lineno) } void -tui_show_source_content (struct tui_source_window_base *win_info) +tui_source_window_base::show_source_content () { - if (!win_info->content.empty ()) + if (!content.empty ()) { int lineno; - for (lineno = 1; lineno <= win_info->content.size (); lineno++) - tui_show_source_line (win_info, lineno); + for (lineno = 1; lineno <= content.size (); lineno++) + tui_show_source_line (this, lineno); } else - tui_erase_source_content (win_info); + tui_erase_source_content (this); - win_info->check_and_display_highlight_if_needed (); - win_info->refresh_window (); + check_and_display_highlight_if_needed (); + refresh_window (); } /* See tui-data.h. */ @@ -332,7 +332,7 @@ tui_source_window_base::reset (int height, int width, void tui_source_window_base::refresh_all () { - tui_show_source_content (this); + show_source_content (); check_and_display_highlight_if_needed (); tui_erase_exec_info_content (this); tui_update_exec_info (this); diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index 9d7f0a7d774..8c76322d069 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -89,6 +89,8 @@ public: void reset (int height, int width, int origin_x, int origin_y) override; + void show_source_content (); + /* Does the locator belong to this window? */ bool m_has_locator = false; /* Execution information window. */ @@ -139,7 +141,6 @@ extern void tui_update_source_windows_with_line (struct symtab *, int); extern void tui_clear_source_content (struct tui_source_window_base *); extern void tui_erase_source_content (struct tui_source_window_base *); -extern void tui_show_source_content (struct tui_source_window_base *); extern void tui_set_exec_info_content (struct tui_source_window_base *); extern void tui_show_exec_info_content (struct tui_source_window_base *); extern void tui_erase_exec_info_content (struct tui_source_window_base *);