From 7bc9165a9a07b023cd7a5ad9181208687e67ac2d Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Fri, 6 May 2011 15:14:26 -0700
Subject: [PATCH] use same command machenism for routing UI command with
 Japanese keyboard change

---
 console-proxy/css/ajaxviewer.css                          | 3 ++-
 console-proxy/js/ajaxviewer.js                            | 8 ++++++++
 .../src/com/cloud/consoleproxy/ConsoleProxyViewer.java    | 6 +++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/console-proxy/css/ajaxviewer.css b/console-proxy/css/ajaxviewer.css
index 3c1908a48a3..1ac3b7dc306 100644
--- a/console-proxy/css/ajaxviewer.css
+++ b/console-proxy/css/ajaxviewer.css
@@ -71,7 +71,8 @@ body {
 #toolbar ul li ul {
     position: absolute;
     top:32;
-    display: block none;
+    display: block;
+    display: none;
     border-top: 1px solid black;
     background-image:url(/resource/images/back.gif); 
     background-repeat:repeat-x repeat-y; 
diff --git a/console-proxy/js/ajaxviewer.js b/console-proxy/js/ajaxviewer.js
index 25fd376ed92..b7f5553a913 100644
--- a/console-proxy/js/ajaxviewer.js
+++ b/console-proxy/js/ajaxviewer.js
@@ -292,6 +292,14 @@ AjaxViewer.prototype = {
 		} else if(cmd == "keyboard_en") {
 			$("#toolbar").find(".pulldown").find("ul").hide();
 			this.currentKeyboard = 0;
+		} else if(cmd == "sendCtrlAltDel") {
+			this.sendKeyboardEvent(ajaxViewer.KEY_DOWN, 45, ajaxViewer.CTRL_KEY | ajaxViewer.ALT_KEY);
+			this.sendKeyboardEvent(ajaxViewer.KEY_UP, 45, ajaxViewer.CTRL_KEY | ajaxViewer.ALT_KEY);
+		} else if(cmd == "sendCtrlEsc") {
+			this.sendKeyboardEvent(ajaxViewer.KEY_DOWN, 17, 0);
+			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);
 		}
 	},
 	
diff --git a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java
index 64be81815b7..e77b24396d6 100644
--- a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java
+++ b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java
@@ -1023,12 +1023,12 @@ public class ConsoleProxyViewer implements java.lang.Runnable, RfbViewer, RfbPro
 			"<div id=\"toolbar\">",
 			"<ul>",
 				"<li>", 
-					"<a href=\"#\" onclick=\"javascript:sendCtrlAltDel();\">", 
+					"<a href=\"#\" cmd=\"sendCtrlAltDel\">", 
 						"<span><img align=\"left\" src=\"/resource/images/cad.gif\" alt=\"Ctrl-Alt-Del\" />Ctrl-Alt-Del</span>", 
 					"</a>", 
 				"</li>",
 				"<li>", 
-					"<a href=\"#\" onclick=\"javascript:sendCtrlEsc();\">", 
+					"<a href=\"#\" cmd=\"sendCtrlEsc\">", 
 						"<span><img align=\"left\" src=\"/resource/images/winlog.png\" alt=\"Ctrl-Esc\" style=\"width:16px;height:16px\"/>Ctrl-Esc</span>",
 					"</a>", 
 				"</li>",
@@ -1038,7 +1038,7 @@ 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 class=\"current\"><a href=\"#\" cmd=\"keyboard_en\"><span>English (US)</span></a></li>",
+		    			"<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>",
 					"</ul>",
 				"</li>",