diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-08-31 14:15:02 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-10-04 13:00:23 +1000 |
| commit | 535b3789be3a7b43b5d9026e2b5150521d91e32b (patch) | |
| tree | 12d48ee9d92a3f7c8e727619e99494a599f267c8 | |
| parent | 9537afb13f2750d22350b7441570332ae60e4860 (diff) | |
dix: warn about keyboard events with valuator masks
We don't actually handle the mask correctly. They're clipped and dropped
into the event but that's about it. I don't think we did since 1.4, let's
warn the user if this happens.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | dix/getevents.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index b81562a86..ebf265377 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -919,6 +919,11 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type, (key_code < 8 || key_code > 255)) return 0; + if (mask_in && valuator_mask_size(mask_in) > 1) { + ErrorF("[dix] the server does not handle valuator masks with " + "keyboard events. This is a bug. You may fix it.\n"); + } + num_events = 1; events = UpdateFromMaster(events, pDev, DEVCHANGE_KEYBOARD_EVENT, &num_events); |