X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcursesdisplay.c;h=4c91e1ea49d41bee7824674394bcd3879b975d9e;hb=cdb7bb773fcb18cedd9e0ad2720b2e3f885f3c8d;hp=3d8d4e40dbb17ab9d56447ca0c703d9c6c80a88b;hpb=dc8f04ddd2f754fe4e5c02a2c24b41fc3da214ae;p=lttngtop.git

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index 3d8d4e4..4c91e1e 100644
--- a/src/cursesdisplay.c
+++ b/src/cursesdisplay.c
@@ -61,7 +61,6 @@ int max_elements = 80;
 
 int toggle_threads = -1;
 int toggle_pause = -1;
-int toggle_tree = -1;
 
 int max_center_lines;
 
@@ -530,6 +529,8 @@ void update_perf()
 
 		if (current_line == selected_line) {
 			selected_process = tmp;
+			selected_tid = tmp->tid;
+			selected_comm = tmp->comm;
 			wattron(center, COLOR_PAIR(5));
 			mvwhline(center, current_line + header_offset, 1, ' ', COLS-3);
 		}
@@ -820,20 +821,6 @@ void *handle_keyboard(void *p)
 			}
 			break;
 		case KEY_NPAGE:
-			if ((selected_line + 10 < max_center_lines - 1) &&
-					((selected_line + 10) < max_elements - 1)) {
-				selected_line += 10;
-				selected_in_list += 10;
-			} else if (max_elements > max_center_lines) {
-				selected_line = max_center_lines - 1;
-				if (selected_in_list + 10 < max_elements - 1) {
-					selected_in_list += 10;
-					list_offset += (selected_in_list - max_center_lines + 1);
-				}
-			} else if (selected_line + 10 > max_elements) {
-				selected_line = max_elements - 1;
-			}
-			update_current_view();
 			break;
 		case KEY_UP:
 			if (perf_panel_visible) {
@@ -852,11 +839,6 @@ void *handle_keyboard(void *p)
 			}
 			break;
 		case KEY_PPAGE:
-			if (selected_line - 10 > 0)
-				selected_line -= 10;
-			else
-				selected_line = 0;
-			update_current_view();
 			break;
 
 		/* Navigate the history with arrows */
@@ -904,29 +886,34 @@ void *handle_keyboard(void *p)
 			break;
 
 		case 13: /* FIXME : KEY_ENTER ?? */
-			if (current_view == cpu) {
+			if (current_view != process_details) {
+				previous_view = current_view;
 				current_view = process_details;
+			} else {
+				current_view = previous_view;
+				previous_view = process_details;
 			}
 			update_current_view();
 			break;
 
 		case KEY_F(1):
-			toggle_tree *= -1;
 			current_view = cpu;
+			selected_line = 0;
 			update_current_view();
 			break;
 		case KEY_F(2):
 			current_view = cpu;
+			selected_line = 0;
 			update_current_view();
 			break;
 		case KEY_F(3):
 			current_view = perf;
-			toggle_tree = -1;
+			selected_line = 0;
 			update_current_view();
 			break;
 		case KEY_F(4):
 			current_view = iostream;
-			toggle_tree = -1;
+			selected_line = 0;
 			update_current_view();
 			break;
 		case KEY_F(10):