From patchwork Wed Dec 11 23:21:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36734 Received: (qmail 10688 invoked by alias); 11 Dec 2019 23:21:13 -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 10675 invoked by uid 89); 11 Dec 2019 23:21:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=HX-Languages-Length:3129 X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 11 Dec 2019 23:21:12 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 8947820300; Wed, 11 Dec 2019 18:21:09 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id C5DEF20391; Wed, 11 Dec 2019 18:21:07 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 996AD25BB4; Wed, 11 Dec 2019 18:21:07 -0500 (EST) X-Gerrit-PatchSet: 5 Date: Wed, 11 Dec 2019 18:21:07 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Tom Tromey , gdb-patches@sourceware.org Cc: Andrew Burgess Auto-Submitted: auto-generated X-Gerrit-MessageType: merged Subject: [pushed] Move max_height method to tui_gen_win_info X-Gerrit-Change-Id: I4ba3e8899bc4668328d3d78e3c1674c61882450d X-Gerrit-Change-Number: 364 X-Gerrit-ChangeURL: X-Gerrit-Commit: c8ec2f433c54dae7746db144a872da6f808e5d73 In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, tromey@sourceware.org, andrew.burgess@embecosm.com, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191211232107.996AD25BB4@gnutoolchain-gerrit.osci.io> Sourceware to Gerrit sync has submitted this change. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/364 ...................................................................... Move max_height method to tui_gen_win_info This moves the max_height method to tui_gen_win_info and implements it in the subclasses. This is used by a subsequent patch, which will normalize window layout across all window types. gdb/ChangeLog 2019-12-11 Tom Tromey * tui/tui-stack.h (struct tui_locator_window) : New method. * tui/tui-regs.h (struct tui_data_item_window) : New method. * tui/tui-data.h (struct tui_gen_win_info) : New method. (struct tui_win_info) : Now override. Change-Id: I4ba3e8899bc4668328d3d78e3c1674c61882450d --- M gdb/ChangeLog M gdb/tui/tui-data.h M gdb/tui/tui-regs.h M gdb/tui/tui-stack.h 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ca47b8c..20d3321 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2019-12-11 Tom Tromey + + * tui/tui-stack.h (struct tui_locator_window) : New + method. + * tui/tui-regs.h (struct tui_data_item_window) : New + method. + * tui/tui-data.h (struct tui_gen_win_info) : New + method. + (struct tui_win_info) : Now override. + 2019-12-11 Joel Brobecker * NEWS: Create a new section for the next release branch. diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 282b49e..d3b84b1 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -82,6 +82,9 @@ return ""; } + /* Compute the maximum height of this window. */ + virtual int max_height () const = 0; + /* Resize this window. The parameters are used to set the window's size and position. */ virtual void resize (int height, int width, @@ -173,8 +176,7 @@ { } - /* Compute the maximum height of this window. */ - virtual int max_height () const; + int max_height () const override; /* Called after the tab width has been changed. */ virtual void update_tab_width () diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h index e45a68f..d476bcf 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -41,6 +41,11 @@ void refresh_window () override; + int max_height () const override + { + return 1; + } + const char *name = nullptr; /* The register number, or data display number. */ int item_no = -1; diff --git a/gdb/tui/tui-stack.h b/gdb/tui/tui-stack.h index 93a79fb..dd9851b 100644 --- a/gdb/tui/tui-stack.h +++ b/gdb/tui/tui-stack.h @@ -37,6 +37,11 @@ proc_name[0] = 0; } + int max_height () const override + { + return 1; + } + void rerender () override; /* Update the locator, with the provided arguments.