Merge lp:~kdub/qtmir/mir-mac-compatibility into lp:qtmir

[Kevin DuBois]

fix api break in event construction that accommodates mir's attestable timestamp support

fix api break in event construction that accommodates mir's attestable timestamp support

Unmerged revisions

370. By Kevin DuBois on 2015-09-04

compatibility with mir mac input stamps

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2015-08-26 11:38:50 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2015-09-04 14:26:52 +0000
@@ -62,7 +62,7 @@
     if (qtEvent->buttons() & Qt::MidButton)
         buttons |= mir_pointer_button_tertiary;
 
-    return mir::events::make_event(0 /*DeviceID */, timestamp, modifiers, action,
+    return mir::events::make_event(0 /*DeviceID */, timestamp, 0, modifiers, action,
                                    buttons, qtEvent->x(), qtEvent->y(), 0, 0);
 }
 
@@ -72,7 +72,7 @@
 
     MirPointerButtons buttons = 0;
 
-    return mir::events::make_event(0 /*DeviceID */, timestamp, mir_input_event_modifier_none, action,
+    return mir::events::make_event(0 /*DeviceID */, timestamp, 0, mir_input_event_modifier_none, action,
                                    buttons, qtEvent->posF().x(), qtEvent->posF().y(), 0, 0);
 }
 
@@ -94,7 +94,7 @@
         action = mir_keyboard_action_repeat;
 
     return mir::events::make_event(0 /* DeviceID */, std::chrono::milliseconds(qtEvent->timestamp()),
-                           action, qtEvent->nativeVirtualKey(),
+                           0, action, qtEvent->nativeVirtualKey(),
                            qtEvent->nativeScanCode(),
                            qtEvent->nativeModifiers());
 }
@@ -105,7 +105,7 @@
                             ulong qtTimestamp)
 {
     auto modifiers = getMirModifiersFromQt(qmods);
-    auto ev = mir::events::make_event(0, std::chrono::milliseconds(qtTimestamp),
+    auto ev = mir::events::make_event(0, std::chrono::milliseconds(qtTimestamp), 0,
                                       modifiers);
 
     for (int i = 0; i < qtTouchPoints.count(); ++i) {

=== modified file 'tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp'
--- tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp	2015-08-11 12:08:32 +0000
+++ tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp	2015-09-04 14:26:52 +0000
@@ -117,7 +117,7 @@
                                                               Contains(AllOf(HasId(0),
                                                                              IsPressed()))),_)).Times(1);
 
-    auto ev1 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(123), 0);
+    auto ev1 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(123), 0, 0);
     mev::add_touch(*ev1, 0 /* touch ID */, mir_touch_action_down, mir_touch_tooltype_unknown,
                    10, 10, 10 /* x, y, pressure */,
                    1, 1, 10 /* touch major, minor, size */);
@@ -142,7 +142,7 @@
                                                ),_)).Times(1);
     }
 
-    auto ev2 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(125), 0);
+    auto ev2 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(125), 0, 0);
     mev::add_touch(*ev2, 1 /* touch ID */, mir_touch_action_down, mir_touch_tooltype_unknown,
                    20, 20, 10 /* x, y, pressure*/,
                    1, 1, 10 /* touch major, minor, size */);
@@ -156,7 +156,7 @@
 
     setIrrelevantMockWindowSystemExpectations();
 
-    auto ev1 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(123), 0);
+    auto ev1 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(123), 0, 0);
     mev::add_touch(*ev1, 0 /* touch ID */, mir_touch_action_down, mir_touch_tooltype_unknown,
                    10, 10, 10 /* x, y, pressure*/,
                    1, 1, 10 /* touch major, minor, size */);
@@ -172,7 +172,7 @@
 
     setIrrelevantMockWindowSystemExpectations();
 
-    auto ev2 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(124), 0);
+    auto ev2 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(124), 0, 0);
     mev::add_touch(*ev2, 0 /* touch ID */, mir_touch_action_change, mir_touch_tooltype_unknown,
                    10, 10, 10 /* x, y, pressure*/,
                    1, 1, 10 /* touch major, minor, size */);
@@ -194,7 +194,7 @@
     setIrrelevantMockWindowSystemExpectations();
 
     // touch 0 disappeared and touch 2 got pressed
-    auto ev3 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(125), 0);
+    auto ev3 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(125), 0, 0);
     mev::add_touch(*ev3, 1 /* touch ID */, mir_touch_action_change, mir_touch_tooltype_unknown,
                    20, 20, 10 /* x, y, pressure*/,
                    1, 1, 10 /* touch major, minor, size */);
@@ -234,7 +234,7 @@
                                                               Contains(AllOf(HasId(0),
                                                                              IsPressed()))),_)).Times(1);
 
-    auto ev1 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(123), 0);
+    auto ev1 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(123), 0, 0);
     mev::add_touch(*ev1, /* touch ID */ 0, mir_touch_action_down, mir_touch_tooltype_unknown,
                    10, 10, 10, 1, 1, 10);
     qtEventFeeder->dispatch(*ev1);
@@ -247,7 +247,7 @@
                                                               Contains(AllOf(HasId(0), StateIsMoved()))
                                                              ),_)).Times(1);
 
-    auto ev2 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(123), 0);
+    auto ev2 = mev::make_event(MirInputDeviceId(), std::chrono::milliseconds(123), 0, 0);
     mev::add_touch(*ev2, /* touch ID */ 0, mir_touch_action_down, mir_touch_tooltype_unknown,
                    10, 10, 10, 1, 1, 10);
     qtEventFeeder->dispatch(*ev2);