huntedbytheirs/peachwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: move applyrules() before effect creation in mapnotify, guard border_bg null derefs

Browse Source
This commit is contained in:
huntedbytheirs
2026-07-03 03:48:57 -04:00
parent f32e74de8c
commit f923ca83fd
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/peachwm.c
+9 -8
View File
@@ -2219,6 +2219,8 @@ static void mapnotify(struct wl_listener *listener, void *data) {
goto unset_fullscreen; goto unset_fullscreen;
} }
applyrules(c);
/* Create single border background rect */ /* Create single border background rect */
if (c->rule_effects.border) { if (c->rule_effects.border) {
c->border_bg = wlr_scene_rect_create(c->scene, 0, 0, c->border_bg = wlr_scene_rect_create(c->scene, 0, 0,
@@ -2250,6 +2252,7 @@ static void mapnotify(struct wl_listener *listener, void *data) {
- cfg.effects.windows.shadows.shadow_expand, - cfg.effects.windows.shadows.shadow_expand,
cfg.effects.windows.shadows.shadow_offset_y cfg.effects.windows.shadows.shadow_offset_y
- cfg.effects.windows.shadows.shadow_expand); - cfg.effects.windows.shadows.shadow_expand);
if (c->border_bg)
wlr_scene_node_place_below(&c->shadow->node, &c->border_bg->node); wlr_scene_node_place_below(&c->shadow->node, &c->border_bg->node);
} }
} }
@@ -2286,6 +2289,8 @@ static void mapnotify(struct wl_listener *listener, void *data) {
} }
} }
if (c->isfullscreen)
setfullscreen(c, 1);
if (c->border_bg) if (c->border_bg)
wlr_scene_node_raise_to_top(&c->border_bg->node); wlr_scene_node_raise_to_top(&c->border_bg->node);
@@ -2301,17 +2306,12 @@ static void mapnotify(struct wl_listener *listener, void *data) {
client_arr_add(c); client_arr_add(c);
fstack_arr_add(c); fstack_arr_add(c);
/* Set initial monitor, tags, floating status, and focus: /* Override monitor/tags for parented clients (dialogs, popups):
* we always consider floating, clients that have parent and thus * they inherit the parent's monitor and tags; applyrules(c) already
* we set the same tags and monitor as its parent. * ran above for rule_effects (border, shadow, blur, corner_radius). */
* If there is no parent, apply rules */
if ((p = client_get_parent(c))) { if ((p = client_get_parent(c))) {
c->isfloating = 1; c->isfloating = 1;
setmon(c, p->mon, p->tags); setmon(c, p->mon, p->tags);
} else {
applyrules(c);
if (c->isfullscreen)
setfullscreen(c, 1);
} }
/* Auto-send to scratchpad if scratchpad is visible */ /* Auto-send to scratchpad if scratchpad is visible */
if (c->mon && c->mon->scratchpad_visible && !c->isscratchpad && if (c->mon && c->mon->scratchpad_visible && !c->isscratchpad &&
@@ -3338,6 +3338,7 @@ reapply_client_appearance(void)
- cfg.effects.windows.shadows.shadow_expand, - cfg.effects.windows.shadows.shadow_expand,
cfg.effects.windows.shadows.shadow_offset_y cfg.effects.windows.shadows.shadow_offset_y
- cfg.effects.windows.shadows.shadow_expand); - cfg.effects.windows.shadows.shadow_expand);
if (c->border_bg)
wlr_scene_node_place_below(&c->shadow->node, wlr_scene_node_place_below(&c->shadow->node,
&c->border_bg->node); &c->border_bg->node);
} }