projects
/
profile
/
ivi
/
weston-ivi-shell.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5ea0480
)
westoy: Fix the version number we request for wl_seat
author
Jasper St. Pierre
<jstpierre@mecheye.net>
Tue, 12 Nov 2013 19:37:20 +0000
(14:37 -0500)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Tue, 12 Nov 2013 19:42:43 +0000
(11:42 -0800)
If the compositor supports a lower version, like version 2, we need
to request that instead of version 3.
clients/window.c
patch
|
blob
|
history
diff --git
a/clients/window.c
b/clients/window.c
index
dd6a213
..
b703656
100644
(file)
--- a/
clients/window.c
+++ b/
clients/window.c
@@
-4748,7
+4748,7
@@
fini_xkb(struct input *input)
xkb_map_unref(input->xkb.keymap);
}
-#define M
AX(a,b) ((a) >
(b) ? a : b)
+#define M
IN(a,b) ((a) <
(b) ? a : b)
static void
display_add_input(struct display *d, uint32_t id)
@@
-4758,7
+4758,7
@@
display_add_input(struct display *d, uint32_t id)
input = xzalloc(sizeof *input);
input->display = d;
input->seat = wl_registry_bind(d->registry, id, &wl_seat_interface,
- M
AX
(d->seat_version, 3));
+ M
IN
(d->seat_version, 3));
input->touch_focus = NULL;
input->pointer_focus = NULL;
input->keyboard_focus = NULL;