SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dix: InitAndStartDevices doesn't need a window parameter.

Browse Source 
Leftover from the old pointer-keyboard pairing code, obsolete and gone now.
This commit is contained in:
Peter Hutterer
2008-05-14 15:29:28 +09:30
parent da728f2127
commit 00db0f35ac
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dix/devices.c
View File

@@ -539,7 +539,7 @@ InitCoreDevices(void)
* @return Success or error code on failure. * @return Success or error code on failure.
*/ */
int int
InitAndStartDevices(WindowPtr root) InitAndStartDevices()
{ {
DeviceIntPtr dev, next; DeviceIntPtr dev, next;

2
dix/main.c
View File

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

4
include/input.h
View File

@@ -231,9 +231,7 @@ extern Bool ActivateDevice(
extern Bool DisableDevice( extern Bool DisableDevice(
DeviceIntPtr /*device*/); DeviceIntPtr /*device*/);
extern int InitAndStartDevices( extern int InitAndStartDevices(void);
WindowPtr /*root*/);
extern void CloseDownDevices(void); extern void CloseDownDevices(void);