safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78 from glyptodon/stuck-guac-menu

Browse Source 
GUAC-998: Fix handling of Guacamole menu with respect to Meta
This commit is contained in:
James Muehlner
2015-02-05 18:19:53 -08:00
parent 08862a6220 078aeff49b
commit 1c1e7a4563
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole-common-js/src/main/webapp/modules/Keyboard.js
View File

@@ -298,8 +298,8 @@ Guacamole.Keyboard = function(element) {
this.location = location;
// If key is known from keyCode or DOM3 alone, use that
this.keysym = keysym_from_keycode(keyCode, location)
|| recentKeysym[keyCode]
this.keysym = recentKeysym[keyCode]
|| keysym_from_keycode(keyCode, location)
|| keysym_from_key_identifier(key, location); // keyCode is still more reliable for keyup when dead keys are in use
// Keyup is as reliable as it will ever be

7
guacamole/src/main/webapp/app/client/controllers/clientController.js
View File

@@ -62,9 +62,10 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
* In order to open the guacamole menu, we need to hit ctrl-alt-shift. There are
* several possible keysysms for each key.
*/
var SHIFT_KEYS = {0xFFE1 : true, 0xFFE2: true},
ALT_KEYS = {0xFFE9 : true, 0xFFEA : true, 0xFE03: true},
CTRL_KEYS = {0xFFE3 : true, 0xFFE4: true},
var SHIFT_KEYS = {0xFFE1 : true, 0xFFE2 : true},
ALT_KEYS = {0xFFE9 : true, 0xFFEA : true, 0xFE03 : true,
0xFFE7 : true, 0xFFE8 : true},
CTRL_KEYS = {0xFFE3 : true, 0xFFE4 : true},
MENU_KEYS = angular.extend({}, SHIFT_KEYS, ALT_KEYS, CTRL_KEYS);
/**