Merge lp:~alan-griffiths/qtmir/small-refactoring-of-QtEventFeeder into lp:qtmir

[Alan Griffiths]

Put the timestamp acquisition in QtEventFeeder::dispatch() instead of repeating it four times in the type-specific dispatch functions.

Put the timestamp acquisition in QtEventFeeder::dispatch() instead of repeating it four times in the type-specific dispatch functions.

(Should obviously not change behaviour.)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:352
http://jenkins.qa.ubuntu.com/job/qtmir-ci/332/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/65/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/332/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Code looks good.

review: Approve (codewise)

[lp:~alan-griffiths/qtmir/small-refactoring-of-QtEventFeeder]

350. By Alan Griffiths on 2015-08-06

  Deduplicate timestamp acquisition

351. By Alan Griffiths on 2015-08-06

  Make timestamps consistently ulong

352. By Alan Griffiths on 2015-08-06

  Inline single use variable

[Daniel d'Andrada (dandrader)]

Manual tests didn't show any regressions.

review: Approve

[Michał Sawicz (saviq)]

Text conflict in src/platforms/mirserver/qteventfeeder.cpp
1 conflicts encountered.

review: Needs Fixing

Unmerged revisions

352. By Alan Griffiths on 2015-08-06

  Inline single use variable

351. By Alan Griffiths on 2015-08-06

  Make timestamps consistently ulong

350. By Alan Griffiths on 2015-08-06

  Deduplicate timestamp acquisition

=== modified file 'src/platforms/mirserver/qteventfeeder.cpp'
--- src/platforms/mirserver/qteventfeeder.cpp	2015-06-24 23:08:44 +0000
+++ src/platforms/mirserver/qteventfeeder.cpp	2015-08-06 09:01:23 +0000
@@ -221,20 +221,22 @@
 
 bool QtEventFeeder::dispatch(MirEvent const& event)
 {
-    auto type = mir_event_get_type(&event);
-    if (type != mir_event_type_input)
+    if (mir_event_get_type(&event) != mir_event_type_input)
         return false;
-    auto iev = mir_event_get_input_event(&event);
+    auto const iev = mir_event_get_input_event(&event);
+
+    // Convert nanoseconds to milliseconds, precision lost but time difference suitable
+    auto const timestamp = mir_input_event_get_event_time(iev) / 1000000;
 
     switch (mir_input_event_get_type(iev)) {
     case mir_input_event_type_key:
-        dispatchKey(iev);
+        dispatchKey(mir_input_event_get_keyboard_event(iev), timestamp);
         break;
     case mir_input_event_type_touch:
-        dispatchTouch(iev);
+        dispatchTouch(mir_input_event_get_touch_event(iev), timestamp);
         break;
     case mir_input_event_type_pointer:
-        dispatchPointer(iev);
+        dispatchPointer(mir_input_event_get_pointer_event(iev), timestamp);
     default:
         break;
     }
@@ -279,14 +281,11 @@
 }
 }
 
-void QtEventFeeder::dispatchPointer(MirInputEvent const* ev)
+void QtEventFeeder::dispatchPointer(MirPointerEvent const* pev, ulong timestamp)
 {
     if (!mQtWindowSystem->hasTargetWindow())
         return;
 
-    auto timestamp = mir_input_event_get_event_time(ev) / 1000000;
-
-    auto pev = mir_input_event_get_pointer_event(ev);
     auto modifiers = getQtModifiersFromMir(mir_pointer_event_modifiers(pev));
     auto buttons = getQtMouseButtonsfromMirPointerEvent(pev);
 
@@ -297,14 +296,11 @@
                                       buttons, modifiers);
 }
 
-void QtEventFeeder::dispatchKey(MirInputEvent const* event)
+void QtEventFeeder::dispatchKey(MirKeyboardEvent const* kev, ulong timestamp)
 {
     if (!mQtWindowSystem->hasTargetWindow())
         return;
 
-    ulong timestamp = mir_input_event_get_event_time(event) / 1000000;
-
-    auto kev = mir_input_event_get_keyboard_event(event);
     xkb_keysym_t xk_sym = mir_keyboard_event_key_code(kev);
 
     // Key modifier and unicode index mapping.
@@ -354,12 +350,11 @@
         mir_keyboard_event_modifiers(kev), text, is_auto_rep);
 }
 
-void QtEventFeeder::dispatchTouch(MirInputEvent const* event)
+void QtEventFeeder::dispatchTouch(MirTouchEvent const* tev, ulong timestamp)
 {
     if (!mQtWindowSystem->hasTargetWindow())
         return;
 
-    auto tev = mir_input_event_get_touch_event(event);
     qCDebug(QTMIR_MIR_INPUT) << "Received" << qPrintable(mirTouchEventToString(tev));
 
     // FIXME(loicm) Max pressure is device specific. That one is for the Samsung Galaxy Nexus. That
@@ -404,13 +399,12 @@
 
     // Qt needs a happy, sane stream of touch events. So let's make sure we're not forwarding
     // any insanity.
-    validateTouches(mir_input_event_get_event_time(event) / 1000000, touchPoints);
+    validateTouches(timestamp, touchPoints);
 
     // Touch event propagation.
     qCDebug(QTMIR_MIR_INPUT) << "Sending to Qt" << qPrintable(touchesToString(touchPoints));
     mQtWindowSystem->handleTouchEvent(
-        //scales down the nsec_t (int64) to fit a ulong, precision lost but time difference suitable
-        mir_input_event_get_event_time(event) / 1000000,
+        timestamp,
         mTouchDevice,
         touchPoints);
 }

=== modified file 'src/platforms/mirserver/qteventfeeder.h'
--- src/platforms/mirserver/qteventfeeder.h	2015-06-24 23:08:44 +0000
+++ src/platforms/mirserver/qteventfeeder.h	2015-08-06 09:01:23 +0000
@@ -66,9 +66,9 @@
     void stop() override;
 
 private:
-    void dispatchKey(MirInputEvent const* event);
-    void dispatchTouch(MirInputEvent const* event);
-    void dispatchPointer(MirInputEvent const* event);
+    void dispatchKey(MirKeyboardEvent const* kev, ulong timestamp);
+    void dispatchTouch(MirTouchEvent const* tev, ulong timestamp);
+    void dispatchPointer(MirPointerEvent const* pev, ulong timestamp);
     void validateTouches(ulong timestamp, QList<QWindowSystemInterface::TouchPoint> &touchPoints);
     bool validateTouch(QWindowSystemInterface::TouchPoint &touchPoint);
     void sendActiveTouchRelease(ulong timestamp, int id);