From patchwork Fri Dec 20 16:20: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: 37011 Received: (qmail 108287 invoked by alias); 20 Dec 2019 16:28:53 -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 108172 invoked by uid 89); 20 Dec 2019 16:28:52 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= 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; Fri, 20 Dec 2019 16:28:51 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id B458A20D4A; Fri, 20 Dec 2019 11:20:18 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [IPv6:2620:52:3:1:5054:ff:fe06:16ca]) by mx1.osci.io (Postfix) with ESMTP id 000172094D; Fri, 20 Dec 2019 11:20:09 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id E42122816F; Fri, 20 Dec 2019 11:20:09 -0500 (EST) X-Gerrit-PatchSet: 3 Date: Fri, 20 Dec 2019 11:20:07 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Tom Tromey , gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [pushed] Remove some unnecessary focus switches X-Gerrit-Change-Id: I0a5bb8a407cf8d52e2fd23b0598eb9bce56b1251 X-Gerrit-Change-Number: 635 X-Gerrit-ChangeURL: X-Gerrit-Commit: d4669c0fc75ad5ad2e99748f9307b5038955f9d3 In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191220162009.E42122816F@gnutoolchain-gerrit.osci.io> The original change was created by Tom Tromey. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/635 ...................................................................... Remove some unnecessary focus switches A couple of lower-level utility functions can change the TUI focus. This seems incorrect to me -- focus switches should only be done either by explicit user request, or ass a side effect of changing the layout. gdb/ChangeLog 2019-12-20 Tom Tromey * tui/tui-winsource.c (tui_source_window_base::update_source_window_as_is): Don't switch focus. * tui/tui-disasm.c (tui_show_disassem): Don't switch focus. Change-Id: I0a5bb8a407cf8d52e2fd23b0598eb9bce56b1251 --- M gdb/ChangeLog M gdb/tui/tui-disasm.c M gdb/tui/tui-winsource.c 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9ac1430..0ef7b0c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2019-12-20 Tom Tromey + * tui/tui-winsource.c + (tui_source_window_base::update_source_window_as_is): Don't switch focus. + * tui/tui-disasm.c (tui_show_disassem): Don't switch focus. + +2019-12-20 Tom Tromey + * tui/tui-winsource.h (struct tui_source_window_base) : Remove line_no and addr parameters. * tui/tui-stack.c (tui_show_frame_info): Set PC on sal. Update. diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 63d581b..11c8b30 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -260,7 +260,6 @@ tui_show_disassem (struct gdbarch *gdbarch, CORE_ADDR start_addr) { struct symtab *s = find_pc_line_symtab (start_addr); - struct tui_win_info *win_with_focus = tui_win_with_focus (); struct tui_line_or_address val; gdb_assert (TUI_DISASM_WIN != nullptr && TUI_DISASM_WIN->is_visible ()); @@ -268,12 +267,6 @@ val.loa = LOA_ADDRESS; val.u.addr = start_addr; TUI_DISASM_WIN->update_source_window (gdbarch, s, val); - - /* If the focus was in the src win, put it in the asm win, if the - source view isn't split. */ - if (tui_current_layout () != SRC_DISASSEM_COMMAND - && win_with_focus == TUI_SRC_WIN) - tui_set_win_focus_to (TUI_DISASM_WIN); } void diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index fe1eb8f..72fbd46 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -201,11 +201,6 @@ sal.symtab = s; sal.pspace = SYMTAB_PSPACE (s); set_current_source_symtab_and_line (sal); - /* If the focus was in the asm win, put it in the src win if - we don't have a split layout. */ - if (tui_win_with_focus () == TUI_DISASM_WIN - && tui_current_layout () != SRC_DISASSEM_COMMAND) - tui_set_win_focus_to (this); } } }