Updated Branches: refs/heads/4.2 f0db7aec9 -> 7cb1c6fa7
CLOUDSTACK-1961: Common issues found in English OS with EN-US standard Keyboard. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e45888df Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e45888df Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e45888df Branch: refs/heads/4.2 Commit: e45888df961890af476f0f9f9b6d1c91c26cbbb6 Parents: f0db7ae Author: Sanjay Tripathi <[email protected]> Authored: Mon Jul 29 18:29:43 2013 +0530 Committer: Devdeep Singh <[email protected]> Committed: Tue Jul 30 17:40:17 2013 +0530 ---------------------------------------------------------------------- services/console-proxy/server/js/ajaxviewer.js | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e45888df/services/console-proxy/server/js/ajaxviewer.js ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/js/ajaxviewer.js b/services/console-proxy/server/js/ajaxviewer.js index a6e1eda..d3f3aa9 100644 --- a/services/console-proxy/server/js/ajaxviewer.js +++ b/services/console-proxy/server/js/ajaxviewer.js @@ -137,6 +137,12 @@ KeyboardMapper.prototype = { this.jsX11KeysymMap[AjaxViewer.JS_KEY_SHIFT] = AjaxViewer.X11_KEY_SHIFT; this.jsX11KeysymMap[AjaxViewer.JS_KEY_CTRL] = AjaxViewer.X11_KEY_CTRL; this.jsX11KeysymMap[AjaxViewer.JS_KEY_ALT] = AjaxViewer.X11_KEY_ALT; + this.jsX11KeysymMap[AjaxViewer.JS_KEY_SELECT_KEY] = AjaxViewer.X11_KEY_SELECT_KEY; + this.jsX11KeysymMap[AjaxViewer.JS_KEY_DECIMAL_POINT] = AjaxViewer.X11_KEY_DECIMAL_POINT; + this.jsKeyPressX11KeysymMap[45] = [{type: AjaxViewer.KEY_DOWN, code: AjaxViewer.X11_KEY_SUBSTRACT, modifiers: 0, shift: true }, + {type: AjaxViewer.KEY_DOWN, code: AjaxViewer.X11_KEY_SUBSTRACT, modifiers: 0, shift: false }]; + this.jsKeyPressX11KeysymMap[47] = [{type: AjaxViewer.KEY_DOWN, code: 0x2f, modifiers: 0, shift: true }, + {type: AjaxViewer.KEY_DOWN, code: 0x2f, modifiers: 0, shift: false }]; } }, RawkeyboardInputHandler : function(eventType, code, modifiers, guestos, browser, browserVersion) { @@ -506,6 +512,7 @@ AjaxViewer.X11_KEY_F12 = 0xffc9; AjaxViewer.X11_KEY_SHIFT = 0xffe1; AjaxViewer.X11_KEY_CTRL = 0xffe3; AjaxViewer.X11_KEY_ALT = 0xffe9; +AjaxViewer.X11_KEY_SELECT_KEY = 0xff67; AjaxViewer.X11_KEY_GRAVE_ACCENT = 0x60; AjaxViewer.X11_KEY_SUBSTRACT = 0x2d; AjaxViewer.X11_KEY_ADD = 0x2b;
