summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@fido2.homeip.net>2008-01-09 18:17:43 -0800
committerPhilip Langdale <philipl@fido2.homeip.net>2008-01-09 18:17:43 -0800
commitff7a63770ab9ce7336c7a9a70b0ae86de4b35bf3 (patch)
treecd46fe96072cc061c1dde8d8927520bec569e238
parent06447732750a022a44476f8929568f0b11bfc6e9 (diff)
Add a warning when the user specifies an ambiguous device name
suggesting that they use the device id instead.
-rw-r--r--src/xinput.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/xinput.c b/src/xinput.c
index f74dee5..68d4136 100644
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -108,6 +108,7 @@ find_device_info(Display *display,
Bool only_extended)
{
XDeviceInfo *devices;
+ XDeviceInfo *found = NULL;
int loop;
int num_devices;
int len = strlen(name);
@@ -131,10 +132,17 @@ find_device_info(Display *display,
if ((!only_extended || (devices[loop].use >= IsXExtensionDevice)) &&
((!is_id && strcmp(devices[loop].name, name) == 0) ||
(is_id && devices[loop].id == id))) {
- return &devices[loop];
+ if (found) {
+ fprintf(stderr,
+ "Warning: There are multiple devices named \"%s\".\n"
+ "To ensure the correct one is selected, please use "
+ "the device ID instead.\n\n", name);
+ } else {
+ found = &devices[loop];
+ }
}
}
- return NULL;
+ return found;
}
static void