aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/scratchpad.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/scratchpad.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/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) {
23 // Check if the currently focused window is a scratchpad window and should 23 // Check if the currently focused window is a scratchpad window and should
24 // be hidden again. 24 // be hidden again.
25 if (focus && focus->scratchpad) { 25 if (focus && focus->scratchpad) {
26 wlr_log(WLR_DEBUG, "Focus is a scratchpad window - hiding %s", 26 sway_log(SWAY_DEBUG, "Focus is a scratchpad window - hiding %s",
27 focus->title); 27 focus->title);
28 root_scratchpad_hide(focus); 28 root_scratchpad_hide(focus);
29 return; 29 return;
@@ -34,7 +34,7 @@ static void scratchpad_toggle_auto(void) {
34 for (int i = 0; i < ws->floating->length; ++i) { 34 for (int i = 0; i < ws->floating->length; ++i) {
35 struct sway_container *floater = ws->floating->items[i]; 35 struct sway_container *floater = ws->floating->items[i];
36 if (floater->scratchpad && focus != floater) { 36 if (floater->scratchpad && focus != floater) {
37 wlr_log(WLR_DEBUG, 37 sway_log(SWAY_DEBUG,
38 "Focusing other scratchpad window (%s) in this workspace", 38 "Focusing other scratchpad window (%s) in this workspace",
39 floater->title); 39 floater->title);
40 root_scratchpad_show(floater); 40 root_scratchpad_show(floater);
@@ -47,7 +47,7 @@ static void scratchpad_toggle_auto(void) {
47 for (int i = 0; i < root->scratchpad->length; ++i) { 47 for (int i = 0; i < root->scratchpad->length; ++i) {
48 struct sway_container *con = root->scratchpad->items[i]; 48 struct sway_container *con = root->scratchpad->items[i];
49 if (con->parent) { 49 if (con->parent) {
50 wlr_log(WLR_DEBUG, 50 sway_log(SWAY_DEBUG,
51 "Moving a visible scratchpad window (%s) to this workspace", 51 "Moving a visible scratchpad window (%s) to this workspace",
52 con->title); 52 con->title);
53 root_scratchpad_show(con); 53 root_scratchpad_show(con);
@@ -60,7 +60,7 @@ static void scratchpad_toggle_auto(void) {
60 return; 60 return;
61 } 61 }
62 struct sway_container *con = root->scratchpad->items[0]; 62 struct sway_container *con = root->scratchpad->items[0];
63 wlr_log(WLR_DEBUG, "Showing %s from list", con->title); 63 sway_log(SWAY_DEBUG, "Showing %s from list", con->title);
64 root_scratchpad_show(con); 64 root_scratchpad_show(con);
65} 65}
66 66