From 4801d3a305e80b449f041d469432780d7b0cc179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Tue, 6 Feb 2024 13:41:09 +0100 Subject: [PATCH] term: drop term->render.title.is_armed This boolean isn't needed. The idea was probably to not re-program the timer unnecessarily, or even to prevent it from being moved forward in time indefinitely. However, the logic has (probably) gone through some changes, that now makes it irrelevant. The timer isn't moved forward indefinitely; it is always set to 8ms from the last title update. The closer we get to that point in time, the smaller the timeout we set. Now, is_armed _did_ prevent the timer from being re-programmed. But that tiny performance tweak isn't really necessary, as the title should, in normal cases, not be set that often anyway. --- render.c | 3 --- terminal.c | 2 -- terminal.h | 1 - 3 files changed, 6 deletions(-) diff --git a/render.c b/render.c index 2bfe36e8..13d348f3 100644 --- a/render.c +++ b/render.c @@ -4508,9 +4508,6 @@ fdm_hook_refresh_pending_terminals(struct fdm *fdm, void *data) void render_refresh_title(struct terminal *term) { - if (term->render.title.is_armed) - return; - struct timespec now; if (clock_gettime(CLOCK_MONOTONIC, &now) < 0) return; diff --git a/terminal.c b/terminal.c index f93e7abc..7ace10ef 100644 --- a/terminal.c +++ b/terminal.c @@ -622,7 +622,6 @@ fdm_title_update_timeout(struct fdm *fdm, int fd, int events, void *data) struct itimerspec reset = {{0}}; timerfd_settime(term->render.title.timer_fd, 0, &reset, NULL); - term->render.title.is_armed = false; render_refresh_title(term); return true; @@ -1209,7 +1208,6 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper, .scrollback_lines = conf->scrollback.lines, .app_sync_updates.timer_fd = app_sync_updates_fd, .title = { - .is_armed = false, .timer_fd = title_update_fd, }, .workers = { diff --git a/terminal.h b/terminal.h index 9e003502..7b743c09 100644 --- a/terminal.h +++ b/terminal.h @@ -603,7 +603,6 @@ struct terminal { struct { struct timespec last_update; - bool is_armed; int timer_fd; } title;