Merge lp:~brandontschaefer/mir/deprecate-input-device-api into lp:mir

[Brandon Schaefer]

Deprecate mir_input_device_state_event_device_pressed_keys for mir_input_device_state_event_device_pressed_keys_for_index

Deprecate

uint32_t const* mir_input_device_state_event_device_pressed_keys

to

uint32_t mir_input_device_state_event_device_pressed_keys_for_index

Issue:
The original one would return a non opaque pointer to a memory location in MirEvent* making it harder to change the underlying structure.

For example moving to capntproto it doesnt allow returning raw pointers from its memory pool. This means we cannot return the uint32_t* required with out extra hacking.

This function was just released in 0.24, and talking with anpok it has not been used. He would be the one using it for qt/gtk.

Since it has not been used, it'll just be easier to return a nullptr vs maintain behaviour that would require extra hacks in capnproto to preserve a uint32_t* for the lifetime of the MirEvent.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3713
https://mir-jenkins.ubuntu.com/job/mir-ci/1790/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2240/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2303
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2294
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2294
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2294
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2268/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2268
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2268/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2268
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2268/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2268
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2268/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2268
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2268/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1790/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3715
https://mir-jenkins.ubuntu.com/job/mir-ci/1792/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2242
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2305
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2296
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2296
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2296
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2270
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2270/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2270
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2270/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2270
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2270/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2270
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2270/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2270
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2270/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1792/rebuild

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

ok..
the old api is not used yet - other than internally.

review: Approve

[Andreas Pokorny (andreas-pokorny)]

ok this is breaking the mircommon ABI.. so you would have to have the mircommon7 MP as a prereq.

review: Needs Resubmitting

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3716
https://mir-jenkins.ubuntu.com/job/mir-ci/1803/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2253
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2307
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2307
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2307
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2281
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2281/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2281
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2281/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2281
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2281/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2281
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2281/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2281
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2281/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1803/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-09-12 11:49:12 +0000
+++ debian/control	2016-09-23 17:21:20 +0000
@@ -101,7 +101,7 @@
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmircommon6 (= ${binary:Version}), 
+Depends: libmircommon7 (= ${binary:Version}), 
          libprotobuf-dev (>= 2.4.1),
          libxkbcommon-dev,
          ${misc:Depends},
@@ -290,7 +290,7 @@
  .
  Contains a tool for checking the graphics components of android devices.
 
-Package: libmircommon6
+Package: libmircommon7
 Section: libs
 Architecture: linux-any
 Multi-Arch: same

=== renamed file 'debian/libmircommon6.install' => 'debian/libmircommon7.install'
--- debian/libmircommon6.install	2016-06-27 18:09:48 +0000
+++ debian/libmircommon7.install	2016-09-23 17:21:20 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmircommon.so.6
+usr/lib/*/libmircommon.so.7

=== modified file 'include/client/mir_toolkit/events/input_device_state_event.h'
--- include/client/mir_toolkit/events/input_device_state_event.h	2016-06-02 15:07:12 +0000
+++ include/client/mir_toolkit/events/input_device_state_event.h	2016-09-23 17:21:20 +0000
@@ -100,13 +100,27 @@
  * Retrieve an array of pressed keys on the device identified by the \a index.
  * The keys are encoded as scan codes.
  *
+ * \deprecated Use mir_input_device_state_event_device_pressed_keys_for_index() instead
  * \param[in] ev The input device state event
  * \param[in] index The index of the input device
- * \return    An array of pressed keys
+ * \return    a NULL pointer
  */
+__attribute__ ((deprecated))
 uint32_t const* mir_input_device_state_event_device_pressed_keys(
     MirInputDeviceStateEvent const* ev, uint32_t index);
 
+/*
+ * Retrieve a pressed key on the device identified by the \a index.
+ * The key is encoded as a scan code.
+ *
+ * \param[in] ev            The input device state event
+ * \param[in] index         The index of the input device
+ * \param[in] pressed_index The index of the pressed key
+ * \return    The pressed key at index pressed_index
+ */
+uint32_t mir_input_device_state_event_device_pressed_keys_for_index(
+    MirInputDeviceStateEvent const* ev, uint32_t index, uint32_t pressed_index);
+
 /**
  * Retrieve the size of scan code array of the device identified by the \a index.
  *

=== modified file 'include/test/mir/test/event_matchers.h'
--- include/test/mir/test/event_matchers.h	2016-07-04 12:17:44 +0000
+++ include/test/mir/test/event_matchers.h	2016-09-23 17:21:20 +0000
@@ -527,8 +527,14 @@
         if (num_required_keys != key_count)
             continue;
 
-        auto pressed_keys = mir_input_device_state_event_device_pressed_keys(device_state, index);
-        if (!std::equal(it_keys, end_keys, pressed_keys))
+        std::vector<uint32_t> pressed_keys;
+        for (uint32_t i = 0; i < key_count; i++)
+        {
+            pressed_keys.push_back(
+                mir_input_device_state_event_device_pressed_keys_for_index(device_state, index, i));
+        }
+
+        if (!std::equal(it_keys, end_keys, std::begin(pressed_keys)))
             continue;
         return true;
     }

=== modified file 'src/client/event.cpp'
--- src/client/event.cpp	2016-09-19 04:16:15 +0000
+++ src/client/event.cpp	2016-09-23 17:21:20 +0000
@@ -321,11 +321,19 @@
     return ev->device_id(index);
 }
 
-uint32_t const* mir_input_device_state_event_device_pressed_keys(MirInputDeviceStateEvent const* ev, uint32_t index)
+// Function is deprecated, and no one is currently using it.
+uint32_t const* mir_input_device_state_event_device_pressed_keys(MirInputDeviceStateEvent const* /*ev*/, uint32_t /*index*/)
+{
+    return nullptr;
+}
+
+uint32_t mir_input_device_state_event_device_pressed_keys_for_index(MirInputDeviceStateEvent const* ev,
+                                                                    uint32_t index,
+                                                                    uint32_t pressed_index)
 {
     expect_event_type(ev, mir_event_type_input_device_state);
     expect_index_in_range(ev->device_count(), index);
-    return ev->device_pressed_keys(index);
+    return ev->device_pressed_keys_for_index(index, pressed_index);
 }
 
 uint32_t mir_input_device_state_event_device_pressed_keys_count(MirInputDeviceStateEvent const* ev, uint32_t index)

=== modified file 'src/client/event_printer.cpp'
--- src/client/event_printer.cpp	2016-09-19 04:16:15 +0000
+++ src/client/event_printer.cpp	2016-09-23 17:21:20 +0000
@@ -348,11 +348,11 @@
         out << mir_input_device_state_event_device_id(&event, index) 
             << " btns=" << mir_input_device_state_event_device_pointer_buttons(&event, index)
             << " pressed=(";
-        auto keys = mir_input_device_state_event_device_pressed_keys(&event, index);
-        for (size_t count_keys = mir_input_device_state_event_device_pressed_keys_count(&event, index), i = 0; i != count_keys; ++i)
+        auto key_count = mir_input_device_state_event_device_pressed_keys_count(&event, index);
+        for (uint32_t i = 0; i < key_count; i++)
         {
-            out << static_cast<uint32_t>(keys[i]);
-            if (i + 1 < count_keys)
+            out << mir_input_device_state_event_device_pressed_keys_for_index(&event, index, i);
+            if (i + 1 < key_count)
                 out << ", ";
         }
         out << ")";

=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2016-09-19 09:05:08 +0000
+++ src/client/symbols.map	2016-09-23 17:21:20 +0000
@@ -432,5 +432,6 @@
     mir_surface_placement_get_relative_position;
     mir_display_output_type_name;
     mir_output_type_name;
+    mir_input_device_state_event_device_pressed_keys_for_index;
 } MIR_CLIENT_0.24;
 

=== modified file 'src/common/CMakeLists.txt'
--- src/common/CMakeLists.txt	2016-09-19 04:16:15 +0000
+++ src/common/CMakeLists.txt	2016-09-23 17:21:20 +0000
@@ -37,7 +37,7 @@
   PARENT_SCOPE)
 
 # TODO we need a place to manage ABI and related versioning but use this as placeholder
-set(MIRCOMMON_ABI 6)
+set(MIRCOMMON_ABI 7)
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
 add_library(mircommon SHARED

=== modified file 'src/common/events/input_device_state_event.cpp'
--- src/common/events/input_device_state_event.cpp	2016-05-26 20:59:38 +0000
+++ src/common/events/input_device_state_event.cpp	2016-09-23 17:21:20 +0000
@@ -98,9 +98,9 @@
     return devices[index].id;
 }
 
-uint32_t const* MirInputDeviceStateEvent::device_pressed_keys(size_t index) const
+uint32_t MirInputDeviceStateEvent::device_pressed_keys_for_index(size_t index, size_t pressed_index) const
 {
-    return devices[index].pressed_keys.data();
+    return devices[index].pressed_keys[pressed_index];
 }
 
 uint32_t MirInputDeviceStateEvent::device_pressed_keys_count(size_t index) const

=== modified file 'src/common/symbols.map'
--- src/common/symbols.map	2016-09-19 04:16:15 +0000
+++ src/common/symbols.map	2016-09-23 17:21:20 +0000
@@ -1,5 +1,8 @@
-MIR_COMMON_5 {
+MIR_COMMON_0.25 {
  global:
+  __android_log_assert;
+  __android_log_print;
+  systemTime;
   extern "C++" {
 # The following symbols come from running a script over the generated docs. Vis:
 # ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mircommon public" | sed "s/mircommon public: /    /" | sort  
@@ -111,7 +114,6 @@
     mir::default_server_socket;
     mir::libraries_for_path*;
     mir::logging::input_timestamp*;
-    mir::logging::log*;
     mir::logging::SharedLibraryProberReport::SharedLibraryProberReport*;
     mir::RecursiveReadLock::?RecursiveReadLock*;
     mir::RecursiveReadLock::RecursiveReadLock*;
@@ -139,16 +141,8 @@
 
     mir::SignalBlocker::SignalBlocker*;
     mir::SignalBlocker::?SignalBlocker*;
-  };
-};
 
-MIR_COMMON_5.1 {  # New functions in Mir 0.16
- global:
-    __android_log_assert;
-    __android_log_print;
-    systemTime;
-    toMillisecondTimeoutDelay;
-    extern "C++" {
+# New functions in Mir 0.16
       android::InputChannel::InputChannel*;
       android::InputChannel::openInputFdPair*;
       android::InputConsumer::consume*;
@@ -170,10 +164,8 @@
       android::IntSet::remove*;
       android::KeyEvent::initialize*;
       android::MotionEvent::getAxisValue*;
-      android::MotionEvent::getAxisValue*;
       android::MotionEvent::getHistoricalAxisValue*;
       android::MotionEvent::getRawAxisValue*;
-      android::MotionEvent::getRawAxisValue*;
       android::PointerCoords::copyFrom*;
       android::PointerCoords::getAxisValue*;
       android::PointerCoords::operator*;
@@ -191,37 +183,21 @@
       mir::write_to_log;
       typeinfo?for?android::RefBase;
       vtable?for?android::IntSet;
-      mir::dispatch::ReadableFd::ReadableFd*;
-      mir::dispatch::ReadableFd::?ReadableFd*;
-      mir::dispatch::ReadableFd::watch_fd*;
-      mir::dispatch::ReadableFd::dispatch*;
-      mir::dispatch::ReadableFd::relevant_events*;
+      vtable?for?mir::dispatch::ReadableFd;
+      mir::dispatch::ReadableFd*;
       mir::logger::Logger::log*;
-    };
-  local: *;
-} MIR_COMMON_5;
 
-MIR_COMMON_5v19 { # New functions in Mir 0.19.0
-  global:
-    extern "C++" {
+# New functions in Mir 0.19.0
       typeinfo?for?mir::logging::SharedLibraryProberReport;
       typeinfo?for?mir::time::SteadyClock;
       typeinfo?for?android::InputChannel;
       typeinfo?for?mir::logging::DumbConsoleLogger;
       mir::detail::libname_impl*;
-    };
-} MIR_COMMON_5.1;
 
-MIR_COMMON_0.19.1 { # New functions in Mir 0.19.1
-  global:
-    extern "C++" {
+# New functions in Mir 0.19.1
       mir::select_libraries_for_path*;
-    };
-} MIR_COMMON_5v19;  # <- Note Mir 0.19.0 used the wrong syntax
 
-MIR_COMMON_0.22 {
-  global:
-    extern "C++" {
+# New functions in Mir 0.22
        MirEvent::to_surface*;
        MirEvent::to_resize*;
        MirEvent::to_orientation*;
@@ -351,12 +327,8 @@
        MirPromptSessionEvent::MirPromptSessionEvent*;
        MirPromptSessionEvent::new_state*;
        MirPromptSessionEvent::set_new_state*;
-    };
-} MIR_COMMON_0.19.1;
 
-MIR_COMMON_0.24 {
-  global:
-    extern "C++" {
+# New functions in Mir 0.24
        android::InputPublisher::publishEventBuffer*;
        MirEvent::to_input_device_state*;
        MirInputDeviceStateEvent::MirInputDeviceStateEvent*;
@@ -366,7 +338,6 @@
        MirInputDeviceStateEvent::device_count*;
        MirInputDeviceStateEvent::device_id*;
        MirInputDeviceStateEvent::device_pointer_buttons*;
-       MirInputDeviceStateEvent::device_pressed_keys*;
        MirInputDeviceStateEvent::device_pressed_keys_count*;
        MirInputDeviceStateEvent::modifiers*;
        MirInputDeviceStateEvent::pointer_axis*;
@@ -382,19 +353,15 @@
        android::MotionEvent::initialize*;
        mir::dispatch::epoll_to_fd_event*;
        mir::dispatch::fd_event_to_epoll*;
-       mir::dispatch::ReadableFd*;
-       vtable?for?mir::dispatch::ReadableFd;
-    };
-} MIR_COMMON_0.22;
 
-MIR_COMMON_0.25 {
-  global:
-    extern "C++" {
+# New functions in Mir 0.25
       MirSurfacePlacementEvent::MirSurfacePlacementEvent*;
       MirSurfacePlacementEvent::id*;
       MirSurfacePlacementEvent::set_id*;
       MirSurfacePlacementEvent::placement*;
       MirSurfacePlacementEvent::set_placement*;
+      MirInputDeviceStateEvent::device_pressed_keys_for_index*;
       mir::output_type_name*;
     };
-} MIR_COMMON_0.24;
+  local: *;
+};

=== modified file 'src/include/common/mir/events/input_device_state_event.h'
--- src/include/common/mir/events/input_device_state_event.h	2016-05-26 20:59:38 +0000
+++ src/include/common/mir/events/input_device_state_event.h	2016-09-23 17:21:20 +0000
@@ -43,7 +43,7 @@
     uint32_t device_count() const;
     MirInputDeviceId device_id(size_t index) const;
     MirPointerButtons device_pointer_buttons(size_t index) const;
-    uint32_t const* device_pressed_keys(size_t index) const;
+    uint32_t device_pressed_keys_for_index(size_t index, size_t pressed_index) const;
     uint32_t device_pressed_keys_count(size_t index) const;
 
     static mir::EventUPtr deserialize(std::string const& bytes);

=== modified file 'src/server/graphics/nested/input_platform.cpp'
--- src/server/graphics/nested/input_platform.cpp	2016-09-01 12:28:46 +0000
+++ src/server/graphics/nested/input_platform.cpp	2016-09-23 17:21:20 +0000
@@ -247,9 +247,13 @@
                         {
                             auto dest = it->second->destination;
                             auto key_count = mir_input_device_state_event_device_pressed_keys_count(device_state, index);
-                            auto const* scan_codes = mir_input_device_state_event_device_pressed_keys(device_state, index);
+                            std::vector<uint32_t> scan_codes;
+                            for (uint32_t i = 0; i < key_count; i++)
+                            {
+                                scan_codes.push_back(mir_input_device_state_event_device_pressed_keys_for_index(device_state, index, i));
+                            }
 
-                            dest->key_state({scan_codes, scan_codes + key_count});
+                            dest->key_state(scan_codes);
                             dest->pointer_state(
                                 mir_input_device_state_event_device_pointer_buttons(device_state, index));
                         }

=== modified file 'tests/unit-tests/input/android/test_android_input_sender.cpp'
--- tests/unit-tests/input/android/test_android_input_sender.cpp	2016-06-07 21:10:34 +0000
+++ tests/unit-tests/input/android/test_android_input_sender.cpp	2016-09-23 17:21:20 +0000
@@ -503,7 +503,8 @@
     const auto timestamp = std::chrono::nanoseconds(10);
     register_surface();
     std::vector<mir::events::InputDeviceState> states;
-    states.push_back({MirInputDeviceId{23}, {50, 60, 80}, 0});
+    std::vector<uint32_t> const pressed_keys = {50, 60, 80};
+    states.push_back({MirInputDeviceId{23}, pressed_keys, 0});
     states.push_back({MirInputDeviceId{21}, {}, mir_pointer_button_primary});
 
     auto device_state = mir::events::make_event(timestamp, mir_pointer_button_primary, mir_input_event_modifier_caps_lock,
@@ -520,12 +521,13 @@
     EXPECT_THAT(mir_input_device_state_event_time(input_device_state), Eq(timestamp.count()));
     EXPECT_THAT(mir_input_device_state_event_modifiers(input_device_state), Eq(mir_input_event_modifier_caps_lock));
     EXPECT_THAT(mir_input_device_state_event_device_count(input_device_state), Eq(2));
-
     EXPECT_THAT(mir_input_device_state_event_device_id(input_device_state, 0), Eq(MirInputDeviceId{23}));
-    EXPECT_THAT(mir_input_device_state_event_device_pressed_keys_count(input_device_state, 0), Eq(3));
-    EXPECT_THAT(mir_input_device_state_event_device_pressed_keys(input_device_state, 0)[0], Eq(50));
-    EXPECT_THAT(mir_input_device_state_event_device_pressed_keys(input_device_state, 0)[1], Eq(60));
-    EXPECT_THAT(mir_input_device_state_event_device_pressed_keys(input_device_state, 0)[2], Eq(80));
+    auto keys_count = mir_input_device_state_event_device_pressed_keys_count(input_device_state, 0);
+    EXPECT_THAT(keys_count, Eq(3));
+    for (uint32_t i = 0; i < keys_count; i++)
+    {
+        EXPECT_THAT(mir_input_device_state_event_device_pressed_keys_for_index(input_device_state, 0, i), Eq(pressed_keys[i]));
+    }
     EXPECT_THAT(mir_input_device_state_event_device_pointer_buttons(input_device_state, 0), 0);
 
     EXPECT_THAT(mir_input_device_state_event_device_id(input_device_state, 1), Eq(MirInputDeviceId{21}));

=== modified file 'tests/unit-tests/input/test_event_builders.cpp'
--- tests/unit-tests/input/test_event_builders.cpp	2016-05-26 20:59:38 +0000
+++ tests/unit-tests/input/test_event_builders.cpp	2016-09-23 17:21:20 +0000
@@ -189,12 +189,13 @@
     auto const pos_y = 53.2f;
     auto const button_state = mir_pointer_button_primary|mir_pointer_button_secondary;
     auto const modifiers = mir_input_event_modifier_ctrl_right | mir_input_event_modifier_ctrl;
+    std::vector<uint32_t> const pressed_keys = {KEY_LEFTALT, KEY_M};
     auto ev = mev::make_event(timestamp,
                               button_state,
                               modifiers,
                               pos_x,
                               pos_y,
-                              {mev::InputDeviceState{MirInputDeviceId{3}, {KEY_LEFTALT, KEY_M}, 0},
+                              {mev::InputDeviceState{MirInputDeviceId{3}, pressed_keys, 0},
                                mev::InputDeviceState{MirInputDeviceId{2}, {}, button_state}});
 
     EXPECT_THAT(mir_event_get_type(ev.get()), Eq(mir_event_type_input_device_state));
@@ -208,9 +209,12 @@
     EXPECT_THAT(mir_input_device_state_event_device_count(ids_event), Eq(2));
 
     EXPECT_THAT(mir_input_device_state_event_device_id(ids_event, 0), Eq(MirInputDeviceId{3}));
-    EXPECT_THAT(mir_input_device_state_event_device_pressed_keys_count(ids_event, 0), Eq(2));
-    EXPECT_THAT(mir_input_device_state_event_device_pressed_keys(ids_event, 0)[0], Eq(KEY_LEFTALT));
-    EXPECT_THAT(mir_input_device_state_event_device_pressed_keys(ids_event, 0)[1], Eq(KEY_M));
+    auto const pressed_keys_count = mir_input_device_state_event_device_pressed_keys_count(ids_event, 0);
+    EXPECT_THAT(pressed_keys_count, Eq(2));
+    for (uint32_t i = 0; i < pressed_keys_count; i++)
+    {
+        EXPECT_THAT(mir_input_device_state_event_device_pressed_keys_for_index(ids_event, 0, i), Eq(pressed_keys[i]));
+    }
     EXPECT_THAT(mir_input_device_state_event_device_pointer_buttons(ids_event, 0), Eq(0));
 
     EXPECT_THAT(mir_input_device_state_event_device_id(ids_event, 1), Eq(MirInputDeviceId{2}));
@@ -252,6 +256,7 @@
     auto const pos_y = 0.0f;
     auto const button_state = mir_pointer_button_primary | mir_pointer_button_secondary;
     auto const modifiers = mir_input_event_modifier_none;
+    std::vector<uint32_t> const pressed_keys = {KEY_RIGHTALT, KEY_LEFTSHIFT, KEY_Q};
     auto ev = mev::make_event(timestamp,
                               button_state,
                               modifiers,
@@ -259,7 +264,7 @@
                               pos_y,
                               {mev::InputDeviceState{MirInputDeviceId{0}, {}, mir_pointer_button_primary},
                                mev::InputDeviceState{MirInputDeviceId{2}, {}, mir_pointer_button_secondary},
-                               mev::InputDeviceState{MirInputDeviceId{3}, {KEY_RIGHTALT, KEY_LEFTSHIFT, KEY_Q}, 0}});
+                               mev::InputDeviceState{MirInputDeviceId{3}, pressed_keys, 0}});
 
     auto encoded = MirEvent::serialize(ev.get());
 
@@ -269,8 +274,10 @@
     auto ids_event = mir_event_get_input_device_state_event(deserialzed_event.get());
 
     EXPECT_THAT(mir_input_device_state_event_device_count(ids_event), Eq(3));
-    EXPECT_THAT(mir_input_device_state_event_device_pressed_keys_count(ids_event, 2), Eq(3));
-    EXPECT_THAT(mir_input_device_state_event_device_pressed_keys(ids_event, 2)[0], Eq(KEY_RIGHTALT));
-    EXPECT_THAT(mir_input_device_state_event_device_pressed_keys(ids_event, 2)[1], Eq(KEY_LEFTSHIFT));
-    EXPECT_THAT(mir_input_device_state_event_device_pressed_keys(ids_event, 2)[2], Eq(KEY_Q));
+    auto pressed_keys_count = mir_input_device_state_event_device_pressed_keys_count(ids_event, 2);
+    EXPECT_THAT(pressed_keys_count, Eq(3));
+    for (uint32_t i = 0; i < pressed_keys_count; i++)
+    {
+        EXPECT_THAT(mir_input_device_state_event_device_pressed_keys_for_index(ids_event, 2, i), Eq(pressed_keys[i]));
+    }
 }