Merge lp:~lukas-kde/unity8/osk-plus-hardware-kbd into lp:unity8

[Lukáš Tinkl]

WIP: enable happy coexistence of OSK and a physical keyboard

WIP: enable happy coexistence of OSK and a physical keyboard

[lp:~lukas-kde/unity8/osk-plus-hardware-kbd]

2809. By Lukáš Tinkl on 2017-02-14

drop debug

Unmerged revisions

2809. By Lukáš Tinkl on 2017-02-14

drop debug

2808. By Lukáš Tinkl on 2017-02-14

enable OSK happily coexisting with a HW keyboard

=== modified file 'qml/OrientedShell.qml'
--- qml/OrientedShell.qml	2017-01-24 07:38:43 +0000
+++ qml/OrientedShell.qml	2017-02-15 12:51:57 +0000
@@ -183,7 +183,7 @@
 
         // We need to manually update this on startup as the binding
         // below doesn't seem to have any effect at that stage
-        oskSettings.disableHeight = !shell.oskEnabled || shell.usageScenario == "desktop"
+        oskSettings.disableHeight = !shell.oskEnabled
     }
 
     // we must rotate to a supported orientation regardless of shell's preference
@@ -194,7 +194,7 @@
     Binding {
         target: oskSettings
         property: "disableHeight"
-        value: !shell.oskEnabled || shell.usageScenario == "desktop"
+        value: !shell.oskEnabled
     }
 
     readonly property int supportedOrientations: shell.supportedOrientations
@@ -268,12 +268,7 @@
         mode: applicationArguments.mode
         hasMouse: pointerInputDevices > 0
         hasKeyboard: keyboardsModel.count > 0
-        // TODO: Factor in if the current screen is a touch screen and if the user wants to
-        //       have multiple keyboards around. For now we only enable one keyboard at a time
-        //       thus hiding it here if there is a physical one around or if we have a second
-        //       screen (the virtual touchpad & osk on the phone) attached.
-        oskEnabled: (keyboardsModel.count === 0 && screens.count === 1) ||
-                    forceOSKEnabled
+        oskEnabled: oskPreferred || forceOSKEnabled
 
         usageScenario: {
             if (unity8Settings.usageMode === "Windowed") {

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2017-01-24 07:43:54 +0000
+++ qml/Shell.qml	2017-02-15 12:51:57 +0000
@@ -69,6 +69,11 @@
     }
     property bool hasMouse: false
     property bool hasKeyboard: false
+    onHasKeyboardChanged: {
+        if (!hasKeyboard) {
+            oskPreferred = true;
+        }
+    }
 
     // to be read from outside
     readonly property int mainAppWindowOrientationAngle: stage.mainAppWindowOrientationAngle
@@ -79,6 +84,8 @@
 
     readonly property bool showingGreeter: greeter && greeter.shown
 
+    property bool oskPreferred: !hasKeyboard
+
     property bool startingUp: true
     Timer { id: finishStartUpTimer; interval: 500; onTriggered: startingUp = false }
 
@@ -231,7 +238,12 @@
 
     WindowInputFilter {
         id: inputFilter
-        Keys.onPressed: physicalKeysMapper.onKeyPressed(event, lastInputTimestamp);
+        Keys.onPressed: {
+            physicalKeysMapper.onKeyPressed(event, lastInputTimestamp);
+            if (hasKeyboard) {
+                shell.oskPreferred = false; // only disable/hide OSK when it's coming from a hardware keyboard, not e.g. a power button press
+            }
+        }
         Keys.onReleased: physicalKeysMapper.onKeyReleased(event, lastInputTimestamp);
     }
 
@@ -244,7 +256,7 @@
                 ApplicationManager.requestFocusApplication("unity8-dash");
             }
         }
-        onTouchBegun: { cursor.opacity = 0; }
+        onTouchBegun: { cursor.opacity = 0; shell.oskPreferred = true; }
         onTouchEnded: {
             // move the (hidden) cursor to the last known touch position
             var mappedCoords = mapFromItem(null, pos.x, pos.y);

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2017-01-24 07:43:17 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2017-02-15 12:51:57 +0000
@@ -341,11 +341,11 @@
                     checked: false
                     activeFocusOnPress: false
                     onCheckedChanged: {
-                        var surface = SurfaceManager.inputMethodSurface;
-                        if (checked) {
-                            surface.setState(Mir.RestoredState);
+                        var inputMethod = testCase.inputMethodSurface();
+                        if (inputMethod.visible) {
+                            inputMethod.requestState(Mir.HiddenState);
                         } else {
-                            surface.setState(Mir.MinimizedState);
+                            inputMethod.requestState(Mir.RestoredState);
                         }
                     }
                 }
@@ -509,6 +509,18 @@
             tearDown();
         }
 
+        function inputMethodSurface() {
+            var surfaceManager = findInvisibleChild(orientedShellLoader.item, "surfaceManager");
+            verify(surfaceManager);
+            surfaceManager.createInputMethodSurface();
+
+            var tlsl = testCase.findInvisibleChild(orientedShellLoader.item, "topLevelSurfaceList");
+            verify(tlsl);
+
+            tryCompareFunction(function() { return tlsl.inputMethodSurface !== null }, true);
+            return tlsl.inputMethodSurface;
+        }
+
         function test_appSupportingOnlyPrimaryOrientationMakesPhoneShellStayPut() {
             loadShell("mako");