diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
| commit | 975511c875674f097bbd2be33fa947a48d8c77c6 (patch) | |
| tree | 207bba2c48054f551f19ed5aa89b9dd9616b8c60 /nx-X11/programs/Xserver/dix/events.c | |
| parent | 9df153668423af868d0df739188a772fbc3356c6 (diff) | |
| parent | a5befd4e20813910022ed771cb599f15bbf4664d (diff) | |
| download | nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.gz nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.bz2 nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.zip | |
Merge branch 'sunweaver-pr/hw-nxagent-drop-duplicate-Xserver-code_disable-Xserver-code-and-include-in-nxagent' into arctica-3.6.x
Attributes GH PR #120: https://github.com/ArcticaProject/nx-libs/pull/120
Diffstat (limited to 'nx-X11/programs/Xserver/dix/events.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/events.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c index 0fda4b294..31b76e38f 100644 --- a/nx-X11/programs/Xserver/dix/events.c +++ b/nx-X11/programs/Xserver/dix/events.c @@ -1218,6 +1218,7 @@ CheckGrabForSyncs(register DeviceIntPtr thisDev, Bool thisMode, Bool otherMode) ComputeFreezes(); } +#ifndef NXAGENT_SERVER void ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab, TimeStamp time, Bool autoGrab) @@ -1269,6 +1270,7 @@ DeactivatePointerGrab(register DeviceIntPtr mouse) FreeCursor(grab->cursor, (Cursor)0); ComputeFreezes(); } +#endif /* NXAGENT_SERVER */ void ActivateKeyboardGrab(register DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool passive) @@ -1914,6 +1916,7 @@ PointInBorderSize(WindowPtr pWin, int x, int y) return FALSE; } +#ifndef NXAGENT_SERVER static WindowPtr XYToWindow(int x, int y) { @@ -1961,6 +1964,7 @@ XYToWindow(int x, int y) } return spriteTrace[spriteTraceGood-1]; } +#endif /* NXAGENT_SERVER */ static Bool CheckMotion(xEvent *xE) @@ -2072,6 +2076,7 @@ void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff) } #endif +#ifndef NXAGENT_SERVER void DefineInitialRootWindow(register WindowPtr win) { @@ -2113,6 +2118,7 @@ DefineInitialRootWindow(register WindowPtr win) } #endif } +#endif /* NXAGENT_SERVER */ /* * This does not take any shortcuts, and even ignores its argument, since @@ -3140,6 +3146,7 @@ EnterLeaveEvent( } if (mask & filters[type]) { + memset(&event, 0, sizeof(xEvent)); event.u.u.type = type; event.u.u.detail = detail; event.u.enterLeave.time = currentTime.milliseconds; @@ -3966,6 +3973,7 @@ CloseDownEvents(void) spriteTraceSize = 0; } +#ifndef NXAGENT_SERVER int ProcSendEvent(ClientPtr client) { @@ -4053,6 +4061,7 @@ ProcSendEvent(ClientPtr client) NullGrab, 0); return Success; } +#endif /* NXAGENT_SERVER */ int ProcUngrabKey(ClientPtr client) |