From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 15 Jul 2013 05:02:55 +0000 (+1000)
Subject: Merge branch 'test-root-flag'
X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/39ac9d85f464ca3195e8b3b2d3f6c3188f83e25e?ds=sidebyside;hp=--cc

Merge branch 'test-root-flag'
---

39ac9d85f464ca3195e8b3b2d3f6c3188f83e25e
diff --cc src/test_xi2.c
index 3139d72,a83bb22..c8dbf34
--- a/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;