diff options
| author |  Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-07-10 20:41:02 +1000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-10 20:41:02 +1000 |
| commit | 56ad148403d77a6defcbd6cd383dd5cde1a44954 (patch) | |
| tree | 9dc36287be4bed02c4e98e600f26f48ceff5d8d6 /swaylock/seat.c | |
| parent | Fix titlebar rendering for nested stacked containers (diff) | |
| parent | Merge pull request #2228 from emersion/focus-mode-toggle (diff) | |
| download | sway-56ad148403d77a6defcbd6cd383dd5cde1a44954.tar.gz sway-56ad148403d77a6defcbd6cd383dd5cde1a44954.tar.zst sway-56ad148403d77a6defcbd6cd383dd5cde1a44954.zip | |
Merge branch 'master' into fix-stacked-layout
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( |