#142 move keyboard layout query to client

html5/index.html

@@ -1382,32 +1382,9 @@ <h2>Xpra Bug Report</h2>
 				xhr.send();
 			}
 
-			function query_keyboard_map() {
-				var keyboard = navigator.keyboard;
-				keyboard.getLayoutMap().then(keyboardLayoutMap => {
-					clog("got a keyboard layout map:", keyboardLayoutMap);
-					//TODO: build the client keymap somehow
-					load_default_settings();
-					clog("keys:", Array.from(keyboardLayoutMap.keys()));
-					for (const [key, value] of keyboardLayoutMap.entries()) {
-						cdebug("keyboard", key, "=", value);
-					}
-				});
-				if (keyboard.addEventListener) {
-					keyboard.addEventListener("layoutchange", function() {
-						clog("keyboard layout has changed!");
-					});
-				}
-			}
-
 			$(document).ready(function() {
 				clog("document is ready, browser is", navigator.platform, "64-bit:", Utilities.is_64bit());
-				if (navigator.keyboard && navigator.keyboard.getLayoutMap) {
-					query_keyboard_map();
-				}
-				else {
-					load_default_settings();
-				}
+				load_default_settings();
 			});
 		</script>
 	</body>

html5/js/Client.js

@@ -637,6 +637,7 @@ XpraClient.prototype._screen_resized = function(event, ctx) {
  */
 XpraClient.prototype.init_keyboard = function() {
 	const me = this;
+	this.query_keyboard_map();
 	// modifier keys:
 	this.num_lock_modifier = null;
 	this.alt_modifier = null;
@@ -702,6 +703,26 @@ XpraClient.prototype.init_keyboard = function() {
 	});
 };
 
+XpraClient.prototype.query_keyboard_map = function() {
+	var keyboard = navigator.keyboard;
+	this.keyboard_map = {};
+	if (!navigator.keyboard) {
+		return;
+	}
+	keyboard.getLayoutMap().then(keyboardLayoutMap => {
+		clog("got a keyboard layout map:", keyboardLayoutMap);
+		clog("keys:", Array.from(keyboardLayoutMap.keys()));
+		for (const [key, value] of keyboardLayoutMap.entries()) {
+			cdebug("keyboard", key, "=", value);
+			this.keyboard_map[key] = value;
+		}
+	});
+	if (keyboard.addEventListener) {
+		keyboard.addEventListener("layoutchange", function() {
+			clog("keyboard layout has changed!");
+		});
+	}
+};
 
 XpraClient.prototype._keyb_get_modifiers = function(event) {
 	/**