projects
/
platform
/
upstream
/
weston.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da50a2a
)
clients/window: bump wl_seat version to 7
author
Sebastian Wick
<sebastian@sebastianwick.net>
Fri, 1 Nov 2019 01:27:55 +0000
(
02:27
+0100)
committer
Sebastian Wick
<sebastian@sebastianwick.net>
Mon, 4 Nov 2019 14:10:05 +0000
(15:10 +0100)
Since version 7 clients must use MAP_PRIVATE to map the keymap fd.
Signed-off-by: Sebastian Wick <sebastian@sebastianwick.net>
clients/window.c
patch
|
blob
|
history
diff --git
a/clients/window.c
b/clients/window.c
index 1baab32e85b33f6ee1354aae08d7607f1f4ba4d4..1c5a81f1ee1f500182407159a1440d16ac0f0d3a 100644
(file)
--- a/
clients/window.c
+++ b/
clients/window.c
@@
-2956,7
+2956,7
@@
keyboard_handle_keymap(void *data, struct wl_keyboard *keyboard,
return;
}
- map_str = mmap(NULL, size, PROT_READ, MAP_
SHARED
, fd, 0);
+ map_str = mmap(NULL, size, PROT_READ, MAP_
PRIVATE
, fd, 0);
if (map_str == MAP_FAILED) {
close(fd);
return;
@@
-5807,7
+5807,7
@@
static void
display_add_input(struct display *d, uint32_t id, int display_seat_version)
{
struct input *input;
- int seat_version = MIN(display_seat_version,
6
);
+ int seat_version = MIN(display_seat_version,
7
);
input = xzalloc(sizeof *input);
input->display = d;