From 7c5dec9f716962a6e67dba99418061cebe10e1d2 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 31 Oct 2008 16:56:49 +1030 Subject: [PATCH] dix: remove unused GuessFreePointerDevice(). Not used since the MD/SD hierarchy was introduced many moons ago. --- dix/devices.c | 40 ---------------------------------------- include/input.h | 2 -- 2 files changed, 42 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index 11720e533..1e7588e59 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -2616,46 +2616,6 @@ GetPairedDevice(DeviceIntPtr dev) return dev->spriteInfo->paired; } -/* Guess a pointer that could be a good one for pairing. Any pointer that is - * not yet paired with keyboard is considered a good one. - * If no pointer is found, the last real pointer is chosen. If that doesn't - * work either, we take the core pointer. - */ -DeviceIntPtr -GuessFreePointerDevice() -{ - DeviceIntPtr it, it2; - DeviceIntPtr lastRealPtr = NULL; - - it = inputInfo.devices; - - while(it) - { - /* found device with a sprite? */ - if (it->spriteInfo->spriteOwner) - { - lastRealPtr = it; - - it2 = inputInfo.devices; - while(it2) - { - /* something paired with it? */ - if (it != it2 && - it2->spriteInfo->sprite == it->spriteInfo->sprite) - break; - - it2 = it2->next; - } - - /* woohoo! no pairing set up for 'it' yet */ - if (!it2) - return it; - } - it = it->next; - } - - return (lastRealPtr) ? lastRealPtr : inputInfo.pointer; -} /** * Create a new master device (== one pointer, one keyboard device). diff --git a/include/input.h b/include/input.h index 742856486..e2f3593f5 100644 --- a/include/input.h +++ b/include/input.h @@ -518,8 +518,6 @@ extern DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd); extern Bool RegisterPairingClient(ClientPtr client); -extern DeviceIntPtr GuessFreePointerDevice(void); - extern int AllocMasterDevice(ClientPtr client, char* name, DeviceIntPtr* ptr,