Merge lp:~andreas-pokorny/mir/print-window-id-in-report into lp:mir

[Andreas Pokorny]

Print window id of MirInputEvent and MirInputDeviceStateEvent

This will show up in the client rpc report.

This just adds window_id to the output of the event printer. This will help tracing input events if clients have multiple windows in the client rpc report.

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

PASSED: Continuous integration, rev:4094
https://mir-jenkins.ubuntu.com/job/mir-ci/3197/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4298
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4385
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4375
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4375
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4375
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4325
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4325/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/4325
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4325/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4325
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4325/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4325
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4325/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/4325
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4325/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/4325
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4325/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

[Daniel van Vugt (vanvugt)]

Sure

review: Approve

=== modified file 'src/client/event_printer.cpp'
--- src/client/event_printer.cpp	2017-02-15 07:38:33 +0000
+++ src/client/event_printer.cpp	2017-03-20 13:53:38 +0000
@@ -18,6 +18,7 @@
 
 #include "mir/event_printer.h"
 
+#include "mir/events/event_private.h"
 #include "mir/events/surface_placement_event.h"
 #include "mir/logging/input_timestamp.h"
 
@@ -285,12 +286,13 @@
 {
     auto event_time = mir::logging::input_timestamp(std::chrono::nanoseconds(mir_input_event_get_event_time(&event)));
     auto device_id = mir_input_event_get_device_id(&event);
+    auto window_id = event.window_id();
     switch (mir_input_event_get_type(&event))
     {
     case mir_input_event_type_key:
         {
             auto key_event = mir_input_event_get_keyboard_event(&event);
-            return out << "key_event(when=" << event_time << ", from=" << device_id << ", "
+            return out << "key_event(when=" << event_time << ", from=" << device_id << ", window_id=" << window_id << ", "
                 << mir_keyboard_event_action(key_event)
                 << ", code=" << mir_keyboard_event_key_code(key_event)
                 << ", scan=" << mir_keyboard_event_scan_code(key_event) << ", modifiers=" << std::hex
@@ -299,7 +301,7 @@
     case mir_input_event_type_touch:
         {
             auto touch_event = mir_input_event_get_touch_event(&event);
-            out << "touch_event(when=" << event_time << ", from=" << device_id << ", touch = {";
+            out << "touch_event(when=" << event_time << ", from=" << device_id << ", window_id=" << window_id << ", touch = {";
 
             for (unsigned int index = 0, count = mir_touch_event_point_count(touch_event); index != count; ++index)
                 out << "{id=" << mir_touch_event_id(touch_event, index)
@@ -323,7 +325,7 @@
                  mir_pointer_button_back, mir_pointer_button_forward})
                 button_state |= mir_pointer_event_button_state(pointer_event, a) ? a : 0;
 
-            return out << "pointer_event(when=" << event_time << ", from=" << device_id << ", "
+            return out << "pointer_event(when=" << event_time << ", from=" << device_id << ", window_id=" << window_id << ", "
                 << mir_pointer_event_action(pointer_event) << ", button_state=" << button_state
                 << ", x=" << mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_x)
                 << ", y=" << mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_y)
@@ -421,8 +423,10 @@
 
 std::ostream& mir::operator<<(std::ostream& out, MirInputDeviceStateEvent const& event)
 {
+    auto window_id = event.window_id();
     out << "input_device_state(ts="
         << mir_input_device_state_event_time(&event)
+        << ", window_id=" << window_id
         << ", mod=" << MirInputEventModifier(mir_input_device_state_event_modifiers(&event))
         << ", btns=" << mir_input_device_state_event_pointer_buttons(&event)
         << ", x=" << mir_input_device_state_event_pointer_axis(&event, mir_pointer_axis_x)