mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-23 05:33:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'timespec-compare-fix' into master

Browse source
This commit is contained in:
Daniel Eklöf 2020-08-23 06:08:38 +02:00
commit 75dc06f303
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
csi.c
View file

@ -544,6 +544,12 @@ decrst(struct terminal *term, unsigned param)
decset_decrst(term, param, false); decset_decrst(term, param, false);
} }
static bool
timespecs_equal(const struct timespec *a, const struct timespec *b)
{
return a->tv_sec == b->tv_sec && a->tv_nsec == b->tv_nsec;
}
static void static void
xtsave(struct terminal *term, unsigned param) xtsave(struct terminal *term, unsigned param)
{ {
@ -561,10 +567,10 @@ xtsave(struct terminal *term, unsigned param)
if (timerfd_gettime(term->cursor_blink.fd, &current_value) < 0) if (timerfd_gettime(term->cursor_blink.fd, &current_value) < 0)
LOG_WARN("xtsave: failed to read cursor blink timer: %s", strerror(errno)); LOG_WARN("xtsave: failed to read cursor blink timer: %s", strerror(errno));
else { else {
const struct timespec zero = {}; const struct timespec zero = {.tv_sec = 0, .tv_nsec = 0};
term->xtsave.cursor_blink = term->xtsave.cursor_blink =
!(memcmp(&current_value.it_interval, &zero, sizeof(zero)) == 0 && !(timespecs_equal(&current_value.it_interval, &zero) &&
memcmp(&current_value.it_value, &zero, sizeof(zero)) == 0); timespecs_equal(&current_value.it_value, &zero));
} }
break; break;
} }