summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-07-09 11:03:59 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-07-09 12:25:50 +1000
commita43c7831739a0ea6ed61ec2058d03dffc396dc92 (patch)
treec0b2e95dc121a34e3fdfb5bd2ce0348a9b16a0c3
parent0b856fbfc6cae5fdb2f9eadb3ae225a67fc29f93 (diff)
server/grab: take major/minor as args to NewClient()
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--tests/server/grab.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/server/grab.cpp b/tests/server/grab.cpp
index 95a759e..a883bae 100644
--- a/tests/server/grab.cpp
+++ b/tests/server/grab.cpp
@@ -684,14 +684,13 @@ public:
/**
* Return a new synchronized client given our default server connection.
- * Client is initialised for XI 2.2
*/
- virtual ::Display* NewClient(void) {
+ virtual ::Display* NewClient(int maj = 2, int min = 2) {
::Display *d = XOpenDisplay(server.GetDisplayString().c_str());
if (!d)
ADD_FAILURE() << "Failed to open display for new client.\n";
XSynchronize(d, True);
- int major = 2, minor = 2;
+ int major = maj, minor = min;
if (XIQueryVersion(d, &major, &minor) != Success)
ADD_FAILURE() << "XIQueryVersion failed on new client.\n";
return d;