fix animation loop delays

Author: dskvr

examples/cherry-blossom/hyprlax.toml

@@ -10,9 +10,9 @@ easing = "expo"
 mode = "cursor"
 
 [global.parallax.sources]
-# Cursor-only parallax; disable workspace influence to avoid jumps on switch.
-workspace.weight = 0.0
 cursor.weight = 1.0
+workspace.weight = 0.01
+window.weight = 0.1
 
 [global.parallax.invert.cursor]
 x = false

src/core/event_loop.c

@@ -45,6 +45,12 @@ int epoll_add_fd(int epfd, int fd, uint32_t events) {
     return epoll_ctl(epfd, EPOLL_CTL_ADD, fd, &ev);
 }
 
+int epoll_del_fd(int epfd, int fd) {
+    if (epfd < 0 || fd < 0) return -1;
+    /* According to epoll_ctl docs, the event pointer is ignored for DEL */
+    return epoll_ctl(epfd, EPOLL_CTL_DEL, fd, NULL);
+}
+
 void hyprlax_setup_epoll(hyprlax_context_t *ctx) {
     if (!ctx) return;
     ctx->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
@@ -216,6 +222,9 @@ int hyprlax_run(hyprlax_context_t *ctx) {
                     }
                 }
             }
+            /* Ensure input providers (e.g., cursor) update during continuous render
+               windows (animations), even when we aren't blocking on epoll. */
+            hyprlax_cursor_tick(ctx);
             /* Advance animations before rendering */
             hyprlax_update_layers(ctx, current_time);
             if (ctx->monitors) {

src/hyprlax_main.c

@@ -51,25 +51,45 @@ static void hyprlax_update_cursor_provider(hyprlax_context_t *ctx) {
                        (ctx->input.weights[INPUT_CURSOR] > 0.0f);
 
     if (need_cursor) {
+        bool created = false;
         if (ctx->cursor_event_fd < 0) {
             ctx->cursor_event_fd = create_timerfd_monotonic();
             if (ctx->cursor_event_fd < 0) {
                 LOG_WARN("Failed to create cursor timerfd");
                 ctx->cursor_supported = false;
                 return;
             }
+            created = true;
         }
 
         int fps = ctx->config.target_fps > 0 ? ctx->config.target_fps : 60;
         int interval_ms = fps > 0 ? (int)(1000.0 / (double)fps) : 16;
         arm_timerfd_ms(ctx->cursor_event_fd, interval_ms, interval_ms);
         ctx->cursor_supported = true;
+
+        /* If epoll is already initialized and this is a new timerfd, register it */
+        if (created && ctx->epoll_fd >= 0) {
+            epoll_add_fd(ctx->epoll_fd, ctx->cursor_event_fd, EPOLLIN);
+        }
+
+        /* Ensure an immediate frame to prime input caches after enabling */
+        if (ctx->frame_timer_fd >= 0) {
+            arm_timerfd_ms(ctx->frame_timer_fd, 1, 0);
+        }
     } else {
         if (ctx->cursor_event_fd >= 0) {
+            if (ctx->epoll_fd >= 0) {
+                epoll_del_fd(ctx->epoll_fd, ctx->cursor_event_fd);
+            }
             close(ctx->cursor_event_fd);
             ctx->cursor_event_fd = -1;
         }
         ctx->cursor_supported = false;
+
+        /* Kick a frame so renderer applies new weights immediately */
+        if (ctx->frame_timer_fd >= 0) {
+            arm_timerfd_ms(ctx->frame_timer_fd, 1, 0);
+        }
     }
 }
 
@@ -319,6 +339,9 @@ int hyprlax_reload_config(hyprlax_context_t *ctx) {
         if (rc == HYPRLAX_SUCCESS) {
             input_manager_apply_config(&ctx->input, &ctx->config);
             hyprlax_update_cursor_provider(ctx);
+            if (ctx->frame_timer_fd >= 0) {
+                arm_timerfd_ms(ctx->frame_timer_fd, 1, 0);
+            }
             return HYPRLAX_SUCCESS;
         }
         return HYPRLAX_ERROR_INVALID_ARGS;
@@ -1501,6 +1524,9 @@ int hyprlax_runtime_set_property(hyprlax_context_t *ctx, const char *property, c
         }
         input_manager_apply_config(&ctx->input, &ctx->config);
         hyprlax_update_cursor_provider(ctx);
+        if (ctx->frame_timer_fd >= 0) {
+            arm_timerfd_ms(ctx->frame_timer_fd, 1, 0);
+        }
         return 0;
     }
     if (strcmp(property, "parallax.input") == 0) {
@@ -1513,6 +1539,9 @@ int hyprlax_runtime_set_property(hyprlax_context_t *ctx, const char *property, c
         input_source_selection_commit(&selection, &ctx->config);
         input_manager_apply_config(&ctx->input, &ctx->config);
         hyprlax_update_cursor_provider(ctx);
+        if (ctx->frame_timer_fd >= 0) {
+            arm_timerfd_ms(ctx->frame_timer_fd, 1, 0);
+        }
         return 0;
     }
     if (strcmp(property, "parallax.sources.cursor.weight") == 0) {
@@ -1521,6 +1550,9 @@ int hyprlax_runtime_set_property(hyprlax_context_t *ctx, const char *property, c
         if (ctx->config.parallax_cursor_weight > 1.0f) ctx->config.parallax_cursor_weight = 1.0f;
         input_manager_apply_config(&ctx->input, &ctx->config);
         hyprlax_update_cursor_provider(ctx);
+        if (ctx->frame_timer_fd >= 0) {
+            arm_timerfd_ms(ctx->frame_timer_fd, 1, 0);
+        }
         return 0;
     }
     if (strcmp(property, "parallax.sources.workspace.weight") == 0) {
@@ -1529,13 +1561,19 @@ int hyprlax_runtime_set_property(hyprlax_context_t *ctx, const char *property, c
         if (ctx->config.parallax_workspace_weight > 1.0f) ctx->config.parallax_workspace_weight = 1.0f;
         input_manager_apply_config(&ctx->input, &ctx->config);
         hyprlax_update_cursor_provider(ctx);
+        if (ctx->frame_timer_fd >= 0) {
+            arm_timerfd_ms(ctx->frame_timer_fd, 1, 0);
+        }
         return 0;
     }
     if (strcmp(property, "parallax.sources.window.weight") == 0) {
         ctx->config.parallax_window_weight = atof(value);
         if (ctx->config.parallax_window_weight < 0.0f) ctx->config.parallax_window_weight = 0.0f;
         if (ctx->config.parallax_window_weight > 1.0f) ctx->config.parallax_window_weight = 1.0f;
         input_manager_apply_config(&ctx->input, &ctx->config);
+        if (ctx->frame_timer_fd >= 0) {
+            arm_timerfd_ms(ctx->frame_timer_fd, 1, 0);
+        }
         return 0;
     }
     if (strcmp(property, "parallax.invert.cursor.x") == 0) {

src/include/hyprlax.h

@@ -154,6 +154,7 @@ int create_timerfd_monotonic(void);
 void disarm_timerfd(int fd);
 void arm_timerfd_ms(int fd, int initial_ms, int interval_ms);
 int epoll_add_fd(int epfd, int fd, uint32_t events);
+int epoll_del_fd(int epfd, int fd);
 void hyprlax_setup_epoll(hyprlax_context_t *ctx);
 void hyprlax_arm_frame_timer(hyprlax_context_t *ctx, int fps);
 void hyprlax_disarm_frame_timer(hyprlax_context_t *ctx);