perf ui browser: Add ->rows to disambiguate from ->height

The ui_browser->height is about the whole browser "window", including
any header, status lines or any other space needed for some "Yes", "No",
etc buttons a descendent browser, like hist_browser, may have.

Since the navigation is done mostly on the ui_browser methods, it needs
to know how many rows are on the screen, while details about what other
components are, say, if a header (that may be composed of multiple
lines, etc) is present.

Besides this we'll need to add a ui_browser->refresh_dimensions() hook
so that browsers like hist_browser can update ->rows in response to
screen resizes, this will come in a follow up patch.

This patch just adds ->rows and updates it when updating ->height, keeps
using ->height for the only other widget that can come with ui_browser,
the scrollbar, that goes on using all the height on the rightmost column
in the screen, using ->rows for the keyboard navigation needs.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-xexmwg1mv7u03j5imn66jdak@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 15 insertions, 15 deletions

diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index 9d2294efc00c..adb294a3ec08 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -150,7 +150,7 @@ unsigned int ui_browser__rb_tree_refresh(struct ui_browser *browser)
         while (nd != NULL) {
                 ui_browser__gotorc(browser, row, 0);
                 browser->write(browser, nd, row);
-                if (++row == browser->height)
+                if (++row == browser->rows)
                         break;
                 nd = rb_next(nd);
         }
@@ -166,7 +166,7 @@ bool ui_browser__is_current_entry(struct ui_browser *browser, unsigned row)
 void ui_browser__refresh_dimensions(struct ui_browser *browser)
 {
         browser->width = SLtt_Screen_Cols - 1;
-        browser->height = SLtt_Screen_Rows - 2;
+        browser->height = browser->rows = SLtt_Screen_Rows - 2;
         browser->y = 1;
         browser->x = 0;
 }
@@ -389,7 +389,7 @@ int ui_browser__run(struct ui_browser *browser, int delay_secs)
                         if (browser->index == browser->nr_entries - 1)
                                 break;
                         ++browser->index;
-                        if (browser->index == browser->top_idx + browser->height) {
+                        if (browser->index == browser->top_idx + browser->rows) {
                                 ++browser->top_idx;
                                 browser->seek(browser, +1, SEEK_CUR);
                         }
@@ -405,10 +405,10 @@ int ui_browser__run(struct ui_browser *browser, int delay_secs)
                         break;
                 case K_PGDN:
                 case ' ':
-                        if (browser->top_idx + browser->height > browser->nr_entries - 1)
+                        if (browser->top_idx + browser->rows > browser->nr_entries - 1)
                                 break;
 
-                        offset = browser->height;
+                        offset = browser->rows;
                         if (browser->index + offset > browser->nr_entries - 1)
                                 offset = browser->nr_entries - 1 - browser->index;
                         browser->index += offset;
@@ -419,10 +419,10 @@ int ui_browser__run(struct ui_browser *browser, int delay_secs)
                         if (browser->top_idx == 0)
                                 break;
 
-                        if (browser->top_idx < browser->height)
+                        if (browser->top_idx < browser->rows)
                                 offset = browser->top_idx;
                         else
-                                offset = browser->height;
+                                offset = browser->rows;
 
                         browser->index -= offset;
                         browser->top_idx -= offset;
@@ -432,7 +432,7 @@ int ui_browser__run(struct ui_browser *browser, int delay_secs)
                         ui_browser__reset_index(browser);
                         break;
                 case K_END:
-                        offset = browser->height - 1;
+                        offset = browser->rows - 1;
                         if (offset >= browser->nr_entries)
                                 offset = browser->nr_entries - 1;
 
@@ -462,7 +462,7 @@ unsigned int ui_browser__list_head_refresh(struct ui_browser *browser)
                 if (!browser->filter || !browser->filter(browser, pos)) {
                         ui_browser__gotorc(browser, row, 0);
                         browser->write(browser, pos, row);
-                        if (++row == browser->height)
+                        if (++row == browser->rows)
                                 break;
                 }
         }
@@ -587,7 +587,7 @@ unsigned int ui_browser__argv_refresh(struct ui_browser *browser)
                 if (!browser->filter || !browser->filter(browser, *pos)) {
                         ui_browser__gotorc(browser, row, 0);
                         browser->write(browser, pos, row);
-                        if (++row == browser->height)
+                        if (++row == browser->rows)
                                 break;
                 }
 
@@ -623,7 +623,7 @@ static void __ui_browser__line_arrow_up(struct ui_browser *browser,
 
         SLsmg_set_char_set(1);
 
-        if (start < browser->top_idx + browser->height) {
+        if (start < browser->top_idx + browser->rows) {
                 row = start - browser->top_idx;
                 ui_browser__gotorc(browser, row, column);
                 SLsmg_write_char(SLSMG_LLCORN_CHAR);
@@ -633,7 +633,7 @@ static void __ui_browser__line_arrow_up(struct ui_browser *browser,
                 if (row-- == 0)
                         goto out;
         } else
-                row = browser->height - 1;
+                row = browser->rows - 1;
 
         if (end > browser->top_idx)
                 end_row = end - browser->top_idx;
@@ -675,8 +675,8 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser,
         } else
                 row = 0;
 
-        if (end >= browser->top_idx + browser->height)
-                end_row = browser->height - 1;
+        if (end >= browser->top_idx + browser->rows)
+                end_row = browser->rows - 1;
         else
                 end_row = end - browser->top_idx;
 
@@ -684,7 +684,7 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser,
         SLsmg_draw_vline(end_row - row + 1);
 
         ui_browser__gotorc(browser, end_row, column);
-        if (end < browser->top_idx + browser->height) {
+        if (end < browser->top_idx + browser->rows) {
                 SLsmg_write_char(SLSMG_LLCORN_CHAR);
                 ui_browser__gotorc(browser, end_row, column + 1);
                 SLsmg_write_char(SLSMG_HLINE_CHAR);