From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752546AbbHMIGV (ORCPT ); Thu, 13 Aug 2015 04:06:21 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51194 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752337AbbHMIGQ (ORCPT ); Thu, 13 Aug 2015 04:06:16 -0400 Date: Thu, 13 Aug 2015 01:06:00 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: acme@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, bp@suse.de, hpa@zytor.com, dsahern@gmail.com, namhyung@kernel.org, eranian@google.com, fweisbec@gmail.com, jolsa@redhat.com, adrian.hunter@intel.com Reply-To: adrian.hunter@intel.com, jolsa@redhat.com, fweisbec@gmail.com, namhyung@kernel.org, eranian@google.com, dsahern@gmail.com, hpa@zytor.com, bp@suse.de, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, acme@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists browser: Make ESC unzoom as well Git-Commit-ID: 63ab1749f39aeec27b0dcf71cd7996d862c5ad63 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 63ab1749f39aeec27b0dcf71cd7996d862c5ad63 Gitweb: http://git.kernel.org/tip/63ab1749f39aeec27b0dcf71cd7996d862c5ad63 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 12 Aug 2015 12:42:58 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 12 Aug 2015 12:46:55 -0300 perf hists browser: Make ESC unzoom as well In addition to <-, that may be repurposed for horizontal scrolling. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-w3rctelxr4yxrjufx7z3fclb@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 2de53d6..f296b73 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -1868,6 +1868,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, case K_RIGHT: /* menu */ break; + case K_ESC: case K_LEFT: { const void *top; @@ -1877,6 +1878,12 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, */ if (left_exits) goto out_free_stack; + + if (key == K_ESC && + ui_browser__dialog_yesno(&browser->b, + "Do you really want to exit?")) + goto out_free_stack; + continue; } top = pstack__peek(browser->pstack); @@ -1892,12 +1899,6 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, do_zoom_thread(browser, actions); continue; } - case K_ESC: - if (!left_exits && - !ui_browser__dialog_yesno(&browser->b, - "Do you really want to exit?")) - continue; - /* Fall thru */ case 'q': case CTRL('c'): goto out_free_stack; @@ -2120,15 +2121,11 @@ browse_hists: else pos = perf_evsel__prev(pos); goto browse_hists; - case K_ESC: - if (!ui_browser__dialog_yesno(&menu->b, - "Do you really want to exit?")) - continue; - /* Fall thru */ case K_SWITCH_INPUT_DATA: case 'q': case CTRL('c'): goto out; + case K_ESC: default: continue; }