diff options
author | Brian Norris <computersforpeace@gmail.com> | 2015-02-17 21:18:31 -0500 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2015-02-28 00:52:47 -0500 |
commit | 0e7b766dc0aeedd47c8264242e06f3a470f5d589 (patch) | |
tree | eff7a02e160135f9ec947ab792ed21be7c7c5e7b | |
parent | a90b6b006c616f1a33f8ffb6939e31c8d66926a4 (diff) |
tools/thermal: tmon: tui: don't hard-code dialog window size assumptions
We can use the ncurses API to get the number of rows.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Acked-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
-rw-r--r-- | tools/thermal/tmon/tui.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/thermal/tmon/tui.c b/tools/thermal/tmon/tui.c index 43c5aecf71da..2779573a53cb 100644 --- a/tools/thermal/tmon/tui.c +++ b/tools/thermal/tmon/tui.c | |||
@@ -274,11 +274,14 @@ const char DIAG_TITLE[] = "[ TUNABLES ]"; | |||
274 | void show_dialogue(void) | 274 | void show_dialogue(void) |
275 | { | 275 | { |
276 | int j, x = 0, y = 0; | 276 | int j, x = 0, y = 0; |
277 | int rows, cols; | ||
277 | WINDOW *w = dialogue_window; | 278 | WINDOW *w = dialogue_window; |
278 | 279 | ||
279 | if (tui_disabled || !w) | 280 | if (tui_disabled || !w) |
280 | return; | 281 | return; |
281 | 282 | ||
283 | getmaxyx(w, rows, cols); | ||
284 | |||
282 | werase(w); | 285 | werase(w); |
283 | box(w, 0, 0); | 286 | box(w, 0, 0); |
284 | mvwprintw(w, 0, maxx/4, DIAG_TITLE); | 287 | mvwprintw(w, 0, maxx/4, DIAG_TITLE); |
@@ -297,10 +300,8 @@ void show_dialogue(void) | |||
297 | wattron(w, A_BOLD); | 300 | wattron(w, A_BOLD); |
298 | mvwprintw(w, DIAG_DEV_ROWS+1, 1, "Enter Choice [A-Z]?"); | 301 | mvwprintw(w, DIAG_DEV_ROWS+1, 1, "Enter Choice [A-Z]?"); |
299 | wattroff(w, A_BOLD); | 302 | wattroff(w, A_BOLD); |
300 | /* y size of dialogue win is nr cdev + 5, so print legend | 303 | /* print legend at the bottom line */ |
301 | * at the bottom line | 304 | mvwprintw(w, rows - 2, 1, |
302 | */ | ||
303 | mvwprintw(w, ptdata.nr_cooling_dev+3, 1, | ||
304 | "Legend: A=Active, P=Passive, C=Critical"); | 305 | "Legend: A=Active, P=Passive, C=Critical"); |
305 | 306 | ||
306 | wrefresh(dialogue_window); | 307 | wrefresh(dialogue_window); |