Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 772C710065 for ; Tue, 30 Jul 2013 12:40:45 +0000 (UTC) Received: (qmail 59322 invoked by uid 500); 30 Jul 2013 12:40:43 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 59294 invoked by uid 500); 30 Jul 2013 12:40:42 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 59277 invoked by uid 99); 30 Jul 2013 12:40:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jul 2013 12:40:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 876FE31A6B3; Tue, 30 Jul 2013 12:40:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: devdeep@apache.org To: commits@cloudstack.apache.org Date: Tue, 30 Jul 2013 12:40:40 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/master to 6ec2bb1 Updated Branches: refs/heads/master 68626f32d -> 6ec2bb151 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/33122478 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/33122478 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/33122478 Branch: refs/heads/master Commit: 33122478c392a6471cf550c40d655b6f70e4701a Parents: 68626f3 Author: Sanjay Tripathi Authored: Mon Jul 29 18:29:43 2013 +0530 Committer: Devdeep Singh Committed: Tue Jul 30 18:02:18 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/33122478/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;