From 92ddec0f3ce2548a023b8e6b1d2e7d580557a0c8 Mon Sep 17 00:00:00 2001 From: Frederic Culot Date: Wed, 6 Sep 2006 17:12:15 +0000 Subject: general keybindings added --- src/calcurse.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/src/calcurse.c b/src/calcurse.c index f873101..8ccdbb5 100755 --- a/src/calcurse.c +++ b/src/calcurse.c @@ -1,4 +1,4 @@ -/* $calcurse: calcurse.c,v 1.11 2006/09/03 17:52:06 culot Exp $ */ +/* $calcurse: calcurse.c,v 1.12 2006/09/06 17:12:15 culot Exp $ */ /* * Calcurse - text-based organizer @@ -171,6 +171,7 @@ int main(int argc, char **argv) init_vars(colr); init_wins(); + reset_status_page(); update_windows(which_pan); /* @@ -207,6 +208,7 @@ int main(int argc, char **argv) switch (ch) { case 9: /* The TAB key was hit. */ + reset_status_page(); /* Save previously highlighted event. */ if (which_pan == TODO) { sav_hilt_tod = hilt_tod; @@ -236,10 +238,15 @@ int main(int argc, char **argv) } break; - case CTRL('L'): + case CTRL('R'): reinit_wins(); break; + case 'O': + case 'o': + other_status_page(which_pan); + break; + case 'G': case 'g': /* Goto function */ erase_window_part(swin, 0, 0, nc_bar, nl_bar); @@ -297,12 +304,14 @@ int main(int argc, char **argv) update_windows(which_pan); break; + case CTRL('A'): + case CTRL('T'): case 'A': case 'a': /* Add an item */ - if (which_pan == APPOINTMENT) { + if (which_pan == APPOINTMENT || ch == CTRL('A')) { add_item(); do_storage = true; - } else if (which_pan == TODO) { + } else if (which_pan == TODO || ch == CTRL('T')) { nb_tod = todo_new_item(nb_tod, colr); if (hilt_tod == 0 && nb_tod == 1) hilt_tod++; @@ -351,7 +360,8 @@ int main(int argc, char **argv) case (261): /* right arrow */ case ('L'): case ('l'): - if (which_pan == CALENDAR) { + case CTRL('L'): + if (which_pan == CALENDAR || ch == CTRL('L')) { do_storage = true; day_changed = true; if ((sel_day == 31) & (sel_month == 12)) @@ -372,7 +382,8 @@ int main(int argc, char **argv) case (260): /* left arrow */ case ('H'): case ('h'): - if (which_pan == CALENDAR) { + case CTRL('H'): + if (which_pan == CALENDAR || ch == CTRL('H')) { do_storage = true; day_changed = true; if ((sel_day == 1) & (sel_month == 1)) @@ -393,7 +404,8 @@ int main(int argc, char **argv) case (259): /* up arrow */ case ('K'): case ('k'): - if (which_pan == CALENDAR) { + case CTRL('K'): + if (which_pan == CALENDAR || ch == CTRL('K')) { do_storage = true; day_changed = true; if ((sel_day <= 7) & (sel_month == 1)) @@ -427,7 +439,8 @@ int main(int argc, char **argv) case (258): /* down arrow */ case ('J'): case ('j'): - if (which_pan == CALENDAR) { + case CTRL('J'): + if (which_pan == CALENDAR || ch == CTRL('J')) { do_storage = true; day_changed = true; if ((sel_day > days[sel_month - 1] - 7) & -- cgit v1.2.3-70-g09d2