Module Name: xsrc
Committed By: tsutsui
Date: Sat Jul 18 04:37:50 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k: x68kInit.c
Log Message:
Use AllocDevicePair() to initialize input devices in InitInput().
This should have been done on the initial X11R7'fied imoprt as
upstream xnest did:
https://cgit.freedesktop.org/xorg/xserver/commit?id=32ce5c83a504d2cafd2b19ed628b40032ef347b3
Tested and no visible regression on XM6i.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c:1.2 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c:1.3
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c:1.2 Fri Apr 10 16:49:36 2020
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c Sat Jul 18 04:37:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.3 2020/07/18 04:37:50 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -128,8 +128,14 @@ InitOutput(ScreenInfo *pScreenInfo, int
void
InitInput(int argc, char *argv[])
{
- x68kPointerDevice = AddInputDevice(serverClient, x68kMouseProc, TRUE);
- x68kKeyboardDevice = AddInputDevice(serverClient, x68kKbdProc, TRUE);
+ int rc;
+
+ rc = AllocDevicePair(serverClient, "x68k",
+ &x68kPointerDevice, &x68kKeyboardDevice,
+ x68kMouseProc,x68kKbdProc, FALSE);
+ if (rc != Success)
+ FatalError("Failed to init x68k default input devices.\n");
+
GetEventList(&x68kEvents);
if ( !mieqInit() )
