Split devices.js into keyboard.js and mouse.js
This commit is contained in:
Samuel Mannehed
parent
c509e6d9c8
commit
c1e2785fb6
|
|
@ -9,8 +9,7 @@
|
||||||
/*global window, Util */
|
/*global window, Util */
|
||||||
|
|
||||||
import * as Log from '../util/logging.js';
|
import * as Log from '../util/logging.js';
|
||||||
import { isTouchDevice } from '../util/browsers.js';
|
import { stopEvent } from '../util/events.js';
|
||||||
import { setCapture, stopEvent, getPointerEvent } from '../util/events.js';
|
|
||||||
import { set_defaults, make_properties } from '../util/properties.js';
|
import { set_defaults, make_properties } from '../util/properties.js';
|
||||||
import * as KeyboardUtil from "./util.js";
|
import * as KeyboardUtil from "./util.js";
|
||||||
import KeyTable from "./keysym.js";
|
import KeyTable from "./keysym.js";
|
||||||
|
|
@ -19,7 +18,7 @@ import KeyTable from "./keysym.js";
|
||||||
// Keyboard event handler
|
// Keyboard event handler
|
||||||
//
|
//
|
||||||
|
|
||||||
function Keyboard(defaults) {
|
export default function Keyboard(defaults) {
|
||||||
this._keyDownList = {}; // List of depressed keys
|
this._keyDownList = {}; // List of depressed keys
|
||||||
// (even if they are happy)
|
// (even if they are happy)
|
||||||
this._pendingKey = null; // Key waiting for keypress
|
this._pendingKey = null; // Key waiting for keypress
|
||||||
|
|
@ -353,223 +352,3 @@ make_properties(Keyboard, [
|
||||||
|
|
||||||
['onKeyEvent', 'rw', 'func'] // Handler for key press/release
|
['onKeyEvent', 'rw', 'func'] // Handler for key press/release
|
||||||
]);
|
]);
|
||||||
|
|
||||||
function Mouse(defaults) {
|
|
||||||
|
|
||||||
this._doubleClickTimer = null;
|
|
||||||
this._lastTouchPos = null;
|
|
||||||
|
|
||||||
// Configuration attributes
|
|
||||||
set_defaults(this, defaults, {
|
|
||||||
'target': document,
|
|
||||||
'focused': true,
|
|
||||||
'touchButton': 1
|
|
||||||
});
|
|
||||||
|
|
||||||
this._eventHandlers = {
|
|
||||||
'mousedown': this._handleMouseDown.bind(this),
|
|
||||||
'mouseup': this._handleMouseUp.bind(this),
|
|
||||||
'mousemove': this._handleMouseMove.bind(this),
|
|
||||||
'mousewheel': this._handleMouseWheel.bind(this),
|
|
||||||
'mousedisable': this._handleMouseDisable.bind(this)
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
Mouse.prototype = {
|
|
||||||
// private methods
|
|
||||||
|
|
||||||
_resetDoubleClickTimer: function () {
|
|
||||||
this._doubleClickTimer = null;
|
|
||||||
},
|
|
||||||
|
|
||||||
_handleMouseButton: function (e, down) {
|
|
||||||
if (!this._focused) { return; }
|
|
||||||
|
|
||||||
var pos = this._getMousePosition(e);
|
|
||||||
|
|
||||||
var bmask;
|
|
||||||
if (e.touches || e.changedTouches) {
|
|
||||||
// Touch device
|
|
||||||
|
|
||||||
// When two touches occur within 500 ms of each other and are
|
|
||||||
// close enough together a double click is triggered.
|
|
||||||
if (down == 1) {
|
|
||||||
if (this._doubleClickTimer === null) {
|
|
||||||
this._lastTouchPos = pos;
|
|
||||||
} else {
|
|
||||||
clearTimeout(this._doubleClickTimer);
|
|
||||||
|
|
||||||
// When the distance between the two touches is small enough
|
|
||||||
// force the position of the latter touch to the position of
|
|
||||||
// the first.
|
|
||||||
|
|
||||||
var xs = this._lastTouchPos.x - pos.x;
|
|
||||||
var ys = this._lastTouchPos.y - pos.y;
|
|
||||||
var d = Math.sqrt((xs * xs) + (ys * ys));
|
|
||||||
|
|
||||||
// The goal is to trigger on a certain physical width, the
|
|
||||||
// devicePixelRatio brings us a bit closer but is not optimal.
|
|
||||||
var threshold = 20 * (window.devicePixelRatio || 1);
|
|
||||||
if (d < threshold) {
|
|
||||||
pos = this._lastTouchPos;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this._doubleClickTimer = setTimeout(this._resetDoubleClickTimer.bind(this), 500);
|
|
||||||
}
|
|
||||||
bmask = this._touchButton;
|
|
||||||
// If bmask is set
|
|
||||||
} else if (e.which) {
|
|
||||||
/* everything except IE */
|
|
||||||
bmask = 1 << e.button;
|
|
||||||
} else {
|
|
||||||
/* IE including 9 */
|
|
||||||
bmask = (e.button & 0x1) + // Left
|
|
||||||
(e.button & 0x2) * 2 + // Right
|
|
||||||
(e.button & 0x4) / 2; // Middle
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this._onMouseButton) {
|
|
||||||
Log.Debug("onMouseButton " + (down ? "down" : "up") +
|
|
||||||
", x: " + pos.x + ", y: " + pos.y + ", bmask: " + bmask);
|
|
||||||
this._onMouseButton(pos.x, pos.y, down, bmask);
|
|
||||||
}
|
|
||||||
stopEvent(e);
|
|
||||||
},
|
|
||||||
|
|
||||||
_handleMouseDown: function (e) {
|
|
||||||
// Touch events have implicit capture
|
|
||||||
if (e.type === "mousedown") {
|
|
||||||
setCapture(this._target);
|
|
||||||
}
|
|
||||||
|
|
||||||
this._handleMouseButton(e, 1);
|
|
||||||
},
|
|
||||||
|
|
||||||
_handleMouseUp: function (e) {
|
|
||||||
this._handleMouseButton(e, 0);
|
|
||||||
},
|
|
||||||
|
|
||||||
_handleMouseWheel: function (e) {
|
|
||||||
if (!this._focused) { return; }
|
|
||||||
|
|
||||||
var pos = this._getMousePosition(e);
|
|
||||||
|
|
||||||
if (this._onMouseButton) {
|
|
||||||
if (e.deltaX < 0) {
|
|
||||||
this._onMouseButton(pos.x, pos.y, 1, 1 << 5);
|
|
||||||
this._onMouseButton(pos.x, pos.y, 0, 1 << 5);
|
|
||||||
} else if (e.deltaX > 0) {
|
|
||||||
this._onMouseButton(pos.x, pos.y, 1, 1 << 6);
|
|
||||||
this._onMouseButton(pos.x, pos.y, 0, 1 << 6);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (e.deltaY < 0) {
|
|
||||||
this._onMouseButton(pos.x, pos.y, 1, 1 << 3);
|
|
||||||
this._onMouseButton(pos.x, pos.y, 0, 1 << 3);
|
|
||||||
} else if (e.deltaY > 0) {
|
|
||||||
this._onMouseButton(pos.x, pos.y, 1, 1 << 4);
|
|
||||||
this._onMouseButton(pos.x, pos.y, 0, 1 << 4);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stopEvent(e);
|
|
||||||
},
|
|
||||||
|
|
||||||
_handleMouseMove: function (e) {
|
|
||||||
if (! this._focused) { return; }
|
|
||||||
|
|
||||||
var pos = this._getMousePosition(e);
|
|
||||||
if (this._onMouseMove) {
|
|
||||||
this._onMouseMove(pos.x, pos.y);
|
|
||||||
}
|
|
||||||
stopEvent(e);
|
|
||||||
},
|
|
||||||
|
|
||||||
_handleMouseDisable: function (e) {
|
|
||||||
if (!this._focused) { return; }
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Stop propagation if inside canvas area
|
|
||||||
* Note: This is only needed for the 'click' event as it fails
|
|
||||||
* to fire properly for the target element so we have
|
|
||||||
* to listen on the document element instead.
|
|
||||||
*/
|
|
||||||
if (e.target == this._target) {
|
|
||||||
stopEvent(e);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
// Return coordinates relative to target
|
|
||||||
_getMousePosition: function(e) {
|
|
||||||
e = getPointerEvent(e);
|
|
||||||
var bounds = this._target.getBoundingClientRect();
|
|
||||||
var x, y;
|
|
||||||
// Clip to target bounds
|
|
||||||
if (e.clientX < bounds.left) {
|
|
||||||
x = 0;
|
|
||||||
} else if (e.clientX >= bounds.right) {
|
|
||||||
x = bounds.width - 1;
|
|
||||||
} else {
|
|
||||||
x = e.clientX - bounds.left;
|
|
||||||
}
|
|
||||||
if (e.clientY < bounds.top) {
|
|
||||||
y = 0;
|
|
||||||
} else if (e.clientY >= bounds.bottom) {
|
|
||||||
y = bounds.height - 1;
|
|
||||||
} else {
|
|
||||||
y = e.clientY - bounds.top;
|
|
||||||
}
|
|
||||||
return {x:x, y:y};
|
|
||||||
},
|
|
||||||
|
|
||||||
// Public methods
|
|
||||||
grab: function () {
|
|
||||||
var c = this._target;
|
|
||||||
|
|
||||||
if (isTouchDevice) {
|
|
||||||
c.addEventListener('touchstart', this._eventHandlers.mousedown);
|
|
||||||
c.addEventListener('touchend', this._eventHandlers.mouseup);
|
|
||||||
c.addEventListener('touchmove', this._eventHandlers.mousemove);
|
|
||||||
}
|
|
||||||
c.addEventListener('mousedown', this._eventHandlers.mousedown);
|
|
||||||
c.addEventListener('mouseup', this._eventHandlers.mouseup);
|
|
||||||
c.addEventListener('mousemove', this._eventHandlers.mousemove);
|
|
||||||
c.addEventListener('wheel', this._eventHandlers.mousewheel);
|
|
||||||
|
|
||||||
/* Prevent middle-click pasting (see above for why we bind to document) */
|
|
||||||
document.addEventListener('click', this._eventHandlers.mousedisable);
|
|
||||||
|
|
||||||
/* preventDefault() on mousedown doesn't stop this event for some
|
|
||||||
reason so we have to explicitly block it */
|
|
||||||
c.addEventListener('contextmenu', this._eventHandlers.mousedisable);
|
|
||||||
},
|
|
||||||
|
|
||||||
ungrab: function () {
|
|
||||||
var c = this._target;
|
|
||||||
|
|
||||||
if (isTouchDevice) {
|
|
||||||
c.removeEventListener('touchstart', this._eventHandlers.mousedown);
|
|
||||||
c.removeEventListener('touchend', this._eventHandlers.mouseup);
|
|
||||||
c.removeEventListener('touchmove', this._eventHandlers.mousemove);
|
|
||||||
}
|
|
||||||
c.removeEventListener('mousedown', this._eventHandlers.mousedown);
|
|
||||||
c.removeEventListener('mouseup', this._eventHandlers.mouseup);
|
|
||||||
c.removeEventListener('mousemove', this._eventHandlers.mousemove);
|
|
||||||
c.removeEventListener('wheel', this._eventHandlers.mousewheel);
|
|
||||||
|
|
||||||
document.removeEventListener('click', this._eventHandlers.mousedisable);
|
|
||||||
|
|
||||||
c.removeEventListener('contextmenu', this._eventHandlers.mousedisable);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
make_properties(Mouse, [
|
|
||||||
['target', 'ro', 'dom'], // DOM element that captures mouse input
|
|
||||||
['focused', 'rw', 'bool'], // Capture and send mouse clicks/movement
|
|
||||||
|
|
||||||
['onMouseButton', 'rw', 'func'], // Handler for mouse button click/release
|
|
||||||
['onMouseMove', 'rw', 'func'], // Handler for mouse movement
|
|
||||||
['touchButton', 'rw', 'int'] // Button mask (1, 2, 4) for touch devices (0 means ignore clicks)
|
|
||||||
]);
|
|
||||||
|
|
||||||
export { Keyboard, Mouse };
|
|
||||||
|
|
@ -0,0 +1,232 @@
|
||||||
|
/*
|
||||||
|
* noVNC: HTML5 VNC client
|
||||||
|
* Copyright (C) 2012 Joel Martin
|
||||||
|
* Copyright (C) 2013 Samuel Mannehed for Cendio AB
|
||||||
|
* Licensed under MPL 2.0 or any later version (see LICENSE.txt)
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*jslint browser: true, white: false */
|
||||||
|
/*global window, Util */
|
||||||
|
|
||||||
|
import * as Log from '../util/logging.js';
|
||||||
|
import { isTouchDevice } from '../util/browsers.js';
|
||||||
|
import { setCapture, stopEvent, getPointerEvent } from '../util/events.js';
|
||||||
|
import { set_defaults, make_properties } from '../util/properties.js';
|
||||||
|
|
||||||
|
export default function Mouse(defaults) {
|
||||||
|
|
||||||
|
this._doubleClickTimer = null;
|
||||||
|
this._lastTouchPos = null;
|
||||||
|
|
||||||
|
// Configuration attributes
|
||||||
|
set_defaults(this, defaults, {
|
||||||
|
'target': document,
|
||||||
|
'focused': true,
|
||||||
|
'touchButton': 1
|
||||||
|
});
|
||||||
|
|
||||||
|
this._eventHandlers = {
|
||||||
|
'mousedown': this._handleMouseDown.bind(this),
|
||||||
|
'mouseup': this._handleMouseUp.bind(this),
|
||||||
|
'mousemove': this._handleMouseMove.bind(this),
|
||||||
|
'mousewheel': this._handleMouseWheel.bind(this),
|
||||||
|
'mousedisable': this._handleMouseDisable.bind(this)
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
Mouse.prototype = {
|
||||||
|
// private methods
|
||||||
|
|
||||||
|
_resetDoubleClickTimer: function () {
|
||||||
|
this._doubleClickTimer = null;
|
||||||
|
},
|
||||||
|
|
||||||
|
_handleMouseButton: function (e, down) {
|
||||||
|
if (!this._focused) { return; }
|
||||||
|
|
||||||
|
var pos = this._getMousePosition(e);
|
||||||
|
|
||||||
|
var bmask;
|
||||||
|
if (e.touches || e.changedTouches) {
|
||||||
|
// Touch device
|
||||||
|
|
||||||
|
// When two touches occur within 500 ms of each other and are
|
||||||
|
// close enough together a double click is triggered.
|
||||||
|
if (down == 1) {
|
||||||
|
if (this._doubleClickTimer === null) {
|
||||||
|
this._lastTouchPos = pos;
|
||||||
|
} else {
|
||||||
|
clearTimeout(this._doubleClickTimer);
|
||||||
|
|
||||||
|
// When the distance between the two touches is small enough
|
||||||
|
// force the position of the latter touch to the position of
|
||||||
|
// the first.
|
||||||
|
|
||||||
|
var xs = this._lastTouchPos.x - pos.x;
|
||||||
|
var ys = this._lastTouchPos.y - pos.y;
|
||||||
|
var d = Math.sqrt((xs * xs) + (ys * ys));
|
||||||
|
|
||||||
|
// The goal is to trigger on a certain physical width, the
|
||||||
|
// devicePixelRatio brings us a bit closer but is not optimal.
|
||||||
|
var threshold = 20 * (window.devicePixelRatio || 1);
|
||||||
|
if (d < threshold) {
|
||||||
|
pos = this._lastTouchPos;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this._doubleClickTimer = setTimeout(this._resetDoubleClickTimer.bind(this), 500);
|
||||||
|
}
|
||||||
|
bmask = this._touchButton;
|
||||||
|
// If bmask is set
|
||||||
|
} else if (e.which) {
|
||||||
|
/* everything except IE */
|
||||||
|
bmask = 1 << e.button;
|
||||||
|
} else {
|
||||||
|
/* IE including 9 */
|
||||||
|
bmask = (e.button & 0x1) + // Left
|
||||||
|
(e.button & 0x2) * 2 + // Right
|
||||||
|
(e.button & 0x4) / 2; // Middle
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this._onMouseButton) {
|
||||||
|
Log.Debug("onMouseButton " + (down ? "down" : "up") +
|
||||||
|
", x: " + pos.x + ", y: " + pos.y + ", bmask: " + bmask);
|
||||||
|
this._onMouseButton(pos.x, pos.y, down, bmask);
|
||||||
|
}
|
||||||
|
stopEvent(e);
|
||||||
|
},
|
||||||
|
|
||||||
|
_handleMouseDown: function (e) {
|
||||||
|
// Touch events have implicit capture
|
||||||
|
if (e.type === "mousedown") {
|
||||||
|
setCapture(this._target);
|
||||||
|
}
|
||||||
|
|
||||||
|
this._handleMouseButton(e, 1);
|
||||||
|
},
|
||||||
|
|
||||||
|
_handleMouseUp: function (e) {
|
||||||
|
this._handleMouseButton(e, 0);
|
||||||
|
},
|
||||||
|
|
||||||
|
_handleMouseWheel: function (e) {
|
||||||
|
if (!this._focused) { return; }
|
||||||
|
|
||||||
|
var pos = this._getMousePosition(e);
|
||||||
|
|
||||||
|
if (this._onMouseButton) {
|
||||||
|
if (e.deltaX < 0) {
|
||||||
|
this._onMouseButton(pos.x, pos.y, 1, 1 << 5);
|
||||||
|
this._onMouseButton(pos.x, pos.y, 0, 1 << 5);
|
||||||
|
} else if (e.deltaX > 0) {
|
||||||
|
this._onMouseButton(pos.x, pos.y, 1, 1 << 6);
|
||||||
|
this._onMouseButton(pos.x, pos.y, 0, 1 << 6);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (e.deltaY < 0) {
|
||||||
|
this._onMouseButton(pos.x, pos.y, 1, 1 << 3);
|
||||||
|
this._onMouseButton(pos.x, pos.y, 0, 1 << 3);
|
||||||
|
} else if (e.deltaY > 0) {
|
||||||
|
this._onMouseButton(pos.x, pos.y, 1, 1 << 4);
|
||||||
|
this._onMouseButton(pos.x, pos.y, 0, 1 << 4);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stopEvent(e);
|
||||||
|
},
|
||||||
|
|
||||||
|
_handleMouseMove: function (e) {
|
||||||
|
if (! this._focused) { return; }
|
||||||
|
|
||||||
|
var pos = this._getMousePosition(e);
|
||||||
|
if (this._onMouseMove) {
|
||||||
|
this._onMouseMove(pos.x, pos.y);
|
||||||
|
}
|
||||||
|
stopEvent(e);
|
||||||
|
},
|
||||||
|
|
||||||
|
_handleMouseDisable: function (e) {
|
||||||
|
if (!this._focused) { return; }
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Stop propagation if inside canvas area
|
||||||
|
* Note: This is only needed for the 'click' event as it fails
|
||||||
|
* to fire properly for the target element so we have
|
||||||
|
* to listen on the document element instead.
|
||||||
|
*/
|
||||||
|
if (e.target == this._target) {
|
||||||
|
stopEvent(e);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
// Return coordinates relative to target
|
||||||
|
_getMousePosition: function(e) {
|
||||||
|
e = getPointerEvent(e);
|
||||||
|
var bounds = this._target.getBoundingClientRect();
|
||||||
|
var x, y;
|
||||||
|
// Clip to target bounds
|
||||||
|
if (e.clientX < bounds.left) {
|
||||||
|
x = 0;
|
||||||
|
} else if (e.clientX >= bounds.right) {
|
||||||
|
x = bounds.width - 1;
|
||||||
|
} else {
|
||||||
|
x = e.clientX - bounds.left;
|
||||||
|
}
|
||||||
|
if (e.clientY < bounds.top) {
|
||||||
|
y = 0;
|
||||||
|
} else if (e.clientY >= bounds.bottom) {
|
||||||
|
y = bounds.height - 1;
|
||||||
|
} else {
|
||||||
|
y = e.clientY - bounds.top;
|
||||||
|
}
|
||||||
|
return {x:x, y:y};
|
||||||
|
},
|
||||||
|
|
||||||
|
// Public methods
|
||||||
|
grab: function () {
|
||||||
|
var c = this._target;
|
||||||
|
|
||||||
|
if (isTouchDevice) {
|
||||||
|
c.addEventListener('touchstart', this._eventHandlers.mousedown);
|
||||||
|
c.addEventListener('touchend', this._eventHandlers.mouseup);
|
||||||
|
c.addEventListener('touchmove', this._eventHandlers.mousemove);
|
||||||
|
}
|
||||||
|
c.addEventListener('mousedown', this._eventHandlers.mousedown);
|
||||||
|
c.addEventListener('mouseup', this._eventHandlers.mouseup);
|
||||||
|
c.addEventListener('mousemove', this._eventHandlers.mousemove);
|
||||||
|
c.addEventListener('wheel', this._eventHandlers.mousewheel);
|
||||||
|
|
||||||
|
/* Prevent middle-click pasting (see above for why we bind to document) */
|
||||||
|
document.addEventListener('click', this._eventHandlers.mousedisable);
|
||||||
|
|
||||||
|
/* preventDefault() on mousedown doesn't stop this event for some
|
||||||
|
reason so we have to explicitly block it */
|
||||||
|
c.addEventListener('contextmenu', this._eventHandlers.mousedisable);
|
||||||
|
},
|
||||||
|
|
||||||
|
ungrab: function () {
|
||||||
|
var c = this._target;
|
||||||
|
|
||||||
|
if (isTouchDevice) {
|
||||||
|
c.removeEventListener('touchstart', this._eventHandlers.mousedown);
|
||||||
|
c.removeEventListener('touchend', this._eventHandlers.mouseup);
|
||||||
|
c.removeEventListener('touchmove', this._eventHandlers.mousemove);
|
||||||
|
}
|
||||||
|
c.removeEventListener('mousedown', this._eventHandlers.mousedown);
|
||||||
|
c.removeEventListener('mouseup', this._eventHandlers.mouseup);
|
||||||
|
c.removeEventListener('mousemove', this._eventHandlers.mousemove);
|
||||||
|
c.removeEventListener('wheel', this._eventHandlers.mousewheel);
|
||||||
|
|
||||||
|
document.removeEventListener('click', this._eventHandlers.mousedisable);
|
||||||
|
|
||||||
|
c.removeEventListener('contextmenu', this._eventHandlers.mousedisable);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
make_properties(Mouse, [
|
||||||
|
['target', 'ro', 'dom'], // DOM element that captures mouse input
|
||||||
|
['focused', 'rw', 'bool'], // Capture and send mouse clicks/movement
|
||||||
|
|
||||||
|
['onMouseButton', 'rw', 'func'], // Handler for mouse button click/release
|
||||||
|
['onMouseMove', 'rw', 'func'], // Handler for mouse movement
|
||||||
|
['touchButton', 'rw', 'int'] // Button mask (1, 2, 4) for touch devices (0 means ignore clicks)
|
||||||
|
]);
|
||||||
|
|
@ -15,7 +15,8 @@ import _ from './util/localization.js';
|
||||||
import { decodeUTF8 } from './util/strings.js';
|
import { decodeUTF8 } from './util/strings.js';
|
||||||
import { set_defaults, make_properties } from './util/properties.js';
|
import { set_defaults, make_properties } from './util/properties.js';
|
||||||
import Display from "./display.js";
|
import Display from "./display.js";
|
||||||
import { Keyboard, Mouse } from "./input/devices.js";
|
import Keyboard from "./input/keyboard.js";
|
||||||
|
import Mouse from "./input/mouse.js";
|
||||||
import Websock from "./websock.js";
|
import Websock from "./websock.js";
|
||||||
import Base64 from "./base64.js";
|
import Base64 from "./base64.js";
|
||||||
import DES from "./des.js";
|
import DES from "./des.js";
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,8 @@
|
||||||
<script src="../core/input/xtscancodes.js"></script>
|
<script src="../core/input/xtscancodes.js"></script>
|
||||||
<script src="../core/input/vkeys.js"></script>
|
<script src="../core/input/vkeys.js"></script>
|
||||||
<script src="../core/input/util.js"></script>
|
<script src="../core/input/util.js"></script>
|
||||||
<script src="../core/input/devices.js"></script>
|
<script src="../core/input/keyboard.js"></script>
|
||||||
|
<script src="../core/input/mouse.js"></script>
|
||||||
<script src="../core/display.js"></script>
|
<script src="../core/display.js"></script>
|
||||||
<script>
|
<script>
|
||||||
var msg_cnt = 0, iterations,
|
var msg_cnt = 0, iterations,
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
var assert = chai.assert;
|
var assert = chai.assert;
|
||||||
var expect = chai.expect;
|
var expect = chai.expect;
|
||||||
|
|
||||||
import { Keyboard } from '../core/input/devices.js';
|
import Keyboard from '../core/input/keyboard.js';
|
||||||
import keysyms from '../core/input/keysymdef.js';
|
import keysyms from '../core/input/keysymdef.js';
|
||||||
import * as KeyboardUtil from '../core/input/util.js';
|
import * as KeyboardUtil from '../core/input/util.js';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -50,8 +50,8 @@
|
||||||
WebUtil.load_scripts({
|
WebUtil.load_scripts({
|
||||||
'core': ["base64.js", "websock.js", "des.js", "input/keysym.js",
|
'core': ["base64.js", "websock.js", "des.js", "input/keysym.js",
|
||||||
"input/keysymdef.js", "input/xtscancodes.js", "input/util.js",
|
"input/keysymdef.js", "input/xtscancodes.js", "input/util.js",
|
||||||
"input/devices.js", "display.js", "rfb.js", "inflator.js",
|
"input/keyboard.js", "input/mouse.js", "display.js", "rfb.js",
|
||||||
"input/vkeys.js", "input/fixedkeys.js"],
|
"inflator.js", "input/vkeys.js", "input/fixedkeys.js"],
|
||||||
'tests': ["playback.js"],
|
'tests': ["playback.js"],
|
||||||
'recordings': [fname]});
|
'recordings': [fname]});
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue