summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-06-17 21:22:23 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-06-17 21:22:23 +1000
commita4efa37a0646497ed46f4462d8c745ab17339f62 (patch)
tree8acd5fcb7d164f96d6c63cdc22f64a29d8a034b8
parent632ef53adf1e18509dfa2a1ae820910aa0a88545 (diff)
Print button and valuator labels when listing a device.
-rw-r--r--src/list.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/list.c b/src/list.c
index 52ffba5..0c80804 100644
--- a/src/list.c
+++ b/src/list.c
@@ -162,6 +162,10 @@ print_classes_xi2(Display* display, XIAnyClassInfo **classes,
{
XIButtonClassInfo *b = (XIButtonClassInfo*)classes[i];
printf("\t\tButtons supported: %d\n", b->num_buttons);
+ printf("\t\tButton labels:");
+ for (j = 0; j < b->num_buttons; j++)
+ printf(" %s", (b->labels[j]) ? XGetAtomName(display, b->labels[j]) : "None");
+ printf("\n");
printf("\t\tButton state:");
for (j = 0; j < b->state.mask_len * 8; j++)
if (XIMaskIsSet(b->state.mask, j))
@@ -180,7 +184,7 @@ print_classes_xi2(Display* display, XIAnyClassInfo **classes,
{
XIValuatorClassInfo *v = (XIValuatorClassInfo*)classes[i];
printf("\t\tDetail for Valuator %d:\n", v->number);
- printf("\t\t Name: %s\n", XGetAtomName(display, v->name));
+ printf("\t\t Label: %s\n", v->label ? XGetAtomName(display, v->label) : "None");
printf("\t\t Range: %f - %f\n", v->min, v->max);
printf("\t\t Resolution: %d units/m\n", v->resolution);
printf("\t\t Mode: %s\n", v->mode == Absolute ? "absolute" :