From patchwork Sun Jun 23 22:42:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33294 Received: (qmail 50064 invoked by alias); 23 Jun 2019 22:44:01 -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 48358 invoked by uid 89); 23 Jun 2019 22:43:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.1 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=Functions X-HELO: gateway33.websitewelcome.com Received: from gateway33.websitewelcome.com (HELO gateway33.websitewelcome.com) (192.185.145.24) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 23 Jun 2019 22:43:43 +0000 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 598BE14196 for ; Sun, 23 Jun 2019 17:43:42 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id fBD4hdbw290onfBD4hbzVZ; Sun, 23 Jun 2019 17:43:42 -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=ViUS6Drwk1VwBZcxLQEqaoP+b3jYB46HcJrrcdup/nQ=; b=u6e9eP/kDAG8gFvFn11zPwmezk OH7QGWcHjCDzyH3w52keDxXBcDWqf983GA5yvkcxWylJHVDS23n8qXtUN3yuTf+zNdhzfe1hxI+LS EFwlLd9j3RQvislfEVxFYKDYx; 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 1hfBD4-000vDQ-5A; Sun, 23 Jun 2019 17:43:42 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 16/66] Remove struct tui_command_info Date: Sun, 23 Jun 2019 16:42:39 -0600 Message-Id: <20190623224329.16060-17-tom@tromey.com> In-Reply-To: <20190623224329.16060-1-tom@tromey.com> References: <20190623224329.16060-1-tom@tromey.com> Like the previous patch, this removes tui_command_info in favor of putting it elements directly into tui_cmd_window. gdb/ChangeLog 2019-06-23 Tom Tromey * tui/tui-layout.c (show_source_disasm_command) (show_source_or_disasm_and_command): Update. * tui/tui-io.c (update_cmdwin_start_line) (tui_redisplay_readline): Update. * tui/tui-data.h (struct tui_command_info): Remove. (struct tui_win_info) : Remove command_info member. (struct tui_data_window) : New member, from tui_command_info. (TUI_CMD_WIN): Add casts. --- gdb/ChangeLog | 12 ++++++++++++ gdb/tui/tui-data.h | 11 +++-------- gdb/tui/tui-io.c | 10 +++++----- gdb/tui/tui-layout.c | 7 ++++--- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 081022a2495..4ca3a89b74e 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -238,12 +238,6 @@ struct tui_data_info }; -struct tui_command_info -{ - int start_line; -}; - - /* This defines information about each logical window. */ struct tui_win_info { @@ -287,7 +281,6 @@ public: union { struct tui_data_info data_display_info; - struct tui_command_info command_info; } detail; @@ -395,6 +388,8 @@ struct tui_cmd_window : public tui_win_info void clear_detail () override; + int start_line; + protected: void do_scroll_vertical (enum tui_scroll_direction, @@ -420,7 +415,7 @@ extern struct tui_win_info *tui_win_list[MAX_MAJOR_WINDOWS]; #define TUI_SRC_WIN ((tui_source_window_base *) tui_win_list[SRC_WIN]) #define TUI_DISASM_WIN ((tui_source_window_base *) tui_win_list[DISASSEM_WIN]) #define TUI_DATA_WIN tui_win_list[DATA_WIN] -#define TUI_CMD_WIN tui_win_list[CMD_WIN] +#define TUI_CMD_WIN ((tui_cmd_window *) tui_win_list[CMD_WIN]) /* Data Manipulation Functions. */ extern void tui_initialize_static_data (void); diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index 31c1c769381..cdb14bf5314 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -179,7 +179,7 @@ do_tui_putc (WINDOW *w, char c) static void update_cmdwin_start_line () { - TUI_CMD_WIN->detail.command_info.start_line + TUI_CMD_WIN->start_line = getcury (TUI_CMD_WIN->generic.handle); } @@ -539,7 +539,7 @@ tui_redisplay_readline (void) c_pos = -1; c_line = -1; w = TUI_CMD_WIN->generic.handle; - start_line = TUI_CMD_WIN->detail.command_info.start_line; + start_line = TUI_CMD_WIN->start_line; wmove (w, start_line, 0); prev_col = 0; height = 1; @@ -580,17 +580,17 @@ tui_redisplay_readline (void) waddch (w, c); } if (c == '\n') - TUI_CMD_WIN->detail.command_info.start_line = getcury (w); + TUI_CMD_WIN->start_line = getcury (w); col = getcurx (w); if (col < prev_col) height++; prev_col = col; } wclrtobot (w); - TUI_CMD_WIN->detail.command_info.start_line = getcury (w); + TUI_CMD_WIN->start_line = getcury (w); if (c_line >= 0) wmove (w, c_line, c_pos); - TUI_CMD_WIN->detail.command_info.start_line -= height - 1; + TUI_CMD_WIN->start_line -= height - 1; wrefresh (w); fflush(stdout); diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 55d737ab315..95b89f8583a 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -692,8 +692,8 @@ show_source_disasm_command (void) tui_show_source_content (TUI_DISASM_WIN); if (TUI_CMD_WIN == NULL) - TUI_CMD_WIN = make_command_window (cmd_height, - tui_term_height () - cmd_height); + tui_win_list[CMD_WIN] + = make_command_window (cmd_height, tui_term_height () - cmd_height); else { init_gen_win_info (&TUI_CMD_WIN->generic, @@ -958,7 +958,8 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type) if (TUI_CMD_WIN == NULL) { - TUI_CMD_WIN = make_command_window (cmd_height, src_height); + tui_win_list[CMD_WIN] = make_command_window (cmd_height, + src_height); tui_refresh_win (&TUI_CMD_WIN->generic); } else