Merge branch 'unstable' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole...
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Tue, 5 Jul 2011 01:35:32 +0000 (18:35 -0700)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Tue, 5 Jul 2011 01:35:32 +0000 (18:35 -0700)
1  2 
src/main/webapp/index.xhtml
src/main/webapp/styles/guacamole.css

index dff8375,0000000..c20f880
mode 100644,000000..100644
--- /dev/null
@@@ -1,422 -1,0 +1,423 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE html>
 +
 +<!--
 +    Guacamole - Clientless Remote Desktop
 +    Copyright (C) 2010  Michael Jumper
 +
 +    This program is free software: you can redistribute it and/or modify
 +    it under the terms of the GNU Affero General Public License as published by
 +    the Free Software Foundation, either version 3 of the License, or
 +    (at your option) any later version.
 +
 +    This program is distributed in the hope that it will be useful,
 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +    GNU Affero General Public License for more details.
 +
 +    You should have received a copy of the GNU Affero General Public License
 +    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +-->
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +
 +    <head>
 +        <link rel="icon" type="image/png" href="images/guacamole-logo-64.png"/>
 +        <link rel="stylesheet" type="text/css" href="styles/guacamole.css"/>
 +        <link rel="stylesheet" type="text/css" href="styles/keyboard.css"/>
 +        <title>Guacamole</title>
 +    </head>
 +
 +    <body>
 +
 +        <div id="login-ui">
 +            <div id="login-dialog-middle">
 +
 +                <div id="login-dialog">
 +
 +                    <p id="login-error"></p>
 +
 +                    <form id="login-form" action="#" method="post">
 +
 +                        <div id="login-fields">
 +                            <table>
 +                                <tr>
 +                                    <th>Username</th>
 +                                    <td><input type="text" name="username" id="username" autofocus="autofocus"/></td>
 +                                </tr>
 +                                <tr>
 +                                    <th>Password</th>
 +                                    <td><input type="password" name="password" id="password"/></td>
 +                                </tr>
 +                            </table>
 +
 +                            <img class="logo" src="images/guacamole-logo-64.png" alt=""/>
 +                        </div>
 +
 +                        <div id="buttons">
 +                            <input type="submit" name="login" id="login" value="Login"/>
 +                        </div>
 +
 +                    </form>
 +                </div>
 +
 +                <div id="version-dialog">
 +                    Guacamole ${project.version}
 +                </div>
 +
 +            </div>
 +        </div>
 +
 +        <!-- Main UI - hidden until login succeeds -->
 +        <div id="main-guacamole-ui" style="display: none">
 +
 +            <!-- Menu -->
 +            <div id="menu">
 +
 +                <!-- Clipboard -->
 +                <button id="showClipboard">Show Clipboard</button>
 +                <div id="clipboardDiv">
 +                    <h2>Clipboard</h2>
 +                    <p>
 +                    Text copied/cut within Guacamole will appear here. Changes to the text will affect the remote clipboard, and will be pastable within the remote desktop. Use the textbox below as an interface between the client and server clipboards.
 +                    </p>
 +                    <textarea rows="10" cols="40" id="clipboard"></textarea>
 +                </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="status-logo" class="logo" src="images/guacamole-logo-24.png" alt="Guacamole" title="Guacamole ${project.version}"/>
 +                <span id="state"></span>
 +
 +                <a href="agpl-3.0-standalone.html"><img id="license" src="images/agpl-logo.png" alt="AGPLv3"/></a>
 +            </div>
 +
 +
 +            <!-- Display -->
 +            <div id="display" class="guac-display guac-loading">
 +                <!-- On-screen keyboard -->
 +                <div id="keyboardContainer"></div>
 +            </div>
 +
 +
 +            <!-- Error Dialog-->
 +            <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>
 +                </div>
 +            </div>
 +        </div>
 +
 +
 +        <!-- 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>
 +        <script type="text/javascript" src="guacamole-common-js/tunnel.js"></script>
 +        <script type="text/javascript" src="guacamole-common-js/guacamole.js"></script>
 +        <script type="text/javascript" src="guacamole-common-js/oskeyboard.js"></script>
 +
 +        <!-- Init -->
 +        <script type="text/javascript"> /* <![CDATA[ */
 +
 +            var loginForm = document.getElementById("login-form");
 +            var loginUI = document.getElementById("login-ui");
 +            var display = document.getElementById("display");
 +
 +            loginForm.onsubmit = function() {
 +
 +                var username = document.getElementById("username");
 +                var password = document.getElementById("password");
 +
 +                var data =
 +                       "username=" + encodeURIComponent(username.value)
 +                    + "&password=" + encodeURIComponent(password.value)
 +
 +                // Instantiate client
 +                var guac = new GuacamoleClient(
 +                    display,
 +                    new GuacamoleHTTPTunnel("tunnel")
 +                );
 +
 +                try {
 +
 +                    // Connect client
 +                    guac.connect(data);
 +
 +                }
 +                catch (e) {
 +
 +                    var loginError = document.getElementById("login-error");
 +
 +                    // Display error, reset and refocus password field
 +                    loginError.textContent = e.message;
 +                    password.value = "";
 +                    password.focus();
 +
 +                    return false;
 +
 +                }
 +
 +                // On success, display UI
 +                startGuacamole(guac);
 +                return false;
 +
 +            }
 +
 +            // Shows guacamole interface and initiates connection to guacamole
 +            function startGuacamole(guac) {
 +
 +                loginUI.style.display = "none";
 +                document.getElementById("main-guacamole-ui").style.display = "block";
 +
 +                var menu = document.getElementById("menu");
 +                var logo = document.getElementById("status-logo");
 +
 +                var errorDialog = document.getElementById("errorDialog");
 +                var errorDialogText = document.getElementById("errorText");
 +
 +                // Position display correctly
 +                window.onresize = function() {
 +                    display.style.top = menu.offsetHeight + "px";
 +                };
 +
 +                window.onresize();
 +
 +                var state = document.getElementById("state");
-                 guac.setOnStateChangeHandler(function(clientState) {
++                guac.onstatechange = function(clientState) {
 +
 +                        switch (clientState) {
 +                            case 0:
 +                                state.textContent = "Idle."
 +                                break;
 +                            case 1:
 +                                state.textContent = "Connecting...";
 +                                break;
 +                            case 2:
 +                                state.textContent = "Connected, waiting for first update...";
 +                                break;
 +                            case 3:
 +                                display.className = display.className.replace(/guac-loading/, '');
 +                                menu.className = "connected";
 +                                state.textContent = "Connected.";
 +                                break;
 +                            case 4:
 +                                state.textContent = "Disconnecting...";
 +                                break;
 +                            case 5:
 +                                state.textContent = "Disconnected.";
 +                                break;
 +                            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();
 +
 +                    menu.className = "error";
 +                    display.className += " guac-error";
 +
 +                    logo.src = guacErrorImage.src;
 +                    errorDialogText.textContent = error;
 +                    errorDialog.style.visibility = "visible";
 +
 +                    // Show error by desaturating display
 +                    var layers = guac.getLayers();
 +                    for (var i=0; i<layers.length; i++) {
 +                        layers[i].filter(desaturateFilter);
 +                    }
 +
 +                    // Filter for desaturation
 +                    function desaturateFilter(data, width, height) {
 +
 +                        for (var i=0; i<data.length; i+=4) {
 +
 +                            // Get RGB values
 +                            var r = data[i];
 +                            var g = data[i+1];
 +                            var b = data[i+2];
 +
 +                            // Desaturate
 +                            var v = Math.max(r, g, b) / 2;
 +                            data[i]   = v;
 +                            data[i+1] = v;
 +                            data[i+2] = v;
 +
 +                        }
 +
 +                    }
 +
-                 });
++                };
 +
 +                // Mouse
 +                var mouse = new GuacamoleMouse(display);
 +                mouse.setButtonPressedHandler(
 +                    function(mouseState) {
 +                        guac.sendMouseState(mouseState);
 +                    }
 +                );
 +
 +                mouse.setButtonReleasedHandler(
 +                    function(mouseState) {
 +                        guac.sendMouseState(mouseState);
 +                    }
 +                );
 +
 +                mouse.setMovementHandler(
 +                    function(mouseState) {
 +                        guac.sendMouseState(mouseState);
 +                    }
 +                );
 +
 +                // Keyboard
 +                var keyboard = new GuacamoleKeyboard(document);
 +
 +                function disableKeyboard() {
 +                    keyboard.setKeyPressedHandler(null);
 +                    keyboard.setKeyReleasedHandler(null);
 +                }
 +
 +                function enableKeyboard() {
 +                    keyboard.setKeyPressedHandler(
 +                        function (keysym) {
 +                            guac.sendKeyEvent(1, keysym);
 +                        }
 +                    );
 +
 +                    keyboard.setKeyReleasedHandler(
 +                        function (keysym) {
 +                            guac.sendKeyEvent(0, keysym);
 +                        }
 +                    );
 +                }
 +
 +                // Enable keyboard by default
 +                enableKeyboard();
 +
 +                // Reconnect button
 +                var reconnect = document.getElementById("reconnect");
 +                reconnect.onclick = function() {
 +                    window.location.reload();
 +                };
 +
 +                // Disconnect on close
 +                window.onunload = function() {
 +                    guac.disconnect();
 +                }
 +
 +                // Handle clipboard events
 +                var clipboardElement = document.getElementById("clipboard");
 +                clipboardElement.onchange = function() {
 +
 +                    var text = clipboardElement.value;
 +                    guac.setClipboard(text);
 +
 +                };
 +
 +                // Ignore keypresses when clipboard is focused
 +                clipboardElement.onfocus = function() {
 +                    disableKeyboard();
 +                };
 +
 +                // Capture keypresses when clipboard is not focused
 +                clipboardElement.onblur = function() {
 +                    enableKeyboard();
 +                };
 +
 +                // Server copy handler
-                 guac.setClipboardHandler(
-                     function(data) {
-                         clipboardElement.value = data;
-                     }
-                 );
++                guac.onclipboard = function(data) {
++                    clipboardElement.value = data;
++                };
 +
 +
 +                // Show/Hide clipboard
 +                var clipboardDiv = document.getElementById("clipboardDiv");
 +                var showClipboard = document.getElementById("showClipboard");
 +                showClipboard.onclick = function() {
 +
 +                    var displayed = clipboardDiv.style.display;
 +                    if (displayed != "block") {
 +                        clipboardDiv.style.display = "block";
 +                        showClipboard.innerHTML = "Hide Clipboard";
 +                    }
 +                    else {
 +                        clipboardDiv.style.display = "none";
 +                        showClipboard.innerHTML = "Show Clipboard";
 +                        clipboardElement.onchange();
 +                    }
 +
 +                };
 +
 +
 +                // Show/Hide keyboard
 +                var keyboardContainer = document.getElementById("keyboardContainer");
 +                var showKeyboard = document.getElementById("showKeyboard");
 +                showKeyboard.onclick = function() {
 +
 +                    var displayed = keyboardContainer.style.display;
 +                    if (displayed != "block") {
 +                        keyboardContainer.style.display = "block";
 +                        showKeyboard.textContent = "Hide Keyboard";
 +                    }
 +                    else {
 +                        keyboardContainer.style.display = "none";
 +                        showKeyboard.textContent = "Show Keyboard";
 +                    }
 +
 +                };
 +
 +                // On-screen keyboard
 +                var osKeyboard = new GuacamoleOnScreenKeyboard("layouts/en-us-qwerty.xml");
 +                keyboardContainer.appendChild(osKeyboard);
 +
 +                osKeyboard.setKeyPressedHandler(
 +                        function(keysym) {
 +                            guac.sendKeyEvent(1, keysym);
 +                        }
 +                );
 +
 +                osKeyboard.setKeyReleasedHandler(
 +                        function(keysym) {
 +                            guac.sendKeyEvent(0, keysym);
 +                        }
 +                );
 +
 +                // 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);
 +                    guac.sendKeyEvent(0, KEYSYM_DELETE);
 +                    guac.sendKeyEvent(0, KEYSYM_ALT);
 +                    guac.sendKeyEvent(0, KEYSYM_CTRL);
 +                }
 +
 +            }
 +
 +            /* ]]> */ </script>
 +
 +    </body>
 +
 +</html>
Simple merge