frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: Enable core devices in InitCoreDevices already. 

Updated patch, see
http://lists.freedesktop.org/archives/xorg/2008-November/040540.html

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Peter Hutterer 2008-11-21 15:13:00 +10:00 committed by Peter Hutterer
parent 2b45602e82
commit ec1d08442f
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dix/devices.c
View File

@ -595,8 +595,6 @@ CorePointerProc(DeviceIntPtr pDev, int what)
* Both devices are not tied to physical devices, but guarantee that there is * Both devices are not tied to physical devices, but guarantee that there is
* always a keyboard and a pointer present and keep the protocol semantics. * always a keyboard and a pointer present and keep the protocol semantics.
* *
* The devices are activated but not enabled.
*
* Note that the server MUST have two core devices at all times, even if there * Note that the server MUST have two core devices at all times, even if there
* is no physical device connected. * is no physical device connected.
*/ */
@ -607,6 +605,12 @@ InitCoreDevices(void)
&inputInfo.pointer, &inputInfo.pointer,
&inputInfo.keyboard) != Success) &inputInfo.keyboard) != Success)
FatalError("Failed to allocate core devices"); FatalError("Failed to allocate core devices");
ActivateDevice(inputInfo.pointer);
ActivateDevice(inputInfo.keyboard);
EnableDevice(inputInfo.pointer);
EnableDevice(inputInfo.keyboard);
} }
/** /**
@ -632,21 +636,6 @@ InitAndStartDevices()
ActivateDevice(dev); ActivateDevice(dev);
} }
if (!inputInfo.keyboard) { /* In theory, this cannot happen */
ErrorF("[dix] No core keyboard\n");
return BadImplementation;
}
if (!inputInfo.pointer) { /* In theory, this cannot happen */
ErrorF("[dix] No core pointer\n");
return BadImplementation;
}
/* Now enable all devices */
if (inputInfo.pointer->inited && inputInfo.pointer->startup)
EnableDevice(inputInfo.pointer);
if (inputInfo.keyboard->inited && inputInfo.keyboard->startup)
EnableDevice(inputInfo.keyboard);
/* enable real devices */ /* enable real devices */
for (dev = inputInfo.off_devices; dev; dev = next) for (dev = inputInfo.off_devices; dev; dev = next)
{ {

3
dix/main.c
View File

@ -361,8 +361,7 @@ int main(int argc, char *argv[], char *envp[])
InitCoreDevices(); InitCoreDevices();
InitInput(argc, argv); InitInput(argc, argv);
if (InitAndStartDevices() != Success) InitAndStartDevices();
FatalError("failed to initialize core devices");
dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset); dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);