perf ui: Make 'exit_msg' optional in ui__question_window()
A message that is not in the archive (sent off-list or not yet received): [email protected]
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 <[email protected]> AuthorDate: Mon, 19 Aug 2019 16:09:50 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> 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 <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/ui/tui/util.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
tools/perf/ui/tui/util.c +11 -3
@@ -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);