diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/xnest/Init.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xnest/Init.c')
| -rw-r--r-- | xorg-server/hw/xnest/Init.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/xorg-server/hw/xnest/Init.c b/xorg-server/hw/xnest/Init.c index 7b344e25f..f80bbd121 100644 --- a/xorg-server/hw/xnest/Init.c +++ b/xorg-server/hw/xnest/Init.c @@ -45,7 +45,7 @@ is" without express or implied warranty. Bool xnestDoFullGeneration = True; -xEvent *xnestEvents = NULL; +EventList *xnestEvents = NULL; void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[]) @@ -89,13 +89,10 @@ InitOutput(ScreenInfo *screenInfo, int argc, char *argv[]) void InitInput(int argc, char *argv[]) { - xnestPointerDevice = AddInputDevice(xnestPointerProc, TRUE); - xnestKeyboardDevice = AddInputDevice(xnestKeyboardProc, TRUE); + xnestPointerDevice = AddInputDevice(serverClient, xnestPointerProc, TRUE); + xnestKeyboardDevice = AddInputDevice(serverClient, xnestKeyboardProc, TRUE); - if (!xnestEvents) - xnestEvents = (xEvent *) xcalloc(sizeof(xEvent), GetMaximumEventsNum()); - if (!xnestEvents) - FatalError("couldn't allocate room for events\n"); + GetEventList(&xnestEvents); RegisterPointerDevice(xnestPointerDevice); RegisterKeyboardDevice(xnestKeyboardDevice); @@ -143,8 +140,3 @@ void ddxBeforeReset(void) { return; } - -/* this is just to get the server to link on AIX */ -#ifdef AIXV3 -int SelectWaitTime = 10000; /* usec */ -#endif |