Revert "Save processInputProc before wrapping it and restore it later, instead of"

Mixed up source trees, this was a very bad fix.

This reverts commit 8431f60830.
This commit is contained in:
Peter Hutterer 2007-06-21 18:16:21 +09:30
parent 8431f60830
commit f6f3322fc7

View File

@ -1300,8 +1300,7 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
UNWRAP_PROCESS_INPUT_PROC(dev,xkbPrivPtr); UNWRAP_PROCESS_INPUT_PROC(dev,xkbPrivPtr);
dev->public.processInputProc(xE,dev,count); dev->public.processInputProc(xE,dev,count);
COND_WRAP_PROCESS_INPUT_PROC(dev, xkbPrivPtr, COND_WRAP_PROCESS_INPUT_PROC(dev, xkbPrivPtr,
(dev == inputInfo.keyboard) ? ProcessKeyboardEvent : ProcessOtherEvent, ProcessKeyboardEvent,xkbUnwrapProc);
xkbUnwrapProc);
keyc->modifierMap[key] = realMods; keyc->modifierMap[key] = realMods;
} }
else CoreProcessPointerEvent(xE,dev,count); else CoreProcessPointerEvent(xE,dev,count);