From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 51109 invoked by alias); 23 Jun 2019 22:44:09 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 49302 invoked by uid 89); 23 Jun 2019 22:43:55 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.7 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=PRIVATE X-HELO: gateway32.websitewelcome.com Received: from gateway32.websitewelcome.com (HELO gateway32.websitewelcome.com) (192.185.145.18) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 23 Jun 2019 22:43:47 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway32.websitewelcome.com (Postfix) with ESMTP id 1493B409EB for ; Sun, 23 Jun 2019 17:43:46 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id fBD8htSrYYTGMfBD8hoHDK; Sun, 23 Jun 2019 17:43:46 -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=rw8vhIQdW7WsT/X6TgQTnsj3RbOzosc2cTP4ONrnCfk=; b=cUWXnPULVW7/Nz6wv3gj9OcLHS +o3RUE1v3AVXad6l8PBKl7j6Drm1QEdaS9QW8WURUU/GkuXnl59jxJbZGTwruUwzpBsDedraCwiDB Rl6YkUUR6pF2Xo/z1tPuMVrqW; Received: from 75-166-12-78.hlrn.qwest.net ([75.166.12.78]:54396 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hfBD7-000vDQ-Sh; Sun, 23 Jun 2019 17:43:45 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 29/66] Introduce set_highlight method Date: Sun, 23 Jun 2019 22:44:00 -0000 Message-Id: <20190623224329.16060-30-tom@tromey.com> In-Reply-To: <20190623224329.16060-1-tom@tromey.com> References: <20190623224329.16060-1-tom@tromey.com> X-SW-Source: 2019-06/txt/msg00491.txt.bz2 This introduces the tui_win_info::set_highlight method, and changes the highlighting-related code to use bool rather than int. gdb/ChangeLog 2019-06-23 Tom Tromey * tui/tui-wingeneral.c (tui_unhighlight_win, tui_highlight_win): Update. * tui/tui-layout.c (make_command_window) (show_source_disasm_command, show_data, init_and_make_win) (show_source_or_disasm_and_command): Update. * tui/tui-data.h (struct tui_win_info) : New method. : Now bool. (tui_set_win_highlight): Don't declare. * tui/tui-data.c (tui_set_win_highlight): Remove. --- gdb/ChangeLog | 13 +++++++++++++ gdb/tui/tui-data.c | 8 -------- gdb/tui/tui-data.h | 12 ++++++++---- gdb/tui/tui-layout.c | 18 +++++++++--------- gdb/tui/tui-wingeneral.c | 4 ++-- 5 files changed, 32 insertions(+), 23 deletions(-) diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index a48b39eba7e..bdfc2de73af 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -69,14 +69,6 @@ tui_win_is_auxillary (enum tui_win_type win_type) return (win_type > MAX_MAJOR_WINDOWS); } -void -tui_set_win_highlight (struct tui_win_info *win_info, - int highlight) -{ - if (win_info != NULL) - win_info->is_highlighted = highlight; -} - /****************************************** ** ACCESSORS & MUTATORS FOR PRIVATE DATA ******************************************/ diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index bed28f64b19..98e7a2ca34e 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -276,6 +276,12 @@ public: /* Compute the maximum height of this window. */ virtual int max_height () const; + /* Set whether this window is highglighted. */ + void set_highlight (bool highlight) + { + is_highlighted = highlight; + } + /* Methods to scroll the contents of this window. Note that they are named with "_scroll" coming at the end because the more obvious "scroll_forward" is defined as a macro in term.h. */ @@ -287,10 +293,10 @@ public: struct tui_gen_win_info generic; /* General window information. */ /* Can this window ever be highlighted? */ - int can_highlight = 0; + bool can_highlight = false; /* Is this window highlighted? */ - int is_highlighted = 0; + bool is_highlighted = false; }; /* The base class for all source-like windows, namely the source and @@ -447,8 +453,6 @@ protected: }; extern int tui_win_is_auxillary (enum tui_win_type win_type); -extern void tui_set_win_highlight (struct tui_win_info *win_info, - int highlight); /* Global Data. */ diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 9b2bd0b7b57..d060c5c7807 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -546,7 +546,7 @@ make_command_window (int height, int origin_y) 0, origin_y, DONT_BOX_WINDOW); - result->can_highlight = FALSE; + result->can_highlight = false; return result; } @@ -627,7 +627,7 @@ show_source_disasm_command (void) TUI_SRC_WIN->generic.width, TUI_SRC_WIN->execution_info->width, 0); - TUI_SRC_WIN->can_highlight = TRUE; + TUI_SRC_WIN->can_highlight = true; init_gen_win_info (TUI_SRC_WIN->execution_info, EXEC_INFO_WIN, src_height, @@ -677,7 +677,7 @@ show_source_disasm_command (void) 3, 0, src_height - 1); - TUI_DISASM_WIN->can_highlight = TRUE; + TUI_DISASM_WIN->can_highlight = true; tui_make_visible (&TUI_DISASM_WIN->generic); tui_make_visible (TUI_DISASM_WIN->execution_info); } @@ -698,7 +698,7 @@ show_source_disasm_command (void) TUI_CMD_WIN->generic.width, 0, TUI_CMD_WIN->generic.origin.y); - TUI_CMD_WIN->can_highlight = FALSE; + TUI_CMD_WIN->can_highlight = false; tui_make_visible (&TUI_CMD_WIN->generic); } tui_refresh_win (&TUI_CMD_WIN->generic); @@ -723,7 +723,7 @@ show_data (enum tui_layout_type new_layout) tui_make_all_invisible (); tui_make_invisible (locator); make_data_window (&tui_win_list[DATA_WIN], data_height, 0); - TUI_DATA_WIN->can_highlight = TRUE; + TUI_DATA_WIN->can_highlight = true; if (new_layout == SRC_DATA_COMMAND) win_type = SRC_WIN; else @@ -835,9 +835,9 @@ init_and_make_win (void *opaque_win_info, if (!tui_win_is_auxillary (win_type)) { if (generic->type == CMD_WIN) - ((struct tui_win_info *) opaque_win_info)->can_highlight = FALSE; + ((struct tui_win_info *) opaque_win_info)->can_highlight = false; else - ((struct tui_win_info *) opaque_win_info)->can_highlight = TRUE; + ((struct tui_win_info *) opaque_win_info)->can_highlight = true; } tui_make_window (generic, box_it); @@ -942,7 +942,7 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type) 3, 0, 0); - base->can_highlight = TRUE; + base->can_highlight = true; tui_make_visible (&(*win_info_ptr)->generic); tui_make_visible (base->execution_info); } @@ -966,7 +966,7 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type) TUI_CMD_WIN->generic.width, TUI_CMD_WIN->generic.origin.x, TUI_CMD_WIN->generic.origin.y); - TUI_CMD_WIN->can_highlight = FALSE; + TUI_CMD_WIN->can_highlight = false; tui_make_visible (&TUI_CMD_WIN->generic); } tui_set_current_layout_to (layout_type); diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index 73d77ce19f3..c1778289442 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -114,7 +114,7 @@ tui_unhighlight_win (struct tui_win_info *win_info) { box_win (&win_info->generic, NO_HILITE); wrefresh (win_info->generic.handle); - tui_set_win_highlight (win_info, 0); + win_info->set_highlight (false); } } @@ -128,7 +128,7 @@ tui_highlight_win (struct tui_win_info *win_info) { box_win (&win_info->generic, HILITE); wrefresh (win_info->generic.handle); - tui_set_win_highlight (win_info, 1); + win_info->set_highlight (true); } } -- 2.17.2