Print the class type when listing devices.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>

diff --git a/src/list.c b/src/list.c
index b791e81b574c2cffba4ac6e55c4f33bc1cc22a1a..46b8bd8446e8aeb8c0ccf43af45304ef7b955c8a 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -146,13 +146,14 @@ print_classes_xi2(Display* display, XIAnyClassInfo **classes,
     printf("\tReporting %d classes:\n", num_classes);
     for (i = 0; i < num_classes; i++)
     {
     printf("\tReporting %d classes:\n", num_classes);
     for (i = 0; i < num_classes; i++)
     {

-        printf("\t\tClass originated from: %d\n", classes[i]->sourceid);
+        printf("\t\tClass originated from: %d. Type: ", classes[i]->sourceid);

         switch(classes[i]->type)
         {
             case XIButtonClass:
                 {
                     XIButtonClassInfo *b = (XIButtonClassInfo*)classes[i];
                     char *name;
         switch(classes[i]->type)
         {
             case XIButtonClass:
                 {
                     XIButtonClassInfo *b = (XIButtonClassInfo*)classes[i];
                     char *name;

+                    printf("XIButtonClass\n");

                     printf("\t\tButtons supported: %d\n", b->num_buttons);
                     printf("\t\tButton labels:");
                     for (j = 0; j < b->num_buttons; j++)
                     printf("\t\tButtons supported: %d\n", b->num_buttons);
                     printf("\t\tButton labels:");
                     for (j = 0; j < b->num_buttons; j++)


@@ -173,6 +174,7 @@ print_classes_xi2(Display* display, XIAnyClassInfo **classes,
             case XIKeyClass:
                 {
                     XIKeyClassInfo *k = (XIKeyClassInfo*)classes[i];
             case XIKeyClass:
                 {
                     XIKeyClassInfo *k = (XIKeyClassInfo*)classes[i];

+                    printf("XIKeyClass\n");

                     printf("\t\tKeycodes supported: %d\n", k->num_keycodes);
                 }
                 break;
                     printf("\t\tKeycodes supported: %d\n", k->num_keycodes);
                 }
                 break;


@@ -184,6 +186,7 @@ print_classes_xi2(Display* display, XIAnyClassInfo **classes,
                     /* Bug in X servers 1.7..1.8.1, mode was | OutOfProximity */
                     v->mode &= DeviceMode;
 
                     /* Bug in X servers 1.7..1.8.1, mode was | OutOfProximity */
                     v->mode &= DeviceMode;
 

+                    printf("XIValuatorClass\n");

                     printf("\t\tDetail for Valuator %d:\n", v->number);
                     printf("\t\t  Label: %s\n",  (name) ? name : "None");
                     printf("\t\t  Range: %f - %f\n", v->min, v->max);
                     printf("\t\tDetail for Valuator %d:\n", v->number);
                     printf("\t\t  Label: %s\n",  (name) ? name : "None");
                     printf("\t\t  Range: %f - %f\n", v->min, v->max);