From efb68518233221a16bdf0ffc9cdd3ee8895d252a Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Sun, 3 Jul 2011 15:33:18 -0700
Subject: [PATCH 1/4] Fixed case of ctrl-alt-del, removed keymap.js

---
 guacamole/src/main/webapp/index.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html
index cd0cf2bee..490564a94 100644
--- a/guacamole/src/main/webapp/index.html
+++ b/guacamole/src/main/webapp/index.html
@@ -80,7 +80,7 @@
                 </div>
 
                 <button id="showKeyboard">Show Keyboard</button>
-                <button id="CtrlAltDelete">Ctrl-Alt-Delete</button>
+                <button id="ctrlAltDelete">Ctrl-Alt-Delete</button>
 
                 <!-- Logo and status -->
                 <img id="logo" src="images/guacamole-logo.png" alt="Guacamole" title="Guacamole 0.4.0"/>
@@ -111,7 +111,6 @@
 
 
         <!-- Scripts -->
-        <script type="text/javascript" src="guacamole-common-js/keymap.js"></script>
         <script type="text/javascript" src="guacamole-common-js/keyboard.js"></script>
         <script type="text/javascript" src="guacamole-common-js/mouse.js"></script>
         <script type="text/javascript" src="guacamole-common-js/layer.js"></script>
@@ -397,9 +396,14 @@
                 );
 
                 // Send Ctrl-Alt-Delete
-                var CtrlAltDelete = document.getElementById("CtrlAltDelete");
+                var ctrlAltDelete = document.getElementById("ctrlAltDelete");
+
+                ctrlAltDelete.onclick = function() {
+
+                    var KEYSYM_CTRL   = 0xFF03;
+                    var KEYSYM_ALT    = 0xFFE9;
+                    var KEYSYM_DELETE = 0xFFFF;
 
-                CtrlAltDelete.onclick = function() {
                     guac.sendKeyEvent(1, KEYSYM_CTRL);
                     guac.sendKeyEvent(1, KEYSYM_ALT);
                     guac.sendKeyEvent(1, KEYSYM_DELETE);

From 5e321dbe98ac88a77ee6f7a1fc6123f61c82302a Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Mon, 4 Jul 2011 13:43:04 -0700
Subject: [PATCH 2/4] Fixed corrupt cursor image.

---
 .../src/main/webapp/images/mouse/blank.cur      | Bin 766 -> 326 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/guacamole/src/main/webapp/images/mouse/blank.cur b/guacamole/src/main/webapp/images/mouse/blank.cur
index dfcdea8d032b551c47a9c1ac5ef0030941df3dd5..60b635ababf3ed7814e21376530f6ac7b64fb329 100644
GIT binary patch
literal 326
ycmZQzU}9ioP*7lE009F=1_m)8tpUUeK<og-j6eti4PX*NKvW|M3^4Qm00RI3zkwM5

literal 766
zcmeH_u@QhU3<Ezo2B4x&$rz00(J~HOgm-A^DL}R)pVj#cl|pMPiL=6{@3P5578Vu4
g>=|Kb5^<aANbg<GV9aKWoTQbjlpmkIfIsjmE_}h37XSbN


From 5e59a18c2c55be0698654d4a2e39fb2947708791 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Mon, 4 Jul 2011 14:22:52 -0700
Subject: [PATCH 3/4] Cleaned up styles.

---
 guacamole/src/main/webapp/styles/guacamole.css | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/guacamole/src/main/webapp/styles/guacamole.css b/guacamole/src/main/webapp/styles/guacamole.css
index ba7319419..c69fd5b51 100644
--- a/guacamole/src/main/webapp/styles/guacamole.css
+++ b/guacamole/src/main/webapp/styles/guacamole.css
@@ -146,20 +146,11 @@ div.errorDialogMiddle {
 
 div.errorDialog {
 
-    background: #D44;
-    border: 1px solid black;
+    opacity: 0.75;
+    background: #D22;
+    border: 1px solid #F44;
     padding: 1em;
 
-    -khtml-border-radius: 0.5em;
-    -webkit-border-radius: 0.5em;
-    -moz-border-radius: 0.5em;
-    border-radius: 0.5em;
-
-    -moz-box-shadow: 0 0.25em 0.75em black, inset 0.1em 0.1em 0.5em #F99, inset -0.1em -0.1em 0.75em #800;
-    -webkit-box-shadow: 0 0.25em 0.75em black, inset 0.1em 0.1em 0.5em #F99, inset -0.1em -0.1em 0.75em #800;
-    -khtml-box-shadow: 0 0.25em 0.75em black, inset 0.1em 0.1em 0.5em #F99, inset -0.1em -0.1em 0.75em #800;
-    box-shadow: 0 0.25em 0.75em black, inset 0.1em 0.1em 0.5em #F99, inset -0.1em -0.1em 0.75em #800;
-
     max-width: 75%;
     text-align: left;
 
@@ -170,7 +161,6 @@ div.errorDialog h1 {
     margin: 0;
     margin-bottom: 0.25em;
     text-align: center;
-    text-shadow: 0 0 0.25em white;
 }
 
 div.errorDialog div.buttons {

From 7e3ecfd5db567972f0f81c20ef49b20deeee9af7 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Mon, 4 Jul 2011 14:26:09 -0700
Subject: [PATCH 4/4] Removed header from error dialog, migrating to
 traditional JS handlers.

---
 guacamole/src/main/webapp/index.html | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html
index 9cab99f90..9222b227e 100644
--- a/guacamole/src/main/webapp/index.html
+++ b/guacamole/src/main/webapp/index.html
@@ -105,7 +105,6 @@
             <div id="errorDialog" class="errorDialogOuter">
                 <div class="errorDialogMiddle">
                     <div class="errorDialog">
-                        <h1>Error</h1>
                         <p id="errorText"></p>
                         <div class="buttons"><button id="reconnect">Reconnect</button></div>
                     </div>
@@ -189,7 +188,7 @@
                 window.onresize();
 
                 var state = document.getElementById("state");
-                guac.setOnStateChangeHandler(function(clientState) {
+                guac.onstatechange = function(clientState) {
 
                         switch (clientState) {
                             case 0:
@@ -215,17 +214,17 @@
                             default:
                                 state.textContent = "Unknown";
                         }
-                });
+                };
 
                 // Cache error image (might not be available when error occurs)
                 var guacErrorImage = new Image();
                 guacErrorImage.src = "images/noguacamole-logo-24.png";
 
-                guac.setNameHandler(function(name) {
+                guac.onname = function(name) {
                     document.title = name;
-                });
+                };
 
-                guac.setErrorHandler(function(error) {
+                guac.onerror = function(error) {
 
                     guac.disconnect();
 
@@ -262,7 +261,7 @@
 
                     }
 
-                });
+                };
 
                 // Mouse
                 var mouse = new GuacamoleMouse(display);
@@ -340,11 +339,9 @@
                 };
 
                 // Server copy handler
-                guac.setClipboardHandler(
-                    function(data) {
-                        clipboardElement.value = data;
-                    }
-                );
+                guac.onclipboard = function(data) {
+                    clipboardElement.value = data;
+                };
 
 
                 // Show/Hide clipboard