Changeset ad10112 in guacamole

Timestamp:

04/08/12 18:56:11 (13 months ago)

Author:

zhangmaike

Branches:

master, guacamole-debian-parent, rpm, unstable, unstable-websocket

Children:

fae5867

Parents:

32a768a

git-author:

Michael Jumper <zhangmaike@…> (04/08/12 18:56:11)

git-committer:

Michael Jumper <zhangmaike@…> (04/08/12 18:56:11)

Message:

Implement touch-specific menu.

Location:

src/main/webapp

Files:

• client.xhtml (modified) (1 diff)
• images/menu-icons/tango/edit-paste.png (added)
• images/menu-icons/tango/input-keyboard.png (added)
• images/menu-icons/tango/system-log-out.png (added)
• scripts/interface.js (modified) (7 diffs)
• styles/client.css (modified) (1 diff)

src/main/webapp/client.xhtml

@@ -85 +85 @@
         </div>
 
+        <!-- Touch-specific menu -->
+        <div class="dialogOuter">
+            <div class="dialogMiddle">
+
+                <div id="touchMenu">
+                    <img id="touchShowClipboard" src="images/menu-icons/tango/edit-paste.png"/>
+                    <img id="touchShowKeyboard" src="images/menu-icons/tango/input-keyboard.png"/>
+                    <img id="touchLogout" src="images/menu-icons/tango/system-log-out.png"/>
+                </div>
+
+            </div>
+        </div>
+
         <!-- guacamole-common-js scripts -->
         <script type="text/javascript" src="guacamole-common-js/keyboard.js"></script>

src/main/webapp/scripts/interface.js

@@ -38 +38 @@
         "ctrlAltDelete": document.getElementById("ctrlAltDelete"),
         "reconnect"    : document.getElementById("reconnect"),
-        "logout"       : document.getElementById("logout")
+        "logout"       : document.getElementById("logout"),
+
+        "touchShowClipboard" : document.getElementById("touchShowClipboard"),
+        "touchShowKeyboard"  : document.getElementById("touchShowKeyboard"),
+        "touchLogout"        : document.getElementById("touchLogout")
 
     },
@@ -134 +138 @@
     };
 
+    GuacamoleUI.hideTouchMenu = function() {
+        GuacamoleUI.touchMenu.style.visibility = "hidden";
+    };
+    
+    GuacamoleUI.showTouchMenu = function() {
+        GuacamoleUI.touchMenu.style.visibility = "visible";
+    };
+
     GuacamoleUI.shadeMenu = function() {
 
@@ -213 +225 @@
     };
 
-    // Assume no native OSK by default
-    GuacamoleUI.oskMode = GuacamoleUI.OSK_MODE_GUAC;
+    GuacamoleUI.buttons.touchShowClipboard.onclick = function() {
+        // FIXME: Implement
+        alert("Not yet implemented... Sorry.");
+    };
 
     // Show/Hide keyboard
@@ -229 +243 @@
             window.clearInterval(keyboardResizeInterval);
         }
-        
-        // If not shown ... action depends on OSK mode.
+
+        // Otherwise, show it
         else {
-
-            // If we think the platform has a native OSK, use the event target to
-            // cause it to display.
-            if (GuacamoleUI.oskMode == GuacamoleUI.OSK_MODE_NATIVE) {
-
-                // ...but use the Guac OSK if clicked again
-                GuacamoleUI.oskMode = GuacamoleUI.OSK_MODE_GUAC;
-
-                // Try to show native OSK by focusing eventTarget.
-                GuacamoleUI.eventTarget.focus();
-                return;
-
-            }
 
             // Ensure event target is NOT focused if we are using the Guac OSK.
@@ -254 +255 @@
             // Automatically update size
             window.onresize = updateKeyboardSize;
-            keyboardResizeInterval = window.setInterval(updateKeyboardSize, GuacamoleUI.KEYBOARD_AUTO_RESIZE_INTERVAL);
+            keyboardResizeInterval = window.setInterval(updateKeyboardSize,
+                GuacamoleUI.KEYBOARD_AUTO_RESIZE_INTERVAL);
 
             updateKeyboardSize();
-        }
-        
-
-    };
+
+        }
+
+    };
+
+    // Touch-specific keyboard show
+    GuacamoleUI.buttons.touchShowKeyboard.ontouchstart = 
+    GuacamoleUI.buttons.touchShowKeyboard.onclick = 
+        function(e) {
+            GuacamoleUI.eventTarget.focus();
+            GuacamoleUI.hideTouchMenu();
+            e.preventDefault();
+        };
 
     // Logout
-    GuacamoleUI.buttons.logout.onclick = function() {
-        window.location.href = "logout";
-    };
+    GuacamoleUI.buttons.logout.onclick =
+    GuacamoleUI.buttons.touchLogout.onclick =
+        function() {
+            window.location.href = "logout";
+        };
 
     // Timeouts for detecting if users wants menu to open or close
@@ -351 +364 @@
                 // Assume native OSK if menu shown via long-press
                 GuacamoleUI.oskMode = GuacamoleUI.OSK_MODE_NATIVE;
-                GuacamoleUI.showMenu();
+                GuacamoleUI.showTouchMenu();
 
             }, GuacamoleUI.LONG_PRESS_DETECT_TIMEOUT);
@@ -368 +381 @@
         // Close menu if shown
         GuacamoleUI.shadeMenu();
+        GuacamoleUI.hideTouchMenu();
         
         // Record touch location

src/main/webapp/styles/client.css

@@ -257 +257 @@
     overflow: hidden;
 }
+
+/* Touch-specific menu */
+
+div#touchMenu {
+    display: inline-block;
+    background: black;
+    border: 1px solid silver;
+    padding: 1em;
+    opacity: 0.8;
+}