From bf605fa6aa1e95dca4d423faee1abd67c00b3f78 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 18 2021 04:13:11 +0000
Subject: import gnome-shell-3.32.2-30.el8


---

diff --git a/SOURCES/0001-keyboard-Only-enable-keyboard-if-ClutterDeviceManage.patch b/SOURCES/0001-keyboard-Only-enable-keyboard-if-ClutterDeviceManage.patch
new file mode 100644
index 0000000..a781d43
--- /dev/null
+++ b/SOURCES/0001-keyboard-Only-enable-keyboard-if-ClutterDeviceManage.patch
@@ -0,0 +1,39 @@
+From 2acede02f30833c3fb891db8483f933f7b41508c Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Wed, 21 Oct 2020 21:32:03 +0200
+Subject: [PATCH] keyboard: Only enable keyboard if
+ ClutterDeviceManager::touch-mode is enabled
+
+---
+ js/ui/keyboard.js | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
+index 94b5325..b1ee270 100644
+--- a/js/ui/keyboard.js
++++ b/js/ui/keyboard.js
+@@ -1051,6 +1051,9 @@ var Keyboard = class Keyboard {
+         this._suggestions = null;
+         this._emojiKeyVisible = true;
+ 
++        let manager = Clutter.DeviceManager.get_default();
++        manager.connect('notify::touch-mode', this._syncEnabled.bind(this));
++
+         this._focusTracker = new FocusTracker();
+         this._focusTracker.connect('position-changed', this._onFocusPositionChanged.bind(this));
+         this._focusTracker.connect('reset', () => {
+@@ -1120,8 +1123,10 @@ var Keyboard = class Keyboard {
+ 
+     _syncEnabled() {
+         let wasEnabled = this._enabled;
++        let manager = Clutter.DeviceManager.get_default();
++        let autoEnabled = manager.get_touch_mode() && this._lastDeviceIsTouchscreen();
+         this._enableKeyboard = this._a11yApplicationsSettings.get_boolean(SHOW_KEYBOARD);
+-        this._enabled = this._enableKeyboard || this._lastDeviceIsTouchscreen();
++        this._enabled = this._enableKeyboard || autoEnabled;
+         if (!this._enabled && !this._keyboardController)
+             return;
+ 
+-- 
+2.26.2
+
diff --git a/SPECS/gnome-shell.spec b/SPECS/gnome-shell.spec
index 6f557c2..b3eb970 100644
--- a/SPECS/gnome-shell.spec
+++ b/SPECS/gnome-shell.spec
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        3.32.2
-Release:        29%{?dist}
+Release:        30%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -70,6 +70,7 @@ Patch70: 0001-screencast-Stop-recording-when-screen-size-or-resour.patch
 
 # Backport OSK fixes (#1871041)
 Patch75: osk-fixes.patch
+Patch76: 0001-keyboard-Only-enable-keyboard-if-ClutterDeviceManage.patch
 
 # suspend/resume fix on nvidia (#1663440)
 Patch10001: 0001-background-refresh-after-suspend-on-wayland.patch
@@ -252,6 +253,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Mon Feb 22 2021 Carlos Garnacho <cgarnach@redhat.com> - 3.32.2-30
+- Backport of touch mode
+  Resolves: #1833787
+
 * Mon Feb 01 2021 Florian Müllner <fmuellner@redhat.com> - 3.32.2-29
 - Refuse to override system extensions
   Related: #1802105