keyboardManager.js: Re-apply the keymap on resume, make sure

reapply() really does so.

- Connect to prepare-for-sleep from the login manager, re-apply the
  keymap on resume.
- Clear the existing keymap in reapply() so that _applyLayoutGroup()
  doesn't return early.

I was unable to reproduce reported issues after resume, but the
conditions for this can be hardware-dependent. Either way, the fix
is safe.

ref: #13213

Author: mtwebster

js/ui/keyboardManager.js

@@ -7,6 +7,7 @@ const Signals = imports.signals;
 const ByteArray = imports.byteArray;
 
 const IBusManager = imports.misc.ibusManager;
+const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const Cairo = imports.cairo;
@@ -107,6 +108,10 @@ var KeyboardManager = class {
         if (!this._current)
             return;
 
+        // The live X keymap may have been changed out from under us (e.g. a
+        // keyboard re-enumerating across suspend/resume), so clear the cache
+        // to force _applyLayoutGroup to re-push it.
+        this._currentKeymap = null;
         this._applyLayoutGroup(this._current.group);
         this._applyLayoutGroupIndex(this._current.groupIndex);
     }
@@ -511,6 +516,14 @@ var InputSourceManager = class {
 
         global.display.connect('modifiers-accelerator-activated', () => this._modifiersSwitcher(false));
 
+        // The keyboard device can re-initialize across suspend and drop our
+        // xkb group/options, so re-apply them on resume.
+        this._loginManager = LoginManager.getLoginManager();
+        this._loginManager.connect('prepare-for-sleep', (lm, aboutToSuspend) => {
+            if (!aboutToSuspend)
+                this._keyboardManager.reapply();
+        });
+
         this._sourcesPerWindow = false;
         this._focusWindowNotifyId = 0;
         this._overviewShowingId = 0;