From 37927b8bfa78670b263311ae1f06d2aae973601d Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 29 Jul 2008 02:51:57 +0300 Subject: [PATCH] Revert "Xi: event_{x,y} should refer to the extended device (bug #16289)" After discussion with Peter, realised that diverging from 1.3 and 1.4's behaviour was daft and insane. Sorry. This reverts commit 8259d19f7155d82197ecc2aa16b316376c2dcb12. --- Xi/exevents.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Xi/exevents.c b/Xi/exevents.c index 0b312f504..641bead33 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -123,14 +123,9 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr other, int count) deviceValuator *xV = (deviceValuator *) xE; if (xE->u.u.type != DeviceValuator) { - /* Other types already have root{X,Y} filled in. */ - if (xE->u.u.type == DeviceKeyPress || - xE->u.u.type == DeviceKeyRelease) { - GetSpritePosition(&rootX, &rootY); - xE->u.keyButtonPointer.rootX = rootX; - xE->u.keyButtonPointer.rootY = rootY; - } - + GetSpritePosition(&rootX, &rootY); + xE->u.keyButtonPointer.rootX = rootX; + xE->u.keyButtonPointer.rootY = rootY; key = xE->u.u.detail; NoticeEventTime(xE); xE->u.keyButtonPointer.state = inputInfo.keyboard->key->state |