diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-18 13:02:34 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-25 00:53:09 +0200 |
| commit | add881931f2e702fb1952f4e1baba04b3dc536ee (patch) | |
| tree | 1305a5c49ae2dadb9d7211999163f9489d71ba99 /nx-X11/programs/Xserver/dix | |
| parent | 0571ece6a4ea66b4d558b3f6d0dc1d81b47c799b (diff) | |
| download | nx-libs-add881931f2e702fb1952f4e1baba04b3dc536ee.tar.gz nx-libs-add881931f2e702fb1952f4e1baba04b3dc536ee.tar.bz2 nx-libs-add881931f2e702fb1952f4e1baba04b3dc536ee.zip | |
hw/nxagent/NXevents.c: Shrink file, drop duplicate code that can identically be found in dix/events.c.
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/Imakefile | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/events.c | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile index da2f35eb1..3e71898b6 100644 --- a/nx-X11/programs/Xserver/dix/Imakefile +++ b/nx-X11/programs/Xserver/dix/Imakefile @@ -15,12 +15,14 @@ FFS_OBJ = ffs.o #if (!(defined(NXAgentServer) && NXAgentServer)) NXAGENT_SKIP_SRCS = \ + events.c \ extension.c \ glyphcurs.c \ resource.c \ window.c \ $(NULL) NXAGENT_SKIP_OBJS = \ + events.o \ extension.o \ glyphcurs.o \ resource.o \ @@ -36,7 +38,6 @@ SRCS = \ devices.c \ dispatch.c \ dixutils.c \ - events.c \ gc.c \ globals.c \ grabs.c \ @@ -61,7 +62,6 @@ OBJS = \ devices.o \ dispatch.o \ dixutils.o \ - events.o \ gc.o \ globals.o \ grabs.o \ 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) |