aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xnest/Init.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xnest/Init.c')
-rw-r--r--xorg-server/hw/xnest/Init.c25
1 files changed, 16 insertions, 9 deletions
diff --git a/xorg-server/hw/xnest/Init.c b/xorg-server/hw/xnest/Init.c
index f80bbd121..0765f73d0 100644
--- a/xorg-server/hw/xnest/Init.c
+++ b/xorg-server/hw/xnest/Init.c
@@ -89,13 +89,18 @@ InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
void
InitInput(int argc, char *argv[])
{
- xnestPointerDevice = AddInputDevice(serverClient, xnestPointerProc, TRUE);
- xnestKeyboardDevice = AddInputDevice(serverClient, xnestKeyboardProc, TRUE);
+ int rc;
+ rc = AllocDevicePair(serverClient, "Xnest",
+ &xnestPointerDevice,
+ &xnestKeyboardDevice,
+ xnestPointerProc,
+ xnestKeyboardProc,
+ FALSE);
- GetEventList(&xnestEvents);
+ if (rc != Success)
+ FatalError("Failed to init Xnest default devices.\n");
- RegisterPointerDevice(xnestPointerDevice);
- RegisterKeyboardDevice(xnestKeyboardDevice);
+ GetEventList(&xnestEvents);
mieqInit();
@@ -107,14 +112,14 @@ InitInput(int argc, char *argv[])
/*
* DDX - specific abort routine. Called by AbortServer().
*/
-void AbortDDX()
+void AbortDDX(void)
{
xnestDoFullGeneration = True;
xnestCloseDisplay();
}
/* Called by GiveUp(). */
-void ddxGiveUp()
+void ddxGiveUp(void)
{
AbortDDX();
}
@@ -126,17 +131,19 @@ DarwinHandleGUI(int argc, char *argv[])
}
#endif
-void OsVendorInit()
+void OsVendorInit(void)
{
return;
}
-void OsVendorFatalError()
+void OsVendorFatalError(void)
{
return;
}
+#if defined(DDXBEFORERESET)
void ddxBeforeReset(void)
{
return;
}
+#endif