safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-27 15:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'unstable' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole into unstable

Browse Source
This commit is contained in:
Michael Jumper
2011-07-04 18:35:32 -07:00
parent 7217ee6136 7e3ecfd5db
commit 2e93774be2
3 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
guacamole/src/main/webapp/images/mouse/blank.cur
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 766 B

After

Width:  |  Height:  |  Size: 326 B

33
guacamole/src/main/webapp/index.xhtml
View File

@@ -85,7 +85,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="status-logo" class="logo" src="images/guacamole-logo-24.png" alt="Guacamole" title="Guacamole ${project.version}"/>
@@ -106,7 +106,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>
@@ -116,7 +115,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>
@@ -191,7 +189,7 @@
window.onresize();
var state = document.getElementById("state");
guac.setOnStateChangeHandler(function(clientState) {
guac.onstatechange = function(clientState) {
switch (clientState) {
case 0:
@@ -217,17 +215,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();
@@ -264,7 +262,7 @@
}
});
};
// Mouse
var mouse = new GuacamoleMouse(display);
@@ -342,11 +340,9 @@
};
// Server copy handler
guac.setClipboardHandler(
function(data) {
clipboardElement.value = data;
}
);
guac.onclipboard = function(data) {
clipboardElement.value = data;
};
// Show/Hide clipboard
@@ -402,9 +398,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);

16
guacamole/src/main/webapp/styles/guacamole.css
View File

@@ -148,20 +148,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;
@@ -172,7 +163,6 @@ div.errorDialog h1 {
margin: 0;
margin-bottom: 0.25em;
text-align: center;
text-shadow: 0 0 0.25em white;
}
div.errorDialog div.buttons {