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-605: Separate common mouse code into functions.

Browse Source
This commit is contained in:
Michael Jumper
2014-11-14 15:32:38 -08:00
parent 534c706d1b
commit 49637fe17f
1 changed files with 66 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,20 +198,53 @@ angular.module('client').directive('guacClient', [function guacClient() {
}; };
/* /**
* MOUSE * Scrolls the client view such that the mouse cursor is visible.
*
* @param {Guacamole.Mouse.State} mouseState The current mouse
* state.
*/ */
var scrollToMouse = function scrollToMouse(mouseState) {
// Watch for changes to mouse emulation mode // Determine mouse position within view
// Send all received mouse events to the client var mouse_view_x = mouseState.x + displayContainer.offsetLeft - main.scrollLeft;
mouse.onmousedown = var mouse_view_y = mouseState.y + displayContainer.offsetTop - main.scrollTop;
mouse.onmouseup =
mouse.onmousemove = function(mouseState) {
if (!client || !display) return; // Determine viewport dimensions
var view_width = main.offsetWidth;
var view_height = main.offsetHeight;
// Hide or show software cursor depending on local cursor state // Determine scroll amounts based on mouse position relative to document
display.showCursor(!localCursor);
var scroll_amount_x;
if (mouse_view_x > view_width)
scroll_amount_x = mouse_view_x - view_width;
else if (mouse_view_x < 0)
scroll_amount_x = mouse_view_x;
else
scroll_amount_x = 0;
var scroll_amount_y;
if (mouse_view_y > view_height)
scroll_amount_y = mouse_view_y - view_height;
else if (mouse_view_y < 0)
scroll_amount_y = mouse_view_y;
else
scroll_amount_y = 0;
// Scroll (if necessary) to keep mouse on screen.
main.scrollLeft += scroll_amount_x;
main.scrollTop += scroll_amount_y;
};
/**
* Sends the given mouse state to the current client.
*
* @param {Guacamole.Mouse.State} mouseState The mouse state to
* send.
*/
var sendScaledMouseState = function sendScaledMouseState(mouseState) {
// Scale event by current scale // Scale event by current scale
var scaledState = new Guacamole.Mouse.State( var scaledState = new Guacamole.Mouse.State(
@@ -228,6 +261,25 @@ angular.module('client').directive('guacClient', [function guacClient() {
}; };
/*
* MOUSE
*/
// Watch for changes to mouse emulation mode
// Send all received mouse events to the client
mouse.onmousedown =
mouse.onmouseup =
mouse.onmousemove = function(mouseState) {
if (!client || !display)
return;
// Send mouse state, show cursor if necessary
display.showCursor(!localCursor);
sendScaledMouseState(mouseState);
};
// Hide software cursor when mouse leaves display // Hide software cursor when mouse leaves display
mouse.onmouseout = function() { mouse.onmouseout = function() {
if (!display) return; if (!display) return;
@@ -307,48 +359,9 @@ angular.module('client').directive('guacClient', [function guacClient() {
// Ensure software cursor is shown // Ensure software cursor is shown
display.showCursor(true); display.showCursor(true);
// Determine mouse position within view // Send mouse state, ensure cursor is visible
var mouse_view_x = mouseState.x + displayContainer.offsetLeft - main.scrollLeft; scrollToMouse(mouseState);
var mouse_view_y = mouseState.y + displayContainer.offsetTop - main.scrollTop; sendScaledMouseState(mouseState);
// Determine viewport dimensions
var view_width = main.offsetWidth;
var view_height = main.offsetHeight;
// Determine scroll amounts based on mouse position relative to document
var scroll_amount_x;
if (mouse_view_x > view_width)
scroll_amount_x = mouse_view_x - view_width;
else if (mouse_view_x < 0)
scroll_amount_x = mouse_view_x;
else
scroll_amount_x = 0;
var scroll_amount_y;
if (mouse_view_y > view_height)
scroll_amount_y = mouse_view_y - view_height;
else if (mouse_view_y < 0)
scroll_amount_y = mouse_view_y;
else
scroll_amount_y = 0;
// Scroll (if necessary) to keep mouse on screen.
main.scrollLeft += scroll_amount_x;
main.scrollTop += scroll_amount_y;
// Scale event by current scale
var scaledState = new Guacamole.Mouse.State(
mouseState.x / display.getScale(),
mouseState.y / display.getScale(),
mouseState.left,
mouseState.middle,
mouseState.right,
mouseState.up,
mouseState.down);
// Send mouse event
client.sendMouseState(scaledState);
}; };