summaryrefslogtreecommitdiff
path: root/sway/commands/scratchpad.c
diff options
context:
space:
mode:
authorM Stoeckl <[email protected]>2019-01-20 13:51:12 -0500
committeremersion <[email protected]>2019-01-21 12:59:42 +0100
commit1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch)
tree5c3f60e0219cb8b4a1b7cafb760a871661866e32 /sway/commands/scratchpad.c
parent5c834d36e14aaeca4ac1d22b869254d5722af4af (diff)
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/scratchpad.c')
-rw-r--r--sway/commands/scratchpad.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c
index 1162d51f..805dbc0b 100644
--- a/sway/commands/scratchpad.c
+++ b/sway/commands/scratchpad.c
@@ -23,7 +23,7 @@ static void scratchpad_toggle_auto(void) {
// Check if the currently focused window is a scratchpad window and should
// be hidden again.
if (focus && focus->scratchpad) {
- wlr_log(WLR_DEBUG, "Focus is a scratchpad window - hiding %s",
+ sway_log(SWAY_DEBUG, "Focus is a scratchpad window - hiding %s",
focus->title);
root_scratchpad_hide(focus);
return;
@@ -34,7 +34,7 @@ static void scratchpad_toggle_auto(void) {
for (int i = 0; i < ws->floating->length; ++i) {
struct sway_container *floater = ws->floating->items[i];
if (floater->scratchpad && focus != floater) {
- wlr_log(WLR_DEBUG,
+ sway_log(SWAY_DEBUG,
"Focusing other scratchpad window (%s) in this workspace",
floater->title);
root_scratchpad_show(floater);
@@ -47,7 +47,7 @@ static void scratchpad_toggle_auto(void) {
for (int i = 0; i < root->scratchpad->length; ++i) {
struct sway_container *con = root->scratchpad->items[i];
if (con->parent) {
- wlr_log(WLR_DEBUG,
+ sway_log(SWAY_DEBUG,
"Moving a visible scratchpad window (%s) to this workspace",
con->title);
root_scratchpad_show(con);
@@ -60,7 +60,7 @@ static void scratchpad_toggle_auto(void) {
return;
}
struct sway_container *con = root->scratchpad->items[0];
- wlr_log(WLR_DEBUG, "Showing %s from list", con->title);
+ sway_log(SWAY_DEBUG, "Showing %s from list", con->title);
root_scratchpad_show(con);
}