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

Add call for key events, refactor to onkeydown and onkeyup.

Browse Source
This commit is contained in:
Michael Jumper
2012-01-23 15:14:47 -08:00
parent ff6ca004db
commit a25bf0f103
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
guacamole-common-js/src/main/resources/oskeyboard.js
View File

@@ -208,9 +208,24 @@ Guacamole.OnScreenKeyboard = function(url) {
// Get content of key cap // Get content of key cap
var content = e.textContent; var content = e.textContent;
// Get keysym
var real_keysym = null;
if (keysym)
real_keysym = parseInt(keysym.value);
// If no keysym specified, try to get from key content
else if (content.length == 1) {
var charCode = content.charCodeAt(0);
if (charCode >= 0x0000 && charCode <= 0x00FF)
real_keysym = charCode;
else if (charCode >= 0x0100 && charCode <= 0x10FFFF)
real_keysym = 0x01000000 | charCode;
}
// Create cap // Create cap
var cap = new Guacamole.OnScreenKeyboard.Cap(content, var cap = new Guacamole.OnScreenKeyboard.Cap(content, real_keysym);
keysym ? keysym.value : null);
if (modifier) if (modifier)
cap.modifier = modifier.value; cap.modifier = modifier.value;
@@ -279,14 +294,23 @@ Guacamole.OnScreenKeyboard = function(url) {
} }
// TODO: Send key event if (on_screen_keyboard.onkeydown && cap.keysym)
on_screen_keyboard.onkeydown(cap.keysym);
}; };
key_element.onmouseup = key_element.onmouseup =
key_element.onmouseout = key_element.onmouseout =
key_element.ontouchend = function() { key_element.ontouchend = function() {
// Get current cap based on modifier state
var cap = key.getCap(on_screen_keyboard.modifiers);
key_element.classList.remove("guac-keyboard-pressed"); key_element.classList.remove("guac-keyboard-pressed");
if (on_screen_keyboard.onkeyup && cap.keysym)
on_screen_keyboard.onkeyup(cap.keysym);
}; };
} }
@@ -359,8 +383,8 @@ Guacamole.OnScreenKeyboard = function(url) {
*/ */
this.modifiers = 0; this.modifiers = 0;
this.onkeypressed = null; this.onkeydown = null;
this.onkeyreleased = null; this.onkeyup = null;
this.getElement = function() { this.getElement = function() {
return keyboard; return keyboard;