From fdfb57d342da0ace14eed635804ebc31441240c5 Mon Sep 17 00:00:00 2001 From: Thomas Jaeger Date: Tue, 1 Apr 2008 15:27:06 +0300 Subject: XKB: Fix processInputProc wrapping If input processing is frozen, only wrap realInputProc: don't smash processInputProc as well. When input processing is thawed, pIP will be rewrapped correctly. This supersedes the previous workaround in 50e80c9. Signed-off-by: Daniel Stone (cherry picked from commit 37b1258f0a288a79ce6a3eef3559e17a67c4dd96) --- xkb/xkbActions.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'xkb') diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 6edac292e..59d34c5fd 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -50,15 +50,14 @@ xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, pointer data) { xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(device); - ProcessInputProc tmp = device->public.processInputProc; - ProcessInputProc dummy; /* unused, but neede for macro */ + ProcessInputProc backupproc; if(xkbPrivPtr->unwrapProc) xkbPrivPtr->unwrapProc = NULL; - UNWRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, dummy); + UNWRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, backupproc); proc(device,data); - WRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, - tmp,xkbUnwrapProc); + COND_WRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, + backupproc,xkbUnwrapProc); } -- cgit v1.2.3