jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keyboard Handling [4/8]: Update input.html to work with new keyboard handling 

Plug new keyboard handling into input.js (which breaks everything else), and update input.html to work with this
This commit is contained in:
jalf 2013-11-27 15:17:32 +01:00 committed by Solly Ross
parent f00b6fb69a
commit 9ceef041c6
2 changed files with 73 additions and 1639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1695
include/input.js
View File

File diff suppressed because it is too large Load Diff

19
tests/input.html
View File

@ -26,6 +26,8 @@
<script src="../include/util.js"></script> <script src="../include/util.js"></script>
<script src="../include/webutil.js"></script> <script src="../include/webutil.js"></script>
<script src="../include/base64.js"></script> <script src="../include/base64.js"></script>
<script src="../include/keysymdef.js"></script>
<script src="../include/keyboard.js"></script>
<script src="../include/input.js"></script> <script src="../include/input.js"></script>
<script src="../include/display.js"></script> <script src="../include/display.js"></script>
<script> <script>
@ -57,9 +59,17 @@
//console.log(msg); //console.log(msg);
} }
function keyPress(keysym, down, e) { function rfbKeyPress(keysym, down) {
var d = down ? "down" : " up "; var d = down ? "down" : " up ";
msg = "keyPress " + d + " keysym: " + keysym + var key = keysyms.lookup(keysym);
var msg = "RFB keypress " + d + " keysym: " + keysym;
if (key && key.keyname) {
msg += " key name: " + key.keyname;
}
message(msg);
}
function rawKey(e) {
msg = "raw key event " + e.type +
" (key: " + e.keyCode + ", char: " + e.charCode + " (key: " + e.keyCode + ", char: " + e.charCode +
", which: " + e.which +")"; ", which: " + e.which +")";
message(msg); message(msg);
@ -94,7 +104,10 @@
window.onload = function() { window.onload = function() {
canvas = new Display({'target' : $D('canvas')}); canvas = new Display({'target' : $D('canvas')});
keyboard = new Keyboard({'target': document, keyboard = new Keyboard({'target': document,
'onKeyPress': keyPress}); 'onKeyPress': rfbKeyPress});
Util.addEvent(document, 'keypress', rawKey);
Util.addEvent(document, 'keydown', rawKey);
Util.addEvent(document, 'keyup', rawKey);
mouse = new Mouse({'target': $D('canvas'), mouse = new Mouse({'target': $D('canvas'),
'onMouseButton': mouseButton, 'onMouseButton': mouseButton,
'onMouseMove': mouseMove}); 'onMouseMove': mouseMove});