Move e key to views

[lackey] / views / todo.c

diff --git a/views/todo.c b/views/todo.c
index 27fdfcd93a871ba967a86166a2943d62b7409baa..d59307ec79eb8db1a33715cedb6d0e4950d2f68f 100644 (file)
--- a/views/todo.c
+++ b/views/todo.c
@@ -1,16 +1,16 @@
 /*
- * Copyright (C) 2012 Andy Spencer <andy753421@gmail.com>
- * 
+ * Copyright (C) 2012-2013 Andy Spencer <andy753421@gmail.com>
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -25,39 +25,61 @@
 /* Static data */
 static WINDOW *win;
 
+static int     line;   // scroll offset
+static int     rows;   // number of rows
+
+static int     srow;   // selected row 
+static int     cursor; // index of the selected row
+static int     items;  // number of items displayed
+static int     first;  // cursor on first item in group
+static int     last;   // cursor on last item in group
+
 static int show_new      = 1;
 static int show_started  = 1;
-static int show_finished = 1;
+static int show_finished = 0;
 
 /* Helper functions */
-static int print_todos(WINDOW *win, int y, todo_t *todos, status_t low, status_t high)
+static int print_todos(WINDOW *win, int row, todo_t *todos, status_t low, status_t high)
 {
-       int n = 0;
-       for (todo_t *cur = todos; cur; cur = cur->next)
-               if (low <= cur->status && cur->status <= high)
-                       todo_line(win, cur, y+n++, 2, COLS-2, 1);
+       int n = 0, found = 0;
+       for (todo_t *cur = todos; cur; cur = cur->next) {
+               if (low <= cur->status && cur->status <= high) {
+                       if (found)
+                               last = 0;
+                       if (items++ == cursor) {
+                               found = 1;
+                               first = n == 0;
+                               last  = 1;
+                               TODO  = cur;
+                               srow  = row+n;
+                       }
+                       todo_line(win, cur, row+n++, 4, COLS-4, SHOW_DETAILS | SHOW_ACTIVE);
+               }
+       }
        return n;
 }
 
-static int print_group(WINDOW *win, int y, todo_t *todos,
+static int print_group(WINDOW *win, int row, todo_t *todos,
                int show, const char *label, status_t low, status_t high)
 {
        int n = 1;
 
        /* Label */
-       mvwprintw(win, y, 0, "%s", label);
+       wattron(win, A_BOLD);
+       mvwprintw(win, row, 0, "%s", label);
+       wattroff(win, A_BOLD);
 
        /* Todos */
        if (show)
-               n = print_todos(win, y+1, todos, low, high);
+               n = print_todos(win, row+1, todos, low, high);
 
        /* Status */
        if (!show)
-               mvwprintw(win, y+1, 4, "[hidden]");
+               mvwprintw(win, row+1, 4, "[hidden]");
        if (n == 0)
-               mvwprintw(win, y+1, 4, "[no tasks]");
+               mvwprintw(win, row+1, 4, "[no tasks]");
 
-       return y+1+MAX(n,1)+1;
+       return row+1+MAX(n,1)+1;
 }
 
 /* Todo init */
@@ -74,32 +96,62 @@ void todo_size(int rows, int cols)
 /* Todo draw */
 void todo_draw(void)
 {
-       int y = 0;
+       int row = -line;
 
-       y = print_group(win, y, TODOS,
+       TODO = 0;
+       items = 0;
+
+       row = print_group(win, row, TODOS,
                show_new, "New Tasks", NEW, NEW);
 
-       y = print_group(win, y, TODOS,
+       row = print_group(win, row, TODOS,
                show_started, "Started Tasks", NEW+1, DONE-1);
 
-       y = print_group(win, y, TODOS,
+       row = print_group(win, row, TODOS,
                show_finished, "Finished Tasks", DONE, DONE);
+
+       rows = row+line-1;
 }
 
 /* Todo run */
 int todo_run(int key, mmask_t btn, int row, int col)
 {
-       int ref = 0;
+       int scroll = 0, move = 0, ref = 0;
        switch (key)
        {
-               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 'g':    ref = 1; scroll = -line;     break;
+               case 'G':    ref = 1; scroll =  rows;     break;
+               case '\005': ref = 1; scroll =  1;        break; // ctrl-e
+               case '\031': ref = 1; scroll = -1;        break; // ctrl-y
+               case 'j':    ref = 1; move   =  1;        break;
+               case 'k':    ref = 1; move   = -1;        break;
+               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 '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 */
+       int extra = 0;
+       if (move < 0 && first) extra = -2;
+       if (move > 0 && last)  extra =  2;
+
+       /* Scroll window when we move off screen */
+       int next = line + srow + move + extra;
+       int ymax = getmaxy(win)-1;
+       while (next-line < 0)    line--;
+       while (next-line > ymax) line++;
+
+       /* Update line and cursor positions */
+       line   = CLAMP(line+scroll, 0, rows-1);
+       cursor = CLAMP(cursor+move, 0, items-1);
+
+       /* Repaint */
        if (ref) {
                werase(win);
                todo_draw();
                wrefresh(win);
        }
-       return 0;
+       return ref;
 }