jachym/dwl-patches
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl-patches.git synced 2026-11-03 20:02:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
Files
main
dwl-patches/patches/animation/animation-0.9.patch
T

308 lines
10 KiB
Diff
Raw Permalink Blame History

From 302ace232def0685dfccefe5d48570996263619d Mon Sep 17 00:00:00 2001
From: pi66 <pixel2176@proton.me>
Date: Wed, 30 Sep 2026 00:05:37 +0100
Subject: [PATCH] fix: animation glitches and zoom logic
---
client.h | 9 +--
config.def.h | 4 ++
dwl.c | 155 ++++++++++++++++++++++++++++++++++++++++++++-------
3 files changed, 144 insertions(+), 24 deletions(-)
diff --git a/client.h b/client.h
index dc0615e..9300417 100644
--- a/client.h
+++ b/client.h
@@ -365,7 +365,7 @@ client_set_scale(struct wlr_surface *s, float scale)
wlr_surface_set_preferred_buffer_scale(s, (int32_t)ceilf(scale));
}
-static inline void
+static inline uint32_t
client_set_size(Client *c, uint32_t width, uint32_t height)
{
#ifdef XWAYLAND
@@ -375,9 +375,10 @@ client_set_size(Client *c, uint32_t width, uint32_t height)
return;
}
#endif
- if ((int32_t)width != c->surface.xdg->toplevel->current.width
- || (int32_t)height != c->surface.xdg->toplevel->current.height)
- wlr_xdg_toplevel_set_size(c->surface.xdg->toplevel, (int32_t)width, (int32_t)height);
+ if ((int32_t)width == c->surface.xdg->toplevel->current.width
+ && (int32_t)height == c->surface.xdg->toplevel->current.height)
+ return 0;
+ return wlr_xdg_toplevel_set_size(c->surface.xdg->toplevel, (int32_t)width, (int32_t)height);
}
static inline void
diff --git a/config.def.h b/config.def.h
index 13c5322..b0c17e8 100644
--- a/config.def.h
+++ b/config.def.h
@@ -15,6 +15,10 @@ static const float urgentcolor[] = COLOR(0xff0000ff);
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */
+/* animation */
+static const unsigned int animation_duration = 300; /* ms */
+static const float animation_curve[4] = {0.0f, 0.85f, 0.2f, 1.0f}; /* cubic-bezier x1, y1, x2, y2 */
+
/* tagging - TAGCOUNT must be no greater than 31 */
#define TAGCOUNT (9)
diff --git a/dwl.c b/dwl.c
index 4cfd0fd..81f157d 100644
--- a/dwl.c
+++ b/dwl.c
@@ -86,6 +86,7 @@
#define LISTEN_STATIC(E, H) do { struct wl_listener *_l = ecalloc(1, sizeof(*_l)); _l->notify = (H); wl_signal_add((E), _l); } while (0)
/* enums */
+enum { CliNormal, CliClosing, CliOpening }; /* client events */
enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */
enum { XDGShell, LayerShell, X11 }; /* client types */
enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrUnmanaged, LyrOverlay,
@@ -159,6 +160,11 @@ typedef struct {
unsigned int bw;
uint32_t tags;
int isfloating, isurgent, isfullscreen;
+
+ /* Animation */
+ struct wlr_box anim_from, anim_to, anim_cur;
+ uint32_t anim_start, serial;
+ int animating, status;
} Client;
typedef struct {
@@ -260,6 +266,10 @@ typedef struct {
} SessionLock;
/* function declarations */
+static uint32_t animation_now_ms(void);
+static float animation_bezier(float t);
+static int animation_tick(void *data);
+static void animation_apply(Client *c, struct wlr_box g);
static void applybounds(Client *c, struct wlr_box *bbox);
static void applyrules(Client *c);
static void arrange(Monitor *m);
@@ -374,6 +384,7 @@ static void xytonode(double x, double y, struct wlr_surface **psurface,
static void zoom(const Arg *arg);
/* variables */
+static struct wl_event_source *animation_timer;
static pid_t child_pid = -1;
static int locked;
static void *exclusive_focus;
@@ -485,6 +496,86 @@ static struct wlr_xwayland *xwayland;
#include "ime.h"
/* function implementations */
+uint32_t
+animation_now_ms(void)
+{
+ struct timespec t;
+
+ clock_gettime(CLOCK_MONOTONIC, &t);
+ return t.tv_sec * 1000 + t.tv_nsec / 1000000;
+}
+
+float
+animation_bezier(float t)
+{
+ float x1 = animation_curve[0], y1 = animation_curve[1];
+ float x2 = animation_curve[2], y2 = animation_curve[3];
+ float lo = 0, hi = 1, s = t, x;
+ int i;
+
+ for (i = 0; i < 20; i++) {
+ x = 3*(1-s)*(1-s)*s*x1 + 3*(1-s)*s*s*x2 + s*s*s;
+ if (x < t)
+ lo = s;
+ else
+ hi = s;
+ s = (lo + hi) / 2;
+ }
+ return 3*(1-s)*(1-s)*s*y1 + 3*(1-s)*s*s*y2 + s*s*s;
+}
+
+int
+animation_tick(void *data)
+{
+ Client *c;
+ float t, p;
+ int more = 0;
+
+ wl_list_for_each(c, &clients, link) {
+ if (!c->animating)
+ continue;
+ t = (animation_now_ms() - c->anim_start) / (float)animation_duration;
+ if (t >= 1) {
+ t = 1;
+ c->animating = 0;
+ }
+ p = animation_bezier(t);
+ c->anim_cur.x = (int)(c->anim_from.x + (c->anim_to.x - c->anim_from.x) * p);
+ c->anim_cur.y = (int)(c->anim_from.y + (c->anim_to.y - c->anim_from.y) * p);
+ c->anim_cur.width = (int)(c->anim_from.width + (c->anim_to.width - c->anim_from.width) * p);
+ c->anim_cur.height = (int)(c->anim_from.height + (c->anim_to.height - c->anim_from.height) * p);
+
+ animation_apply(c, c->anim_cur);
+ more |= c->animating;
+ }
+ if (more)
+ wl_event_source_timer_update(animation_timer, 16);
+ return 0;
+}
+
+void
+animation_apply(Client *c, struct wlr_box g)
+{
+ struct wlr_box clip, save = c->geom;
+
+ c->geom = g;
+
+ wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y);
+ wlr_scene_node_set_position(&c->scene_surface->node, c->bw, c->bw);
+ wlr_scene_rect_set_size(c->border[0], c->geom.width, c->bw);
+ wlr_scene_rect_set_size(c->border[1], c->geom.width, c->bw);
+ wlr_scene_rect_set_size(c->border[2], c->bw, c->geom.height - 2 * c->bw);
+ wlr_scene_rect_set_size(c->border[3], c->bw, c->geom.height - 2 * c->bw);
+ wlr_scene_node_set_position(&c->border[1]->node, 0, c->geom.height - c->bw);
+ wlr_scene_node_set_position(&c->border[2]->node, 0, c->bw);
+ wlr_scene_node_set_position(&c->border[3]->node, c->geom.width - c->bw, c->bw);
+
+ client_get_clip(c, &clip);
+ wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip);
+
+ c->geom = save;
+}
+
void
applybounds(Client *c, struct wlr_box *bbox)
{
@@ -1873,6 +1964,7 @@ mapnotify(struct wl_listener *listener, void *data)
.title = client_get_title(c),
};
+ c->status = CliOpening;
/* Create scene tree for this client and its border */
c->scene = client_surface(c)->data = wlr_scene_tree_create(layers[LyrTile]);
/* Enabled later by a call to arrange() */
@@ -2322,12 +2414,17 @@ rendermon(struct wl_listener *listener, void *data)
* generally at the output's refresh rate (e.g. 60Hz). */
Monitor *m = wl_container_of(listener, m, frame);
struct timespec now;
+ Client *c;
if (!wlr_scene_output_needs_frame(m->scene_output)) {
return;
}
+ wl_list_for_each(c, &clients, link)
+ if (c->serial && !c->isfloating && client_is_rendered_on_mon(c, m) && !client_is_stopped(c))
+ goto skip;
wlr_scene_output_commit(m->scene_output, NULL);
+skip:
clock_gettime(CLOCK_MONOTONIC, &now);
wlr_scene_output_send_frame_done(m->scene_output, &now);
}
@@ -2365,7 +2462,6 @@ void
resize(Client *c, struct wlr_box geo, int interact)
{
struct wlr_box *bbox;
- struct wlr_box clip;
if (!c->mon || !client_surface(c)->mapped)
return;
@@ -2375,21 +2471,27 @@ resize(Client *c, struct wlr_box geo, int interact)
client_set_bounds(c, geo.width, geo.height);
c->geom = geo;
applybounds(c, bbox);
+ c->serial = client_set_size(c, c->geom.width - 2 * c->bw, c->geom.height - 2 * c->bw);
- /* Update scene-graph, including borders */
- wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y);
- wlr_scene_node_set_position(&c->scene_surface->node, c->bw, c->bw);
- wlr_scene_rect_set_size(c->border[0], c->geom.width, c->bw);
- wlr_scene_rect_set_size(c->border[1], c->geom.width, c->bw);
- wlr_scene_rect_set_size(c->border[2], c->bw, c->geom.height - 2 * c->bw);
- wlr_scene_rect_set_size(c->border[3], c->bw, c->geom.height - 2 * c->bw);
- wlr_scene_node_set_position(&c->border[1]->node, 0, c->geom.height - c->bw);
- wlr_scene_node_set_position(&c->border[2]->node, 0, c->bw);
- wlr_scene_node_set_position(&c->border[3]->node, c->geom.width - c->bw, c->bw);
+ if (interact) {
+ c->animating = 0;
+ c->anim_cur = c->geom;
+ animation_apply(c, c->geom);
+ return;
+ }
- client_set_size(c, c->geom.width - 2 * c->bw, c->geom.height - 2 * c->bw);
- client_get_clip(c, &clip);
- wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip);
+ if (!c->animating && c->anim_cur.width == 0) {
+ c->anim_cur.width = c->geom.width / 2;
+ c->anim_cur.height = c->geom.height / 2;
+ c->anim_cur.x = c->geom.x + (c->geom.width - c->anim_cur.width) / 2;
+ c->anim_cur.y = c->geom.y + (c->geom.height - c->anim_cur.height) / 2;
+ }
+
+ c->anim_from = c->anim_cur;
+ c->anim_to = c->geom;
+ c->anim_start = animation_now_ms();
+ c->animating = 1;
+ wl_event_source_timer_update(animation_timer, 1);
}
void
@@ -2615,6 +2717,7 @@ setup(void)
* clients from the Unix socket, managing Wayland globals, and so on. */
dpy = wl_display_create();
event_loop = wl_display_get_event_loop(dpy);
+ animation_timer = wl_event_loop_add_timer(event_loop, animation_tick, NULL);
/* The backend is a wlroots feature which abstracts the underlying input and
* output hardware. The autocreate option will choose the most suitable
@@ -2896,19 +2999,31 @@ tile(Monitor *m)
mw = m->nmaster ? (int)roundf(m->w.width * m->mfact) : 0;
else
mw = m->w.width;
+
i = my = ty = 0;
wl_list_for_each(c, &clients, link) {
+ struct wlr_box geo;
+
if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
continue;
+
if (i < m->nmaster) {
- resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw,
- .height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0);
- my += c->geom.height;
+ geo = (struct wlr_box){m->w.x, m->w.y + my, mw,
+ (m->w.height - my) / (MIN(n, m->nmaster) - i)};
+ my += geo.height;
} else {
- resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y + ty,
- .width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0);
- ty += c->geom.height;
+ geo = (struct wlr_box){m->w.x + mw, m->w.y + ty, m->w.width - mw,
+ (m->w.height - ty) / (n - i)};
+ ty += geo.height;
+ }
+
+ if (c->status == CliOpening) {
+ c->anim_cur = (struct wlr_box){geo.x + geo.width / 4, geo.y + geo.height / 4,
+ geo.width / 2, geo.height / 2};
+ c->anim_from = c->anim_cur;
+ c->status = CliNormal;
}
+ resize(c, geo, 0);
i++;
}
}
--
2.55.0
Reference in New Issue View Git Blame Copy Permalink