The following commit has been merged into the perf/core branch of tip: Commit-ID: 9e79ff77e4195e40e7a47a2001132db66e25d541 Gitweb: https://git.kernel.org/tip/9e79ff77e4195e40e7a47a2001132db66e25d541 Author: Arnaldo Carvalho de Melo <a...@redhat.com> AuthorDate: Mon, 19 Aug 2019 16:09:50 -03:00 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitterDate: Tue, 20 Aug 2019 12:21:27 -03:00
perf ui: Make 'exit_msg' optional in ui__question_window() We will not need it when refactoring this function to be non-interactive, so make it optional. Cc: Adrian Hunter <adrian.hun...@intel.com> Cc: Jiri Olsa <jo...@kernel.org> Cc: Namhyung Kim <namhy...@kernel.org> Link: https://lkml.kernel.org/n/tip-pnx1dn17bsz7lqt9ty95n...@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/ui/tui/util.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/perf/ui/tui/util.c b/tools/perf/ui/tui/util.c index fe5e571..5d65ea8 100644 --- a/tools/perf/ui/tui/util.c +++ b/tools/perf/ui/tui/util.c @@ -188,7 +188,9 @@ int ui__question_window(const char *title, const char *text, pthread_mutex_lock(&ui__lock); max_len += 2; - nr_lines += 4; + nr_lines += 2; + if (exit_msg) + nr_lines += 2; y = SLtt_Screen_Rows / 2 - nr_lines / 2, x = SLtt_Screen_Cols / 2 - max_len / 2; @@ -199,14 +201,20 @@ int ui__question_window(const char *title, const char *text, SLsmg_write_string((char *)title); } SLsmg_gotorc(++y, x); - nr_lines -= 2; + if (exit_msg) + nr_lines -= 2; max_len -= 2; SLsmg_write_wrapped_string((unsigned char *)text, y, x, nr_lines, max_len, 1); SLsmg_gotorc(y + nr_lines - 2, x); SLsmg_write_nstring((char *)" ", max_len); SLsmg_gotorc(y + nr_lines - 1, x); - SLsmg_write_nstring((char *)exit_msg, max_len); + if (exit_msg) { + SLsmg_gotorc(y + nr_lines - 2, x); + SLsmg_write_nstring((char *)" ", max_len); + SLsmg_gotorc(y + nr_lines - 1, x); + SLsmg_write_nstring((char *)exit_msg, max_len); + } SLsmg_refresh(); pthread_mutex_unlock(&ui__lock);
