aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-07-22 17:17:57 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-07-22 17:17:57 +0000
commit428b31f0713d69fe07ecde19eb103a8274a2f96a (patch)
treed5798079ebfb08060f4067f56d35ece62b6535c2
parentterm: group 'flash' state together in a struct (diff)
term: group 'blink' state together in a struct
-rw-r--r--main.c14
-rw-r--r--render.c16
-rw-r--r--terminal.h8
3 files changed, 21 insertions, 17 deletions
diff --git a/main.c b/main.c
index 1041eadc..1690d5c0 100644
--- a/main.c
+++ b/main.c
@@ -330,7 +330,9 @@ main(int argc, char *const *argv)
.flash = {
.fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC),
},
- .blink_timer_fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC),
+ .blink = {
+ .fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC),
+ },
.vt = {
.state = 1, /* STATE_GROUND */
.attrs = {
@@ -688,7 +690,7 @@ main(int argc, char *const *argv)
{.fd = term.ptmx, .events = POLLIN},
{.fd = term.kbd.repeat.pipe_read_fd, .events = POLLIN},
{.fd = term.flash.fd, .events = POLLIN},
- {.fd = term.blink_timer_fd, .events = POLLIN},
+ {.fd = term.blink.fd, .events = POLLIN},
};
wl_display_flush(term.wl.display);
@@ -804,7 +806,7 @@ main(int argc, char *const *argv)
if (fds[4].revents & POLLIN) {
uint64_t expiration_count;
ssize_t ret = read(
- term.blink_timer_fd, &expiration_count, sizeof(expiration_count));
+ term.blink.fd, &expiration_count, sizeof(expiration_count));
if (ret < 0)
LOG_ERRNO("failed to read blink timer");
@@ -812,7 +814,7 @@ main(int argc, char *const *argv)
LOG_DBG("blink timer expired %llu times",
(unsigned long long)expiration_count);
- term.blink_mode = term.blink_mode == BLINK_ON
+ term.blink.state = term.blink.state == BLINK_ON
? BLINK_OFF : BLINK_ON;
/* Scan all visible cells and mark rows with blinking cells dirty */
@@ -919,8 +921,8 @@ out:
if (term.flash.fd != -1)
close(term.flash.fd);
- if (term.blink_timer_fd != -1)
- close(term.blink_timer_fd);
+ if (term.blink.fd != -1)
+ close(term.blink.fd);
if (term.ptmx != -1)
close(term.ptmx);
diff --git a/render.c b/render.c
index 2b5cc293..f0e818e9 100644
--- a/render.c
+++ b/render.c
@@ -118,7 +118,7 @@ render_cell(struct terminal *term, struct buffer *buf, const struct cell *cell,
_bg = swap;
}
- if (cell->attrs.blink && term->blink_mode == BLINK_OFF)
+ if (cell->attrs.blink && term->blink.state == BLINK_OFF)
_fg = _bg;
struct rgb fg = color_hex_to_rgb(_fg);
@@ -132,7 +132,7 @@ render_cell(struct terminal *term, struct buffer *buf, const struct cell *cell,
cairo_rectangle(buf->cairo, x, y, width, height);
cairo_fill(buf->cairo);
- if (cell->attrs.blink && !term->is_blinking) {
+ if (cell->attrs.blink && !term->blink.active) {
/* First cell we see that has blink set - arm blink timer */
LOG_DBG("arming blink timer");
struct itimerspec alarm = {
@@ -140,10 +140,10 @@ render_cell(struct terminal *term, struct buffer *buf, const struct cell *cell,
.it_interval = {.tv_sec = 0, .tv_nsec = 500 * 1000000},
};
- if (timerfd_settime(term->blink_timer_fd, 0, &alarm, NULL) < 0)
+ if (timerfd_settime(term->blink.fd, 0, &alarm, NULL) < 0)
LOG_ERRNO("failed to arm blink timer");
else
- term->is_blinking = true;
+ term->blink.active = true;
}
if (cell->c[0] == '\0' || cell->attrs.conceal)
@@ -389,7 +389,7 @@ grid_render(struct terminal *term)
term->width, term->cell_height);
}
- if (term->is_blinking) {
+ if (term->blink.active) {
/* Check if there are still any visible blinking cells */
bool none_is_blinking = true;
for (int r = 0; r < term->rows; r++) {
@@ -406,11 +406,11 @@ grid_render(struct terminal *term)
if (none_is_blinking) {
LOG_DBG("disarming blink timer");
- term->is_blinking = false;
- term->blink_mode = BLINK_ON;
+ term->blink.active = false;
+ term->blink.state = BLINK_ON;
if (timerfd_settime(
- term->blink_timer_fd, 0,
+ term->blink.fd, 0,
&(struct itimerspec){0}, NULL) < 0)
{
LOG_ERRNO("failed to disarm blink timer");
diff --git a/terminal.h b/terminal.h
index bf693769..451d7ac9 100644
--- a/terminal.h
+++ b/terminal.h
@@ -248,9 +248,11 @@ struct terminal {
int fd;
} flash;
- bool is_blinking;
- enum { BLINK_ON, BLINK_OFF } blink_mode;
- int blink_timer_fd;
+ struct {
+ bool active;
+ enum { BLINK_ON, BLINK_OFF } state;
+ int fd;
+ } blink;
struct vt vt;
struct kbd kbd;