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 8259d19f71.
This commit is contained in:
Daniel Stone 2008-07-29 02:51:57 +03:00
parent c0c73e9236
commit 37927b8bfa

View File

@ -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 |