Merge lp:~brandontschaefer/mir/set-device-states-vs-add into lp:mir

[Brandon Schaefer]

Move the InputDeviceState into a shared region we can then use for both event_builder and the class InputDevice.

This is needed for capnproto changes due to capnproto needing to know the full size of the number of InputDeviceStates so adding one at a time doesnt work.

Move the InputDeviceState into a shared region we can then use for both event_builder and the class InputDevice.

This is needed for capnproto changes due to capnproto needing to know the full size of the number of InputDeviceStates so adding one at a time doesnt work.

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

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

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

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

this needs the mircommon7 MP as prereq..

other than that - I am ok with the change

review: Needs Resubmitting

[Andreas Pokorny (andreas-pokorny)]

ok

review: Approve

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

FAILED: Continuous integration, rev:3717
https://mir-jenkins.ubuntu.com/job/mir-ci/1805/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2255/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2318
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2309
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2309
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2309
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2283
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2283/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/2283
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2283/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2283
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2283/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/2283
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2283/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2283/console

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Daniel van Vugt (vanvugt)]

The prerequisite chain is potentially contentious still.

=== modified file 'include/client/mir/events/event_builders.h'
--- include/client/mir/events/event_builders.h	2016-09-19 04:16:15 +0000
+++ include/client/mir/events/event_builders.h	2016-09-23 17:25:32 +0000
@@ -25,6 +25,7 @@
 #include "mir/geometry/point.h"
 #include "mir/geometry/rectangle.h"
 #include "mir/frontend/surface_id.h"
+#include "mir/events/input_device_state.h"
 
 #include <memory>
 #include <functional>
@@ -138,13 +139,6 @@
 EventUPtr make_event(MirInputConfigurationAction action,
     MirInputDeviceId id, std::chrono::nanoseconds time);
 
-struct InputDeviceState
-{
-    MirInputDeviceId id;
-    std::vector<uint32_t> pressed_keys;
-    MirPointerButtons buttons;
-};
-
 EventUPtr make_event(std::chrono::nanoseconds timestamp,
                      MirPointerButtons pointer_buttons,
                      MirInputEventModifiers modifiers,

=== added directory 'include/common/mir/events'
=== added file 'include/common/mir/events/input_device_state.h'
--- include/common/mir/events/input_device_state.h	1970-01-01 00:00:00 +0000
+++ include/common/mir/events/input_device_state.h	2016-09-23 17:25:32 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_DEVICE_STATE_H_
+#define MIR_INPUT_DEVICE_STATE_H_
+
+#include "mir_toolkit/event.h"
+
+#include <vector>
+
+namespace mir
+{
+namespace events
+{
+
+struct InputDeviceState
+{
+    MirInputDeviceId id;
+    std::vector<uint32_t> pressed_keys;
+    MirPointerButtons buttons;
+};
+
+}
+}
+
+#endif // MIR_INPUT_DEVICE_STATE_H_

=== modified file 'src/client/events/event_builders.cpp'
--- src/client/events/event_builders.cpp	2016-09-19 04:16:15 +0000
+++ src/client/events/event_builders.cpp	2016-09-23 17:25:32 +0000
@@ -439,8 +439,7 @@
     e->set_pointer_buttons(pointer_buttons);
     e->set_pointer_axis(mir_pointer_axis_x, x_axis_value);
     e->set_pointer_axis(mir_pointer_axis_y, y_axis_value);
-    for (auto& dev : device_states)
-        e->add_device(dev.id, std::move(dev.pressed_keys), dev.buttons);
+    e->set_device_states(device_states);
 
     return make_uptr_event(e);
 }

=== modified file 'src/common/events/input_device_state_event.cpp'
--- src/common/events/input_device_state_event.cpp	2016-09-23 17:25:32 +0000
+++ src/common/events/input_device_state_event.cpp	2016-09-23 17:25:32 +0000
@@ -83,9 +83,9 @@
     modifiers_ = modifiers;
 }
 
-void MirInputDeviceStateEvent::add_device(MirInputDeviceId id, std::vector<uint32_t> && pressed_keys, MirPointerButtons pointer_buttons)
+void MirInputDeviceStateEvent::set_device_states(std::vector<mir::events::InputDeviceState> const& device_states)
 {
-    devices.emplace_back(id, std::move(pressed_keys), pointer_buttons);
+    devices = device_states;
 }
 
 uint32_t MirInputDeviceStateEvent::device_count() const
@@ -110,7 +110,7 @@
 
 MirPointerButtons MirInputDeviceStateEvent::device_pointer_buttons(size_t index) const
 {
-    return devices[index].pointer_buttons;
+    return devices[index].buttons;
 }
 
 namespace
@@ -159,6 +159,7 @@
     new_event->set_pointer_axis(mir_pointer_axis_x, pointer_x);
     new_event->set_pointer_axis(mir_pointer_axis_y, pointer_y);
 
+    std::vector<mir::events::InputDeviceState> states;
     for (size_t i = 0; i != count; ++i)
     {
         uint32_t pressed_count = 0;
@@ -172,8 +173,9 @@
         for (size_t j = 0;j != pressed_count; ++j)
             pos = mir::event::consume(pos, pressed_keys[j]);
 
-        new_event->add_device(id, std::move(pressed_keys), pointer_buttons);
+        states.push_back({id, std::move(pressed_keys), pointer_buttons});
     }
+    new_event->set_device_states(states);
 
     return mir::EventUPtr(new_event, delete_input_device_state_event);
 }
@@ -206,7 +208,7 @@
     for (auto const& dev : input_state->devices)
     {
         encode(encoded, dev.id);
-        encode(encoded, dev.pointer_buttons);
+        encode(encoded, dev.buttons);
         encode(encoded, uint32_t(dev.pressed_keys.size()));
         for (auto const& key : dev.pressed_keys)
             encode(encoded, key);

=== modified file 'src/common/symbols.map'
--- src/common/symbols.map	2016-09-23 17:25:32 +0000
+++ src/common/symbols.map	2016-09-23 17:25:32 +0000
@@ -332,7 +332,6 @@
        android::InputPublisher::publishEventBuffer*;
        MirEvent::to_input_device_state*;
        MirInputDeviceStateEvent::MirInputDeviceStateEvent*;
-       MirInputDeviceStateEvent::add_device*;
        MirInputDeviceStateEvent::clone*;
        MirInputDeviceStateEvent::deserialize*;
        MirInputDeviceStateEvent::device_count*;
@@ -361,6 +360,7 @@
       MirSurfacePlacementEvent::placement*;
       MirSurfacePlacementEvent::set_placement*;
       MirInputDeviceStateEvent::device_pressed_keys_for_index*;
+      MirInputDeviceStateEvent::set_device_states*;
       mir::output_type_name*;
     };
   local: *;

=== modified file 'src/include/common/mir/events/input_device_state_event.h'
--- src/include/common/mir/events/input_device_state_event.h	2016-09-23 17:25:32 +0000
+++ src/include/common/mir/events/input_device_state_event.h	2016-09-23 17:25:32 +0000
@@ -23,6 +23,7 @@
 #include <limits>
 
 #include "mir/events/event.h"
+#include "mir/events/input_device_state_event.h"
 
 struct MirInputDeviceStateEvent : MirEvent
 {
@@ -50,7 +51,7 @@
     static std::string serialize(MirEvent const* event);
     MirEvent* clone() const;
 
-    void add_device(MirInputDeviceId id, std::vector<uint32_t> && pressed_keys, MirPointerButtons pointer_buttons);
+    void set_device_states(std::vector<mir::events::InputDeviceState> const& device_states);
 
 private:
     std::chrono::nanoseconds when_{0};
@@ -60,16 +61,7 @@
     float pointer_x{0.0f};
     float pointer_y{0.0f};
 
-    struct DeviceState
-    {
-        DeviceState(MirInputDeviceId id, std::vector<uint32_t> && pressed_keys, MirPointerButtons buttons)
-            : id{id}, pressed_keys{std::move(pressed_keys)}, pointer_buttons{buttons}
-        {}
-        MirInputDeviceId id;
-        std::vector<uint32_t> pressed_keys;
-        MirPointerButtons pointer_buttons;
-    };
-    std::vector<DeviceState> devices;
+    std::vector<mir::events::InputDeviceState> devices;
 };
 
 #endif /* MIR_COMMON_INPUT_DEVICE_STATE_EVENT_H_*/