mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-12 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace wlr_log with sway_log

Browse source 
This commit mostly duplicates the wlr_log functions, although
with a sway_* prefix. (This is very similar to PR #2009.)
However, the logging function no longer needs to be replaceable,
so sway_log_init's second argument is used to set the exit
callback for sway_abort.

wlr_log_init is still invoked in sway/main.c

This commit makes it easier to remove the wlroots dependency for
the helper programs swaymsg, swaybg, swaybar, and swaynag.
This commit is contained in:
M Stoeckl 2019-01-20 13:51:12 -05:00 • committed by emersion
parent 5c834d36e1
commit 1211a81aad
108 changed files with 613 additions and 504 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sway/tree/container.c
View file

@ -28,7 +28,7 @@
struct sway_container *container_create(struct sway_view *view) {
struct sway_container *c = calloc(1, sizeof(struct sway_container));
if (!c) {
wlr_log(WLR_ERROR, "Unable to allocate sway_container");
sway_log(SWAY_ERROR, "Unable to allocate sway_container");
return NULL;
}
node_init(&c->node, N_CONTAINER, c);
@ -983,7 +983,7 @@ void container_discover_outputs(struct sway_container *con) {
if (intersects && index == -1) {
// Send enter
wlr_log(WLR_DEBUG, "Container %p entered output %p", con, output);
sway_log(SWAY_DEBUG, "Container %p entered output %p", con, output);
if (con->view) {
view_for_each_surface(con->view,
surface_send_enter_iterator, output->wlr_output);
@ -991,7 +991,7 @@ void container_discover_outputs(struct sway_container *con) {
list_add(con->outputs, output);
} else if (!intersects && index != -1) {
// Send leave
wlr_log(WLR_DEBUG, "Container %p left output %p", con, output);
sway_log(SWAY_DEBUG, "Container %p left output %p", con, output);
if (con->view) {
view_for_each_surface(con->view,
surface_send_leave_iterator, output->wlr_output);