diff options
author | M Stoeckl <code@mstoeckl.com> | 2019-01-20 13:51:12 -0500 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2019-01-21 12:59:42 +0100 |
commit | 1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch) | |
tree | 5c3f60e0219cb8b4a1b7cafb760a871661866e32 /swaybar/input.c | |
parent | Log libinput_config_status errors (diff) | |
download | sway-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 'swaybar/input.c')
-rw-r--r-- | swaybar/input.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/swaybar/input.c b/swaybar/input.c index 998b186f..e416f6e7 100644 --- a/swaybar/input.c +++ b/swaybar/input.c | |||
@@ -3,7 +3,6 @@ | |||
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #include <wayland-client.h> | 4 | #include <wayland-client.h> |
5 | #include <wayland-cursor.h> | 5 | #include <wayland-cursor.h> |
6 | #include <wlr/util/log.h> | ||
7 | #include "list.h" | 6 | #include "list.h" |
8 | #include "log.h" | 7 | #include "log.h" |
9 | #include "swaybar/bar.h" | 8 | #include "swaybar/bar.h" |
@@ -55,7 +54,7 @@ static uint32_t wl_axis_to_button(uint32_t axis, wl_fixed_t value) { | |||
55 | case WL_POINTER_AXIS_HORIZONTAL_SCROLL: | 54 | case WL_POINTER_AXIS_HORIZONTAL_SCROLL: |
56 | return negative ? SWAY_SCROLL_LEFT : SWAY_SCROLL_RIGHT; | 55 | return negative ? SWAY_SCROLL_LEFT : SWAY_SCROLL_RIGHT; |
57 | default: | 56 | default: |
58 | wlr_log(WLR_DEBUG, "Unexpected axis value on mouse scroll"); | 57 | sway_log(SWAY_DEBUG, "Unexpected axis value on mouse scroll"); |
59 | return 0; | 58 | return 0; |
60 | } | 59 | } |
61 | } | 60 | } |