Clean up the detection of XI2

[xorg-xinput] / src / list.c

diff --git a/src/list.c b/src/list.c
index a50987265e9d10b11cc6c22f11e2b290db4c748a..de8aca7981f41a68e49eb105d08e70de3cc0c893 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -34,7 +34,9 @@ print_info(XDeviceInfo        *info, Bool shortformat)
     XButtonInfoPtr     b;
     XValuatorInfoPtr   v;
     XAxisInfoPtr       a;
     XButtonInfoPtr     b;
     XValuatorInfoPtr   v;
     XAxisInfoPtr       a;

+#if HAVE_XI2

     XAttachInfoPtr      att;
     XAttachInfoPtr      att;

+#endif

 
     printf("\"%s\"\tid=%ld\t[", info->name, info->id);
 
 
     printf("\"%s\"\tid=%ld\t[", info->name, info->id);
 


@@ -93,11 +95,12 @@ print_info(XDeviceInfo      *info, Bool shortformat)
                    printf ("\t\tResolution is %d\n", a->resolution);
                }
                break;
                    printf ("\t\tResolution is %d\n", a->resolution);
                }
                break;

+#if HAVE_XI2

             case AttachClass:
                 att = (XAttachInfoPtr)any;
                 printf("\tAttached to %d\n", att->attached);
                 break;
             case AttachClass:
                 att = (XAttachInfoPtr)any;
                 printf("\tAttached to %d\n", att->attached);
                 break;

-
+#endif

            default:
                printf ("unknown class\n");
            }
            default:
                printf ("unknown class\n");
            }


@@ -125,12 +128,14 @@ list(Display      *display,
        int             num_devices;
         XEvent  ev;
 
        int             num_devices;
         XEvent  ev;
 

+#if HAVE_XI2

         if (daemon)
         {
             XiSelectEvent(display, DefaultRootWindow(display), NULL,
                           XI_DeviceHierarchyChangedMask |
                           XI_DeviceClassesChangedMask);
         }
         if (daemon)
         {
             XiSelectEvent(display, DefaultRootWindow(display), NULL,
                           XI_DeviceHierarchyChangedMask |
                           XI_DeviceClassesChangedMask);
         }

+#endif

 
         do {
             info = XListInputDevices(display, &num_devices);
 
         do {
             info = XListInputDevices(display, &num_devices);


@@ -138,6 +143,7 @@ list(Display        *display,
                 print_info(info+loop, shortformat);
             }
 
                 print_info(info+loop, shortformat);
             }
 

+#if HAVE_XI2

             /* just wait for the next generic event to come along */
             while (daemon && !XNextEvent(display, &ev))
             {
             /* just wait for the next generic event to come along */
             while (daemon && !XNextEvent(display, &ev))
             {


@@ -157,6 +163,7 @@ list(Display        *display,
                     break;
                 }
             }
                     break;
                 }
             }

+#endif

         } while(daemon);
     } else {
        int     ret = EXIT_SUCCESS;
         } while(daemon);
     } else {
        int     ret = EXIT_SUCCESS;