From patchwork Sat Aug 3 13:29:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33938 Received: (qmail 95565 invoked by alias); 3 Aug 2019 13:29:37 -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 95356 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= X-HELO: gateway30.websitewelcome.com Received: from gateway30.websitewelcome.com (HELO gateway30.websitewelcome.com) (192.185.196.18) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 03 Aug 2019 13:29:33 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway30.websitewelcome.com (Postfix) with ESMTP id 120FE5785 for ; Sat, 3 Aug 2019 08:29:32 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id tu6GhqP843Qi0tu6GhaImZ; 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=PPK0PPLpQk4m2qXIhlsc8j2980ninLjK4hZMP9eMkXI=; b=KngRl8GEfOLtAoqKEX+j8k6GCu ISnsXgzKYMJpOxXdCNG+pSnrMNMVF7GJ7V/Ju6yysLNFmZGfCs41uRDOPmk71flW8o/PPGbeUH6Cz 3W0XJdVppBErpv4q/S51gQqH+; 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 1htu6F-003nqS-QF; Sat, 03 Aug 2019 08:29:31 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 10/19] Change tui_check_and_display_highlight_if_needed to be a method Date: Sat, 3 Aug 2019 07:29:16 -0600 Message-Id: <20190803132925.25074-11-tom@tromey.com> In-Reply-To: <20190803132925.25074-1-tom@tromey.com> References: <20190803132925.25074-1-tom@tromey.com> This changes tui_check_and_display_highlight_if_needed to be a method on tui_win_info. This makes it clear that the NULL check in that function is not needed, so it is removed here. gdb/ChangeLog 2019-08-03 Tom Tromey * tui/tui-winsource.c (tui_erase_source_content) (tui_show_source_content, tui_source_window_base::refresh_all): Update. * tui/tui-wingeneral.h (tui_check_and_display_highlight_if_needed): Don't declare. * tui/tui-wingeneral.c (tui_win_info::check_and_display_highlight_if_needed): Rename from check_and_display_highlight_if_needed. * tui/tui-win.c (tui_rehighlight_all) (tui_win_info::make_visible_with_new_height): Update. * tui/tui-regs.c (tui_data_window::display_registers_from_line) (tui_data_window::erase_data_content) (tui_data_window::display_all_data): Update. * tui/tui-data.h (struct tui_win_info) : Declare. --- gdb/ChangeLog | 18 ++++++++++++++++++ gdb/tui/tui-data.h | 2 ++ gdb/tui/tui-regs.c | 6 +++--- gdb/tui/tui-win.c | 4 ++-- gdb/tui/tui-wingeneral.c | 11 +++++------ gdb/tui/tui-wingeneral.h | 1 - gdb/tui/tui-winsource.c | 6 +++--- 7 files changed, 33 insertions(+), 15 deletions(-) diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index d3fa03657c5..6683848bc18 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -291,6 +291,8 @@ public: return true; } + void check_and_display_highlight_if_needed (); + /* Can this window ever be highlighted? */ bool can_highlight = true; diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 27654629181..aaba94da467 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -369,7 +369,7 @@ tui_data_window::display_reg_element_at_line (int start_element_no, int tui_data_window::display_registers_from_line (int line_no) { - tui_check_and_display_highlight_if_needed (this); + check_and_display_highlight_if_needed (); if (!regs_content.empty ()) { int element_no; @@ -436,7 +436,7 @@ void tui_data_window::erase_data_content (const char *prompt) { werase (handle); - tui_check_and_display_highlight_if_needed (this); + check_and_display_highlight_if_needed (); if (prompt != NULL) { int half_width = (width - 2) / 2; @@ -462,7 +462,7 @@ tui_data_window::display_all_data () { erase_data_content (NULL); delete_data_content_windows (); - tui_check_and_display_highlight_if_needed (this); + check_and_display_highlight_if_needed (); display_registers_from (0); } } diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 0e64db3e7a1..f8238c7303e 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -515,7 +515,7 @@ void tui_rehighlight_all (void) { for (tui_win_info *win_info : all_tui_windows ()) - tui_check_and_display_highlight_if_needed (win_info); + win_info->check_and_display_highlight_if_needed (); } /* Resize all the windows based on the terminal size. This function @@ -1205,7 +1205,7 @@ void tui_win_info::make_visible_with_new_height () { make_visible (true); - tui_check_and_display_highlight_if_needed (this); + check_and_display_highlight_if_needed (); do_make_visible_with_new_height (); } diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index 79f93ceaf9f..8ff5aa5fce8 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -112,15 +112,14 @@ tui_highlight_win (struct tui_win_info *win_info) } void -tui_check_and_display_highlight_if_needed (struct tui_win_info *win_info) +tui_win_info::check_and_display_highlight_if_needed () { - if (win_info != NULL && win_info->can_highlight) + if (can_highlight) { - if (win_info->is_highlighted) - tui_highlight_win (win_info); + if (is_highlighted) + tui_highlight_win (this); else - tui_unhighlight_win (win_info); - + tui_unhighlight_win (this); } } diff --git a/gdb/tui/tui-wingeneral.h b/gdb/tui/tui-wingeneral.h index 051be6da690..54d6eb684f7 100644 --- a/gdb/tui/tui-wingeneral.h +++ b/gdb/tui/tui-wingeneral.h @@ -33,7 +33,6 @@ extern void tui_make_all_invisible (void); extern void tui_unhighlight_win (struct tui_win_info *); extern void tui_make_window (struct tui_gen_win_info *, enum tui_box); extern void tui_highlight_win (struct tui_win_info *); -extern void tui_check_and_display_highlight_if_needed (struct tui_win_info *); extern void tui_refresh_all (); extern void tui_delete_win (WINDOW *window); diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 3de2692deea..6a72c6fe74b 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -225,7 +225,7 @@ tui_erase_source_content (struct tui_source_window_base *win_info) if (win_info->handle != NULL) { werase (win_info->handle); - tui_check_and_display_highlight_if_needed (win_info); + win_info->check_and_display_highlight_if_needed (); const char *no_src_str; @@ -287,7 +287,7 @@ tui_show_source_content (struct tui_source_window_base *win_info) else tui_erase_source_content (win_info); - tui_check_and_display_highlight_if_needed (win_info); + win_info->check_and_display_highlight_if_needed (); win_info->refresh_window (); } @@ -333,7 +333,7 @@ void tui_source_window_base::refresh_all () { tui_show_source_content (this); - tui_check_and_display_highlight_if_needed (this); + check_and_display_highlight_if_needed (); tui_erase_exec_info_content (this); tui_update_exec_info (this); }