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.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-pnx1dn17bsz7lqt9ty95nnjx@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a4973d8f
...@@ -188,7 +188,9 @@ int ui__question_window(const char *title, const char *text, ...@@ -188,7 +188,9 @@ int ui__question_window(const char *title, const char *text,
pthread_mutex_lock(&ui__lock); pthread_mutex_lock(&ui__lock);
max_len += 2; max_len += 2;
nr_lines += 4; nr_lines += 2;
if (exit_msg)
nr_lines += 2;
y = SLtt_Screen_Rows / 2 - nr_lines / 2, y = SLtt_Screen_Rows / 2 - nr_lines / 2,
x = SLtt_Screen_Cols / 2 - max_len / 2; x = SLtt_Screen_Cols / 2 - max_len / 2;
...@@ -199,14 +201,20 @@ int ui__question_window(const char *title, const char *text, ...@@ -199,14 +201,20 @@ int ui__question_window(const char *title, const char *text,
SLsmg_write_string((char *)title); SLsmg_write_string((char *)title);
} }
SLsmg_gotorc(++y, x); SLsmg_gotorc(++y, x);
nr_lines -= 2; if (exit_msg)
nr_lines -= 2;
max_len -= 2; max_len -= 2;
SLsmg_write_wrapped_string((unsigned char *)text, y, x, SLsmg_write_wrapped_string((unsigned char *)text, y, x,
nr_lines, max_len, 1); nr_lines, max_len, 1);
SLsmg_gotorc(y + nr_lines - 2, x); SLsmg_gotorc(y + nr_lines - 2, x);
SLsmg_write_nstring((char *)" ", max_len); SLsmg_write_nstring((char *)" ", max_len);
SLsmg_gotorc(y + nr_lines - 1, x); 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(); SLsmg_refresh();
pthread_mutex_unlock(&ui__lock); pthread_mutex_unlock(&ui__lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment