From cc72cba29a9a322c2a24d97f3eb82432b5af894c Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Sun, 2 Mar 2014 17:49:01 -0800
Subject: [PATCH] Allow default action of key events to be manually enabled.

---
 .../src/main/webapp/modules/Keyboard.js       | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/guacamole-common-js/src/main/webapp/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
index c2ce79e9f..abf71accd 100644
--- a/guacamole-common-js/src/main/webapp/modules/Keyboard.js
+++ b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
@@ -44,6 +44,8 @@ Guacamole.Keyboard = function(element) {
      * 
      * @event
      * @param {Number} keysym The keysym of the key being pressed.
+     * @return {Boolean} true if the key event should be allowed through to the
+     *                   browser, false otherwise.
      */
     this.onkeydown = null;
 
@@ -365,6 +367,7 @@ Guacamole.Keyboard = function(element) {
      * 
      * @private
      * @param keysym The keysym of the key to press.
+     * @return {Boolean} true if event should NOT be canceled, false otherwise.
      */
     function press_key(keysym) {
 
@@ -379,7 +382,7 @@ Guacamole.Keyboard = function(element) {
 
             // Send key event
             if (guac_keyboard.onkeydown) {
-                guac_keyboard.onkeydown(keysym);
+                var result = guac_keyboard.onkeydown(keysym);
 
                 // Stop any current repeat
                 window.clearTimeout(key_repeat_timeout);
@@ -394,9 +397,12 @@ Guacamole.Keyboard = function(element) {
                         }, 50);
                     }, 500);
 
+                return result;
             }
         }
 
+        return false;
+
     }
 
     /**
@@ -519,9 +525,9 @@ Guacamole.Keyboard = function(element) {
         // Press key if known
         if (keysym !== null) {
 
-            e.preventDefault();
             keydownChar[keynum] = keysym;
-            press_key(keysym);
+            if (!press_key(keysym))
+                e.preventDefault();
             
             // If a key is pressed while meta is held down, the keyup will
             // never be sent in Chrome, so send it now. (bug #108404)
@@ -538,8 +544,6 @@ Guacamole.Keyboard = function(element) {
         // Only intercept if handler set
         if (!guac_keyboard.onkeydown && !guac_keyboard.onkeyup) return;
 
-        e.preventDefault();
-
         var keynum;
         if (window.event) keynum = window.event.keyCode;
         else if (e.which) keynum = e.which;
@@ -560,9 +564,12 @@ Guacamole.Keyboard = function(element) {
 
         // Send press + release if keysym known
         if (keysym !== null) {
-            press_key(keysym);
+            if (!press_key(keysym))
+                e.preventDefault();
             release_key(keysym);
         }
+        else
+            e.preventDefault();
 
     }, true);