PowerTOP UI navigation enhancement(v3).
Chris Ferron
This patch add more ui navigation features allowing for the scrolling of PowerTop content for each tab. This is done by controlling the location of the winpad, and refreshing the terminal window when needed. To do this, the navigation keys have been updated as follows.
"Arrow Keys" now scroll the tab windows
"Page up/down" scroll tab windows up and down "TAB" cycles the next window tab
"SHIFT+TAB" cycles the previous window tab "ENTER" toggles tunables
"SPACE BAR" toggles tunables
"r KEY" refresh results and resets view of tab window.
Known issues:
There is no handler for terminal re-sizing. The workaround is to use "r KEY" to refresh if terminal windows size is changed mid session.
--- src/cpu/abstract_cpu.cpp | 6 --- src/display.cpp | 98 ++++++++++++++++++++++++++++++++++-------------- src/display.h | 13 ++++++- src/main.cpp | 16 +++++--- 4 files changed, 92 insertions(+), 41 deletions(-)
src/cpu/abstract_cpu.cpp +0 -6
@@ -421,12 +421,6 @@ void abstract_cpu::validate(void) for (i = 0; i < children.size(); i++) { if (children[i]) { - if (my_time != children[i]->total_pstate_time()) - printf("My (%i) time %llu is not the same as child (%i) time %llu\n", - first_cpu, - (unsigned long long)my_time, - children[i]->number, - (unsigned long long)children[i]->total_pstate_time()); children[i]->validate(); } }
src/display.cpp +70 -28
156 lines not on this page · raw message
src/display.h +11 -2
@@ -41,6 +41,8 @@ extern void show_prev_tab(void);extern void show_cur_tab (void );extern void cursor_up (void );extern void cursor_down (void ); +extern void cursor_right (void ); +extern void cursor_left (void );extern void cursor_enter (void );extern void window_refresh (void );
@@ -48,10 +50,17 @@ class tab_window { public:int cursor_pos;int cursor_max; +int xpad_pos, ypad_pos;WINDOW *win; - virtual void cursor_down(void) { if (cursor_pos < cursor_max ) cursor_pos++; repaint(); } ; - virtual void cursor_up(void) { if (cursor_pos > 0) cursor_pos--; repaint(); }; + virtual void cursor_down(void) { +if (cursor_pos < cursor_max ) cursor_pos++;repaint (); + } ; + virtual void cursor_up(void) { +if (cursor_pos >0 ) cursor_pos--;repaint (); + }; + virtual void cursor_left(void) { }; + virtual void cursor_right(void) { }; virtual void cursor_enter(void) { }; virtual void window_refresh() { };
src/main.cpp +11 -5
@@ -135,22 +135,28 @@ static void do_sleep(int seconds) halfdelay(delta * 10); c = getch(); - switch (c) { - case KEY_NPAGE: + case 353: + show_prev_tab(); + break; + case 9: + show_next_tab(); + break; case KEY_RIGHT: - show_next_tab(); + cursor_right(); break; - case KEY_PPAGE: case KEY_LEFT: - show_prev_tab(); + cursor_left(); break; + case KEY_NPAGE: case KEY_DOWN: cursor_down(); break; + case KEY_PPAGE: case KEY_UP: cursor_up(); break; + case 32: case 10: cursor_enter(); break;
Sergey Senozhatsky
Quoted 136 lines · Chris Ferron
This patch add more ui navigation features allowing for the scrolling of PowerTop content for each tab. This is done by controlling the location of the winpad, and refreshing the terminal window when needed. To do this, the navigation keys have been updated as follows.
"Arrow Keys" now scroll the tab windows
"Page up/down" scroll tab windows up and down "TAB" cycles the next window tab
"SHIFT+TAB" cycles the previous window tab "ENTER" toggles tunables
"SPACE BAR" toggles tunables
"r KEY" refresh results and resets view of tab window.Known issues:
There is no handler for terminal re-sizing. The workaround is to use "r KEY" to refresh if terminal windows size is changed mid session.--- src/cpu/abstract_cpu.cpp | 6 --- src/display.cpp | 98 ++++++++++++++++++++++++++++++++++-------------- src/display.h | 13 ++++++- src/main.cpp | 16 +++++--- 4 files changed, 92 insertions(+), 41 deletions(-)src/cpu/abstract_cpu.cpp +0
-6@@ -421,12 +421,6 @@ void abstract_cpu::validate(void) for (i = 0; i < children.size(); i++) { if (children[i]) { - if (my_time != children[i]->total_pstate_time()) - printf("My (%i) time %llu is not the same as child (%i) time %llu\n", - first_cpu, - (unsigned long long)my_time, - children[i]->number, - (unsigned long long)children[i]->total_pstate_time()); children[i]->validate(); } }src/display.cpp +22
-23@@ -95,7 +95,7 @@ static int current_tab; void show_tab(unsigned int tab) { - WINDOW *win; + class tab_window *win; unsigned int i; int tab_pos = 17; const char *c;@@ -145,11 +145,11 @@ void show_tab(unsigned int tab) wrefresh(tab_bar); wrefresh(bottom_line); - win = get_ncurses_win(tab_names[tab]); + win = tab_windows[tab_names[tab]]; if (!win) return; - prefresh(win, 0, 0, 1, 0, LINES - 3, COLS - 1); + prefresh(win->win, win->ypad_pos, win->xpad_pos, 1, 0, LINES - 3, COLS - 1); } WINDOW *get_ncurses_win(const char *name)@@ -185,42 +185,41 @@ WINDOW *get_ncurses_win(const string &name) return get_ncurses_win(name.c_str()); } - -void show_next_tab(void) +void show_prev_tab(void) { - class tab_window *w; + class tab_window *w; - if (!display) - return; + if (!display) + return; + w = tab_windows[tab_names[current_tab]]; + if (w) + w->hide(); - w = tab_windows[tab_names[current_tab]]; - if (w) - w->hide(); + current_tab --; + if (current_tab < 0) + current_tab = tab_names.size() - 1; - current_tab ++; - if (current_tab >= (int)tab_names.size()) - current_tab = 0; - - w = tab_windows[tab_names[current_tab]]; - if (w) - w->expose(); + w = tab_windows[tab_names[current_tab]]; + if (w) + w->expose(); - show_tab(current_tab); + show_tab(current_tab); } -void show_prev_tab(void) +void show_next_tab(void) { class tab_window *w; if (!display) return; + w = tab_windows[tab_names[current_tab]]; if (w) w->hide(); - current_tab --; - if (current_tab < 0) - current_tab = tab_names.size() - 1; + current_tab ++; + if (current_tab >= (int)tab_names.size()) + current_tab = 0; w = tab_windows[tab_names[current_tab]]; if (w)@@ -241,8 +240,16 @@ void cursor_down(void) class tab_window *w; w = tab_windows[tab_names[current_tab]];
src/display.cpp void cursor_down(void) · line 250
Quoted 10 lines
src/display.cpp +8
-2- if (w) - w->cursor_down(); + if (w) { + if (tab_names[current_tab] == "Tunables") { + if ((w->cursor_pos + 7) >= LINES) { + prefresh(w->win, ++w->ypad_pos, w->xpad_pos, 1, 0, LINES - 3, COLS - 1); + } + w->cursor_down(); + } else { + prefresh(w->win, ++w->ypad_pos, w->xpad_pos, 1, 0, LINES - 3, COLS - 1);
^^^^^
src/display.cpp void cursor_down(void) · line 253
Quoted 3 lines
src/display.cpp +2
-0+ } + }
not critical at all, just a 2 very small notes
I can scroll down/right as much as I want (can), even to (signed int)-1. the biggest in LINES window seems to be `Overview'. is that window limited to max pid?
how about
-int xpad_pos, ypad_pos;
+signed short xpad_pos, ypad_pos;
src/display.cpp void cursor_up(void) · line 265
Quoted 12 lines
src/display.cpp +3
-3show_cur_tab(); }@@ -253,12 +260,45 @@ void cursor_up(void) w = tab_windows[tab_names[current_tab]]; - if (w) - w->cursor_up(); - + if (w) { + w->cursor_up(); + if(w->ypad_pos > 0) {
ypad_pos can overflow (very, very unlikely, but still). the same can happen to xpad_pos.
though, imho, this is not required to be addressed.
-ss
Quoted 120 lines
src/display.cpp +35
-0+ if (tab_names[current_tab] == "Tunables") { + prefresh(w->win, --w->ypad_pos, w->xpad_pos, 1, 0, LINES - 3, COLS - 1); + } else { + prefresh(w->win, --w->ypad_pos, w->xpad_pos, 1, 0, LINES - 3, COLS - 1); + } + } + } + show_cur_tab(); } +void cursor_left(void) +{ + class tab_window *w; + + w = tab_windows[tab_names[current_tab]]; + + if (w) { + if (w->xpad_pos > 0) { + prefresh(w->win, w->ypad_pos,--w->xpad_pos, 1, 0, LINES - 3, COLS - 1); + } + } +} + +void cursor_right(void) +{ + class tab_window *w; + + w = tab_windows[tab_names[current_tab]]; + + if (w) { + prefresh(w->win, w->ypad_pos, ++w->xpad_pos, 1, 0, LINES - 3, COLS - 1); + } + +} + void cursor_enter(void) { class tab_window *w;@@ -279,6 +319,8 @@ void window_refresh() w = tab_windows[tab_names[current_tab]]; if (w) { + w->ypad_pos = 0; + w->xpad_pos = 0; w->window_refresh(); w->repaint(); }src/display.h +11
-2@@ -41,6 +41,8 @@ extern void show_prev_tab(void);extern void show_cur_tab (void );extern void cursor_up (void );extern void cursor_down (void ); +extern void cursor_right (void ); +extern void cursor_left (void );extern void cursor_enter (void );extern void window_refresh (void );@@ -48,10 +50,17 @@ class tab_window { public:int cursor_pos;int cursor_max; +int xpad_pos, ypad_pos;WINDOW *win; - virtual void cursor_down(void) { if (cursor_pos < cursor_max ) cursor_pos++; repaint(); } ; - virtual void cursor_up(void) { if (cursor_pos > 0) cursor_pos--; repaint(); }; + virtual void cursor_down(void) { +if (cursor_pos < cursor_max ) cursor_pos++;repaint (); + } ; + virtual void cursor_up(void) { +if (cursor_pos >0 ) cursor_pos--;repaint (); + }; + virtual void cursor_left(void) { }; + virtual void cursor_right(void) { }; virtual void cursor_enter(void) { }; virtual void window_refresh() { };src/main.cpp +11
-5@@ -135,22 +135,28 @@ static void do_sleep(int seconds) halfdelay(delta * 10); c = getch(); - switch (c) { - case KEY_NPAGE: + case 353: + show_prev_tab(); + break; + case 9: + show_next_tab(); + break; case KEY_RIGHT: - show_next_tab(); + cursor_right(); break; - case KEY_PPAGE: case KEY_LEFT: - show_prev_tab(); + cursor_left(); break; + case KEY_NPAGE: case KEY_DOWN: cursor_down(); break; + case KEY_PPAGE: case KEY_UP: cursor_up(); break; + case 32: case 10: cursor_enter(); break;
Ferron
Quoted 152 lines · Sergey Senozhatsky
Quoted 136 lines · Chris Ferron
This patch add more ui navigation features allowing for the scrolling of PowerTop content for each tab. This is done by controlling the location of the winpad, and refreshing the terminal window when needed. To do this, the navigation keys have been updated as follows.
"Arrow Keys" now scroll the tab windows
"Page up/down" scroll tab windows up and down "TAB" cycles the next window tab
"SHIFT+TAB" cycles the previous window tab "ENTER" toggles tunables
"SPACE BAR" toggles tunables
"r KEY" refresh results and resets view of tab window.Known issues:
There is no handler for terminal re-sizing. The workaround is to use "r KEY" to refresh if terminal windows size is changed mid session.--- src/cpu/abstract_cpu.cpp | 6 --- src/display.cpp | 98 ++++++++++++++++++++++++++++++++++-------------- src/display.h | 13 ++++++- src/main.cpp | 16 +++++--- 4 files changed, 92 insertions(+), 41 deletions(-)src/cpu/abstract_cpu.cpp +0
-6@@ -421,12 +421,6 @@ void abstract_cpu::validate(void) for (i = 0; i < children.size(); i++) { if (children[i]) { - if (my_time != children[i]->total_pstate_time()) - printf("My (%i) time %llu is not the same as child (%i) time %llu\n", - first_cpu, - (unsigned long long)my_time, - children[i]->number, - (unsigned long long)children[i]->total_pstate_time()); children[i]->validate(); } }src/display.cpp +22
-23@@ -95,7 +95,7 @@ static int current_tab; void show_tab(unsigned int tab) { - WINDOW *win; + class tab_window *win; unsigned int i; int tab_pos = 17; const char *c;@@ -145,11 +145,11 @@ void show_tab(unsigned int tab) wrefresh(tab_bar); wrefresh(bottom_line); - win = get_ncurses_win(tab_names[tab]); + win = tab_windows[tab_names[tab]]; if (!win) return; - prefresh(win, 0, 0, 1, 0, LINES - 3, COLS - 1); + prefresh(win->win, win->ypad_pos, win->xpad_pos, 1, 0, LINES - 3, COLS - 1); } WINDOW *get_ncurses_win(const char *name)@@ -185,42 +185,41 @@ WINDOW *get_ncurses_win(const string &name) return get_ncurses_win(name.c_str()); } - -void show_next_tab(void) +void show_prev_tab(void) { - class tab_window *w; + class tab_window *w; - if (!display) - return; + if (!display) + return; + w = tab_windows[tab_names[current_tab]]; + if (w) + w->hide(); - w = tab_windows[tab_names[current_tab]]; - if (w) - w->hide(); + current_tab --; + if (current_tab < 0) + current_tab = tab_names.size() - 1; - current_tab ++; - if (current_tab >= (int)tab_names.size()) - current_tab = 0; - - w = tab_windows[tab_names[current_tab]]; - if (w) - w->expose(); + w = tab_windows[tab_names[current_tab]]; + if (w) + w->expose(); - show_tab(current_tab); + show_tab(current_tab); } -void show_prev_tab(void) +void show_next_tab(void) { class tab_window *w; if (!display) return; + w = tab_windows[tab_names[current_tab]]; if (w) w->hide(); - current_tab --; - if (current_tab < 0) - current_tab = tab_names.size() - 1; + current_tab ++; + if (current_tab >= (int)tab_names.size()) + current_tab = 0; w = tab_windows[tab_names[current_tab]]; if (w)@@ -241,8 +240,16 @@ void cursor_down(void) class tab_window *w; w = tab_windows[tab_names[current_tab]];src/display.cpp void cursor_down(void) · line 250
Quoted 10 lines
src/display.cpp +8
-2- if (w) - w->cursor_down(); + if (w) { + if (tab_names[current_tab] == "Tunables") { + if ((w->cursor_pos + 7) >= LINES) { + prefresh(w->win, ++w->ypad_pos, w->xpad_pos, 1, 0, LINES - 3, COLS - 1); + } + w->cursor_down(); + } else { + prefresh(w->win, ++w->ypad_pos, w->xpad_pos, 1, 0, LINES - 3, COLS - 1);^^^^^src/display.cpp void cursor_down(void) · line 253
Quoted 3 lines
src/display.cpp +2
-0+ } + }
Quoted 6 lines
not critical at all, just a 2 very small notes
I can scroll down/right as much as I want (can), even to (signed int)-1. the biggest in LINES window seems to be `Overview'. is that window limited to max pid?
The Window is created to size of terminal, but PowerTOP creates a winpad at 1000x1000. So the real max is the actual max of the pad for PowerTOP. Overview can be big in terms of lines drawn to the pad, but so can tunables, but I tend to agree Overview will have the most lines for the most part. Didn't really think of the implications of max_pid or wrapping, but im thinking it may not be a big issue overall.
Review
Quoted 6 lines
how about
(quoted diff) +1
-1-int xpad_pos, ypad_pos; +signed short xpad_pos, ypad_pos;
Ya that should be tuned up, I agree.
Quoted 20 lines
Quoted 5 lines
src/display.cpp +0
-0show_cur_tab(); }src/display.cpp void cursor_up(void) · line 265
Quoted 9 lines
src/display.cpp +3
-3@@ -253,12 +260,45 @@ void cursor_up(void) w = tab_windows[tab_names[current_tab]]; - if (w) - w->cursor_up(); - + if (w) { + w->cursor_up(); + if(w->ypad_pos > 0) {
ypad_poscan overflow (very, very unlikely, but still). the same can happen toxpad_pos.
Quoted 2 lines
though, imho, this is not required to be addressed.
ya, this should be tightened regardless
Quoted 1 line
-ss
So tuning and comments aside, will this fix your intrest to truncate for terminal sizing issues?
-C
Quoted 126 lines
Quoted 111 lines
src/display.cpp +35
-0+ if (tab_names[current_tab] == "Tunables") { + prefresh(w->win, --w->ypad_pos, w->xpad_pos, 1, 0, LINES - 3, COLS - 1); + } else { + prefresh(w->win, --w->ypad_pos, w->xpad_pos, 1, 0, LINES - 3, COLS - 1); + } + } + } + show_cur_tab(); } +void cursor_left(void) +{ + class tab_window *w; + + w = tab_windows[tab_names[current_tab]]; + + if (w) { + if (w->xpad_pos > 0) { + prefresh(w->win, w->ypad_pos,--w->xpad_pos, 1, 0, LINES - 3, COLS - 1); + } + } +} + +void cursor_right(void) +{ + class tab_window *w; + + w = tab_windows[tab_names[current_tab]]; + + if (w) { + prefresh(w->win, w->ypad_pos, ++w->xpad_pos, 1, 0, LINES - 3, COLS - 1); + } + +} + void cursor_enter(void) { class tab_window *w;@@ -279,6 +319,8 @@ void window_refresh() w = tab_windows[tab_names[current_tab]]; if (w) { + w->ypad_pos = 0; + w->xpad_pos = 0; w->window_refresh(); w->repaint(); }src/display.h +11
-2@@ -41,6 +41,8 @@ extern void show_prev_tab(void);extern void show_cur_tab (void );extern void cursor_up (void );extern void cursor_down (void ); +extern void cursor_right (void ); +extern void cursor_left (void );extern void cursor_enter (void );extern void window_refresh (void );@@ -48,10 +50,17 @@ class tab_window { public:int cursor_pos;int cursor_max; +int xpad_pos, ypad_pos;WINDOW *win; - virtual void cursor_down(void) { if (cursor_pos < cursor_max ) cursor_pos++; repaint(); } ; - virtual void cursor_up(void) { if (cursor_pos > 0) cursor_pos--; repaint(); }; + virtual void cursor_down(void) { +if (cursor_pos < cursor_max ) cursor_pos++;repaint (); + } ; + virtual void cursor_up(void) { +if (cursor_pos >0 ) cursor_pos--;repaint (); + }; + virtual void cursor_left(void) { }; + virtual void cursor_right(void) { }; virtual void cursor_enter(void) { }; virtual void window_refresh() { };src/main.cpp +9
-5@@ -135,22 +135,28 @@ static void do_sleep(int seconds) halfdelay(delta * 10); c = getch(); - switch (c) { - case KEY_NPAGE: + case 353: + show_prev_tab(); + break; + case 9: + show_next_tab(); + break; case KEY_RIGHT: - show_next_tab(); + cursor_right(); break; - case KEY_PPAGE: case KEY_LEFT: - show_prev_tab(); + cursor_left(); break; + case KEY_NPAGE: case KEY_DOWN:src/main.cpp static void do_sleep(int seconds) · line 162
Quoted 10 lines
src/main.cpp +2
-0cursor_down(); break; + case KEY_PPAGE: case KEY_UP: cursor_up(); break; + case 32: case 10: cursor_enter(); break;_______________________________________________
PowerTop mailing list
PowerTop(a)lists.01.org
https://lists.01.org/mailman/listinfo/powertop
Sergey Senozhatsky
Quoted 11 lines · Chris E
Quoted 4 lines
I can scroll down/right as much as I want (can), even to (signed int)-1. the biggest in LINES window seems to be `Overview'. is that window limited to max pid?
The Window is created to size of terminal, but PowerTOP creates a winpad at 1000x1000. So the real max is the actual max of the pad for PowerTOP. Overview can be big in terms of lines drawn to the pad, but so can tunables, but I tend to agree Overview will have the most lines for the most part. Didn't really think of the implications of
max_pidor wrapping, but im thinking it may not be a big issue overall.
agree.
Quoted 6 lines
Quoted 1 line
ya, this should be tightened regardless
Quoted 1 line
-ssSo tuning and comments aside, will this fix your intrest to truncate for terminal sizing issues?
absolutely, I like the patch. great job!
-ss