Merge lp:~mir-team/qtmir/fix-key-auto-repeat into lp:qtmir

[Robert Carr]

Pass key auto-repeat flag through QtEventFeeder.

This ensures that clients of a qtmir server will receive a value for MirKeyEvent.repeat_count.

Fix key auto repeat...note though we lose the actual count of repeat_count from the original mir event, and instead just end up using it as a boolean "is this an auto-repeat event". This works fine for Qt clients as they only deal with isAutoRep, but supposedly some mir clients could want to utilize the actual repeat_count (e.g. accelerating repeat...? I'm not really confident on the use case actually).

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[Daniel d'Andrada (dandrader)]

Just checked QWindowSystemInterface::handleExtendedKeyEvent signature:

"""
void QWindowSystemInterface::handleExtendedKeyEvent(QWindow *tlw, ulong timestamp, QEvent::Type type, int key,
                                                    Qt::KeyboardModifiers modifiers,
                                                    quint32 nativeScanCode, quint32 nativeVirtualKey,
                                                    quint32 nativeModifiers,
                                                    const QString& text, bool autorep,
                                                    ushort count)

"""

So its last parameter is the repeat count. Seems to be what you want.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

And please property format your commit message.

Its first line should be a short description of the change. Then an empty line with the long, detailed, description coming after it.

[Robert Carr (robertcarr)]

Hi Daniel, I believe the count is actually something else :(

http://qt-project.org/doc/qt-4.8/qkeyevent.html#count

I got confused too.

Fixing commit message though.

[Daniel d'Andrada (dandrader)]

So maybe if, let's say, mir key is 'c' with repeat_count 4, we would have a QKeyEvent(key=Qt::Key_C, text="cccc",count=4)?

But, anyway, the bug doesn't complain about the count number.

review: Approve

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
--- src/modules/Unity/Application/mirsurfaceitem.cpp	2014-09-11 20:21:47 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.cpp	2014-09-24 21:36:07 +0000
@@ -72,9 +72,10 @@
     mirEvent.key.key_code = qtEvent->nativeVirtualKey();
     mirEvent.key.scan_code = qtEvent->nativeScanCode();
 
-    // TODO: Investigate how to pass it from mir to qt in the first place.
-    //       Then implement the reverse here.
-    mirEvent.key.repeat_count = 0;
+    // TODO: It's not the best that we lose the actual repeat count from
+    // the original mir event (pre QtEventFeeder)...of course it will
+    // not matter for Qt clients...so this is an improvement for now.
+    mirEvent.key.repeat_count = qtEvent->isAutoRepeat() ? 1 : 0;
 
     // Don't care
     mirEvent.key.down_time = 0;

=== modified file 'src/platforms/mirserver/qteventfeeder.cpp'
--- src/platforms/mirserver/qteventfeeder.cpp	2014-08-28 12:56:57 +0000
+++ src/platforms/mirserver/qteventfeeder.cpp	2014-09-24 21:36:07 +0000
@@ -264,13 +264,15 @@
     char s[2];
     int keyCode = translateKeysym(xk_sym, s, sizeof(s));
     QString text = QString::fromLatin1(s);
+    
+    bool is_auto_rep = event.repeat_count > 0;
 
     QPlatformInputContext* context = QGuiApplicationPrivate::platformIntegration()->inputContext();
     if (context) {
         // TODO: consider event.repeat_count
         QKeyEvent qKeyEvent(keyType, keyCode, modifiers,
                             event.scan_code, event.key_code, event.modifiers,
-                            text);
+                            text, is_auto_rep);
         qKeyEvent.setTimestamp(timestamp);
         if (context->filterEvent(&qKeyEvent)) {
             // key event filtered out by input context
@@ -279,7 +281,7 @@
     }
 
     mQtWindowSystem->handleExtendedKeyEvent(timestamp, keyType, keyCode, modifiers,
-            event.scan_code, event.key_code, event.modifiers, text);
+            event.scan_code, event.key_code, event.modifiers, text, is_auto_rep);
 }
 
 void QtEventFeeder::dispatchMotion(MirMotionEvent const& event)