diff options
author | Lars Henriksen <LarsHenriksen@get2net.dk> | 2018-12-01 19:54:14 +0100 |
---|---|---|
committer | Lukas Fleischer <lfleischer@calcurse.org> | 2019-01-07 16:58:01 +0100 |
commit | 620c4eeca5cd1dda90a26527aa6d782edb1b5271 (patch) | |
tree | 1510d99f61857f765416d409b3e2091798f761aa /src/calcurse.h | |
parent | bcfc71f4fe195f8ef98ea29a44f9c7a25a6aa75f (diff) | |
download | calcurse-620c4eeca5cd1dda90a26527aa6d782edb1b5271.tar.gz calcurse-620c4eeca5cd1dda90a26527aa6d782edb1b5271.zip |
CLI: Revert to and update of parse_datetimearg()
An earlier commit ("CLI: take input date format from configuration file,
do not accept time") replaced parse_datetimearg() with parse_datearg()
and eliminated time-of-day from command line date arguments. This made
the full use of filter options impossible.
That earlier commit is reverted and updated. The parse_datearg()
function is replaced by an updated parse_datetimearg() function that
- takes the date format from the configuration file
- accepts date, date-time or time
The updated parse_datetimearg() function has been extended to report
back the type of the date string received in order to set (filter)
options correctly. Input dates for query ranges (--from, --to, --days)
are still limited to dates only.
Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Diffstat (limited to 'src/calcurse.h')
-rw-r--r-- | src/calcurse.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/calcurse.h b/src/calcurse.h index 8626393..c6ddc8d 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -137,10 +137,12 @@ /* * Note the difference between the number of seconds in a day and daylength * in seconds. The two may differ when DST is in effect (daylength is either - * 23, 24 or 25 hours. The argument to DAYLEN is of type time_t. + * 23, 24 or 25 hours. The argument "date" is assumed to be of type time_t. */ #define DAYINSEC (DAYINMIN * MININSEC) -#define DAYLEN(date) (date_sec_change((date), 0, 1) - (date)) +#define NEXTDAY(date) date_sec_change((date), 0, 1) +#define DAYLEN(date) (NEXTDAY(date) - (date)) +#define ENDOFDAY(date) (NEXTDAY(date) - 1) #define HOURINSEC (HOURINMIN * MININSEC) #define MAXDAYSPERMONTH 31 @@ -760,6 +762,7 @@ int ui_calendar_get_view(void); void ui_calendar_start_date_thread(void); void ui_calendar_stop_date_thread(void); void ui_calendar_set_current_date(void); +struct date *ui_calendar_get_today(void); void ui_calendar_set_first_day_of_week(enum wday); void ui_calendar_change_first_day_of_week(void); unsigned ui_calendar_week_begins_on_monday(void); |