diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-07-09 16:23:03 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-09 16:23:03 -0700 |
commit | fbeef1322f5d10c1e2dac0d7de2358a59f442455 (patch) | |
tree | 76624b3d4820551261e5c15f773c403c1a41264e /swaylock/seat.c | |
parent | Merge pull request #2223 from RyanDwyer/floating-move (diff) | |
parent | Update for swaywm/wlroots#1126 (diff) | |
download | sway-fbeef1322f5d10c1e2dac0d7de2358a59f442455.tar.gz sway-fbeef1322f5d10c1e2dac0d7de2358a59f442455.tar.zst sway-fbeef1322f5d10c1e2dac0d7de2358a59f442455.zip |
Merge pull request #2234 from emersion/wlr-log-prefix
Update for swaywm/wlroots#1126
Diffstat (limited to 'swaylock/seat.c')
-rw-r--r-- | swaylock/seat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swaylock/seat.c b/swaylock/seat.c index 6c66d220..c2630d87 100644 --- a/swaylock/seat.c +++ b/swaylock/seat.c | |||
@@ -12,13 +12,13 @@ static void keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard, | |||
12 | struct swaylock_state *state = data; | 12 | struct swaylock_state *state = data; |
13 | if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) { | 13 | if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) { |
14 | close(fd); | 14 | close(fd); |
15 | wlr_log(L_ERROR, "Unknown keymap format %d, aborting", format); | 15 | wlr_log(WLR_ERROR, "Unknown keymap format %d, aborting", format); |
16 | exit(1); | 16 | exit(1); |
17 | } | 17 | } |
18 | char *map_shm = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0); | 18 | char *map_shm = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0); |
19 | if (map_shm == MAP_FAILED) { | 19 | if (map_shm == MAP_FAILED) { |
20 | close(fd); | 20 | close(fd); |
21 | wlr_log(L_ERROR, "Unable to initialize keymap shm, aborting"); | 21 | wlr_log(WLR_ERROR, "Unable to initialize keymap shm, aborting"); |
22 | exit(1); | 22 | exit(1); |
23 | } | 23 | } |
24 | struct xkb_keymap *keymap = xkb_keymap_new_from_string( | 24 | struct xkb_keymap *keymap = xkb_keymap_new_from_string( |