diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-05-05 16:14:26 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-01 16:36:24 +0100 |
| commit | a6603778643168e766e142b2e77040bdfac3d710 (patch) | |
| tree | d09915f4b2cc5c61313aebb40351937ff66d1017 /nx-X11/programs/Xserver/dix | |
| parent | bdcb5a188db8f472809ca25077145516daf582d5 (diff) | |
| download | nx-libs-a6603778643168e766e142b2e77040bdfac3d710.tar.gz nx-libs-a6603778643168e766e142b2e77040bdfac3d710.tar.bz2 nx-libs-a6603778643168e766e142b2e77040bdfac3d710.zip | |
NXevents.c: call upstream versions of (De)ActivatePointerGrab()
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/events.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c index 70224c3b8..fe18cba64 100644 --- a/nx-X11/programs/Xserver/dix/events.c +++ b/nx-X11/programs/Xserver/dix/events.c @@ -1216,10 +1216,14 @@ CheckGrabForSyncs(register DeviceIntPtr thisDev, Bool thisMode, Bool otherMode) ComputeFreezes(); } -#ifndef NXAGENT_SERVER void -ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab, +#ifdef NXAGENT_SERVER +xorg_ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab, + TimeStamp time, Bool autoGrab) +#else +ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab, TimeStamp time, Bool autoGrab) +#endif { WindowPtr oldWin = (mouse->grab) ? mouse->grab->window : sprite.win; @@ -1246,7 +1250,11 @@ ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab, } void +#ifdef NXAGENT_SERVER +xorg_DeactivatePointerGrab(register DeviceIntPtr mouse) +#else DeactivatePointerGrab(register DeviceIntPtr mouse) +#endif { register GrabPtr grab = mouse->grab; register DeviceIntPtr dev; @@ -1268,7 +1276,6 @@ DeactivatePointerGrab(register DeviceIntPtr mouse) FreeCursor(grab->cursor, (Cursor)0); ComputeFreezes(); } -#endif /* NXAGENT_SERVER */ void ActivateKeyboardGrab(register DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool passive) |