mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-05-03 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use sway_log functions instead of wlr_log

Browse source
This commit is contained in:
Markus Ongyerth 2018-05-24 21:45:22 +02:00
parent 1185a8cc1f
commit c7c1cf31f7
79 changed files with 377 additions and 372 deletions
Download patch file Download diff file Expand all files Collapse all files

6
swaylock/seat.c
View file

@ -2,8 +2,8 @@
#include <stdlib.h>
#include <sys/mman.h>
#include <unistd.h>
#include <wlr/util/log.h>
#include <xkbcommon/xkbcommon.h>
#include "log.h"
#include "swaylock/swaylock.h"
#include "swaylock/seat.h"
@ -34,13 +34,13 @@ static void keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
struct swaylock_state *state = data;
if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
close(fd);
wlr_log(L_ERROR, "Unknown keymap format %d, aborting", format);
sway_log(L_ERROR, "Unknown keymap format %d, aborting", format);
exit(1);
}
char *map_shm = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
if (map_shm == MAP_FAILED) {
close(fd);
wlr_log(L_ERROR, "Unable to initialize keymap shm, aborting");
sway_log(L_ERROR, "Unable to initialize keymap shm, aborting");
exit(1);
}
struct xkb_keymap *keymap = xkb_keymap_new_from_string(