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

Move mouse events to new display.

Browse Source
This commit is contained in:
Michael Jumper
2012-02-16 21:41:17 -08:00
parent ca851827a4
commit 29cb34d2a1
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
guacamole/src/main/webapp/scripts/interface.js
View File

@@ -220,9 +220,6 @@ var GuacamoleUI = {
// When mouse hovers over top of screen, start detection of intent to open menu // When mouse hovers over top of screen, start detection of intent to open menu
GuacamoleUI.menuControl.addEventListener('mousemove', GuacamoleUI.startMenuOpenDetect, true); GuacamoleUI.menuControl.addEventListener('mousemove', GuacamoleUI.startMenuOpenDetect, true);
// When mouse enters display, start detection of intent to close menu
GuacamoleUI.display.addEventListener('mouseover', GuacamoleUI.startMenuCloseDetect, true);
var menuShowLongPressTimeout = null; var menuShowLongPressTimeout = null;
GuacamoleUI.startLongPressDetect = function() { GuacamoleUI.startLongPressDetect = function() {
@@ -271,11 +268,6 @@ var GuacamoleUI = {
window.location.reload(); window.location.reload();
}; };
GuacamoleUI.display.onclick = function(e) {
e.preventDefault();
return false;
};
// On-screen keyboard // On-screen keyboard
GuacamoleUI.keyboard = new Guacamole.OnScreenKeyboard("layouts/en-us-qwerty-mobile.xml"); GuacamoleUI.keyboard = new Guacamole.OnScreenKeyboard("layouts/en-us-qwerty-mobile.xml");
GuacamoleUI.containers.keyboard.appendChild(GuacamoleUI.keyboard.getElement()); GuacamoleUI.containers.keyboard.appendChild(GuacamoleUI.keyboard.getElement());
@@ -295,17 +287,27 @@ var GuacamoleUI = {
// Tie UI events / behavior to a specific Guacamole client // Tie UI events / behavior to a specific Guacamole client
GuacamoleUI.attach = function(guac) { GuacamoleUI.attach = function(guac) {
var guac_display = guac.getDisplay();
// When mouse enters display, start detection of intent to close menu
guac_display.addEventListener('mouseover', GuacamoleUI.startMenuCloseDetect, true);
guac_display.onclick = function(e) {
e.preventDefault();
return false;
};
// Mouse // Mouse
var mouse = new Guacamole.Mouse(GuacamoleUI.display); var mouse = new Guacamole.Mouse(guac_display);
mouse.onmousedown = mouse.onmouseup = mouse.onmousemove = mouse.onmousedown = mouse.onmouseup = mouse.onmousemove =
function(mouseState) { function(mouseState) {
// Determine mouse position within view // Determine mouse position within view
var mouse_view_x = mouseState.x + GuacamoleUI.display.offsetLeft - window.pageXOffset; var mouse_view_x = mouseState.x + guac_display.offsetLeft - window.pageXOffset;
var mouse_view_y = mouseState.y + GuacamoleUI.display.offsetTop - window.pageYOffset; var mouse_view_y = mouseState.y + guac_display.offsetTop - window.pageYOffset;
// Determine viewport dimensioins // Determine viewport dimensioins
var view_width = GuacamoleUI.viewport.offsetWidth; var view_width = GuacamoleUI.viewport.offsetWidth;
var view_height = GuacamoleUI.viewport.offsetHeight; var view_height = GuacamoleUI.viewport.offsetHeight;
// Determine scroll amounts based on mouse position relative to document // Determine scroll amounts based on mouse position relative to document