From de3f12901e8c44b35055fb5a4dbd3149c73bd61e Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Tue, 10 May 2011 15:58:12 -0700
Subject: [PATCH] wire-up international keyboard event handling

---
 console-proxy/js/ajaxviewer.js                | 101 ++++++++++++++----
 .../consoleproxy/ConsoleProxyViewer.java      |   2 +-
 2 files changed, 81 insertions(+), 22 deletions(-)

diff --git a/console-proxy/js/ajaxviewer.js b/console-proxy/js/ajaxviewer.js
index 906e48221f7..c4ac9fabdfa 100644
--- a/console-proxy/js/ajaxviewer.js
+++ b/console-proxy/js/ajaxviewer.js
@@ -56,35 +56,53 @@ StringBuilder.prototype = {
 /////////////////////////////////////////////////////////////////////////////
 // class KeyboardMapper
 //
-function KeyboardMapper(nativeKeypress, keyCodeMap, charCodeMap, shiftedCharCodeMap) {
+function KeyboardMapper(nativeKeypress, keyCodeMap, shiftedKeyCodeMap, charCodeMap, shiftedCharCodeMap) {
 	this.nativeKeypress = nativeKeypress;
 	this.keyCodeMap = keyCodeMap;
+	this.shiftedKeyCodeMap = shiftedKeyCodeMap;
 	this.charCodeMap = charCodeMap;
 	this.shiftedCharCodeMap = shiftedCharCodeMap;
 }
 
 KeyboardMapper.prototype = {
-	nativeKeypress : function() {
+	supportNativeKeypress : function() {
 		return this.nativeKeypress;
 	},
 
-	mapKeyCode : function(code, modifier) {
-		if(this.keyCodeMap && this.keyCodeMap[code])
-			return this.keyCodeMap[code];
+	mapKeyCode : function(code, modifiers) {
+		if((modifiers & AjaxViewer.SHIFT_KEY) != 0) {
+			if(this.shiftedKeyCodeMap && this.shiftedKeyCodeMap[code]) {
+				g_logger.log(Logger.LEVEL_INFO, "map SHIFTED keycode " + code + " to " +  this.shiftedKeyCodeMap[code] + ", modifiers: " + modifiers + ', char: ' + String.fromCharCode(code));
+				return this.shiftedKeyCodeMap[code];
+			} else {
+				g_logger.log(Logger.LEVEL_INFO, "map SHIFTED keycode " + code + " to " +  code + ", modifiers: " + modifiers + ', char: ' + String.fromCharCode(code));
+			}
+		} else {
+			if(this.keyCodeMap && this.keyCodeMap[code]) {
+				g_logger.log(Logger.LEVEL_INFO, "map keycode " + code + " to " +  this.keyCodeMap[code] + ", modifiers: " + modifiers + ', char: ' + String.fromCharCode(code));
+				return this.keyCodeMap[code];
+			} else {
+				g_logger.log(Logger.LEVEL_INFO, "map keycode " + code + " to " +  code + ", modifiers: " + modifiers + ', char: ' + String.fromCharCode(code));
+			}
+		}
 		
 		return code;
 	},
 	
-	mapCharCode : function(code, modifier) {
-		if((modifier & AjaxViewer.SHIFT_KEY) != 0) {
-			if(this.shiftedCharCodeMap && this.shiftedCharCodeMap[code])
+	mapCharCode : function(code, modifiers) {
+		if((modifiers & AjaxViewer.SHIFT_KEY) != 0) {
+			if(this.shiftedCharCodeMap && this.shiftedCharCodeMap[code]) {
+				g_logger.log(Logger.LEVEL_INFO, "map SHIFTED keycode " + code + " to charcode " +  this.shiftedCharCodeMap[code] + ", modifiers: " + modifiers + ', char: ' + String.fromCharCode(code));
 				return this.shiftedCharCodeMap[code];
+			}
 		} else {
-			if(this.charCodeMap && this.charCodeMap[code])
+			if(this.charCodeMap && this.charCodeMap[code]) {
+				g_logger.log(Logger.LEVEL_INFO, "map keycode " + code + " to charcode " +  this.shiftedCharCodeMap[code] + ", modifiers: " + modifiers + ', char: ' + String.fromCharCode(code));
 				return this.charCodeMap[code];
+			}
 		}
 			
-		return code;
+		return undefined;
 	}
 };
 
@@ -303,10 +321,27 @@ AjaxViewer.prototype = {
 	},
 	
 	setupKeyboardTranslationTable : function() {
-		this.keyboardTables = [];
+		this.keyboardMappers = [];
+		this.keyboardMappers[AjaxViewer.KEYBOARD_TYPE_ENGLISH] = new KeyboardMapper(true, null, null, null, null);
+
+		var keyCodeMap = [];
+		var shiftedKeyCodeMap = [];
+		var charCodeMap = [];
+		var shiftedCharCodeMap = [];
 		
-		this.keyboardMappers[AjaxViewer.KEYBOARD_TYPE_JAPANESE] = new KeyboardMapper(true, null, null, null);
-		this.keyboardMappers[AjaxViewer.KEYBOARD_TYPE_JAPANESE] = new KeyboardMapper(true, null, null, null);
+		shiftedKeyCodeMap[50] = 222;		// EN 2/@ -> JP 2/"
+		shiftedCharCodeMap[50] = 34;
+		
+		shiftedKeyCodeMap[54] = 55;			// EN 6/^ -> JP 6/&
+		shiftedCharCodeMap[94] = 38;
+
+		
+		this.keyboardMappers[AjaxViewer.KEYBOARD_TYPE_JAPANESE] = new KeyboardMapper(false, keyCodeMap, shiftedKeyCodeMap, 
+			charCodeMap, shiftedCharCodeMap);
+	},
+	
+	getCurrentKeyboardMapper : function() {
+		return this.keyboardMappers[this.currentKeyboard];
 	},
 	
 	setupUIController : function() {
@@ -328,13 +363,18 @@ AjaxViewer.prototype = {
 			}
 		);
 
-		$("#toolbar").find("a").each(function(i, val) {
+		$("[cmd]", "#toolbar").each(function(i, val) {
 			$(val).click(function(e) {
-				var cmdLink = $(e.target).closest("a");
-				
-				if(cmdLink.attr("cmd")) {
-					var cmd = cmdLink.attr("cmd");
-					ajaxViewer.onCommand(cmd);
+				var cmd = $(e.target).attr("cmd");
+				if(cmd)
+					ajaxViewer.onCommand(cmd); 
+				else {
+					var cmdLink = $(e.target).closest("a");
+					
+					if(cmdLink.attr("cmd")) {
+						var cmd = cmdLink.attr("cmd");
+						ajaxViewer.onCommand(cmd);
+					}
 				}
 			});
 		});
@@ -355,6 +395,13 @@ AjaxViewer.prototype = {
 			this.sendKeyboardEvent(AjaxViewer.KEY_DOWN, 27, AjaxViewer.CTRL_KEY);
 			this.sendKeyboardEvent(AjaxViewer.KEY_UP, 27, AjaxViewer.CTRL_KEY);
 			this.sendKeyboardEvent(AjaxViewer.KEY_UP, 17, 0);
+		} else if(cmd == "toggle_logwin") {
+			if(!g_logger.isOpen()) {
+				g_logger.enable(true);
+				g_logger.open();
+			} else {
+				g_logger.close();
+			}
 		}
 	},
 	
@@ -923,7 +970,11 @@ AjaxViewer.prototype = {
 		var ajaxViewer = this;
 		var target = $(document);
 
-		target.keypress(function(e) {
+		target.keypress(function(e) {
+			var keyboardMapper = ajaxViewer.getCurrentKeyboardMapper();
+			if(!keyboardMapper.supportNativeKeypress())
+				return true;
+			
 			ajaxViewer.onKeyPress(e.which, ajaxViewer.getKeyModifiers(e));
 
 			e.stopPropagation();
@@ -935,7 +986,15 @@ AjaxViewer.prototype = {
 		});
 		
 		target.keydown(function(e) {
-			ajaxViewer.onKeyDown(e.which, ajaxViewer.getKeyModifiers(e));
+			var keyboardMapper = ajaxViewer.getCurrentKeyboardMapper();
+
+			ajaxViewer.onKeyDown(keyboardMapper.mapKeyCode(e.which, ajaxViewer.getKeyModifiers(e)), ajaxViewer.getKeyModifiers(e));
+			
+			if(!keyboardMapper.supportNativeKeypress()) {
+				var charCode = keyboardMapper.mapCharCode(e.which, ajaxViewer.getKeyModifiers(e));
+				if(charCode)
+					ajaxViewer.onKeyPress(charCode, ajaxViewer.getKeyModifiers(e));
+			}
 			
 			e.stopPropagation();
 			if(ajaxViewer.requiresDefaultKeyProcess(e))
diff --git a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java
index e77b24396d6..7bef0b1ace4 100644
--- a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java
+++ b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java
@@ -1043,7 +1043,7 @@ public class ConsoleProxyViewer implements java.lang.Runnable, RfbViewer, RfbPro
 					"</ul>",
 				"</li>",
 			"</ul>",
-			"<span id=\"light\" class=\"dark\"></span>", 
+			"<span id=\"light\" class=\"dark\" cmd=\"toggle_logwin\"></span>", 
 			"</div>",
 			"<div id=\"main_panel\" tabindex=\"1\"></div>",
 			"<script language=\"javascript\">",