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 /sway/input/cursor.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 'sway/input/cursor.c')
-rw-r--r-- | sway/input/cursor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 35683f06..bf9bf2da 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -713,7 +713,7 @@ static uint32_t wl_axis_to_button(struct wlr_event_pointer_axis *event) { | |||
713 | case WLR_AXIS_ORIENTATION_HORIZONTAL: | 713 | case WLR_AXIS_ORIENTATION_HORIZONTAL: |
714 | return event->delta < 0 ? SWAY_SCROLL_LEFT : SWAY_SCROLL_RIGHT; | 714 | return event->delta < 0 ? SWAY_SCROLL_LEFT : SWAY_SCROLL_RIGHT; |
715 | default: | 715 | default: |
716 | wlr_log(WLR_DEBUG, "Unknown axis orientation"); | 716 | sway_log(SWAY_DEBUG, "Unknown axis orientation"); |
717 | return 0; | 717 | return 0; |
718 | } | 718 | } |
719 | } | 719 | } |
@@ -1004,7 +1004,7 @@ static void handle_request_set_cursor(struct wl_listener *listener, | |||
1004 | // TODO: check cursor mode | 1004 | // TODO: check cursor mode |
1005 | if (focused_client == NULL || | 1005 | if (focused_client == NULL || |
1006 | event->seat_client->client != focused_client) { | 1006 | event->seat_client->client != focused_client) { |
1007 | wlr_log(WLR_DEBUG, "denying request to set cursor from unfocused client"); | 1007 | sway_log(SWAY_DEBUG, "denying request to set cursor from unfocused client"); |
1008 | return; | 1008 | return; |
1009 | } | 1009 | } |
1010 | 1010 | ||