summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin J. Pohly <djpohly@gmail.com>2023-07-03 17:48:45 -0500
committerLeonardo Hernández <leohdz172@proton.me>2023-07-03 21:21:43 -0600
commita01e402c5dc2e9fe6af58e4921a1c28179e253b7 (patch)
treeb634f0b90d8426c1cf6a0840c95b2245cc1d13a3
parent9dd3f230c0eacc19f7c9ccfc7b97737403d3e8fc (diff)
Line saver: follow "local = wlr->data = obj" pattern
There were still a couple of places where we could use this handy multiple assignment to save a line. ΔSLOC = -3
-rw-r--r--dwl.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/dwl.c b/dwl.c
index 740e543..0c08bfd 100644
--- a/dwl.c
+++ b/dwl.c
@@ -847,7 +847,7 @@ createlayersurface(struct wl_listener *listener, void *data)
return;
}
- layersurface = ecalloc(1, sizeof(LayerSurface));
+ layersurface = wlr_layer_surface->data = ecalloc(1, sizeof(LayerSurface));
layersurface->type = LayerShell;
LISTEN(&wlr_layer_surface->surface->events.commit,
&layersurface->surface_commit, commitlayersurfacenotify);
@@ -860,8 +860,6 @@ createlayersurface(struct wl_listener *listener, void *data)
layersurface->layer_surface = wlr_layer_surface;
layersurface->mon = wlr_layer_surface->output->data;
- wlr_layer_surface->data = layersurface;
-
layersurface->scene_layer = wlr_scene_layer_surface_v1_create(l, wlr_layer_surface);
layersurface->scene = layersurface->scene_layer->tree;
layersurface->popups = wlr_layer_surface->surface->data = wlr_scene_tree_create(l);
@@ -1497,13 +1495,12 @@ locksession(struct wl_listener *listener, void *data)
wlr_session_lock_v1_destroy(session_lock);
return;
}
- lock = ecalloc(1, sizeof(*lock));
+ lock = session_lock->data = ecalloc(1, sizeof(*lock));
focusclient(NULL, 0);
lock->scene = wlr_scene_tree_create(layers[LyrBlock]);
cur_lock = lock->lock = session_lock;
locked = 1;
- session_lock->data = lock;
LISTEN(&session_lock->events.new_surface, &lock->new_surface, createlocksurface);
LISTEN(&session_lock->events.destroy, &lock->destroy, destroysessionlock);
@@ -1529,12 +1526,11 @@ mapnotify(struct wl_listener *listener, void *data)
int i;
/* Create scene tree for this client and its border */
- c->scene = wlr_scene_tree_create(layers[LyrTile]);
+ c->scene = client_surface(c)->data = wlr_scene_tree_create(layers[LyrTile]);
wlr_scene_node_set_enabled(&c->scene->node, c->type != XDGShell);
c->scene_surface = c->type == XDGShell
? wlr_scene_xdg_surface_create(c->scene, c->surface.xdg)
: wlr_scene_subsurface_tree_create(c->scene, client_surface(c));
- client_surface(c)->data = c->scene;
c->scene->node.data = c->scene_surface->node.data = c;
/* Handle unmanaged clients first so we can return prior create borders */
@@ -2393,7 +2389,7 @@ startdrag(struct wl_listener *listener, void *data)
if (!drag->icon)
return;
- drag->icon->data = icon = wlr_scene_drag_icon_create(&scene->tree, drag->icon);
+ icon = drag->icon->data = wlr_scene_drag_icon_create(&scene->tree, drag->icon);
wlr_scene_node_place_below(&icon->node, &layers[LyrBlock]->node);
motionnotify(0);
wl_signal_add(&drag->icon->events.destroy, &drag_icon_destroy);