From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1188 invoked by alias); 4 Jan 2020 18:34:28 -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 596 invoked by uid 89); 4 Jan 2020 18:34:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.3 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=favor, 6943 X-HELO: gateway31.websitewelcome.com Received: from gateway31.websitewelcome.com (HELO gateway31.websitewelcome.com) (192.185.143.35) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 04 Jan 2020 18:34:17 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 7BE37E0E1 for ; Sat, 4 Jan 2020 12:34:16 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id noFci0ey44kpjnoFciV4Jq; Sat, 04 Jan 2020 12:34:16 -0600 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=kFWrz4IY/PgJUnAST479rrUGYSEfoFvHMesl1Se/J40=; b=tW/W6DUWf/xe8d0/EwG6j5XIpZ DFF/c0rr+E7x57eFAow4anR4X7uj3kB9POUfBge0MtDl7MvQmtyYzm/8wQTIShyAnY/UbqMYT3e7o cGOcxyUlaf5n95aM6fMaBjP4X; Received: from 75-166-123-50.hlrn.qwest.net ([75.166.123.50]:48942 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1inoFc-0026Lh-36; Sat, 04 Jan 2020 11:34:16 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 15/24] Remove tui_delete_invisible_windows and tui_make_all_invisible Date: Sat, 04 Jan 2020 18:34:00 -0000 Message-Id: <20200104183410.17114-16-tom@tromey.com> In-Reply-To: <20200104183410.17114-1-tom@tromey.com> References: <20200104183410.17114-1-tom@tromey.com> X-SW-Source: 2020-01/txt/msg00064.txt.bz2 tui_delete_invisible_windows is only needed after applying a layout, and tui_make_all_invisible is only needed before applying a layout. This patch removes these functions, in favor of doing this management directly in tui_apply_current_layout. This is needed so that the lifetimes of non-built-in windows will be properly managed. 2020-01-04 Tom Tromey * tui/tui-wingeneral.h (tui_make_all_invisible): Don't declare. * tui/tui-wingeneral.c (tui_make_all_invisible): Remove. * tui/tui-win.c (tui_resize_all): Don't call tui_delete_invisible_windows. * tui/tui-layout.c (tui_apply_current_layout): Delete windows when done. (tui_set_layout): Update. (tui_add_win_to_layout): Don't call tui_delete_invisible_windows. * tui/tui-data.h (tui_delete_invisible_windows): Don't declare. * tui/tui-data.c (tui_delete_invisible_windows): Remove. Change-Id: Ia3603b021dcb7ec31700a4a32640cd09b00b8f3b --- gdb/ChangeLog | 13 ++++++++++++ gdb/tui/tui-data.c | 23 -------------------- gdb/tui/tui-data.h | 5 ----- gdb/tui/tui-layout.c | 46 ++++++++++++++++++++++++++++++---------- gdb/tui/tui-win.c | 1 - gdb/tui/tui-wingeneral.c | 9 -------- gdb/tui/tui-wingeneral.h | 3 --- 7 files changed, 48 insertions(+), 52 deletions(-) diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index 5d42fafccca..ead8b1043ca 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -129,29 +129,6 @@ tui_prev_win (struct tui_win_info *cur_win) } -/* See tui-data.h. */ - -void -tui_delete_invisible_windows () -{ - for (int win_type = SRC_WIN; (win_type < MAX_MAJOR_WINDOWS); win_type++) - { - if (tui_win_list[win_type] != NULL - && !tui_win_list[win_type]->is_visible ()) - { - /* This should always be made visible before a call to this - function. */ - gdb_assert (win_type != CMD_WIN); - - if (win_with_focus == tui_win_list[win_type]) - win_with_focus = nullptr; - - delete tui_win_list[win_type]; - tui_win_list[win_type] = NULL; - } - } -} - tui_win_info::tui_win_info (enum tui_win_type type) : tui_gen_win_info (type) { diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index a5e4940666c..96265bb4215 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -256,11 +256,6 @@ extern void tui_set_win_resized_to (bool); extern struct tui_win_info *tui_next_win (struct tui_win_info *); extern struct tui_win_info *tui_prev_win (struct tui_win_info *); -/* Delete all the invisible windows. Note that it is an error to call - this when the command window is invisible -- we don't allow the - command window to be removed from the layout. */ -extern void tui_delete_invisible_windows (); - extern unsigned int tui_tab_width; #endif /* TUI_TUI_DATA_H */ diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 9ad91ce713b..898d2f0b8d2 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -69,8 +69,43 @@ std::vector tui_windows; void tui_apply_current_layout () { + struct gdbarch *gdbarch; + CORE_ADDR addr; + + extract_display_start_addr (&gdbarch, &addr); + + std::vector saved_windows = std::move (tui_windows); tui_windows.clear (); + + for (tui_win_info *win_info : saved_windows) + win_info->make_visible (false); + applied_layout->apply (0, 0, tui_term_width (), tui_term_height ()); + + /* Keep the list of internal windows up-to-date. */ + for (int win_type = SRC_WIN; (win_type < MAX_MAJOR_WINDOWS); win_type++) + if (tui_win_list[win_type] != nullptr + && !tui_win_list[win_type]->is_visible ()) + tui_win_list[win_type] = nullptr; + + /* This should always be made visible by a layout. */ + gdb_assert (TUI_CMD_WIN->is_visible ()); + + /* Now delete any window that was not re-applied. */ + tui_win_info *focus = tui_win_with_focus (); + for (tui_win_info *win_info : saved_windows) + { + if (!win_info->is_visible ()) + { + if (focus == win_info) + tui_set_win_focus_to (tui_windows[0]); + delete win_info; + } + } + + if (gdbarch == nullptr && TUI_DISASM_WIN != nullptr) + tui_get_begin_asm_address (&gdbarch, &addr); + tui_update_source_windows_with_addr (gdbarch, addr); } /* See tui-layout. */ @@ -86,19 +121,9 @@ tui_adjust_window_height (struct tui_win_info *win, int new_height) static void tui_set_layout (tui_layout_split *layout) { - struct gdbarch *gdbarch; - CORE_ADDR addr; - - extract_display_start_addr (&gdbarch, &addr); - tui_make_all_invisible (); applied_skeleton = layout; applied_layout = layout->clone (); tui_apply_current_layout (); - tui_delete_invisible_windows (); - - if (gdbarch == nullptr && TUI_DISASM_WIN != nullptr) - tui_get_begin_asm_address (&gdbarch, &addr); - tui_update_source_windows_with_addr (gdbarch, addr); } /* See tui-layout.h. */ @@ -121,7 +146,6 @@ tui_add_win_to_layout (enum tui_win_type type) const char *name = type == SRC_WIN ? SRC_NAME : DISASSEM_NAME; applied_layout->replace_window (tui_win_list[other]->name (), name); tui_apply_current_layout (); - tui_delete_invisible_windows (); } /* Find LAYOUT in the "layouts" global and return its index. */ diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 6eab125d731..f8a57732cca 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -550,7 +550,6 @@ tui_resize_all (void) erase (); clearok (curscr, TRUE); tui_apply_current_layout (); - tui_delete_invisible_windows (); /* Turn keypad back on, unless focus is in the command window. */ if (win_with_focus != TUI_CMD_WIN) diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index dae4255ada2..9c571204e2a 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -159,15 +159,6 @@ tui_gen_win_info::make_visible (bool visible) handle.reset (nullptr); } -/* See tui-wingeneral.h. */ - -void -tui_make_all_invisible (void) -{ - for (tui_win_info *win_info : all_tui_windows ()) - win_info->make_visible (false); -} - /* Function to refresh all the windows currently displayed. */ void diff --git a/gdb/tui/tui-wingeneral.h b/gdb/tui/tui-wingeneral.h index e32dbed2995..797a8a927e8 100644 --- a/gdb/tui/tui-wingeneral.h +++ b/gdb/tui/tui-wingeneral.h @@ -26,9 +26,6 @@ struct tui_win_info; -/* Makes all windows invisible. */ -extern void tui_make_all_invisible (void); - extern void tui_unhighlight_win (struct tui_win_info *); extern void tui_highlight_win (struct tui_win_info *); extern void tui_refresh_all (); -- 2.17.2