aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/swap.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/commands/swap.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/commands/swap.c')
-rw-r--r--sway/commands/swap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index a8beb162..0d8d1116 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -1,6 +1,5 @@
1#define _POSIX_C_SOURCE 200809L 1#define _POSIX_C_SOURCE 200809L
2#include <strings.h> 2#include <strings.h>
3#include <wlr/util/log.h>
4#include "config.h" 3#include "config.h"
5#include "log.h" 4#include "log.h"
6#include "sway/commands.h" 5#include "sway/commands.h"
@@ -96,7 +95,7 @@ static void container_swap(struct sway_container *con1,
96 return; 95 return;
97 } 96 }
98 97
99 wlr_log(WLR_DEBUG, "Swapping containers %zu and %zu", 98 sway_log(SWAY_DEBUG, "Swapping containers %zu and %zu",
100 con1->node.id, con2->node.id); 99 con1->node.id, con2->node.id);
101 100
102 bool fs1 = con1->is_fullscreen; 101 bool fs1 = con1->is_fullscreen;