diff options
author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-05-17 13:03:57 +0300 |
---|---|---|
committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-05-20 16:13:02 +0200 |
commit | 8b991cabcc9289455f963aadb8c0666068efe476 (patch) | |
tree | 11192d9cb23c2aedf29db9dad1af32b7cfbb8fd1 /tests/auto/client/mockcompositor.cpp | |
parent | 3836847ab68c52e4fe39dff94649534ffda99418 (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.cpp')
-rw-r--r-- | tests/auto/client/mockcompositor.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/client/mockcompositor.cpp b/tests/auto/client/mockcompositor.cpp index 6c7c66fa7..4e5537e26 100644 --- a/tests/auto/client/mockcompositor.cpp +++ b/tests/auto/client/mockcompositor.cpp @@ -197,10 +197,14 @@ Compositor::Compositor() wl_display_add_socket(m_display, 0); - wl_input_device_init(&m_input); + wl_seat_init(&m_seat); + wl_pointer_init(&m_pointer); + wl_seat_set_pointer(&m_seat, &m_pointer); + wl_keyboard_init(&m_keyboard); + wl_seat_set_keyboard(&m_seat, &m_keyboard); wl_display_add_global(m_display, &wl_compositor_interface, this, bindCompositor); - wl_display_add_global(m_display, &wl_input_device_interface, this, bindInput); + wl_display_add_global(m_display, &wl_seat_interface, this, bindSeat); wl_display_add_global(m_display, &wl_output_interface, this, bindOutput); wl_display_add_global(m_display, &wl_shell_interface, this, bindShell); @@ -212,6 +216,8 @@ Compositor::Compositor() Compositor::~Compositor() { + wl_pointer_release(&m_pointer); + wl_keyboard_release(&m_keyboard); wl_display_destroy(m_display); } |