RPJosh
/
wlsunset
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use timezone as time offset for manual time 

When entering manual time, the timezone was adjusted in the time input
instead of storing the time offset. The time offset is necessary to
calculate the correct day boundaries.

Remove the timezone correction of time input and instead adjust the time
offset accordingly.
master
Kenny Levinsen 2022-05-04 11:01:10 +02:00
parent 8d1067a5aa
commit 5afa1d2819
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.c
View File

@ -72,6 +72,13 @@ static inline void adjust_timerspec(struct itimerspec *timerspec) {
} }
#endif #endif
static time_t get_timezone(void) {
struct tm tm;
time_t now = time(NULL);
localtime_r(&now, &tm);
return tm.tm_gmtoff;
}
static time_t round_day_offset(time_t now, time_t offset) { static time_t round_day_offset(time_t now, time_t offset) {
return now - ((now - offset) % 86400); return now - ((now - offset) % 86400);
} }
@ -115,7 +122,7 @@ struct context {
struct config config; struct config config;
struct sun sun; struct sun sun;
double longitude_time_offset; time_t longitude_time_offset;
enum state state; enum state state;
enum sun_condition condition; enum sun_condition condition;
@ -729,6 +736,8 @@ static int wlrun(struct config cfg) {
if (!cfg.manual_time) { if (!cfg.manual_time) {
ctx.longitude_time_offset = longitude_time_offset(cfg.longitude); ctx.longitude_time_offset = longitude_time_offset(cfg.longitude);
} else {
ctx.longitude_time_offset = get_timezone();
} }
wl_list_init(&ctx.outputs); wl_list_init(&ctx.outputs);
@ -804,11 +813,6 @@ static int parse_time_of_day(const char *s, time_t *time) {
return -1; return -1;
} }
*time = tm.tm_hour * 3600 + tm.tm_min * 60; *time = tm.tm_hour * 3600 + tm.tm_min * 60;
#if defined(__FreeBSD__)
*time += tm.tm_gmtoff;
#else
*time += timezone;
#endif
return 0; return 0;
} }