From fd27127f6e82c7b1b119eec3dfcc1c62da457c78 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Tue, 17 May 2011 17:11:26 -0700
Subject: [PATCH] Japanese keyboard + guest Japanese OS

---
 console-proxy/css/ajaxviewer.css              |   6 +--
 console-proxy/images/right2.png               | Bin 0 -> 3156 bytes
 console-proxy/js/ajaxviewer.js                |  47 ++++++++++++++----
 .../consoleproxy/ConsoleProxyViewer.java      |   5 +-
 4 files changed, 44 insertions(+), 14 deletions(-)
 create mode 100644 console-proxy/images/right2.png

diff --git a/console-proxy/css/ajaxviewer.css b/console-proxy/css/ajaxviewer.css
index e6e150d0cb2..af306eaced4 100644
--- a/console-proxy/css/ajaxviewer.css
+++ b/console-proxy/css/ajaxviewer.css
@@ -71,8 +71,8 @@ body {
 #toolbar ul li ul {
     position: absolute;
     top:32;
-    width: 130;
-    height: 66;
+    width: 260;
+    height: 99;
     display: block;
     display: none;
     border-top: 1px solid black;
@@ -103,7 +103,7 @@ body {
 }
 
 #toolbar ul li ul li a:hover span {
-    background: url(/resource/images/right.png) no-repeat right center; 
+    background: url(/resource/images/right2.png) no-repeat right center; 
 }
 
 span.dark {
diff --git a/console-proxy/images/right2.png b/console-proxy/images/right2.png
new file mode 100644
index 0000000000000000000000000000000000000000..cca9379fe5b0891fbfc32e63db260d78ca15a5bb
GIT binary patch
literal 3156
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

literal 0
HcmV?d00001

diff --git a/console-proxy/js/ajaxviewer.js b/console-proxy/js/ajaxviewer.js
index eaeca1a95a5..3ee621636f5 100644
--- a/console-proxy/js/ajaxviewer.js
+++ b/console-proxy/js/ajaxviewer.js
@@ -280,7 +280,8 @@ AjaxViewer.STATUS_SENDING = 3;
 AjaxViewer.STATUS_SENT = 4;
 
 AjaxViewer.KEYBOARD_TYPE_ENGLISH = 0;
-AjaxViewer.KEYBOARD_TYPE_JAPANESE = 1;
+AjaxViewer.KEYBOARD_TYPE_JAPANESE_TO_ENGLISH = 1;
+AjaxViewer.KEYBOARD_TYPE_JAPANESE_TO_JAPANESE = 2;
 
 AjaxViewer.getEventName = function(type) {
 	switch(type) {
@@ -442,7 +443,11 @@ AjaxViewer.prototype = {
 	setupKeyboardTranslationTable : function() {
 		this.keyboardMappers = [];
 		this.keyboardMappers[AjaxViewer.KEYBOARD_TYPE_ENGLISH] = new KeyboardMapper(true, null, null, null, null);
-
+		this.setupJapaneseKeyboardToEnglishVmMapping();
+		this.setupJapaneseKeyboardToJapaneseVmMapping();
+	},
+	
+	setupJapaneseKeyboardToEnglishVmMapping : function() {
 		var keyCodeMap = [];
 		var shiftedKeyCodeMap = [];
 		var charCodeMap = [];
@@ -593,10 +598,30 @@ AjaxViewer.prototype = {
 			keyCodeMap[110] = { code: 190, shift : 0 };								// JP NUM .
 			charCodeMap[46] = { code: 46, shift : 0 };
 		}
-		this.keyboardMappers[AjaxViewer.KEYBOARD_TYPE_JAPANESE] = new KeyboardMapper(false, keyCodeMap, shiftedKeyCodeMap, 
+		this.keyboardMappers[AjaxViewer.KEYBOARD_TYPE_JAPANESE_TO_ENGLISH] = new KeyboardMapper(false, keyCodeMap, shiftedKeyCodeMap, 
 			charCodeMap, shiftedCharCodeMap);
 	},
 	
+	setupJapaneseKeyboardToJapaneseVmMapping : function() {
+		
+		var keyCodeMap = [];
+		var shiftedKeyCodeMap = [];
+		var charCodeMap = [];
+		var shiftedCharCodeMap = [];
+		
+		var currentLanguage = getCurrentLanguage();
+		if(currentLanguage == 'ja' || currentLanguage == 'ja-JP') {
+			// TODO
+			// two keys need to be handled in this case, one is the one that is at left of BACKSPACE KEY
+			// the other one is at left of RIGHT SHIFT key
+		} else {
+			// TODO
+		}
+		
+		this.keyboardMappers[AjaxViewer.KEYBOARD_TYPE_JAPANESE_TO_ENGLISH] = new KeyboardMapper(false, keyCodeMap, shiftedKeyCodeMap, 
+				charCodeMap, shiftedCharCodeMap);
+	},
+	
 	getCurrentKeyboardMapper : function() {
 		return this.keyboardMappers[this.currentKeyboard];
 	},
@@ -642,7 +667,10 @@ AjaxViewer.prototype = {
 	onCommand : function(cmd) {
 		if(cmd == "keyboard_jp") {
 			$("#toolbar").find(".pulldown").find("ul").hide();
-			this.currentKeyboard = AjaxViewer.KEYBOARD_TYPE_JAPANESE;
+			this.currentKeyboard = AjaxViewer.KEYBOARD_TYPE_JAPANESE_TO_ENGLISH;
+		} else if(cmd == "keyboard_jp_jp") {
+			$("#toolbar").find(".pulldown").find("ul").hide();
+			this.currentKeyboard = AjaxViewer.KEYBOARD_TYPE_JAPANESE_TO_JAPANESE;
 		} else if(cmd == "keyboard_en") {
 			$("#toolbar").find(".pulldown").find("ul").hide();
 			this.currentKeyboard = AjaxViewer.KEYBOARD_TYPE_ENGLISH;
@@ -1143,11 +1171,11 @@ AjaxViewer.prototype = {
 	
 	installMouseHook: function() {
 		var ajaxViewer = this;
-		var target = $(document);
+		var target = $(document.body);
 		
 		target.mousemove(function(e) {
 			if(!ajaxViewer.ptInPanel(e.pageX, e.pageY))
-				return true;
+				return true;
 			
 			var pt = ajaxViewer.pageToPanel(e.pageX, e.pageY);  
 			ajaxViewer.onMouseMove(pt.x, pt.y);
@@ -1161,11 +1189,11 @@ AjaxViewer.prototype = {
 			
 			if(!ajaxViewer.ptInPanel(e.pageX, e.pageY))
 				return true;
-			
+			
 			var modifiers = ajaxViewer.getKeyModifiers(e);
 			var whichButton = e.button;
 			
-			var pt = ajaxViewer.pageToPanel(e.pageX, e.pageY);  
+			var pt = ajaxViewer.pageToPanel(e.pageX, e.pageY);  
 			ajaxViewer.onMouseDown(pt.x, pt.y, whichButton, modifiers);
 			
 			e.stopPropagation();
@@ -1174,12 +1202,13 @@ AjaxViewer.prototype = {
 		
 		target.mouseup(function(e) {
 			if(!ajaxViewer.ptInPanel(e.pageX, e.pageY))
-				return true;
+				return true;
 			
 			var modifiers = ajaxViewer.getKeyModifiers(e);
 			var whichButton = e.button;
 			
 			var pt = ajaxViewer.pageToPanel(e.pageX, e.pageY);  
+
 			ajaxViewer.onMouseUp(pt.x, pt.y, whichButton, modifiers);
 			e.stopPropagation();
 			return false;
diff --git a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java
index 4585b57387d..371f4c49448 100644
--- a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java
+++ b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java
@@ -1048,8 +1048,9 @@ public class ConsoleProxyViewer implements java.lang.Runnable, RfbViewer, RfbPro
 						"<span><img align=\"left\" src=\"/resource/images/winlog.png\" alt=\"Keyboard\" style=\"width:16px;height:16px\"/>Keyboard</span>",
 					"</a>", 
 					"<ul>",
-		    			"<li><a href=\"#\" cmd=\"keyboard_en\"><span>English (US)</span></a></li>",
-			    		"<li><a href=\"#\" cmd=\"keyboard_jp\"><span>Japanese&nbsp;&nbsp;&nbsp;</span></a></li>",
+		    			"<li><a href=\"#\" cmd=\"keyboard_en\"><span>Standard (US) keyboard</span></a></li>",
+			    		"<li><a href=\"#\" cmd=\"keyboard_jp\"><span>Japanese keyboard -> English VM</span></a></li>",
+			    		"<li><a href=\"#\" cmd=\"keyboard_jp_jp\"><span>Japanese keyboard -> Japanese VM</span></a></li>",
 					"</ul>",
 				"</li>",
 			"</ul>",