Add box packing to day view

[lackey] / src / date.c

diff --git a/src/date.c b/src/date.c
index 9503b4c2a37e49e3fe211b4d4cddd0a0debeb1cd..e0e439956d39edb2cd7dc625fd4475d980b31832 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -126,16 +126,21 @@ int get_mins(date_t *start, date_t *end)
        return (get_time(end)-get_time(start))/60;
 }
 
-int before(date_t *start, int year, int month, int day, int hour, int min)
+int compare(date_t *a, date_t *b)
 {
-       int rval = start->year  < year  ? 1 : start->year  > year ? 0 :
-                  start->month < month ? 1 : start->month > month? 0 :
-                  start->day   < day   ? 1 : start->day   > day  ? 0 :
-                  start->hour  < hour  ? 1 : start->hour  > hour ? 0 :
-                  start->min   < min   ? 1 : start->min   > min  ? 0 : 0;
+       int rval = a->year  < b->year  ? -1 : a->year  > b->year  ? 1 :
+                  a->month < b->month ? -1 : a->month > b->month ? 1 :
+                  a->day   < b->day   ? -1 : a->day   > b->day   ? 1 :
+                  a->hour  < b->hour  ? -1 : a->hour  > b->hour  ? 1 :
+                  a->min   < b->min   ? -1 : a->min   > b->min   ? 1 : 0;
        return rval;
 }
 
+int before(date_t *start, int year, int month, int day, int hour, int min)
+{
+       return compare(start, &(date_t){year, month, day, hour, min}) < 0;
+}
+
 /* Debug functions */
 const char *month_to_str(month_t month)
 {