From c104b1f201f243dabb18cbd712b20a8351d269be Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Mon, 26 Jan 2015 20:55:42 +0000 Subject: [PATCH] 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. --- src/view.c | 2 -- views/day.c | 1 + views/events.c | 5 ++--- views/todo.c | 5 ++--- views/week.c | 1 + 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/view.c b/src/view.c index ceb9fec..5a80051 100644 --- 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 088873c..a48513d 100644 --- 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 9d7434c..d5cdf99 100644 --- 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; inext; i++) diff --git a/views/todo.c b/views/todo.c index 3f2b634..d59307e 100644 --- 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 18cc362..3386947 100644 --- 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 } -- 2.43.2