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)

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

PASSED: Continuous integration, rev:3716
https://mir-jenkins.ubuntu.com/job/mir-ci/1804/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2254
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2317
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2308
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2308
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2308
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2282
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2282/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/2282
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2282/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2282
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2282/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/2282
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2282/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/2282
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2282/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

lgtm

review: Approve

[Alan Griffiths (alan-griffiths)]

Deprecated functions are still, in principle, supported and working.

If the function is unusable then we shouldn't be deprecating it, we should be *removing* it. (The description claims we can get away with this.)

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Note the prerequisite branch to this is still contentious, so a blocker.

[Alexandros Frantzis (afrantzis)]

> Deprecated functions are still, in principle, supported and working.
>
> If the function is unusable then we shouldn't be deprecating it, we should be *removing* it. (The description claims we can get away with this.)

+1

Changing the function to return a nullptr is still an ABI break, and an insidious one at that. If we are going to silently break ABI anyway, we should go all the way and remove the function completely.

review: Needs Fixing

[Brandon Schaefer (brandontschaefer)]

Talking with anpok this function is used (somewhere?). Ill have to talk to him again about it, but just returning a nullptr shouldnt be an ABI break? All the sizes are the same... though unexpected behaviour changes (bad).

Im fine with removing this function but wouldnt this be something we've not broken in a long time?

=== 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-29 18:19:03 +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-29 18:19:03 +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-29 18:19:03 +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-29 18:19:03 +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-29 12:26:11 +0000
+++ src/client/symbols.map	2016-09-29 18:19:03 +0000
@@ -433,6 +433,7 @@
     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;
 
 MIR_CLIENT_DETAIL_0.26 {

=== 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-29 18:19:03 +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-27 08:57:34 +0000
+++ src/common/symbols.map	2016-09-29 18:19:03 +0000
@@ -363,7 +363,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*;
@@ -401,6 +400,7 @@
       MirSurfacePlacementEvent::set_id*;
       MirSurfacePlacementEvent::placement*;
       MirSurfacePlacementEvent::set_placement*;
+      MirInputDeviceStateEvent::device_pressed_keys_for_index*;
       mir::output_type_name*;
     };
 } MIR_COMMON_0.24;

=== 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-29 18:19:03 +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-29 18:19:03 +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-29 18:19:03 +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-29 18:19:03 +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]));
+    }
 }