aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/container.c
diff options
context:
space:
mode:
authorLibravatar M Stoeckl <code@mstoeckl.com>2019-01-20 13:51:12 -0500
committerLibravatar emersion <contact@emersion.fr>2019-01-21 12:59:42 +0100
commit1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch)
tree5c3f60e0219cb8b4a1b7cafb760a871661866e32 /sway/tree/container.c
parentLog libinput_config_status errors (diff)
downloadsway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.gz
sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.zst
sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.zip
Replace wlr_log with sway_log
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.
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r--sway/tree/container.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index d9c721f5..97a52d91 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -28,7 +28,7 @@
28struct sway_container *container_create(struct sway_view *view) { 28struct sway_container *container_create(struct sway_view *view) {
29 struct sway_container *c = calloc(1, sizeof(struct sway_container)); 29 struct sway_container *c = calloc(1, sizeof(struct sway_container));
30 if (!c) { 30 if (!c) {
31 wlr_log(WLR_ERROR, "Unable to allocate sway_container"); 31 sway_log(SWAY_ERROR, "Unable to allocate sway_container");
32 return NULL; 32 return NULL;
33 } 33 }
34 node_init(&c->node, N_CONTAINER, c); 34 node_init(&c->node, N_CONTAINER, c);
@@ -983,7 +983,7 @@ void container_discover_outputs(struct sway_container *con) {
983 983
984 if (intersects && index == -1) { 984 if (intersects && index == -1) {
985 // Send enter 985 // Send enter
986 wlr_log(WLR_DEBUG, "Container %p entered output %p", con, output); 986 sway_log(SWAY_DEBUG, "Container %p entered output %p", con, output);
987 if (con->view) { 987 if (con->view) {
988 view_for_each_surface(con->view, 988 view_for_each_surface(con->view,
989 surface_send_enter_iterator, output->wlr_output); 989 surface_send_enter_iterator, output->wlr_output);
@@ -991,7 +991,7 @@ void container_discover_outputs(struct sway_container *con) {
991 list_add(con->outputs, output); 991 list_add(con->outputs, output);
992 } else if (!intersects && index != -1) { 992 } else if (!intersects && index != -1) {
993 // Send leave 993 // Send leave
994 wlr_log(WLR_DEBUG, "Container %p left output %p", con, output); 994 sway_log(SWAY_DEBUG, "Container %p left output %p", con, output);
995 if (con->view) { 995 if (con->view) {
996 view_for_each_surface(con->view, 996 view_for_each_surface(con->view,
997 surface_send_leave_iterator, output->wlr_output); 997 surface_send_leave_iterator, output->wlr_output);