From 535b3789be3a7b43b5d9026e2b5150521d91e32b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 31 Aug 2011 14:15:02 +1000 Subject: [PATCH] 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 Reviewed-by: Daniel Stone --- dix/getevents.c | 5 +++++ 1 file changed, 5 insertions(+) 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);