Move e key to views

This way they can call the view_edit with the correct argument.
Pressing 'e' should be the same as pressing 'return' in most cases.

diff --git a/src/view.c b/src/view.c
index ceb9fec7328019bc154f067645e234fea3d68d80..5a800510a921dae328feb535d8361a87697eed49 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -237,8 +237,6 @@ static int process(int key, mmask_t btn, int row, int col)
                        update_sizes();
                        draw_view();
                        return 1;
-               case 'e':    // edit
-                       return set_view(active, &edit_view);
        }
 
        /* Pass key to active view */

diff --git a/views/day.c b/views/day.c
index 088873cf86b1a3f6faa9beeb270602172eeef422..a48513d43aab6286e80ae3f69d54ef41677c4471 100644 (file)
--- a/views/day.c
+++ b/views/day.c
@@ -226,6 +226,7 @@ int day_run(int key, mmask_t btn, int row, int col)
                case 'j':    events =  1; break;
                case '\031': lines  = -1; break; // ctrl-y
                case '\005': lines  =  1; break; // ctrl-e
+               case 'e':    view_edit(EDIT_EVENT); return 1;
                case '\012': view_edit(EDIT_EVENT); return 1; // enter
                default:     return 0; // not found
        }

diff --git a/views/events.c b/views/events.c
index 9d7434c3459dc98af79c5b9ea6f5c3125945c18e..d5cdf99e6041706b14476b38f5983bc1eaaf82f7 100644 (file)
--- a/views/events.c
+++ b/views/events.c
@@ -117,9 +117,8 @@ int events_run(int key, mmask_t btn, int row, int col)
                case 'U':    scroll = -LINES;   break;
                case 'j':    move   =  1;       break;
                case 'k':    move   = -1;       break;
-               case '\012': // enter
-                       view_edit(EDIT_EVENT);
-                       return 1;
+               case 'e':    view_edit(EDIT_EVENT); return 1;
+               case '\012': view_edit(EDIT_EVENT); return 1; // enter
        }
        line   = CLAMP(line+scroll, 0, rows-1);
        for (int i=0; i<move && EVENT && EVENT->next; i++)

diff --git a/views/todo.c b/views/todo.c
index 3f2b634a0ed904bda0f8bf33bd5d97448c4a56b0..d59307ec79eb8db1a33715cedb6d0e4950d2f68f 100644 (file)
--- a/views/todo.c
+++ b/views/todo.c
@@ -128,9 +128,8 @@ int todo_run(int key, mmask_t btn, int row, int col)
                case 'n':    ref = 1; show_new      ^= 1; break;
                case 's':    ref = 1; show_started  ^= 1; break;
                case 'f':    ref = 1; show_finished ^= 1; break;
-               case '\012': // enter
-                       view_edit(EDIT_TODO);
-                       return 1;
+               case 'e':    view_edit(EDIT_TODO); return 1;
+               case '\012': view_edit(EDIT_TODO); return 1; // enter
        }
 
        /* Move more if we're on the edge of a group */

diff --git a/views/week.c b/views/week.c
index 18cc362739537b8c2730c27d5277b31cd80590b2..3386947231cd633186e90d8a300cd39f0e3da1bf 100644 (file)
--- a/views/week.c
+++ b/views/week.c
@@ -188,6 +188,7 @@ int week_run(int key, mmask_t btn, int row, int col)
                case 'j':    events =  1; break;
                case '\031': lines  = -1; break; // ctrl-y
                case '\005': lines  =  1; break; // ctrl-e
+               case 'e':    view_edit(EDIT_EVENT); return 1;
                case '\012': view_edit(EDIT_EVENT); return 1; // enter
                default:     return 0; // not found
        }