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

GUAC-862: Track keysyms associated with recent keypresses. Add logging of dropped keys.

Browse Source
This commit is contained in:
Michael Jumper
2014-09-22 14:21:49 -07:00
parent e33783adf4
commit b2ef2971fd
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -469,10 +469,13 @@ Guacamole.Keyboard = function(element) {
var last_keydown_result = {}; var last_keydown_result = {};
/** /**
* The keysym associated with a given keycode when keydown fired. * The keysym most recently associated with a given keycode when keydown
* fired. This object maps keycodes to keysyms.
*
* @private * @private
* @type Object.<Number, Number>
*/ */
var keydownChar = []; var recentKeysym = {};
/** /**
* Timeout before key repeat starts. * Timeout before key repeat starts.
@@ -730,6 +733,7 @@ Guacamole.Keyboard = function(element) {
keysym = keysym_from_key_identifier(first.key, first.location) keysym = keysym_from_key_identifier(first.key, first.location)
|| keysym_from_keycode(first.keyCode, first.location); || keysym_from_keycode(first.keyCode, first.location);
if (keysym) { if (keysym) {
recentKeysym[first.keyCode] = keysym;
eventLog.shift(); eventLog.shift();
return !press_key(keysym); return !press_key(keysym);
} }
@@ -740,18 +744,22 @@ Guacamole.Keyboard = function(element) {
keysym = keysym_from_charcode(next.charCode); keysym = keysym_from_charcode(next.charCode);
if (keysym) { if (keysym) {
recentKeysym[first.keyCode] = keysym;
eventLog.shift(); eventLog.shift();
return !press_key(keysym); return !press_key(keysym);
} }
// If keypress cannot be identified, then drop // If keypress cannot be identified, then drop
console.log("Warning: Key press was dropped as unidentifiable.", first);
eventLog.shift(); eventLog.shift();
} }
// Drop event if completely old and uninterpretable // Drop event if completely old and uninterpretable
else if (first.getAge() > 100) else if (first.getAge() > 100) {
console.log("Warning: Key press was dropped as ambiguous.", first);
eventLog.shift(); eventLog.shift();
}
// Lacking further information, pray for a future keypress event // Lacking further information, pray for a future keypress event
else else
@@ -764,7 +772,8 @@ Guacamole.Keyboard = function(element) {
// If key is known from keyCode or DOM3 alone, use that // If key is known from keyCode or DOM3 alone, use that
var keysym = keysym_from_key_identifier(first.key, first.location) var keysym = keysym_from_key_identifier(first.key, first.location)
|| keysym_from_keycode(first.keyCode, first.location); || keysym_from_keycode(first.keyCode, first.location)
|| recentKeysym[first.keyCode];
if (keysym) { if (keysym) {
eventLog.shift(); eventLog.shift();
release_key(keysym); release_key(keysym);
@@ -772,6 +781,7 @@ Guacamole.Keyboard = function(element) {
} }
// Drop if keyup cannot be narrowed to a specific key // Drop if keyup cannot be narrowed to a specific key
console.log("Warning: Key release was dropped as ambiguous.", first);
eventLog.shift(); eventLog.shift();
} }