From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 47624 invoked by alias); 23 Jun 2019 22:43:42 -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 47475 invoked by uid 89); 23 Jun 2019 22:43:41 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.6 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: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.149.105) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 23 Jun 2019 22:43:39 +0000 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway34.websitewelcome.com (Postfix) with ESMTP id 9987528920 for ; Sun, 23 Jun 2019 17:43:38 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id fBD0h9EJ4iQerfBD0hf4s0; Sun, 23 Jun 2019 17:43:38 -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=5jXbooAqeRl5/6yl+4m+mz7OXiBHlxspfGCpA1olkLA=; b=MTnHv+X2R0zp0ocAZDEcCKtEqN gtMBkSWgvoY9lkc/Nbqf+HBXPORmE/FATXy4mIlh6hhubC2oDvPDM0BdsXw4jlmdTQRJ5HD/BCFki mEexq9CMnEhcZUmJOAJ0f+HFW; 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 1hfBD0-000vDQ-DE; Sun, 23 Jun 2019 17:43:38 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 03/66] Create subclasses for different window types Date: Sun, 23 Jun 2019 22:44:00 -0000 Message-Id: <20190623224329.16060-4-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/msg00490.txt.bz2 This changes the TUI so that each different major window type has its own subclass. gdb/ChangeLog 2019-06-23 Tom Tromey * tui/tui-data.h (struct tui_win_info): Make constructor protected. Make destructor virtual. Add initializers. (tui_source_window, tui_data_window, tui_cmd_window): New classes. * tui/tui-data.c (tui_win_info): Rename from init_win_info. Now a constructor. Add "type" parameter. (tui_source_window, tui_data_window, tui_cmd_window): New constructors. (tui_alloc_win_info): Instantiate the appropriate subclass. --- gdb/ChangeLog | 12 ++++++++ gdb/tui/tui-data.c | 76 +++++++++++++++++++++++++++------------------- gdb/tui/tui-data.h | 38 ++++++++++++++++++----- 3 files changed, 86 insertions(+), 40 deletions(-) diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index 1c96fc1c077..3320b4fc62a 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -495,47 +495,59 @@ init_content_element (struct tui_win_element *element, } } -static void -init_win_info (struct tui_win_info *win_info) +tui_win_info::tui_win_info (enum tui_win_type type) { - tui_init_generic_part (&win_info->generic); - win_info->can_highlight = - win_info->is_highlighted = FALSE; - switch (win_info->generic.type) - { - case SRC_WIN: - case DISASSEM_WIN: - win_info->detail.source_info.execution_info = NULL; - win_info->detail.source_info.has_locator = FALSE; - win_info->detail.source_info.horizontal_offset = 0; - win_info->detail.source_info.gdbarch = NULL; - win_info->detail.source_info.start_line_or_addr.loa = LOA_ADDRESS; - win_info->detail.source_info.start_line_or_addr.u.addr = 0; - win_info->detail.source_info.fullname = NULL; - break; - case DATA_WIN: - win_info->detail.data_display_info.data_content = NULL; - win_info->detail.data_display_info.data_content_count = 0; - win_info->detail.data_display_info.regs_content = NULL; - win_info->detail.data_display_info.regs_content_count = 0; - win_info->detail.data_display_info.regs_column_count = 1; - win_info->detail.data_display_info.display_regs = FALSE; - win_info->detail.data_display_info.current_group = 0; - break; - case CMD_WIN: - break; - } + generic.type = type; + tui_init_generic_part (&generic); } +tui_source_window::tui_source_window (enum tui_win_type type) + : tui_win_info (type) +{ + gdb_assert (type == SRC_WIN || type == DISASSEM_WIN); + detail.source_info.execution_info = NULL; + detail.source_info.has_locator = FALSE; + detail.source_info.horizontal_offset = 0; + detail.source_info.gdbarch = NULL; + detail.source_info.start_line_or_addr.loa = LOA_ADDRESS; + detail.source_info.start_line_or_addr.u.addr = 0; + detail.source_info.fullname = NULL; +} + +tui_data_window::tui_data_window () + : tui_win_info (DATA_WIN) +{ + detail.data_display_info.data_content = (tui_win_content) NULL; + detail.data_display_info.data_content_count = 0; + detail.data_display_info.regs_content = (tui_win_content) NULL; + detail.data_display_info.regs_content_count = 0; + detail.data_display_info.regs_column_count = 1; + detail.data_display_info.display_regs = FALSE; + detail.data_display_info.current_group = 0; +} + +tui_cmd_window::tui_cmd_window () + : tui_win_info (CMD_WIN) +{ +} struct tui_win_info * tui_alloc_win_info (enum tui_win_type type) { - struct tui_win_info *win_info = new struct tui_win_info (type); + switch (type) + { + case SRC_WIN: + case DISASSEM_WIN: + return new tui_source_window (type); - init_win_info (win_info); + case DATA_WIN: + return new tui_data_window (); - return win_info; + case CMD_WIN: + return new tui_cmd_window (); + } + + gdb_assert_not_reached (_("Unhandled window type")); } diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index ef20c02df2b..2c873c26a2f 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -271,15 +271,15 @@ struct tui_command_info /* This defines information about each logical window. */ struct tui_win_info { - tui_win_info (enum tui_win_type type) - { - generic.type = type; - } - - ~tui_win_info (); +protected: + tui_win_info (enum tui_win_type type); DISABLE_COPY_AND_ASSIGN (tui_win_info); +public: + + virtual ~tui_win_info (); + struct tui_gen_win_info generic; /* General window information. */ union { @@ -288,8 +288,30 @@ struct tui_win_info struct tui_command_info command_info; } detail; - int can_highlight; /* Can this window ever be highlighted? */ - int is_highlighted; /* Is this window highlighted? */ + + /* Can this window ever be highlighted? */ + int can_highlight = 0; + + /* Is this window highlighted? */ + int is_highlighted = 0; +}; + +struct tui_source_window : public tui_win_info +{ + tui_source_window (enum tui_win_type type); + DISABLE_COPY_AND_ASSIGN (tui_source_window); +}; + +struct tui_data_window : public tui_win_info +{ + tui_data_window (); + DISABLE_COPY_AND_ASSIGN (tui_data_window); +}; + +struct tui_cmd_window : public tui_win_info +{ + tui_cmd_window (); + DISABLE_COPY_AND_ASSIGN (tui_cmd_window); }; extern int tui_win_is_source_type (enum tui_win_type win_type); -- 2.17.2