aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2024-02-06 12:50:38 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-02-06 12:50:38 +0000
commit0b95e720739cce46df47972895e86eeb91fbc109 (patch)
treefff232f14e2cc0236772330f2ae7b3da378e05dd /terminal.c
parentterm: drop term->render.title.is_armed (diff)
parentchangelog: OSC-176 - set app-id (diff)
Merge branch 'app-id'
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c61
1 files changed, 60 insertions, 1 deletions
diff --git a/terminal.c b/terminal.c
index 7ace10ef..bc7dc428 100644
--- a/terminal.c
+++ b/terminal.c
@@ -628,6 +628,30 @@ fdm_title_update_timeout(struct fdm *fdm, int fd, int events, void *data)
}
static bool
+fdm_app_id_update_timeout(struct fdm *fdm, int fd, int events, void *data)
+{
+ if (events & EPOLLHUP)
+ return false;
+
+ struct terminal *term = data;
+ uint64_t unused;
+ ssize_t ret = read(term->render.app_id.timer_fd, &unused, sizeof(unused));
+
+ if (ret < 0) {
+ if (errno == EAGAIN)
+ return true;
+ LOG_ERRNO("failed to read app ID update throttle timer");
+ return false;
+ }
+
+ struct itimerspec reset = {{0}};
+ timerfd_settime(term->render.app_id.timer_fd, 0, &reset, NULL);
+
+ render_refresh_app_id(term);
+ return true;
+}
+
+static bool
initialize_render_workers(struct terminal *term)
{
LOG_INFO("using %hu rendering threads", term->render.workers.count);
@@ -1050,6 +1074,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
int delay_upper_fd = -1;
int app_sync_updates_fd = -1;
int title_update_fd = -1;
+ int app_id_update_fd = -1;
struct terminal *term = malloc(sizeof(*term));
if (unlikely(term == NULL)) {
@@ -1084,6 +1109,12 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
goto close_fds;
}
+ if ((app_id_update_fd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK)) < 0)
+ {
+ LOG_ERRNO("failed to create app ID update throttle timer FD");
+ goto close_fds;
+ }
+
if (ioctl(ptmx, (unsigned int)TIOCSWINSZ,
&(struct winsize){.ws_row = 24, .ws_col = 80}) < 0)
{
@@ -1114,7 +1145,8 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
!fdm_add(fdm, delay_lower_fd, EPOLLIN, &fdm_delayed_render, term) ||
!fdm_add(fdm, delay_upper_fd, EPOLLIN, &fdm_delayed_render, term) ||
!fdm_add(fdm, app_sync_updates_fd, EPOLLIN, &fdm_app_sync_updates_timeout, term) ||
- !fdm_add(fdm, title_update_fd, EPOLLIN, &fdm_title_update_timeout, term))
+ !fdm_add(fdm, title_update_fd, EPOLLIN, &fdm_title_update_timeout, term) ||
+ !fdm_add(fdm, app_id_update_fd, EPOLLIN, &fdm_app_id_update_timeout, term))
{
goto err;
}
@@ -1210,6 +1242,9 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
.title = {
.timer_fd = title_update_fd,
},
+ .app_id = {
+ .timer_fd = app_id_update_fd,
+ },
.workers = {
.count = conf->render_worker_count,
.queue = tll_init(),
@@ -1318,6 +1353,7 @@ close_fds:
fdm_del(fdm, delay_upper_fd);
fdm_del(fdm, app_sync_updates_fd);
fdm_del(fdm, title_update_fd);
+ fdm_del(fdm, app_id_update_fd);
free(term);
return NULL;
@@ -1510,6 +1546,7 @@ term_shutdown(struct terminal *term)
fdm_del(term->fdm, term->selection.auto_scroll.fd);
fdm_del(term->fdm, term->render.app_sync_updates.timer_fd);
+ fdm_del(term->fdm, term->render.app_id.timer_fd);
fdm_del(term->fdm, term->render.title.timer_fd);
fdm_del(term->fdm, term->delayed_render_timer.lower_fd);
fdm_del(term->fdm, term->delayed_render_timer.upper_fd);
@@ -1548,6 +1585,7 @@ term_shutdown(struct terminal *term)
term->selection.auto_scroll.fd = -1;
term->render.app_sync_updates.timer_fd = -1;
+ term->render.app_id.timer_fd = -1;
term->render.title.timer_fd = -1;
term->delayed_render_timer.lower_fd = -1;
term->delayed_render_timer.upper_fd = -1;
@@ -1601,6 +1639,7 @@ term_destroy(struct terminal *term)
fdm_del(term->fdm, term->selection.auto_scroll.fd);
fdm_del(term->fdm, term->render.app_sync_updates.timer_fd);
+ fdm_del(term->fdm, term->render.app_id.timer_fd);
fdm_del(term->fdm, term->render.title.timer_fd);
fdm_del(term->fdm, term->delayed_render_timer.lower_fd);
fdm_del(term->fdm, term->delayed_render_timer.upper_fd);
@@ -1644,6 +1683,7 @@ term_destroy(struct terminal *term)
composed_free(term->composed);
+ free(term->app_id);
free(term->window_title);
tll_free_and_free(term->window_title_stack, free);
@@ -3261,6 +3301,25 @@ term_set_window_title(struct terminal *term, const char *title)
}
void
+term_set_app_id(struct terminal *term, const char *app_id)
+{
+ if (app_id != NULL && *app_id == '\0')
+ app_id = NULL;
+ if (term->app_id == NULL && app_id == NULL)
+ return;
+ if (term->app_id != NULL && app_id != NULL && strcmp(term->app_id, app_id) == 0)
+ return;
+
+ free(term->app_id);
+ if (app_id != NULL) {
+ term->app_id = xstrdup(app_id);
+ } else {
+ term->app_id = NULL;
+ }
+ render_refresh_app_id(term);
+}
+
+void
term_flash(struct terminal *term, unsigned duration_ms)
{
LOG_DBG("FLASH for %ums", duration_ms);