fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix default time format for multi-day appointments

Browse Source 
As of commit 0791eaabca, we use strftime()
instead of apoint_sec2str() to format start and end dates of
appointments. "%H:%M" is the default strftime() format string used to
simulate apoint_sec2str(). However, apoint_sec2str() additionally checks
for intersection with the current day and displays "..:.." instead of
the actual time if the item doesn't start (end) at the current day. Add
an additional check to the new default time format and recreate the old
behavior for items starting before or ending after the current day.

Fixes BUG#3.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2012-05-21 11:42:07 +02:00
parent cfd8ede2b3
commit 94a5d4cb1b
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/utils.c
View File

@@ -1167,7 +1167,7 @@ static enum format_specifier parse_fs(const char **s, char *extformat)
}
/* Print a formatted date to stdout. */
static void print_date(long date, const char *extformat)
static void print_date(long date, long day, const char *extformat)
{
char buf[BUFSIZ];
@@ -1177,10 +1177,14 @@ static void print_date(long date, const char *extformat)
time_t t = date;
struct tm *lt = localtime((time_t *) & t);
if (extformat[0] == '\0' || !strcmp(extformat, "default"))
strftime(buf, BUFSIZ, "%H:%M", lt);
else
if (extformat[0] == '\0' || !strcmp(extformat, "default")) {
if (date >= day && date <= day + DAYINSEC)
strftime(buf, BUFSIZ, "%H:%M", lt);
else
strftime(buf, BUFSIZ, "..:..", lt);
} else {
strftime(buf, BUFSIZ, extformat, lt);
}
printf("%s", buf);
}
@@ -1197,13 +1201,13 @@ void print_apoint(const char *format, long day, struct apoint *apt)
p++;
switch (parse_fs(&p, extformat)) {
case FS_STARTDATE:
print_date(apt->start, extformat);
print_date(apt->start, day, extformat);
break;
case FS_DURATION:
printf("%ld", apt->dur);
break;
case FS_ENDDATE:
print_date(apt->start + apt->dur, extformat);
print_date(apt->start + apt->dur, day, extformat);
break;
case FS_MESSAGE:
printf("%s", apt->mesg);