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-919: Restore CSS3 cursor-related code from GUAC-823 and GUAC-842.

Browse Source
This commit is contained in:
Michael Jumper
2014-11-03 15:10:23 -08:00
parent 2e8283c94f
commit 161c4d2359
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
guacamole/src/main/webapp/app/client/directives/guacClient.js
View File

@@ -341,6 +341,16 @@ angular.module('client').directive('guacClient', [function guacClient() {
* Handle mouse and touch events relative to the display element. * Handle mouse and touch events relative to the display element.
*/ */
var localCursor = false;
// Ensure software cursor is shown
guac.getDisplay().showCursor(true);
// Use local cursor if possible.
guac.getDisplay().oncursor = function(canvas, x, y) {
localCursor = mouse.setCursor(canvas, x, y);
};
// Touchscreen // Touchscreen
var touch_screen = new Guacamole.Mouse.Touchscreen(guac_display); var touch_screen = new Guacamole.Mouse.Touchscreen(guac_display);
$scope.touch_screen = touch_screen; $scope.touch_screen = touch_screen;
@@ -353,6 +363,9 @@ angular.module('client').directive('guacClient', [function guacClient() {
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
guac.getDisplay().showCursor(!localCursor);
// 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(),
@@ -368,6 +381,11 @@ angular.module('client').directive('guacClient', [function guacClient() {
}; };
// Hide software cursor when mouse leaves display
mouse.onmouseout = function() {
guac.getDisplay().showCursor(false);
};
// Hide any existing status notifications // Hide any existing status notifications
$scope.$emit('guacClientStatusChange', guac, null); $scope.$emit('guacClientStatusChange', guac, null);
@@ -377,8 +395,8 @@ angular.module('client').directive('guacClient', [function guacClient() {
$display.html(""); $display.html("");
// Add client to UI // Add client to UI
guac.getDisplay().getElement().className = "software-cursor"; guac_display.className = "software-cursor";
$display.append(guac.getDisplay().getElement()); $display.append(guac_display);
}; };