summaryrefslogtreecommitdiffstats
path: root/tests/auto/client/mockcompositor.h
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-05-17 13:03:57 +0300
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-05-20 16:13:02 +0200
commit8b991cabcc9289455f963aadb8c0666068efe476 (patch)
tree11192d9cb23c2aedf29db9dad1af32b7cfbb8fd1 /tests/auto/client/mockcompositor.h
parent3836847ab68c52e4fe39dff94649534ffda99418 (diff)
Migrate from wl_input_device to wl_seat
Change-Id: I0d218c32478c2acce4d7012bdb26b0cde50ee633 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tests/auto/client/mockcompositor.h')
-rw-r--r--tests/auto/client/mockcompositor.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/client/mockcompositor.h b/tests/auto/client/mockcompositor.h
index c47f5f2d1..8805d7bf2 100644
--- a/tests/auto/client/mockcompositor.h
+++ b/tests/auto/client/mockcompositor.h
@@ -87,10 +87,14 @@ public:
private:
static void bindCompositor(wl_client *client, void *data, uint32_t version, uint32_t id);
- static void bindInput(wl_client *client, void *data, uint32_t version, uint32_t id);
+ static void bindSeat(wl_client *client, void *data, uint32_t version, uint32_t id);
static void bindOutput(wl_client *client, void *data, uint32_t version, uint32_t id);
static void bindShell(wl_client *client, void *data, uint32_t version, uint32_t id);
+ static void get_pointer(wl_client *client, wl_resource *resource, uint32_t id);
+ static void get_keyboard(wl_client *client, wl_resource *resource, uint32_t id);
+ static void get_touch(wl_client *client, wl_resource *resource, uint32_t id);
+
static void destroyInputResource(wl_resource *resource);
void initShm();
@@ -108,7 +112,9 @@ private:
wl_list m_outputResources;
uint32_t m_time;
- wl_input_device m_input;
+ wl_seat m_seat;
+ wl_pointer m_pointer;
+ wl_keyboard m_keyboard;
QVector<Surface *> m_surfaces;
};