- Now points to 1.0.1

- Fixed bug whereby random numbers were used by the custom UUID generator, but srandom/srand was not called first.

.gitignore

@@ -1,7 +1,6 @@
 Makefile.in
 aclocal.m4
 autom4te.cache
-conf.defs
 auto.h*
 config.h.in
 config.status

AUTHORS

@@ -1,7 +1,7 @@
-Principal Author
+Principal Author:
   Paul Beckingham, paul@beckingham.net
 
-Contributing Authors
+With thanks to:
-
+  Eugene Kramer
-Testers
+  SK
 

COPYING

@@ -278,63 +278,4 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
 
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 2 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, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

ChangeLog

@@ -1,15 +1,30 @@
-
+1.1.0 (?)
-1.0.0 (?)
+  - Command line specification of alternate .taskrc file
-  - Bug: assertion fails on mobile for t v
-
-0.9.9 (?)
-  - Autoconf/autmake behaving properly.
-  - All bugs fixed.
 
 ------ reality -----------------------------------
 
+1.0.0 (6/3/2008)
+  + New movie made, uploaded
+  + Bug: assertion fails on mobile for t v
+  + Bug: configure.ac does not properly determine ncurses availability
+  + Bug: Cannot seem to use the percent character in a task description
+  + Bug: New installation "task stats" reports newest task 12/31/1969
+  + Bug: New installation task projects displays header but no data - should short-circuit
+  + Bug: incorrect color specification in sample .taskrc file
+  + Bug: when run without arguments, task dumps core on Solaris 10
+  + "task calendar" now reports all months with due pending tasks
+  + Added rules for colorization by tag, project and keyword
+  + Added legend to "task calendar"
+
+0.9.9 (5/27/2008)
+  + Autoconf/automake behaving properly.
+  + Clean build on OS X 10.5.
+  + Clean build on Ubuntu 8.0.
+  + Clean build on Fedora Core 8.
+  + Clean build on Fedora Core 9.
+
 0.9.8 (5/25/2008)
-  + Color command.
+  + Added "task color" command.
   + Removed unnecessary files.
   + Completed documentation.
 
@@ -57,10 +72,18 @@
   + Initial commit.
 
 0.9.3 (4/6/2008)
+  + Added "task completed" command.
+  + Properly recognizes ncurses.
 
 0.9.2 (4/3/2008)
+  + Recognizes whether ncurses, flock is available.
+  + "task" duplicated to "task_rel" for preparation of a fork.
 
 0.9.1 (4/1/2008)
+  + Blank attributes read are longer be written out.
+  + Completed "task export" command.
+  + Added configuration values to "task version" command.
+  + Consolidated header files, removed unnecessary ones.
 
 0.9.0 (3/23/2008)
   + flat source directory

DEVELOPERS

@@ -16,5 +16,5 @@ included.
   color.cpp       Color support functions.
   rules.cpp       Auto-colorization rules.
 
-Don't forget, please send patches to task@beckingham.net
+Don't forget, please send bugs, patches to task@beckingham.net
 

NEWS

@@ -1,13 +1,21 @@
-
 Welcome to Task 1.0.0.
 
-While Task has undergone much testing, bugs are sure to remain.  If you
+Task has been built and tested on the following configurations:
-encounter a bug, please contact me at bugs@beckingham.net.  Here is what you
+
-could do, in order of increasing effort (to you) and usefulness (to me):
+  - OS X 10.4 Tiger
+  - OS X 10.5 Leopard
+  - Fedora Core 8
+  - Fedora Core 9
+  - Ubuntu 8 Hardy Heron
+  - Solaris 10
+
+While Task has undergone testing, bugs are sure to remain.  If you encounter a
+bug, please contact me at task@beckingham.net.  Here is what you could do, in
+order of increasing effort (to you) and usefulness (to me):
 
   - Do nothing.  Bug probably won't get fixed.
 
-  - Send an email to bugs@beckingham.net, explaining what you saw.  The bug
+  - Send an email to task@beckingham.net, explaining what you saw.  The bug
     will be addressed, and a new release will be made.  You will be a hero.
 
   - Send an email, and a reproducible test case in the form of the few commands

README

@@ -4,6 +4,7 @@ Thank you for taking a look at task.  Task is a GTD utility featuring:
   - Tags
   - Colorful, tabular output
   - Reports
+  - Lots of commands
   - Low-level API
   - Abbreviations for all commands, options
   - Multi-user file locking
@@ -14,12 +15,14 @@ frequently, with best practices and useful reports evolving from usage patterns.
 
 Task is scope-limited to GTD functionality only.
 
+You may want to jump straight to the TUTORIAL file, or perhaps watch the old
+task movie on YouTube:
 
+  http://www.youtube.com/watch?v=l68LCl6BYvs
 
-You may want to jump straight to the TUTORIAL file, or perhaps watch the task
+or the new improved one:
-movie on YouTube:
 
-  http://?????????????????
+  http://www.youtube.com/watch?v=D2Kn4DMOVSw
 
 Either will give you a fairly good idea of what task is capable of, and whether
 it fits in to your way of working.  As a command line application, task is not
@@ -40,3 +43,6 @@ All feedback is welcome, in addition to any bug reports or patches to:
 
 Got an idea for an enhancement?  Send a message!
 
+I have found that task makes me more productive and organized.  I hope task can
+do the same for you.  
+

TUTORIAL

@@ -29,7 +29,7 @@ transcript illustrates a typical installation:
   ...
   % make
   ...
-  % make install
+  % make install     # (may require sudo, depending on --prefix)
 
 You need to make sure that the installed task program is in your PATH
 environment variable.
@@ -617,6 +617,11 @@ Configuring Task
  
                           bold_red on_bright_yellow
 
+    color.tag.X         Colors any task that has the tag X.
+
+    color.project.X     Colors any task assigned to project X.
+
+    color.keyword.X     Colors any task where the description contains X.
 
 
 Colors

announcement.txt

@@ -0,0 +1,36 @@
+Some considerable time ago - longer than I had hoped - I demonstrated an
+alternate implementation of the todo script, called task, in the form of a
+YouTube movie:
+
+  http://www.youtube.com/watch?v=l68LCl6BYvs
+
+A lot has happened since then, and the task program has been slowly improving
+thanks to feedback from some early testers, and continuous use by me.  Today,
+I have uploaded a new movie:
+
+  http://www.youtube.com/watch?v=D2Kn4DMOVSw
+
+This movie includes most of the changes and improvements to task, but behind
+the scenes are the biggest changes.  There was a rewrite of the underlying
+storage mechanism yielding a clean API for the front end, and the code was
+reviewed for portability and converted to use GNU autoconf/automake.
+
+Task has been released under GPL, and so far has been tested on:
+
+  Max OS X 10.4 (Tiger)
+  Max OS X 10.5 (Leopard)
+  Fedora 8
+  Fedora 9
+  Ubuntu 8 (Hardy Heron)
+  Solaris 10
+
+Task has been making me more organized and productive for some time now.
+Perhaps some of you might find it useful, and I welcome feedback of all kinds.
+
+You can find the task source code at:
+
+  http://www.beckingham.net/task-1.0.0.tar.gz
+
+Thank you.
+Paul Beckingham
+

configure.ac

@@ -2,11 +2,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(task, 0.9.8, bugs@beckingham.net)
+AC_INIT(task, 1.0.1, bugs@beckingham.net)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/task.cpp])
 AC_CONFIG_HEADER([auto.h])
-#AC_CONFIG_SUBDIRS([src])
 
 # Checks for programs.
 AC_PROG_CXX
@@ -14,7 +13,6 @@ AC_PROG_CC
 AC_LANG(C++)
 
 # Checks for libraries.
-#AC_CHECK_LIB(ncurses, initscr, [LIBS="$LIBS -lncurses" AC_DEFINE([HAVE_NCURSES], [1], [Found ncurses])])
 AC_CHECK_LIB(ncurses,initscr)
 AC_CHECK_LIB(ncurses,endwin)
 
@@ -37,6 +35,8 @@ AC_FUNC_SELECT_ARGTYPES
 AC_CHECK_FUNCS([select])
 AC_CHECK_FUNC(flock, [AC_DEFINE([HAVE_FLOCK], [1], [Found flock])])
 AC_CHECK_FUNC(uuid_unparse_lower, [AC_DEFINE([HAVE_UUID], [1], [Found uuid_unparse_lower])])
+AC_CHECK_FUNC(random, [AC_DEFINE([HAVE_RANDOM], [1], [Found random])])
+AC_CHECK_FUNC(srandom, [AC_DEFINE([HAVE_SRANDOM], [1], [Found srandom])])
 
 AC_CONFIG_FILES([Makefile src/Makefile])
 AC_OUTPUT

script.txt

@@ -0,0 +1,105 @@
+                                            Hello, and welcome to this quick demo of the task program.
+
+task add do laundry                         Let's add some tasks
+                                            I need to do laundry
+
+task add project:garage order dumpster      Oh yeah, the dumpster
+
+task add +phone tell mom i loveher          Must call Mom  (that "phone" there is a tag - they are
+                                              useful for searching, categorizing)
+task add +phone pro:garage schedule
+  goodwill pickup
+
+task ad +email pro:garage ask Tom if        Notice I can abbreviating commands
+  he wants that old bkie
+
+task ls                                     Let's see what we've got
+                                            I spelled bike wrong
+
+task 5 /bkie/bike/
+task ls                                     That's better
+
+task 1 pro:home                             Let's assign projects
+task 3 pro:home tell mom I love her
+task ls pro:garage
+
+task long pro:garage                        Let's see all the columns
+
+task list pro:garage                        There are different ways to list
+
+task lis +phone                             By tag
+task li pro:garage +phone                   By project and tag
+task l mom                                  By word
+
+task 1 priority:H                           Priorities can be High, Medium or Low
+task pri:H 3
+task 1 pri:M
+task li                                     The list is sorted by priority.
+
+task 2 pri:L
+task li
+
+task done 3                                 Suppose task 3 is done
+task li                                     ...and it's gone
+
+task 2 +phone +mistake                      Lets add tags
+
+# Oops!
+task 2 -mistake                             or remove tags
+
+task tags                                   or look at all the tags
+
+task info 2                                 or all the details
+
+task projects                               or all the projects
+
+task 3 fg:bold                              Let's make it colorful
+task 4 fg:bold_green
+task li
+task 3 fg:bold_underline_white
+task li
+
+task 4 bg:on_bright_red fg:bold_yellow
+task li                                     Oh that's just nasty - let's get rid of that.
+task 4 bg:
+task li
+task 4 fg:
+task 3 fg:
+
+task colors                                 There are many combinations to choose from
+
+(Slashes!!!)
+task 1 due:6/8/2008                         Let's add a due date
+date
+
+task li
+task calendar                               Notice the due task is in yellow, today is marked cyan
+
+task 1 due:5/20/2008                        This is now an overdue task
+task li                                     and it shows up red
+task overdue
+task cal
+
+task export file.csv                        You can export the tasks to a spreadsheet
+cat file.csv
+
+task start 1                                Started tasks can be used as reminders
+                                              of what you are supposed to be doing
+
+task active                                 They show up as active
+task done 1                                 Let's clear out a couple
+task li
+task done 3
+task active
+
+task summary                                Summary shows progress on all projects
+
+task history                                History shows general activity - how many added,
+                                              completed etc, by month
+
+                                            And that's it.  There are more commands than this
+                                            covered in the TUTORIAL file, but this should give
+                                            the basic idea.
+
+                                            Thank you for watching.
+

src/.deps/Config.Po

@@ -98,7 +98,7 @@ Config.o Config.o: Config.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_tree.h \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h /usr/include/sys/types.h \
-  Config.h Table.h color.h Grid.h color.h TDB.h T.h stlmacros.h ../auto.h
+  Config.h Table.h color.h Grid.h color.h TDB.h T.h ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -402,6 +402,4 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/Date.Po

@@ -95,8 +95,7 @@ Date.o Date.o: Date.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_tree.h \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h /usr/include/sys/types.h \
-  Config.h Table.h color.h Grid.h color.h TDB.h T.h stlmacros.h ../auto.h \
+  Config.h Table.h color.h Grid.h color.h TDB.h T.h ../auto.h Date.h
-  Date.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -388,8 +387,6 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:
 
 Date.h:

src/.deps/T.Po

@@ -95,7 +95,7 @@ T.o T.o: T.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_tree.h \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h /usr/include/sys/types.h \
-  Config.h Table.h color.h Grid.h color.h TDB.h T.h stlmacros.h ../auto.h
+  Config.h Table.h color.h Grid.h color.h TDB.h T.h ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -387,6 +387,4 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/TDB.Po

@@ -99,7 +99,7 @@ TDB.o TDB.o: TDB.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_tree.h \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h Config.h Table.h color.h \
-  Grid.h color.h TDB.h T.h stlmacros.h ../auto.h
+  Grid.h color.h TDB.h T.h ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -403,6 +403,4 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/Table.Po

@@ -96,7 +96,7 @@ Table.o Table.o: Table.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_bvector.h \
   /usr/include/c++/4.0.0/bits/vector.tcc color.h Grid.h Date.h task.h \
   /usr/include/sys/types.h Config.h Table.h color.h TDB.h T.h T.h \
-  stlmacros.h ../auto.h
+  ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -394,6 +394,4 @@ T.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/parse.Po

@@ -96,7 +96,7 @@ parse.o parse.o: parse.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h Date.h task.h \
   /usr/include/sys/types.h Config.h Table.h color.h Grid.h color.h TDB.h \
-  T.h stlmacros.h ../auto.h
+  T.h ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -390,6 +390,4 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/rules.Po

@@ -95,7 +95,7 @@ rules.o rules.o: rules.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/vector /usr/include/c++/4.0.0/bits/stl_vector.h \
   /usr/include/c++/4.0.0/bits/stl_bvector.h \
   /usr/include/c++/4.0.0/bits/vector.tcc Table.h color.h Grid.h Date.h \
-  T.h task.h /usr/include/sys/types.h color.h TDB.h stlmacros.h ../auto.h
+  T.h task.h /usr/include/sys/types.h color.h TDB.h ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -389,6 +389,4 @@ color.h:
 
 TDB.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/task.Po

@@ -99,7 +99,7 @@ task.o task.o: task.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/vector /usr/include/c++/4.0.0/bits/stl_vector.h \
   /usr/include/c++/4.0.0/bits/stl_bvector.h \
   /usr/include/c++/4.0.0/bits/vector.tcc Date.h Table.h color.h Grid.h \
-  stlmacros.h TDB.h T.h task.h color.h ../auto.h /usr/include/ncurses.h \
+  TDB.h T.h task.h color.h ../auto.h /usr/include/ncurses.h \
   /usr/include/ncurses_dll.h /usr/include/unctrl.h /usr/include/curses.h
 
 /usr/include/c++/4.0.0/iostream:
@@ -398,8 +398,6 @@ color.h:
 
 Grid.h:
 
-stlmacros.h:
-
 TDB.h:
 
 T.h:

src/.deps/text.Po

@@ -95,7 +95,7 @@ text.o text.o: text.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/map /usr/include/c++/4.0.0/bits/stl_tree.h \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h /usr/include/sys/types.h \
-  Config.h Table.h color.h Grid.h color.h TDB.h T.h stlmacros.h ../auto.h
+  Config.h Table.h color.h Grid.h color.h TDB.h T.h ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -387,6 +387,4 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/util.Po

@@ -96,8 +96,7 @@ util.o util.o: util.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_tree.h \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h color.h Grid.h task.h \
-  Config.h color.h TDB.h T.h stlmacros.h ../auto.h \
+  Config.h color.h TDB.h T.h ../auto.h /usr/include/uuid/uuid.h
-  /usr/include/uuid/uuid.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -391,8 +390,6 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:
 
 /usr/include/uuid/uuid.h:

src/Config.cpp

@@ -1,12 +1,34 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Copyright 2005 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
 #include <fstream>
 #include <sstream>
 #include <sys/stat.h>
+#include <stdlib.h>
 #include "task.h"
 #include "Config.h"
 
@@ -35,7 +57,7 @@ bool Config::load (const std::string& file)
     while (getline (in, line))
     {
       // Remove comments.
-      unsigned int pound = line.find ("#");
+      size_type pound = line.find ("#");
       if (pound != std::string::npos)
         line = line.substr (0, pound);
 
@@ -44,7 +66,7 @@ bool Config::load (const std::string& file)
       // Skip empty lines.
       if (line.length () > 0)
       {
-        unsigned int equal = line.find ("=");
+        size_type equal = line.find ("=");
         if (equal != std::string::npos)
         {
           std::string key   = trim (line.substr (0, equal), " \t");
@@ -85,6 +107,7 @@ void Config::createDefault (const std::string& file)
 
     if (taskDir != "")
     {
+      // Create a sample .taskrc file.
       FILE* out;
       if ((out = fopen (file.c_str (), "w")))
       {
@@ -96,16 +119,20 @@ void Config::createDefault (const std::string& file)
         fprintf (out, "curses=on\n");
         fprintf (out, "color=on\n");
 
-        fprintf (out, "color.overdue=red\n");
+        fprintf (out, "color.overdue=bold_red\n");
-        fprintf (out, "#color.due=on yellow\n");
+        fprintf (out, "#color.due=on_bright_yellow\n");
         fprintf (out, "#color.pri.H=on_red\n");
         fprintf (out, "#color.pri.M=on_yellow\n");
         fprintf (out, "#color.pri.L=on_green\n");
-        fprintf (out, "color.active=cyan\n");
+        fprintf (out, "color.active=bold_cyan\n");
         fprintf (out, "color.tagged=yellow\n");
+        fprintf (out, "#color.tag.bug=yellow\n");
+        fprintf (out, "#color.project.home=on_green\n");
+        fprintf (out, "#color.keyword.car=on_blue\n");
 
         fclose (out);
 
+        // Now set the live values.
         set ("data.location", taskDir);
         set ("command.logging", "off");
         set ("confirmation", "yes");

src/Config.h

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2005 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_CONFIG

src/Date.cpp

@@ -1,10 +1,33 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2005 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
 #include <time.h>
+#include <assert.h>
+#include <stdlib.h>
 #include "task.h"
 #include "Date.h"
 
@@ -36,8 +59,8 @@ Date::Date (const int m, const int d, const int y)
 ////////////////////////////////////////////////////////////////////////////////
 Date::Date (const std::string& mdy)
 {
-  unsigned int firstSlash  = mdy.find ("/");
+  size_t firstSlash  = mdy.find ("/");
-  unsigned int secondSlash = mdy.find ("/", firstSlash + 1);
+  size_t secondSlash = mdy.find ("/", firstSlash + 1);
   if (firstSlash != std::string::npos &&
       secondSlash != std::string::npos)
   {
@@ -155,7 +178,7 @@ int Date::daysInMonth (int month, int year)
 ////////////////////////////////////////////////////////////////////////////////
 std::string Date::monthName (int month)
 {
-  static char* months[12] =
+  static const char* months[12] =
   {
     "January",
     "February",
@@ -179,7 +202,7 @@ std::string Date::monthName (int month)
 ////////////////////////////////////////////////////////////////////////////////
 void Date::dayName (int dow, std::string& name)
 {
-  static char* days[7] =
+  static const char* days[7] =
   {
     "Sunday",
     "Monday",
@@ -196,7 +219,7 @@ void Date::dayName (int dow, std::string& name)
 ////////////////////////////////////////////////////////////////////////////////
 std::string Date::dayName (int dow)
 {
-  static char* days[7] =
+  static const char* days[7] =
   {
     "Sunday",
     "Monday",
@@ -211,28 +234,28 @@ std::string Date::dayName (int dow)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int Date::dayOfWeek ()
+int Date::dayOfWeek () const
 {
   struct tm* t = localtime (&mT);
   return t->tm_wday;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int Date::month ()
+int Date::month () const
 {
   struct tm* t = localtime (&mT);
   return t->tm_mon + 1;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int Date::day ()
+int Date::day () const
 {
   struct tm* t = localtime (&mT);
   return t->tm_mday;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int Date::year ()
+int Date::year () const
 {
   struct tm* t = localtime (&mT);
   return t->tm_year + 1900;

src/Date.h

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2005 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_DATE
@@ -32,11 +53,11 @@ public:
   static std::string monthName (int);
   static void dayName (int, std::string&);
   static std::string dayName (int);
-  int dayOfWeek ();
+  int dayOfWeek () const;
 
-  int month ();
+  int month () const;
-  int day ();
+  int day () const;
-  int year ();
+  int year () const;
 
   bool operator== (const Date&);
   bool operator!= (const Date&);

src/Grid.cpp

@@ -1,5 +1,29 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2007 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
+//
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
+//
 //
 // Grid implements a sparse 2D array of Cell objects.  Grid makes every effort
 // to perform well on cell insertion and retrieval.  A Cell is a variant type,
@@ -145,9 +169,9 @@ unsigned int Grid::height () const
 ////////////////////////////////////////////////////////////////////////////////
 Grid::Cell* Grid::byRow (const unsigned int row, const unsigned int col) const
 {
-  if (row <= mRows.size () &&
+  if (row < mRows.size () &&
       mRows[row] != NULL   &&
-      col <= mRows[row]->size ())
+      col < mRows[row]->size ())
     return (*mRows[row])[col];
 
   return NULL;
@@ -155,9 +179,9 @@ Grid::Cell* Grid::byRow (const unsigned int row, const unsigned int col) const
 
 Grid::Cell* Grid::byColumn (const unsigned int row, const unsigned int col) const
 {
-  if (col <= mColumns.size () &&
+  if (col < mColumns.size () &&
       mColumns[col] != NULL   &&
-      row <= mColumns[col]->size ())
+      row < mColumns[col]->size ())
     return (*mColumns[col])[row];
 
   return NULL;
@@ -166,36 +190,25 @@ Grid::Cell* Grid::byColumn (const unsigned int row, const unsigned int col) cons
 ////////////////////////////////////////////////////////////////////////////////
 void Grid::expandGrid (const unsigned int row, const unsigned int col)
 {
+
   // If the new row is outside the bounds of the current grid, add blank rows to
   // pad, then a new row vector.
   if (row >= mRows.size ())
   {
     for (unsigned int r = mRows.size (); r <= row; ++r)
       if (r < row)
-//      {
-//        std::cout << "additional mRows[" << r << "] = NULL" << std::endl;
         mRows.push_back (NULL);
-//      }
       else
-//      {
-//        std::cout << "additional mRows[" << r << "] = new std::vector <Cell*>" << std::endl;
         mRows.push_back (new std::vector <Cell*>);
-//      }
   }
   // If the new row is within the bounds of the current grid, ensure that the
   // row points to a vector of cells.
   else if (mRows[row] == NULL)
-//  {
-//    std::cout << "existing mRows[" << row << "] = new std::vector <Cell*>" << std::endl;
     mRows[row] = new std::vector <Cell*>;
-//  }
 
   if (col >= mRows[row]->size ())
     for (unsigned int c = mRows[row]->size (); c <= col; ++c)
-//    {
-//      std::cout << "additional mRows[" << row << "][" << c << "] = NULL" << std::endl;
       mRows[row]->push_back (NULL);
-//    }
 
   // If the new col is outside the bounds of the current grid, add blank cols to
   // pad, then a new col vector.
@@ -203,30 +216,18 @@ void Grid::expandGrid (const unsigned int row, const unsigned int col)
   {
     for (unsigned int c = mColumns.size (); c <= col; ++c)
       if (c < col)
-//      {
-//        std::cout << "additional mColumns[" << c << "] = NULL" << std::endl;
         mColumns.push_back (NULL);
-//      }
       else
-//      {
-//        std::cout << "additional mColumns[" << c << "] = new std::vector <Cell*>" << std::endl;
         mColumns.push_back (new std::vector <Cell*>);
-//      }
   }
   // If the new col is within the bounds of the current grid, ensure that the
   // col points to a vector of cells.
   else if (mColumns[col] == NULL)
-//  {
-//    std::cout << "existing mColumns[" << col << "] = new std::vector <Cell*>" << std::endl;
     mColumns[col] = new std::vector <Cell*>;
-//  }
 
   if (row >= mColumns[col]->size ())
     for (unsigned int r = mColumns[col]->size (); r <= row; ++r)
-//    {
-//      std::cout << "additional mColumns[" << col << "][" << r << "] = NULL" << std::endl;
       mColumns[col]->push_back (NULL);
-//    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -237,15 +238,10 @@ void Grid::insertCell (
 {
   // Delete any existing cell, because cells are owned by rows, not columns.
   if ((*mRows[row])[col] != NULL)
-//  {
-//    std::cout << "deleted old cell mRows[" << row << "][" << col << "]" << std::endl;
     delete (*mRows[row])[col];
-//  }
 
   (*mRows[row])[col]    = cell;
   (*mColumns[col])[row] = cell;
-//  std::cout << "assigned new cell mRows[" << row << "][" << col << "]" << std::endl;
-//  std::cout << "assigned new cell mColumns[" << col << "][" << row << "]" << std::endl;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

src/Grid.h

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2007 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_GRID

src/Makefile.am

@@ -1,3 +1,3 @@
 bin_PROGRAMS = task
-task_SOURCES = Config.cpp Date.cpp T.cpp TDB.cpp Table.cpp Grid.cpp color.cpp parse.cpp task.cpp util.cpp text.cpp rules.cpp Config.h Date.h T.h TDB.h Table.h Grid.h color.h stlmacros.h task.h
+task_SOURCES = Config.cpp Date.cpp T.cpp TDB.cpp Table.cpp Grid.cpp color.cpp parse.cpp task.cpp util.cpp text.cpp rules.cpp Config.h Date.h T.h TDB.h Table.h Grid.h color.h task.h
 AM_CPPFLAGS = -Wall -pedantic -ggdb3 -fno-rtti

src/Makefile.in

@@ -154,7 +154,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-task_SOURCES = Config.cpp Date.cpp T.cpp TDB.cpp Table.cpp Grid.cpp color.cpp parse.cpp task.cpp util.cpp text.cpp rules.cpp Config.h Date.h T.h TDB.h Table.h Grid.h color.h stlmacros.h task.h
+task_SOURCES = Config.cpp Date.cpp T.cpp TDB.cpp Table.cpp Grid.cpp color.cpp parse.cpp task.cpp util.cpp text.cpp rules.cpp Config.h Date.h T.h TDB.h Table.h Grid.h color.h task.h
 AM_CPPFLAGS = -Wall -pedantic -ggdb3 -fno-rtti
 all: all-am
 

src/T.cpp

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -115,7 +136,7 @@ void T::addTag (const std::string& tag)
 ////////////////////////////////////////////////////////////////////////////////
 void T::addTags (const std::vector <std::string>& tags)
 {
-  for (unsigned int i = 0; i < tags.size (); ++i)
+  for (size_t i = 0; i < tags.size (); ++i)
   {
     if (tags[i].find (' ') != std::string::npos)
       throw std::string ("T::addTags - tags may not contain spaces");
@@ -137,7 +158,7 @@ void T::addTags (const std::vector <std::string>& tags)
 void T::removeTag (const std::string& tag)
 {
   std::vector <std::string> copy;
-  for (unsigned int i = 0; i < mTags.size (); ++i)
+  for (size_t i = 0; i < mTags.size (); ++i)
     if (mTags[i] != tag)
       copy.push_back (mTags[i]);
 
@@ -242,7 +263,7 @@ const std::string T::compose () const
   else if (mStatus == deleted)   line += "X [";
 
   // Tags
-  for (unsigned int i = 0; i < mTags.size (); ++i)
+  for (size_t i = 0; i < mTags.size (); ++i)
   {
     line += (i > 0 ? " " : "");
     line += mTags[i];
@@ -297,7 +318,7 @@ const std::string T::composeCSV ()
 
   // Tags
   line += "'";
-  for (unsigned int i = 0; i < mTags.size (); ++i)
+  for (size_t i = 0; i < mTags.size (); ++i)
   {
     line += (i > 0 ? " " : "");
     line += mTags[i];
@@ -364,13 +385,13 @@ void T::parse (const std::string& line)
         if (line[0] == 'X')
           setStatus (deleted);
 
-        unsigned int openTagBracket  = line.find ("[");
+        size_t openTagBracket  = line.find ("[");
-        unsigned int closeTagBracket = line.find ("]", openTagBracket);
+        size_t closeTagBracket = line.find ("]", openTagBracket);
         if (openTagBracket  != std::string::npos &&
             closeTagBracket != std::string::npos)
         {
-          unsigned int openAttrBracket  = line.find ("[", closeTagBracket);
+          size_t openAttrBracket  = line.find ("[", closeTagBracket);
-          unsigned int closeAttrBracket = line.find ("]", openAttrBracket);
+          size_t closeAttrBracket = line.find ("]", openAttrBracket);
           if (openAttrBracket  != std::string::npos &&
               closeAttrBracket != std::string::npos)
           {
@@ -383,7 +404,7 @@ void T::parse (const std::string& line)
                openAttrBracket + 1, closeAttrBracket - openAttrBracket - 1);
              std::vector <std::string> pairs;
              split (pairs, attributes, ' ');
-             for (unsigned int i = 0; i <  pairs.size (); ++i)
+             for (size_t i = 0; i <  pairs.size (); ++i)
              {
                std::vector <std::string> pair;
                split (pair, pairs[i], ':');
@@ -415,13 +436,13 @@ void T::parse (const std::string& line)
                   : line[37] == 'X' ? deleted
                   :                  pending;
 
-        unsigned int openTagBracket  = line.find ("[");
+        size_t openTagBracket  = line.find ("[");
-        unsigned int closeTagBracket = line.find ("]", openTagBracket);
+        size_t closeTagBracket = line.find ("]", openTagBracket);
         if (openTagBracket  != std::string::npos &&
             closeTagBracket != std::string::npos)
         {
-          unsigned int openAttrBracket  = line.find ("[", closeTagBracket);
+          size_t openAttrBracket  = line.find ("[", closeTagBracket);
-          unsigned int closeAttrBracket = line.find ("]", openAttrBracket);
+          size_t closeAttrBracket = line.find ("]", openAttrBracket);
           if (openAttrBracket  != std::string::npos &&
               closeAttrBracket != std::string::npos)
           {
@@ -434,7 +455,7 @@ void T::parse (const std::string& line)
                openAttrBracket + 1, closeAttrBracket - openAttrBracket - 1);
              std::vector <std::string> pairs;
              split (pairs, attributes, ' ');
-             for (unsigned int i = 0; i <  pairs.size (); ++i)
+             for (size_t i = 0; i <  pairs.size (); ++i)
              {
                std::vector <std::string> pair;
                split (pair, pairs[i], ':');

src/T.h

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2007, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_T

src/TDB.cpp

@@ -1,12 +1,34 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2007, 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
 #include <fstream>
 #include <sys/file.h>
 #include <unistd.h>
+#include <string.h>
 
 #include "task.h"
 #include "TDB.h"
@@ -221,7 +243,6 @@ bool TDB::addT (const T& t) const
   std::vector <std::string> tags;
   task.getTags (tags);
 
-  // TODO This logic smells funny.
   // +tag or -tag are both considered valid tags to add to a new pending task.
   // Generating an error here would not be friendly.
   for (unsigned int i = 0; i < tags.size (); ++i)
@@ -306,7 +327,7 @@ bool TDB::logCommand (int argc, char** argv) const
         delay (0.25);
 #endif
 
-      fprintf (out, command.c_str ());
+      fputs (command.c_str (), out);
 
       fclose (out);
       return true;
@@ -341,7 +362,7 @@ bool TDB::overwritePending (std::vector <T>& all) const
 
     std::vector <T>::iterator it;
     for (it = all.begin (); it != all.end (); ++it)
-      fprintf (out, it->compose ().c_str ());
+      fputs (it->compose ().c_str (), out);
 
     fclose (out);
     return true;
@@ -363,7 +384,7 @@ bool TDB::writePending (const T& t) const
       delay (0.25);
 #endif
 
-    fprintf (out, t.compose ().c_str ());
+    fputs (t.compose ().c_str (), out);
 
     fclose (out);
     return true;
@@ -385,7 +406,7 @@ bool TDB::writeCompleted (const T& t) const
       delay (0.25);
 #endif
 
-    fprintf (out, t.compose ().c_str ());
+    fputs (t.compose ().c_str (), out);
 
     fclose (out);
     return true;

src/TDB.h

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2007, 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_TDB

src/Table.cpp

@@ -1,7 +1,29 @@
 ////////////////////////////////////////////////////////////////////////////////
+// task - a command line task list manager.
+//
 // Copyright 2006 - 2008, Paul Beckingham.
 // All rights reserved.
 //
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
+//
 //
 // Attributes                Table    Row Column   Cell
 // ----------------------------------------------------
@@ -22,10 +44,11 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
+#include <string.h>
+#include <assert.h>
 #include <Table.h>
 #include <Date.h>
 #include <task.h>
-#include <stlmacros.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Table::Table ()
@@ -415,7 +438,7 @@ void Table::calculateColumnWidths ()
   std::vector <int> ideal = mMaxDataWidth;
   int width = 0;
   int countFlexible = 0;
-  for (unsigned int c = 0; c < mColumns.size (); ++c)
+  for (size_t c = 0; c < mColumns.size (); ++c)
   {
     if (mSpecifiedWidth[c] == flexible)
       ++countFlexible;
@@ -440,7 +463,7 @@ void Table::calculateColumnWidths ()
   {
     ideal = mMaxDataWidth;
     width = 0;
-    for (unsigned int c = 0; c < mColumns.size (); ++c)
+    for (size_t c = 0; c < mColumns.size (); ++c)
     {
       if (mSpecifiedWidth[c] > 0)
         ideal[c] = mSpecifiedWidth[c];
@@ -462,7 +485,7 @@ void Table::calculateColumnWidths ()
       int remainder = available % countFlexible;
 
       int lastFlexible = mColumns.size () - 1;
-      for (unsigned int c = 0; c < mColumns.size (); ++c)
+      for (size_t c = 0; c < mColumns.size (); ++c)
       {
          if (mSpecifiedWidth[c] == flexible)
          {
@@ -593,7 +616,7 @@ void Table::formatCell (
   std::string postJust;
   std::vector <std::string> chunks;
   wrapText (chunks, data, width);
-  for (unsigned int chunk = 0; chunk < chunks.size (); ++chunk)
+  for (size_t chunk = 0; chunk < chunks.size (); ++chunk)
   {
     // Place the data within the available space - justify.
     int gap = width - chunks[chunk].length ();
@@ -614,7 +637,7 @@ void Table::formatCell (
       for (int i = 0; i < gap / 2; ++i)
         preJust += " ";
 
-      for (unsigned int i = 0; i < gap - preJust.length (); ++i)
+      for (size_t i = 0; i < gap - preJust.length (); ++i)
         postJust += " ";
     }
 
@@ -630,57 +653,6 @@ void Table::formatCell (
   blank = Text::colorize (fg, bg, pad + intraPad);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-const std::string Table::formatCell (
-  const int row,
-  const int col,
-  const int width,
-  const int padding)
-{
-  assert (width > 0);
-
-  Text::color fg     = getFg (row, col);
-  Text::color bg     = getBg (row, col);
-  just justification = getJustification (row, col);
-  std::string data   = getCell (row, col);
-
-  std::string pad      = "";
-  std::string intraPad = "";
-  std::string preJust  = "";
-  std::string postJust = "";
-
-  for (int i = 0; i < padding; ++i)
-    pad += " ";
-
-  // Place the data within the available space - justify.
-  int gap = width - data.length ();
-
-  if (justification == left)
-  {
-    for (int i = 0; i < gap; ++i)
-      postJust += " ";
-  }
-  else if (justification == right)
-  {
-    for (int i = 0; i < gap; ++i)
-      preJust += " ";
-  }
-  else if (justification == center)
-  {
-    for (int i = 0; i < gap / 2; ++i)
-      preJust += " ";
-
-    for (unsigned int i = 0; i < gap - preJust.length (); ++i)
-      postJust += " ";
-  }
-
-  if (col < (signed) mColumns.size () - 1)
-    for (int i = 0; i < getIntraPadding (); ++i)
-      intraPad += " ";
-
-  return Text::colorize (fg, bg, pad + preJust + data + postJust + pad + intraPad);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 void Table::suppressWS ()
 {
@@ -706,15 +678,15 @@ int Table::columnCount ()
 //   - removal of redundant color codes:
 //       ^[[31mName^[[0m ^[[31mValue^[[0m -> ^[[31mName Value^[[0m
 //
+// This method is a work in progress.
 void Table::optimize (std::string& output)
 {
 /*
-  TODO Unoptimized length.
   int start = output.length ();
 */
 
   // \s\n -> \n
-  unsigned int i = 0;
+  size_t i = 0;
   while ((i = output.find (" \n")) != std::string::npos)
   {
     output = output.substr (0, i) +
@@ -722,7 +694,6 @@ void Table::optimize (std::string& output)
   }
 
 /*
-  TODO This code displays the % reduction of the optimize function.
   std::cout << int ((100 * (start - output.length ()) / start))
             << "%" << std::endl;
 */
@@ -757,7 +728,7 @@ void Table::sort (std::vector <int>& order)
     while (r + gap < (int) order.size ())
     {
       bool keepScanning = true;
-      for (unsigned int c = 0; keepScanning && c < mSortColumns.size (); ++c)
+      for (size_t c = 0; keepScanning && c < mSortColumns.size (); ++c)
       {
         keepScanning = false;
 
@@ -855,8 +826,8 @@ void Table::sort (std::vector <int>& order)
 ////////////////////////////////////////////////////////////////////////////////
 void Table::clean (std::string& value)
 {
-  unsigned int start = 0;
+  size_t start = 0;
-  unsigned int pos;
+  size_t pos;
   while ((pos = value.find ('\t', start)) != std::string::npos)
   {
     value.replace (pos, 1, " ");
@@ -884,7 +855,7 @@ const std::string Table::render ()
 
   // Print column headers in column order.
   std::string output;
-  for (unsigned int col = 0; col < mColumns.size (); ++col)
+  for (size_t col = 0; col < mColumns.size (); ++col)
     output += formatHeader (
                 col,
                 mCalculatedWidth[col],
@@ -907,8 +878,8 @@ const std::string Table::render ()
     std::vector <std::vector <std::string> > columns;
     std::vector <std::string> blanks;
 
-    unsigned int maxHeight = 0;
+    size_t maxHeight = 0;
-    for (unsigned int col = 0; col < mColumns.size (); ++col)
+    for (size_t col = 0; col < mColumns.size (); ++col)
     {
       std::vector <std::string> lines;
       std::string blank;
@@ -928,9 +899,9 @@ const std::string Table::render ()
 
     if (maxHeight)
     {
-      for (unsigned int lines = 0; lines < maxHeight; ++lines)
+      for (size_t lines = 0; lines < maxHeight; ++lines)
       {
-        for (unsigned int col = 0; col < mColumns.size (); ++col)
+        for (size_t col = 0; col < mColumns.size (); ++col)
           if (lines < columns[col].size ())
             output += columns[col][lines];
           else

src/Table.h

@@ -1,8 +1,28 @@
 ////////////////////////////////////////////////////////////////////////////////
+// task - a command line task list manager.
+//
 // Copyright 2006 - 2008, Paul Beckingham.
 // All rights reserved.
 //
-// TODO Implement height
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_TABLE
 #define INCLUDED_TABLE
@@ -77,7 +97,6 @@ private:
            just getJustification (const int, const int);
            just getHeaderJustification (const int);
            const std::string formatHeader (const int, const int, const int);
-           const std::string formatCell (const int, const int, const int, const int);
            void formatCell (const int, const int, const int, const int, std::vector <std::string>&, std::string&);
            void optimize (std::string&);
            void sort (std::vector <int>&);

src/color.cpp

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <string>

src/color.h

@@ -1,7 +1,28 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2008, Paul Beckingham.
+// task - a command line task list manager.
+//
+// Copyright 2006 - 2008, Paul Beckingham.
 // All rights reserved.
 //
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_COLOR
 #define INCLUDED_COLOR

src/parse.cpp

@@ -1,9 +1,31 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
+#include <stdlib.h>
 #include <string>
 #include <vector>
 #include <map>
@@ -13,7 +35,7 @@
 #include "T.h"
 
 ////////////////////////////////////////////////////////////////////////////////
-static char* colors[] =
+static const char* colors[] =
 {
   "bold",
   "underline",
@@ -75,7 +97,7 @@ static char* colors[] =
   "",
 };
 
-static char* attributes[] =
+static const char* attributes[] =
 {
   "project",
   "priority",
@@ -88,7 +110,7 @@ static char* attributes[] =
   "",
 };
 
-static char* commands[] =
+static const char* commands[] =
 {
   "active",
   "add",
@@ -115,7 +137,7 @@ static char* commands[] =
   "",
 };
 
-void guess (const std::string& type, char** list, std::string& candidate)
+void guess (const std::string& type, const char** list, std::string& candidate)
 {
   std::vector <std::string> options;
   for (int i = 0; list[i][0]; ++i)
@@ -136,7 +158,7 @@ void guess (const std::string& type, char** list, std::string& candidate)
     error += " '";
     error += candidate;
     error += "' - could be either of ";
-    for (unsigned int i = 0; i < matches.size (); ++i)
+    for (size_t i = 0; i < matches.size (); ++i)
     {
       if (i)
         error += ", ";
@@ -165,8 +187,8 @@ static bool isCommand (const std::string& candidate)
 ////////////////////////////////////////////////////////////////////////////////
 bool validDate (std::string& date)
 {
-  unsigned int firstSlash  = date.find ("/");
+  size_t firstSlash  = date.find ("/");
-  unsigned int secondSlash = date.find ("/", firstSlash + 1);
+  size_t secondSlash = date.find ("/", firstSlash + 1);
   if (firstSlash != std::string::npos &&
       secondSlash != std::string::npos)
   {
@@ -236,7 +258,7 @@ static bool validAttribute (std::string& name, std::string& value)
 ////////////////////////////////////////////////////////////////////////////////
 static bool validId (const std::string& input)
 {
-  for (unsigned int i = 0; i < input.length (); ++i)
+  for (size_t i = 0; i < input.length (); ++i)
     if (!::isdigit (input[i]))
       return false;
 
@@ -275,13 +297,13 @@ static bool validSubstitution (
   std::string& from,
   std::string& to)
 {
-  unsigned int first = input.find ('/');
+  size_t first = input.find ('/');
   if (first != std::string::npos)
   {
-    unsigned int second = input.find ('/', first + 1);
+    size_t second = input.find ('/', first + 1);
     if (second != std::string::npos)
     {
-      unsigned int third = input.find ('/', second + 1);
+      size_t third = input.find ('/', second + 1);
       if (third != std::string::npos)
       {
         if (first == 0 &&
@@ -318,10 +340,10 @@ void parse (
   command = "";
 
   std::string descCandidate = "";
-  for (unsigned int i = 0; i < args.size (); ++i)
+  for (size_t i = 0; i < args.size (); ++i)
   {
     std::string arg (args[i]);
-    unsigned int colon;               // Pointer to colon in argument.
+    size_t colon;               // Pointer to colon in argument.
     std::string from;
     std::string to;
 

src/rules.cpp

@@ -1,9 +1,31 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
+#include <stdlib.h>
 #include "Config.h"
 #include "Table.h"
 #include "Date.h"
@@ -61,6 +83,7 @@ void initializeColorRules (Config& conf)
 void autoColorize (T& task, Text::color& fg, Text::color& bg)
 {
   // Note: fg, bg already contain colors specifically assigned via command.
+  // TODO These rules form a hierarchy - the last rule is king.
 
   // Colorization of the tagged.
   if (gsFg["color.tagged"] != Text::nocolor ||
@@ -152,6 +175,49 @@ void autoColorize (T& task, Text::color& fg, Text::color& bg)
       bg = gsBg["color.due"];
     }
   }
+
+  // Colorization by tag value.
+  std::map <std::string, Text::color>::iterator it;
+  for (it = gsFg.begin (); it != gsFg.end (); ++it)
+  {
+    if (it->first.substr (0, 10) == "color.tag.")
+    {
+      std::string value = it->first.substr (10, std::string::npos);
+      if (task.hasTag (value))
+      {
+        fg = gsFg[it->first];
+        bg = gsBg[it->first];
+      }
+    }
+  }
+
+  // Colorization by project name.
+  for (it = gsFg.begin (); it != gsFg.end (); ++it)
+  {
+    if (it->first.substr (0, 14) == "color.project.")
+    {
+      std::string value = it->first.substr (14, std::string::npos);
+      if (task.getAttribute ("project") == value)
+      {
+        fg = gsFg[it->first];
+        bg = gsBg[it->first];
+      }
+    }
+  }
+
+  // Colorization by keyword.
+  for (it = gsFg.begin (); it != gsFg.end (); ++it)
+  {
+    if (it->first.substr (0, 14) == "color.keyword.")
+    {
+      std::string value = it->first.substr (14, std::string::npos);
+      if (task.getDescription ().find (value) != std::string::npos)
+      {
+        fg = gsFg[it->first];
+        bg = gsBg[it->first];
+      }
+    }
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////

src/stlmacros.h

@@ -1,18 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2008, Paul Beckingham.  All rights reserved.
-//
-//
-////////////////////////////////////////////////////////////////////////////////
-#ifndef INCLUDED_STLMACROS
-#define INCLUDED_STLMACROS
-
-#define foreach(i, c)                                              \
-for (typeof (c) *foreach_p = & (c);                                \
-     foreach_p;                                                    \
-     foreach_p = 0)                                                \
-  for (typeof (foreach_p->begin()) i = foreach_p->begin();         \
-       i != foreach_p->end();                                      \
-       ++i)
-
-#endif
-////////////////////////////////////////////////////////////////////////////////

src/task.cpp

@@ -1,7 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
+// task - a command line task list manager.
+//
 // Copyright 2006 - 2008, Paul Beckingham.
 // All rights reserved.
 //
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -9,13 +29,13 @@
 #include <fstream>
 #include <sys/types.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <pwd.h>
 #include <time.h>
 
 #include "Config.h"
 #include "Date.h"
 #include "Table.h"
-#include "stlmacros.h"
 #include "TDB.h"
 #include "T.h"
 #include "task.h"
@@ -187,6 +207,13 @@ int main (int argc, char** argv)
 // TODO Find out what this is, and either promote it to live code, or remove it.
 //  std::set_terminate (__gnu_cxx::__verbose_terminate_handler);
 
+  // Set up randomness.
+#ifdef HAVE_SRANDOM
+  srandom (time (NULL));
+#else
+  srand (time (NULL));
+#endif
+
   try
   {
     // Load the config file from the home directory.  If the file cannot be
@@ -255,8 +282,7 @@ int main (int argc, char** argv)
     return -2;
   }
 
-//  return 0;
+  return 0;
-  exit (0);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -283,7 +309,6 @@ void handleAdd (const TDB& tdb, T& task, Config& conf)
   task.setAttribute ("entry", entryTime);
 
   if (task.getDescription () == "")
-//    std::cout << "Cannot add a blank task" << std::endl;
     throw std::string ("Cannot add a blank task.");
 
   if (!tdb.addT (task))
@@ -306,29 +331,35 @@ void handleProjects (const TDB& tdb, T& task, Config& conf)
     unique[task.getAttribute ("project")] += 1;
   }
 
-  // Render a list of project names from the map.
+  if (unique.size ())
-  Table table;
-  table.addColumn ("Project");
-  table.addColumn ("Tasks");
-
-  table.setColumnUnderline (0);
-  table.setColumnUnderline (1);
-
-  table.setColumnJustification (1, Table::right);
-
-  foreach (i, unique)
   {
-    int row = table.addRow ();
+    // Render a list of project names from the map.
-    table.addCell (row, 0, i->first);
+    Table table;
-    table.addCell (row, 1, i->second);
+    table.addColumn ("Project");
-  }
+    table.addColumn ("Tasks");
 
-  std::cout << std::endl
+    table.setColumnUnderline (0);
-            << table.render ()
+    table.setColumnUnderline (1);
-            << std::endl
+
-            << unique.size ()
+    table.setColumnJustification (1, Table::right);
-            << (unique.size () == 1 ? " project" : " projects")
+
-            << std::endl;
+    foreach (i, unique)
+    {
+      int row = table.addRow ();
+      table.addCell (row, 0, i->first);
+      table.addCell (row, 1, i->second);
+    }
+
+    std::cout << std::endl
+              << table.render ()
+              << std::endl
+              << unique.size ()
+              << (unique.size () == 1 ? " project" : " projects")
+              << std::endl;
+  }
+  else
+    std::cout << "No projects."
+              << std::endl;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -383,7 +414,7 @@ void handleList (const TDB& tdb, T& task, Config& conf)
   }
 #endif
 
-  /* int count = */ tdb.gc ();
+  tdb.gc ();
 
   // Get the pending tasks.
   std::vector <T> tasks;
@@ -539,15 +570,6 @@ void handleList (const TDB& tdb, T& task, Config& conf)
   else
     std::cout << "No matches."
               << std::endl;
-
-/*
-  if (count)
-    std::cout << std::endl
-              << "[gc: "
-              << count
-              << " transferred]"
-              << std::endl;
-*/
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -567,7 +589,7 @@ void handleSmallList (const TDB& tdb, T& task, Config& conf)
   }
 #endif
 
-  /* int count = */ tdb.gc ();
+  tdb.gc ();
 
   // Get the pending tasks.
   std::vector <T> tasks;
@@ -709,15 +731,6 @@ void handleSmallList (const TDB& tdb, T& task, Config& conf)
   else
     std::cout << "No matches."
               << std::endl;
-
-/*
-  if (count)
-    std::cout << std::endl
-              << "[gc: "
-              << count
-              << " transferred]"
-              << std::endl;
-*/
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -736,7 +749,7 @@ void handleCompleted (const TDB& tdb, T& task, Config& conf)
   }
 #endif
 
-  /* int count = */ tdb.gc ();
+  tdb.gc ();
 
   // Get the pending tasks.
   std::vector <T> tasks;
@@ -839,15 +852,6 @@ void handleCompleted (const TDB& tdb, T& task, Config& conf)
   else
     std::cout << "No matches."
               << std::endl;
-
-/*
-  if (count)
-    std::cout << std::endl
-              << "[gc: "
-              << count
-              << " transferred]"
-              << std::endl;
-*/
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1026,7 +1030,7 @@ void handleLongList (const TDB& tdb, T& task, Config& conf)
   }
 #endif
 
-  /* int count = */ tdb.gc ();
+  tdb.gc ();
 
   // Get all the tasks.
   std::vector <T> tasks;
@@ -1206,15 +1210,6 @@ void handleLongList (const TDB& tdb, T& task, Config& conf)
               << std::endl;
   else
     std::cout << "No matches." << std::endl;
-
-/*
-  if (count)
-    std::cout << std::endl
-              << "[gc: "
-              << count
-              << " transferred]"
-              << std::endl;
-*/
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1403,7 +1398,7 @@ void handleReportNext (const TDB& tdb, T& task, Config& conf)
   }
 #endif
 
-  /* int gcCount = */ tdb.gc ();
+  tdb.gc ();
 
   // Get the pending tasks.
   std::vector <T> tasks;
@@ -1559,15 +1554,6 @@ void handleReportNext (const TDB& tdb, T& task, Config& conf)
   else
     std::cout << "No matches."
               << std::endl;
-
-/*
-  if (gcCount)
-    std::cout << std::endl
-              << "[gc: "
-              << gcCount
-              << " transferred]"
-              << std::endl;
-*/
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1694,7 +1680,7 @@ void handleReportHistory (const TDB& tdb, T& task, Config& conf)
   table.setColumnJustification (4, Table::right);
   table.setColumnJustification (5, Table::right);
 
-  char *months[] =
+  const char *months[] =
   {
     "January", "February", "March", "April", "May", "June",
     "July", "August", "September", "October", "November", "December",
@@ -1817,32 +1803,15 @@ void handleReportUsage (const TDB& tdb, T& task, Config& conf)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void handleReportCalendar (const TDB& tdb, T& task, Config& conf)
+std::string renderMonth (
+  int month,
+  int year,
+  const Date& today,
+  std::vector <T>& all,
+  Config& conf)
 {
-  // Today.
-  Date date;
-  int m     = date.month ();
-  int y     = date.year ();
-  int today = date.day ();
-
-  // Read all the tasks, filter by those that have a due date.
-  std::vector <int> annotations;
-  std::vector <T> pending;
-  tdb.pendingT (pending);
-  for (unsigned int i = 0; i < pending.size (); ++i)
-  {
-    T task (pending[i]);
-    if (task.getAttribute ("due") != "")
-    {
-      Date d (::atoi (task.getAttribute ("due").c_str ()));
-      if (d.year () == y && d.month () == m)
-        annotations.push_back (d.day ());
-    }
-  }
-
-  pending.clear ();
-
   Table table;
+  table.addColumn (" ");
   table.addColumn ("Su");
   table.addColumn ("Mo");
   table.addColumn ("Tu");
@@ -1851,13 +1820,13 @@ void handleReportCalendar (const TDB& tdb, T& task, Config& conf)
   table.addColumn ("Fr");
   table.addColumn ("Sa");
 
-  table.setColumnUnderline (0);
   table.setColumnUnderline (1);
   table.setColumnUnderline (2);
   table.setColumnUnderline (3);
   table.setColumnUnderline (4);
   table.setColumnUnderline (5);
   table.setColumnUnderline (6);
+  table.setColumnUnderline (7);
 
   table.setColumnJustification (0, Table::right);
   table.setColumnJustification (1, Table::right);
@@ -1866,25 +1835,35 @@ void handleReportCalendar (const TDB& tdb, T& task, Config& conf)
   table.setColumnJustification (4, Table::right);
   table.setColumnJustification (5, Table::right);
   table.setColumnJustification (6, Table::right);
+  table.setColumnJustification (7, Table::right);
 
-  int days = Date::daysInMonth (m, y);
+  int days = Date::daysInMonth (month, year);
   int row = table.addRow ();
   for (int d = 1; d <= days; ++d)
   {
-    Date temp (m, d, y);
+    Date temp (month, d, year);
     int dow = temp.dayOfWeek ();
 
-    table.addCell (row, dow, d);
+    table.addCell (row, dow + 1, d);
 
-    if (conf.get ("color", true) && d == today)
+    if (conf.get ("color", true) &&
-      table.setCellFg (row, dow, Text::cyan);
+        today.day ()   == d      &&
+        today.month () == month  &&
+        today.year ()  == year)
+      table.setCellFg (row, dow + 1, Text::cyan);
 
-    for (unsigned int a = 0; a < annotations.size (); ++a)
+    std::vector <T>::iterator it;
+    for (it = all.begin (); it != all.end (); ++it)
     {
-      if (conf.get ("color", true) && annotations[a] == d)
+      Date due (::atoi (it->getAttribute ("due").c_str ()));
+
+      if (conf.get ("color", true) &&
+          due.day ()   == d        &&
+          due.month () == month    &&
+          due.year ()  == year)
       {
-        table.setCellFg (row, dow, Text::black);
+        table.setCellFg (row, dow + 1, Text::black);
-        table.setCellBg (row, dow, d < today ? Text::red : Text::yellow);
+        table.setCellBg (row, dow + 1, due < today ? Text::on_red : Text::on_yellow);
       }
     }
 
@@ -1892,13 +1871,66 @@ void handleReportCalendar (const TDB& tdb, T& task, Config& conf)
       row = table.addRow ();
   }
 
-  std::cout << std::endl
+  return table.render ();
-            << Date::monthName (m)
+}
-            << " "
+
-            << y
+////////////////////////////////////////////////////////////////////////////////
+void handleReportCalendar (const TDB& tdb, T& task, Config& conf)
+{
+  // Load all the pending tasks.
+  std::vector <T> pending;
+  tdb.pendingT (pending);
+
+  // Find the oldest pending due date.
+  Date oldest;
+  Date newest;
+  std::vector <T>::iterator it;
+  for (it = pending.begin (); it != pending.end (); ++it)
+  {
+    if (it->getAttribute ("due") != "")
+    {
+      Date d (::atoi (it->getAttribute ("due").c_str ()));
+
+      if (d < oldest) oldest = d;
+      if (d > newest) newest = d;
+    }
+  }
+
+  // Iterate from oldest due month, year to newest month, year.
+  Date today;
+  int mFrom = oldest.month ();
+  int yFrom = oldest.year ();
+
+  int mTo = newest.month ();
+  int yTo = newest.year ();
+
+  std::cout << std::endl;
+  std::string output;
+  while (yFrom < yTo || (yFrom == yTo && mFrom <= mTo))
+  {
+    std::cout << Date::monthName (mFrom)
+              << " "
+              << yFrom
+              << std::endl
+              << std::endl
+              << renderMonth (mFrom, yFrom, today, pending, conf)
+              << std::endl;
+
+    if (++mFrom == 13)
+    {
+      mFrom = 1;
+      ++yFrom;
+    }
+  }
+
+  std::cout << "Legend: "
+            << Text::colorize (Text::cyan, Text::nocolor, "today")
+            << ", "
+            << Text::colorize (Text::black, Text::on_yellow, "due")
+            << ", "
+            << Text::colorize (Text::black, Text::on_red, "overdue")
+            << "."
             << std::endl
-            << std::endl
-            << table.render ()
             << std::endl;
 }
 
@@ -2143,17 +2175,6 @@ void handleReportOverdue (const TDB& tdb, T& task, Config& conf)
 ////////////////////////////////////////////////////////////////////////////////
 void handleReportStats (const TDB& tdb, T& task, Config& conf)
 {
-  // Determine window size, and set table accordingly.
-  int width = 80;
-#ifdef HAVE_LIBNCURSES
-  if (conf.get ("curses", true))
-  {
-    WINDOW* w = initscr ();
-    width = w->_maxx + 1;
-    endwin ();
-  }
-#endif
-
   // Get all the tasks.
   std::vector <T> tasks;
   tdb.allT (tasks);
@@ -2197,18 +2218,19 @@ void handleReportStats (const TDB& tdb, T& task, Config& conf)
     if (tags.size ()) ++taggedT;
   }
 
-  // TODO Unused feature list
-
   std::cout << "Pending               " << pendingT   << std::endl
             << "Completed             " << completedT << std::endl
             << "Deleted               " << deletedT   << std::endl
             << "Total                 " << totalT     << std::endl;
 
-  Date e (earliest);
+  if (tasks.size ())
-  std::cout << "Oldest task           " << e.toString () << std::endl;
+  {
-  Date l (latest);
+    Date e (earliest);
-  std::cout << "Newest task           " << l.toString () << std::endl;
+    std::cout << "Oldest task           " << e.toString () << std::endl;
-  std::cout << "Task used for         " << formatSeconds (latest - earliest) << std::endl;
+    Date l (latest);
+    std::cout << "Newest task           " << l.toString () << std::endl;
+    std::cout << "Task used for         " << formatSeconds (latest - earliest) << std::endl;
+  }
 
   if (totalT)
     std::cout << "Task added every      " << formatSeconds ((latest - earliest) / totalT)     << std::endl;
@@ -2255,7 +2277,7 @@ void handleVersion (Config& conf)
   table.setColumnUnderline (0);
   table.setColumnUnderline (1);
   table.setColumnWidth (0, Table::minimum);
-  table.setColumnWidth (1, Table::minimum);
+  table.setColumnWidth (1, Table::flexible);
   table.setColumnJustification (0, Table::left);
   table.setColumnJustification (1, Table::left);
   table.sortOn (0, Table::ascendingCharacter);
@@ -2280,6 +2302,14 @@ void handleVersion (Config& conf)
             << VERSION
             << std::endl
             << std::endl
+            << "Task comes with ABSOLUTELY NO WARRANTY; for details read the COPYING file"
+            << std::endl
+            << "included.  This is free software, and you are welcome to redistribute it"
+            << std::endl
+            << "under certain conditions; again, see the COPYING file for details."
+            << std::endl
+            << std::endl
+            << std::endl
             << table.render ()
             << std::endl;
 
@@ -2458,7 +2488,7 @@ void handleModify (const TDB& tdb, T& task, Config& conf)
       if (from != "")
       {
         std::string description = original.getDescription ();
-        unsigned int pattern = description.find (from);
+        size_t pattern = description.find (from);
         if (pattern != std::string::npos)
         {
           description = description.substr (0, pattern) +

src/task.h

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -13,13 +34,20 @@
 #include "color.h"
 #include "TDB.h"
 #include "T.h"
-#include "stlmacros.h"
 #include "../auto.h"
 
 #ifndef max
 #define max(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
+#define foreach(i, c)                                              \
+for (typeof (c) *foreach_p = & (c);                                \
+     foreach_p;                                                    \
+     foreach_p = 0)                                                \
+  for (typeof (foreach_p->begin()) i = foreach_p->begin();         \
+       i != foreach_p->end();                                      \
+       ++i)
+
 // parse.cpp
 void parse (std::vector <std::string>&, std::string&, T&);
 bool validDate (std::string&);

src/tests/t.t.cpp

@@ -1,4 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
+// task - a command line task list manager.
+//
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include "../T.h"

src/tests/tdb.t.cpp

@@ -1,4 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
+// task - a command line task list manager.
+//
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>

src/tests/test.cpp

@@ -1,11 +1,32 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2007, 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
 #include <string>
-#include <library.h>
+#include <task.h>
 
 static int total = 0;
 static int counter = 0;

src/tests/test.h

@@ -1,5 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2007, 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
+//
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_TEST

src/text.cpp

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2004 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -76,8 +97,8 @@ void extractParagraphs (const std::string& input, std::vector<std::string>& outp
   std::string copy = input;
   while (1)
   {
-    unsigned int so = copy.find ("<p>");
+    size_t so = copy.find ("<p>");
-    unsigned int eo = copy.find ("</p>");
+    size_t eo = copy.find ("</p>");
 
     if (so == std::string::npos && eo == std::string::npos)
       break;
@@ -126,7 +147,7 @@ void unquoteText (std::string& text)
 ////////////////////////////////////////////////////////////////////////////////
 void extractLine (std::string& text, std::string& line, int length)
 {
-  unsigned int eol = text.find ("\n");
+  size_t eol = text.find ("\n");
 
   // Special case: found \n in first length characters.
   if (eol != std::string::npos && eol < (unsigned) length)

src/util.cpp

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// 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 2 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, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -10,6 +31,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <string.h>
 #include "Table.h"
 #include "task.h"
 #include "../auto.h"
@@ -160,14 +182,18 @@ const std::string uuid ()
 static char randomHexDigit ()
 {
   static char digits[] = "0123456789abcdef";
+#ifdef HAVE_RANDOM
   return digits[random () % 16];
+#else
+  return digits[rand () % 16];
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 const std::string uuid ()
 {
   // xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  char id [37];
+  char id [48] = {0};
   id[0]  = randomHexDigit ();
   id[1]  = randomHexDigit ();
   id[2]  = randomHexDigit ();

task.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Task</title>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  </head>
+  <body>
+    Download the latest task source code <a href="http://www.beckingham.net/task-1.0.1.tar.gz">task-1.0.1.tar.gz</a> (6/4/2008).
+  <body>
+</html>
+