safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-823: Use CSS3 cursor whenever possible.

Browse Source
This commit is contained in:
Michael Jumper
2014-10-16 15:08:25 -07:00
parent 22411a7790
commit deaec480db
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
guacamole/src/main/webapp/scripts/client-ui.js
View File

@@ -253,7 +253,11 @@ GuacUI.Client = {
/* Clipboard */ /* Clipboard */
"remote_clipboard" : "", "remote_clipboard" : "",
"clipboard_integration_enabled" : undefined "clipboard_integration_enabled" : undefined,
/* Local (hardware) cursor */
"local_cursor" : false
}; };
@@ -1289,7 +1293,10 @@ GuacUI.Client.setMouseEmulationAbsolute = function(absolute) {
// Get client - do nothing if not attached // Get client - do nothing if not attached
var guac = GuacUI.Client.attachedClient; var guac = GuacUI.Client.attachedClient;
if (!guac) return; if (!guac) return;
// Ensure software cursor is shown
guac.getDisplay().showCursor(true);
// Determine mouse position within view // Determine mouse position within view
var guac_display = guac.getDisplay().getElement(); var guac_display = guac.getDisplay().getElement();
var mouse_view_x = mouseState.x + guac_display.offsetLeft - GuacUI.Client.main.scrollLeft; var mouse_view_x = mouseState.x + guac_display.offsetLeft - GuacUI.Client.main.scrollLeft;
@@ -1566,6 +1573,10 @@ GuacUI.Client.attach = function(guac) {
var mouse = new Guacamole.Mouse(guac_display); var mouse = new Guacamole.Mouse(guac_display);
mouse.onmousedown = mouse.onmouseup = mouse.onmousemove = function(mouseState) { mouse.onmousedown = mouse.onmouseup = mouse.onmousemove = function(mouseState) {
// Hide software cursor if local cursor is in use
if (GuacUI.Client.local_cursor)
guac.getDisplay().showCursor(false);
// Scale event by current scale // Scale event by current scale
var scaledState = new Guacamole.Mouse.State( var scaledState = new Guacamole.Mouse.State(
mouseState.x / guac.getDisplay().getScale(), mouseState.x / guac.getDisplay().getScale(),
@@ -1592,6 +1603,14 @@ GuacUI.Client.attach = function(guac) {
guac.getDisplay().getElement().className = "software-cursor"; guac.getDisplay().getElement().className = "software-cursor";
GuacUI.Client.display.appendChild(guac.getDisplay().getElement()); GuacUI.Client.display.appendChild(guac.getDisplay().getElement());
/*
* Use local cursor if possible.
*/
guac.getDisplay().oncursor = function(canvas, x, y) {
GuacUI.Client.local_cursor = mouse.setCursor(canvas, x, y);
};
}; };
// One-time UI initialization // One-time UI initialization