Merge lp:~osomon/qtubuntu/qkeyevent-native-virtual-key into lp:qtubuntu

[Olivier Tilloy]

Instantiate QKeyEvents with the scan code, native modifiers and native virtual key code, and special-case XKB_KEY_Return and XKB_KEY_KP_Enter to emit a carriage return character.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:307
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/86
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/86/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~osomon/qtubuntu/qkeyevent-native-virtual-key]

308. By Olivier Tilloy on 2016-01-14

Also pass the scan code, native modifiers and native virtual key code to QWindowSystemInterface.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:308
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/296/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/87
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/87/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~osomon/qtubuntu/qkeyevent-native-virtual-key]

309. By Olivier Tilloy on 2016-01-15

Special case Enter and Return to forward the event with the correct text.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:309
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/298/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/89
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/89/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~osomon/qtubuntu/qkeyevent-native-virtual-key]

310. By Olivier Tilloy on 2016-01-15

Send the Carriage Return character to actually get a new line.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:310
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/299/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/90/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Works fine for me

P.S. Submitted from a u8 session :)

review: Approve

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2015-12-23 13:55:42 +0000
+++ src/ubuntumirclient/input.cpp	2016-01-15 17:21:55 +0000
@@ -367,6 +367,11 @@
     if (sym >= XKB_KEY_F1 && sym <= XKB_KEY_F35)
         return Qt::Key_F1 + (int(sym) - XKB_KEY_F1);
 
+    if (sym == XKB_KEY_Return || sym == XKB_KEY_KP_Enter) {
+        string[0] = '\r';
+        string[1] = '\0';
+    }
+
     for (int i = 0; KeyTable[i]; i += 2) {
         if (sym == KeyTable[i])
             return KeyTable[i + 1];
@@ -404,6 +409,8 @@
 
     ulong timestamp = mir_input_event_get_event_time(event) / 1000000;
     xkb_keysym_t xk_sym = mir_keyboard_event_key_code(key_event);
+    quint32 scan_code = mir_keyboard_event_scan_code(key_event);
+    quint32 native_modifiers = mir_keyboard_event_modifiers(key_event);
 
     // Key modifier and unicode index mapping.
     auto modifiers = qt_modifiers_from_mir(mir_keyboard_event_modifiers(key_event));
@@ -423,7 +430,7 @@
 
     QPlatformInputContext *context = QGuiApplicationPrivate::platformIntegration()->inputContext();
     if (context) {
-        QKeyEvent qKeyEvent(keyType, sym, modifiers, text, is_auto_rep);
+        QKeyEvent qKeyEvent(keyType, sym, modifiers, scan_code, xk_sym, native_modifiers, text, is_auto_rep);
         qKeyEvent.setTimestamp(timestamp);
         if (context->filterEvent(&qKeyEvent)) {
             DLOG("key event filtered out by input context");
@@ -431,7 +438,7 @@
         }
     }
 
-    QWindowSystemInterface::handleKeyEvent(window->window(), timestamp, keyType, sym, modifiers, text, is_auto_rep);
+    QWindowSystemInterface::handleExtendedKeyEvent(window->window(), timestamp, keyType, sym, modifiers, scan_code, xk_sym, native_modifiers, text, is_auto_rep);
 }
 
 namespace