commit d96731aecee0e3db250215640de26827fcd72505
author Daniel Lezcano <daniel.lezcano@linaro.org> Wed Jun 15 15:45:12 2011 +0200
committer Daniel Lezcano <daniel.lezcano@linaro.org> Wed Jun 15 15:45:12 2011 +0200
tree e78a256dd29a4b695d9e040dcdbc3cd56e95ecd2
parent 7b3da5001ca3648380070a1ea19a44bd76ce3d4b

Encapsulate the display (2)

Remove the specific cases in the mainloop and encapsulate the 
display functions.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

powerdebug.c

diff --git a/powerdebug.c b/powerdebug.c
index 4d94829..e702011 100644
--- a/powerdebug.c
+++ b/powerdebug.c
@@ -164,24 +164,19 @@
 	if (keystroke == EOF)
 		exit(0);
 
-	if (keystroke == KEY_RIGHT || keystroke == '\t') {
-		options->selectedwindow++;
-		options->selectedwindow %= TOTAL_FEATURE_WINS;
-	}
+	if (keystroke == KEY_RIGHT || keystroke == '\t')
+		 options->selectedwindow = display_next_panel();
 
-	if (keystroke == KEY_LEFT || keystroke == KEY_BTAB) {
-		options->selectedwindow--;
-		if (options->selectedwindow < 0)
-			options->selectedwindow = TOTAL_FEATURE_WINS - 1;
-	}
+	if (keystroke == KEY_LEFT || keystroke == KEY_BTAB)
+		 options->selectedwindow = display_prev_panel();
 
 	if (keystroke == KEY_DOWN) {
-		display_next_line(options->selectedwindow);
+		display_next_line();
 		*cont = true;
 	}
 
 	if (keystroke == KEY_UP) {
-		display_prev_line(options->selectedwindow);
+		display_prev_line();
 		*cont = true;
 	}
 
@@ -258,12 +253,12 @@
 		struct timeval tval;
 		fd_set readfds;
 
-		/* if (options->selectedwindow != CLOCK || !cont) */
-		/* 	show_header(options->selectedwindow); */
-
 		if (options->selectedwindow == REGULATOR)
 			regulator_display();
 
+		if (options->selectedwindow == SENSOR)
+			sensor_display();
+
 		if (options->selectedwindow == CLOCK) {
 
 			if (!cont) {
@@ -281,9 +276,6 @@
 			} else cont = false;
 		}
 
-		if (options->selectedwindow == SENSOR)
-			sensor_display();
-
 		FD_ZERO(&readfds);
 		FD_SET(0, &readfds);
 		tval.tv_sec = options->ticktime;