[PATCH 5/7] dix: warn about keyboard events with valuator masks

Peter Hutterer peter.hutterer at who-t.net
Thu Sep 1 03:41:28 PDT 2011


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 at who-t.net>
---
 dix/getevents.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index 33847d0..a0a26ce 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -987,6 +987,11 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
        (key_code < 8 || key_code > 255))
         return 0;
 
+    if (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);
-- 
1.7.6



More information about the xorg-devel mailing list