bind pref on 'r' instead of 'P'

[lttngtop.git] / src / cursesdisplay.c

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index 82bb81097f758a80568fb615e68ccf9cd67e92ae..edcf4e59a7fc1340df45915e75c37a33286cd9a9 100644 (file)
--- a/src/cursesdisplay.c
+++ b/src/cursesdisplay.c
@@ -269,8 +269,8 @@ void update_footer()
        print_key(footer, "F4", "IOTop  ", current_view == iostream);
        print_key(footer, "Enter", "Details  ", current_view == process_details);
        print_key(footer, "Space", "Highlight  ", 0);
-       print_key(footer, "q", "Quit | ", 0);
-       print_key(footer, "P", "Perf Pref  ", 0);
+       print_key(footer, "q", "Quit ", 0);
+       print_key(footer, "r", "Pref  ", 0);
        print_key(footer, "p", "Pause  ", toggle_pause);
 
        wrefresh(footer);
@@ -913,7 +913,7 @@ void update_process_detail_pref(int *line_selected, int toggle_view, int toggle_
        set_window_title(pref_panel_window, "Process Detail Preferences ");
        wattron(pref_panel_window, A_BOLD);
        mvwprintw(pref_panel_window, size + 1, 1,
-                       " 's' to sort");
+                       " 's' : sort, space : toggle");
        wattroff(pref_panel_window, A_BOLD);
 
        if (*line_selected > (size - 1))
@@ -934,7 +934,7 @@ void update_process_detail_pref(int *line_selected, int toggle_view, int toggle_
                }
                if (fileview[i].sort == 1)
                        wattron(pref_panel_window, A_BOLD);
-               mvwprintw(pref_panel_window, i + 1, 1, "[x] %s",
+               mvwprintw(pref_panel_window, i + 1, 1, "[-] %s",
                                fileview[i].title);
                wattroff(pref_panel_window, A_BOLD);
                wattroff(pref_panel_window, COLOR_PAIR(5));
@@ -965,7 +965,7 @@ void update_iostream_pref(int *line_selected, int toggle_view, int toggle_sort)
        set_window_title(pref_panel_window, "IOTop Preferences ");
        wattron(pref_panel_window, A_BOLD);
        mvwprintw(pref_panel_window, size + 1, 1,
-                       " 's' to sort");
+                       " 's' : sort, space : toggle");
        wattroff(pref_panel_window, A_BOLD);
 
        if (*line_selected > (size - 1))
@@ -986,7 +986,7 @@ void update_iostream_pref(int *line_selected, int toggle_view, int toggle_sort)
                }
                if (iostreamtopview[i].sort == 1)
                        wattron(pref_panel_window, A_BOLD);
-               mvwprintw(pref_panel_window, i + 1, 1, "[x] %s",
+               mvwprintw(pref_panel_window, i + 1, 1, "[-] %s",
                                iostreamtopview[i].title);
                wattroff(pref_panel_window, A_BOLD);
                wattroff(pref_panel_window, COLOR_PAIR(5));
@@ -1017,7 +1017,7 @@ void update_cpu_pref(int *line_selected, int toggle_view, int toggle_sort)
        set_window_title(pref_panel_window, "CPUTop Preferences ");
        wattron(pref_panel_window, A_BOLD);
        mvwprintw(pref_panel_window, size + 1, 1,
-                       " 's' to sort");
+                       " 's' : sort, space : toggle");
        wattroff(pref_panel_window, A_BOLD);
 
        if (*line_selected > (size - 1))
@@ -1041,7 +1041,7 @@ void update_cpu_pref(int *line_selected, int toggle_view, int toggle_sort)
                }
                if (cputopview[i].sort == 1)
                        wattron(pref_panel_window, A_BOLD);
-               mvwprintw(pref_panel_window, i + 1, 1, "[x] %s",
+               mvwprintw(pref_panel_window, i + 1, 1, "[-] %s",
                                cputopview[i].title);
                wattroff(pref_panel_window, A_BOLD);
                wattroff(pref_panel_window, COLOR_PAIR(5));
@@ -1074,7 +1074,7 @@ void update_perf_pref(int *line_selected, int toggle_view, int toggle_sort)
        set_window_title(pref_panel_window, "Perf Preferences ");
        wattron(pref_panel_window, A_BOLD);
        mvwprintw(pref_panel_window, g_hash_table_size(global_perf_liszt) + 1, 1,
-                       " 's' to sort");
+                       " 's' : sort, space : toggle");
        wattroff(pref_panel_window, A_BOLD);
 
        if (toggle_sort == 1) {
@@ -1195,6 +1195,7 @@ void *handle_keyboard(void *p)
        while((ch = getch())) {
                switch(ch) {
                /* Move the cursor and scroll */
+               case 'j':
                case KEY_DOWN:
                        if (pref_panel_visible) {
                                pref_line_selected++;
@@ -1214,6 +1215,7 @@ void *handle_keyboard(void *p)
                        break;
                case KEY_NPAGE:
                        break;
+               case 'k':
                case KEY_UP:
                        if (pref_panel_visible) {
                                if (pref_line_selected > 0)
@@ -1262,9 +1264,11 @@ void *handle_keyboard(void *p)
                        } else {
                                print_log("Manually moving forward");
                                sem_post(&timer);
-                               /* we force to resume the refresh when moving forward */
-                               if (toggle_pause > 0)
-                                       resume_display();
+                               if (toggle_pause > 0) {
+                                       sem_post(&pause_sem);
+                                       update_current_view();
+                                       sem_wait(&pause_sem);
+                               }
                        }
 
                        break;
@@ -1282,6 +1286,8 @@ void *handle_keyboard(void *p)
                        break;
 
                case 13: /* FIXME : KEY_ENTER ?? */
+                       if (pref_panel_visible)
+                               break;
                        if (current_view != process_details) {
                                previous_view = current_view;
                                current_view = process_details;
@@ -1335,9 +1341,19 @@ void *handle_keyboard(void *p)
                                resume_display();
                        }
                        break;
-               case 'P':
+               case 'r':
                        toggle_pref_panel();
                        break;
+               /* ESCAPE, but slow to process, don't know why */
+               case 27:
+                       if (pref_panel_visible)
+                               toggle_pref_panel();
+                       else if (current_view == process_details) {
+                               current_view = previous_view;
+                               previous_view = process_details;
+                       }
+                       update_current_view();
+                       break;
                default:
                        if (data)
                                update_current_view();