Remove no longer needed GrabDevice option

This is only relevant for evdev input driver and we're using inputtest.

9 files changed, 21 insertions, 45 deletions

diff --git a/tests/lib/libXi.cpp b/tests/lib/libXi.cpp
index 513e824..cef3fe5 100644
--- a/tests/lib/libXi.cpp
+++ b/tests/lib/libXi.cpp
@@ -63,8 +63,7 @@ public:
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(0).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--keyboard-device--",
@@ -205,8 +204,7 @@ public:
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(0).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--keyboard-device--",
diff --git a/tests/server/barriers-common.h b/tests/server/barriers-common.h
index c29a7eb..06f29f7 100644
--- a/tests/server/barriers-common.h
+++ b/tests/server/barriers-common.h
@@ -89,7 +89,6 @@ public:
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n"
                                /* Disable pointer acceleration to allow for accurate
                                 * pointer positions with relative events... */
                                "Option \"AccelerationProfile\" \"-1\"\n" +
@@ -165,14 +164,12 @@ public:
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device0--",
                                "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n"
                                /* Disable pointer acceleration to allow for accurate
                                 * pointer positions with relative events... */
                                "Option \"AccelerationProfile\" \"-1\"" +
                                Dev(0).GetOptions());
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device1--",
                                "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n"
                                /* Disable pointer acceleration to allow for accurate
                                 * pointer positions with relative events... */
                                "Option \"AccelerationProfile\" \"-1\"\n" +
diff --git a/tests/server/dga.cpp b/tests/server/dga.cpp
index 8b63614..e02ade4 100644
--- a/tests/server/dga.cpp
+++ b/tests/server/dga.cpp
@@ -67,8 +67,7 @@ public:
     void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(0).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--kbd-device--",
diff --git a/tests/server/grab.cpp b/tests/server/grab.cpp
index 20ff4e1..2caacd5 100644
--- a/tests/server/grab.cpp
+++ b/tests/server/grab.cpp
@@ -71,8 +71,7 @@ public:
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(0).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device-kbd--",
@@ -414,16 +413,13 @@ public:
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--mouse--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                MouseDev().GetOptions());
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--keyboard--",
-                               "Option \"CoreKeyboard\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CoreKeyboard\" \"on\"\n" +
                                KeyboardDev().GetOptions());
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--touch--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                TouchDev().GetOptions());
         config.WriteConfig();
     }
@@ -853,8 +849,7 @@ public:
     void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                TouchDev().GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--kbd-device--",
@@ -2348,12 +2343,10 @@ public:
     void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--pointer--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                PointerDev().GetOptions());
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--keyboard--",
-                               "Option \"CoreKeyboard\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CoreKeyboard\" \"on\"\n" +
                                KeyboardDev().GetOptions());
         config.WriteConfig();
     }
diff --git a/tests/server/misc.cpp b/tests/server/misc.cpp
index a2b5355..0b1ecb4 100644
--- a/tests/server/misc.cpp
+++ b/tests/server/misc.cpp
@@ -60,8 +60,7 @@ public:
     void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(0).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--kbd-device--",
@@ -168,8 +167,7 @@ public:
     void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(0).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device-kbd--",
@@ -297,8 +295,7 @@ public:
     void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(0).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device-kbd--",
diff --git a/tests/server/multihead.cpp b/tests/server/multihead.cpp
index d504063..fdc2d94 100644
--- a/tests/server/multihead.cpp
+++ b/tests/server/multihead.cpp
@@ -50,8 +50,7 @@ public:
     void SetUpConfigAndLog() override {
         config.SetAutoAddDevices(true);
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(0).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--keyboard-device--",
@@ -490,12 +489,10 @@ protected:
     void SetUpConfigAndLog() override {
         config.SetAutoAddDevices(true);
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device-touch--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(0).GetOptions());
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(1).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--keyboard-device--",
diff --git a/tests/server/touch.cpp b/tests/server/touch.cpp
index f2ad4be..9014fc8 100644
--- a/tests/server/touch.cpp
+++ b/tests/server/touch.cpp
@@ -58,8 +58,7 @@ protected:
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"Emulate3Buttons\" \"off\""
-                               "Option \"CorePointer\" \"on\""
-                               "Option \"GrabDevice\" \"on\"\n"+
+                               "Option \"CorePointer\" \"on\"" +
                                Dev(0).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device-kbd--",
@@ -97,12 +96,10 @@ protected:
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"Emulate3Buttons\" \"off\""
-                               "Option \"CorePointer\" \"on\""
-                               "Option \"GrabDevice\" \"on\"\n"+
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(0).GetOptions());
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device-mouse--",
-                               "Option \"CorePointer\" \"on\""
-                               "Option \"GrabDevice\" \"on\"\n"+
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(1).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device-kbd--",
diff --git a/tests/server/xigrabbutton.cpp b/tests/server/xigrabbutton.cpp
index f9c8828..56e8244 100644
--- a/tests/server/xigrabbutton.cpp
+++ b/tests/server/xigrabbutton.cpp
@@ -57,8 +57,7 @@ public:
         config.SetAutoAddDevices(false);
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
-                               "    Option \"CorePointer\" \"on\"\n"
-                               "    Option \"GrabDevice\" \"on\"\n" +
+                               "    Option \"CorePointer\" \"on\"\n" +
                                Dev(0).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--kbd-device--",
diff --git a/tests/server/xtest.cpp b/tests/server/xtest.cpp
index 897a260..641fd2c 100644
--- a/tests/server/xtest.cpp
+++ b/tests/server/xtest.cpp
@@ -162,8 +162,7 @@ public:
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
-                               "Option \"CorePointer\" \"on\"\n"
-                               "Option \"GrabDevice\" \"on\"\n" +
+                               "Option \"CorePointer\" \"on\"\n" +
                                Dev(0).GetOptions());
         /* add default keyboard device */
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--kbd-device--",