// Configuration settings
Util.conf_default(conf, that, 'target', null);
+// Area that traps keyboard input
+Util.conf_default(conf, that, 'focusContainer', document);
Util.conf_default(conf, that, 'true_color', true);
Util.conf_default(conf, that, 'focused', true);
Util.conf_default(conf, that, 'colourMap', []);
Util.conf_default(conf, that, 'scale', 1);
-Util.conf_default(conf, that, 'currentDocument', document);
// Override some specific getters/setters
that.set_prefer_js = function(val) {
c_mouseButton = mouseButtonFunc || null;
c_mouseMove = mouseMoveFunc || null;
- Util.addEvent(conf.currentDocument, 'keydown', onKeyDown);
- Util.addEvent(conf.currentDocument, 'keyup', onKeyUp);
+ Util.addEvent(conf.focusContainer, 'keydown', onKeyDown);
+ Util.addEvent(conf.focusContainer, 'keyup', onKeyUp);
Util.addEvent(c, 'mousedown', onMouseDown);
Util.addEvent(c, 'mouseup', onMouseUp);
Util.addEvent(c, 'mousemove', onMouseMove);
onMouseWheel);
/* Work around right and middle click browser behaviors */
- Util.addEvent(conf.currentDocument, 'click', onMouseDisable);
- Util.addEvent(conf.currentDocument.body, 'contextmenu', onMouseDisable);
+ Util.addEvent(conf.focusContainer, 'click', onMouseDisable);
+ Util.addEvent(conf.focusContainer.body, 'contextmenu', onMouseDisable);
Util.Debug("<< Canvas.start");
};
that.stop = function() {
var c = conf.target;
- Util.removeEvent(conf.currentDocument, 'keydown', onKeyDown);
- Util.removeEvent(conf.currentDocument, 'keyup', onKeyUp);
+ Util.removeEvent(conf.focusContainer, 'keydown', onKeyDown);
+ Util.removeEvent(conf.focusContainer, 'keyup', onKeyUp);
Util.removeEvent(c, 'mousedown', onMouseDown);
Util.removeEvent(c, 'mouseup', onMouseUp);
Util.removeEvent(c, 'mousemove', onMouseMove);
onMouseWheel);
/* Work around right and middle click browser behaviors */
- Util.removeEvent(conf.currentDocument, 'click', onMouseDisable);
- Util.removeEvent(conf.currentDocument.body, 'contextmenu', onMouseDisable);
+ Util.removeEvent(conf.focusContainer, 'click', onMouseDisable);
+ Util.removeEvent(conf.focusContainer.body, 'contextmenu', onMouseDisable);
// Turn off cursor rendering
if (conf.cursor_uri) {
//
// VNC viewport rendering Canvas
-//Util.conf_default(conf, that, 'target', 'VNC_canvas');
+Util.conf_default(conf, that, 'target', 'VNC_canvas');
+// Area that traps keyboard input
+Util.conf_default(conf, that, 'focusContainer', document);
Util.conf_default(conf, that, 'encrypt', false, true);
Util.conf_default(conf, that, 'true_color', true, true);
Util.conf_default(conf, that, 'b64encode', true, true);
Util.conf_default(conf, that, 'local_cursor', true, true);
-Util.conf_default(conf, that, 'currentDocument', true, document);
-
// time to wait for connection
Util.conf_default(conf, that, 'connectTimeout', 2000);
// frequency to check for send/receive
}
// Initialize canvas
try {
- canvas = new Canvas({'target': conf.target, 'currentDocument': conf.currentDocument});
+ canvas = new Canvas({'target': conf.target,
+ 'focusContainer': conf.focusContainer});
} catch (exc) {
Util.Error("Canvas exception: " + exc);
updateState('fatal', "No working Canvas");