Configuration Variable - due

- Added support for the "due" configuration variable that defines
  how many days into the future when a task is considered due.

ChangeLog

@@ -12,6 +12,8 @@
   + "configure --enable-debug" now supported to suppress compiler optimization
     to allow debugging.
   + Allow lower case priorities, and automatically upper case them.
+  + Added support for "due" configuration variable which defines the number
+    of days in the future when a task is considered due.
 
 ------ old releases ------------------------------
 

html/config.html

@@ -195,6 +195,14 @@
                   Defaults to 80.
                 </dd>
 
+                <dt>due</dt>
+                <dd>
+
+                  This is the number of days into the future that define when a
+                  task is considered due, and is colored accordingly.
+                  Defaults to 7.
+                </dd>
+
                 <dt>color</dt>
                 <dd>
                  May be "on" or "off".  Determines whether task uses color.

html/task.html

@@ -104,6 +104,9 @@
                       which may be spelling mistakes or deprecated variables.
                   <li>"configure --enable-debug" now supported to suppress compiler optimization
                       to allow debugging.
+                  <li>Allow lower case priorities, and automatically upper case them.
+                  <li>Added support for "due" configuration variable which defines the number
+                      of days in the future when a task is considered due.
                 </ul>
 
                 <p>

src/Config.cpp

@@ -118,6 +118,7 @@ void Config::createDefault (const std::string& home)
         fprintf (out, "monthsperline=1\n");
         fprintf (out, "curses=on\n");
         fprintf (out, "color=on\n");
+        fprintf (out, "due=7\n");
 
         fprintf (out, "color.overdue=bold_red\n");
         fprintf (out, "#color.due=on_bright_yellow\n");

src/report.cpp

@@ -258,7 +258,7 @@ std::string handleList (TDB& tdb, T& task, Config& conf)
     {
       Text::color fg = Text::colorCode (refTask.getAttribute ("fg"));
       Text::color bg = Text::colorCode (refTask.getAttribute ("bg"));
-      autoColorize (refTask, fg, bg);
+      autoColorize (refTask, fg, bg, conf);
       table.setRowFg (row, fg);
       table.setRowBg (row, bg);
 
@@ -390,7 +390,7 @@ std::string handleSmallList (TDB& tdb, T& task, Config& conf)
     {
       Text::color fg = Text::colorCode (refTask.getAttribute ("fg"));
       Text::color bg = Text::colorCode (refTask.getAttribute ("bg"));
-      autoColorize (refTask, fg, bg);
+      autoColorize (refTask, fg, bg, conf);
       table.setRowFg (row, fg);
       table.setRowBg (row, bg);
 
@@ -489,7 +489,7 @@ std::string handleCompleted (TDB& tdb, T& task, Config& conf)
     {
       Text::color fg = Text::colorCode (refTask.getAttribute ("fg"));
       Text::color bg = Text::colorCode (refTask.getAttribute ("bg"));
-      autoColorize (refTask, fg, bg);
+      autoColorize (refTask, fg, bg, conf);
       table.setRowFg (row, fg);
       table.setRowBg (row, bg);
     }
@@ -851,7 +851,7 @@ std::string handleLongList (TDB& tdb, T& task, Config& conf)
     {
       Text::color fg = Text::colorCode (refTask.getAttribute ("fg"));
       Text::color bg = Text::colorCode (refTask.getAttribute ("bg"));
-      autoColorize (refTask, fg, bg);
+      autoColorize (refTask, fg, bg, conf);
       table.setRowFg (row, fg);
       table.setRowBg (row, bg);
 
@@ -1180,7 +1180,7 @@ std::string handleReportNext (TDB& tdb, T& task, Config& conf)
     {
       Text::color fg = Text::colorCode (refTask.getAttribute ("fg"));
       Text::color bg = Text::colorCode (refTask.getAttribute ("bg"));
-      autoColorize (refTask, fg, bg);
+      autoColorize (refTask, fg, bg, conf);
       table.setRowFg (row, fg);
       table.setRowBg (row, bg);
 
@@ -1962,7 +1962,7 @@ std::string handleReportActive (TDB& tdb, T& task, Config& conf)
       {
         Text::color fg = Text::colorCode (refTask.getAttribute ("fg"));
         Text::color bg = Text::colorCode (refTask.getAttribute ("bg"));
-        autoColorize (refTask, fg, bg);
+        autoColorize (refTask, fg, bg, conf);
         table.setRowFg (row, fg);
         table.setRowBg (row, bg);
 
@@ -2076,7 +2076,7 @@ std::string handleReportOverdue (TDB& tdb, T& task, Config& conf)
           {
             Text::color fg = Text::colorCode (refTask.getAttribute ("fg"));
             Text::color bg = Text::colorCode (refTask.getAttribute ("bg"));
-            autoColorize (refTask, fg, bg);
+            autoColorize (refTask, fg, bg, conf);
             table.setRowFg (row, fg);
             table.setRowBg (row, bg);
 
@@ -2220,7 +2220,7 @@ std::string handleReportOldest (TDB& tdb, T& task, Config& conf)
     {
       Text::color fg = Text::colorCode (refTask.getAttribute ("fg"));
       Text::color bg = Text::colorCode (refTask.getAttribute ("bg"));
-      autoColorize (refTask, fg, bg);
+      autoColorize (refTask, fg, bg, conf);
       table.setRowFg (row, fg);
       table.setRowBg (row, bg);
 
@@ -2368,7 +2368,7 @@ std::string handleReportNewest (TDB& tdb, T& task, Config& conf)
     {
       Text::color fg = Text::colorCode (refTask.getAttribute ("fg"));
       Text::color bg = Text::colorCode (refTask.getAttribute ("bg"));
-      autoColorize (refTask, fg, bg);
+      autoColorize (refTask, fg, bg, conf);
       table.setRowFg (row, fg);
       table.setRowBg (row, bg);
 

src/rules.cpp

@@ -80,7 +80,11 @@ void initializeColorRules (Config& conf)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void autoColorize (T& task, Text::color& fg, Text::color& bg)
+void autoColorize (
+  T& task,
+  Text::color& fg,
+  Text::color& bg,
+  Config& conf)
 {
   // Note: fg, bg already contain colors specifically assigned via command.
   // Note: These rules form a hierarchy - the last rule is king.
@@ -159,7 +163,7 @@ void autoColorize (T& task, Text::color& fg, Text::color& bg)
   {
     Date dueDate (::atoi (due.c_str ()));
     Date now;
-    Date then (now + 7 * 86400);
+    Date then (now + conf.get ("due", 7) * 86400);
 
     // Overdue
     if (dueDate < now)

src/task.h

@@ -141,6 +141,6 @@ std::string expandPath (const std::string&);
 
 // rules.cpp
 void initializeColorRules (Config&);
-void autoColorize (T&, Text::color&, Text::color&);
+void autoColorize (T&, Text::color&, Text::color&, Config&);
 
 ////////////////////////////////////////////////////////////////////////////////