From 2bcb2d5b15237489fa905ce9293d3ed1af925b33 Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Tue, 13 Apr 2010 09:39:29 -0500
Subject: [PATCH] Remove event handlers on disconnect.

---
 canvas.js | 15 ++++++++++++---
 vnc.html  |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/canvas.js b/canvas.js
index 7f923ef..22fc4b6 100644
--- a/canvas.js
+++ b/canvas.js
@@ -52,8 +52,6 @@ init: function (id, width, height, keyDown, keyUp, mouseDown, mouseUp) {
     if (! mouseUp) mouseUp = Canvas.mouseUp;
 
     var c = $(Canvas.id);
-    c.width = width;
-    c.height = height;
     document.addEvent('keydown', keyDown);
     document.addEvent('keyup', keyUp);
     c.addEvent('mousedown', mouseDown);
@@ -63,6 +61,8 @@ init: function (id, width, height, keyDown, keyUp, mouseDown, mouseUp) {
     document.addEvent('click', Canvas.ctxDisable);
     document.body.addEvent('contextmenu', Canvas.ctxDisable);
 
+    c.width = width;
+    c.height = height;
     Canvas.c_x = c.getPosition().x;
     Canvas.c_y = c.getPosition().y;
     Canvas.c_wx = c.getSize().x;
@@ -77,8 +77,17 @@ init: function (id, width, height, keyDown, keyUp, mouseDown, mouseUp) {
 clear: function () {
     Canvas.ctx.clearRect(0, 0, Canvas.c_wx, Canvas.c_wy);
     var c = $(Canvas.id);
+    document.removeEvents('keydown');
+    document.removeEvents('keyup');
+    c.removeEvents('mousedown');
+    c.removeEvents('mouseup');
+
+    /* Work around right and middle click browser behaviors */
+    document.removeEvents('click');
+    document.body.removeEvents('contextmenu');
+
     c.width = 640;
-    c.height = 100;
+    c.height = 20;
 },
 
 draw: function () {
diff --git a/vnc.html b/vnc.html
index fdb6849..85754fb 100644
--- a/vnc.html
+++ b/vnc.html
@@ -12,7 +12,7 @@
         <br><br>
 
         <div id='status'>Disconnected</div>
-        <canvas id="vnc" width="640" height="100"
+        <canvas id="vnc" width="640" height="20"
                 style="border-style: dotted; border-width: 1px;">
             Canvas not supported.
         </canvas>