dix: NextFreePointerDevice() can be static.

This commit is contained in:
Peter Hutterer 2008-10-31 16:50:28 +10:30
parent 5d0a945a03
commit 12599af285
2 changed files with 14 additions and 12 deletions

View File

@ -161,6 +161,20 @@ PairDevices(ClientPtr client, DeviceIntPtr ptr, DeviceIntPtr kbd)
}
/**
* Find and return the next unpaired MD pointer device.
*/
static DeviceIntPtr
NextFreePointerDevice(void)
{
DeviceIntPtr dev;
for (dev = inputInfo.devices; dev; dev = dev->next)
if (dev->isMaster &&
dev->spriteInfo->spriteOwner &&
!dev->spriteInfo->paired)
return dev;
return NULL;
}
/**
* Create a new input device and init it to sane values. The device is added
@ -2643,17 +2657,6 @@ GuessFreePointerDevice()
return (lastRealPtr) ? lastRealPtr : inputInfo.pointer;
}
DeviceIntPtr
NextFreePointerDevice()
{
DeviceIntPtr dev;
for (dev = inputInfo.devices; dev; dev = dev->next)
if (dev->isMaster &&
dev->spriteInfo->spriteOwner &&
!dev->spriteInfo->paired)
return dev;
return NULL;
}
/**
* Create a new master device (== one pointer, one keyboard device).
* Only allocates the devices, you will need to call ActivateDevice() and

View File

@ -519,7 +519,6 @@ extern DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
extern Bool RegisterPairingClient(ClientPtr client);
extern DeviceIntPtr GuessFreePointerDevice(void);
extern DeviceIntPtr NextFreePointerDevice(void);
extern int AllocMasterDevice(ClientPtr client,
char* name,