Merge branch 'test-root-flag'

diff --cc src/test_xi2.c
index 3139d723e6804a690d8a0378df980f81cb40ad22,a83bb22c7f3399acb070ffa61058b74b26d54dde..c8dbf3469176cbf950910815e18f6eeebb5383d7
--- 1/src/test_xi2.c
--- 2/src/test_xi2.c
+++ b/src/test_xi2.c
@@@ -321,13 -321,22 +321,22 @@@ test_xi2(Display        *display
           char *name,
           char *desc)
  {
-     XIEventMask mask;
+     XIEventMask mask[2];
+     XIEventMask *m;
      Window win;
      int deviceid = -1;
+     int use_root = 0;
      int rc;
  
 -    setlinebuf(stdout);
 +    setvbuf(stdout, NULL, _IOLBF, 0);
  
+     if (argc >= 1 && strcmp(argv[0], "--root") == 0) {
+         use_root = 1;
+ 
+         argc--;
+         argv++;
+     }
+ 
      rc = list(display, argc, argv, name, desc);
      if (rc != EXIT_SUCCESS)
          return rc;