Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GUACAMOLE-1904: Broadcast events for mouse/touch events in client. #950

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ angular.module('client').directive('guacClient', [function guacClient() {
const ManagedClient = $injector.get('ManagedClient');

// Required services
const $rootScope = $injector.get('$rootScope');
const $window = $injector.get('$window');

/**
Expand Down Expand Up @@ -197,6 +198,28 @@ angular.module('client').directive('guacClient', [function guacClient() {

};

/**
* Return the name of the angular event associated with the provided
* mouse event.
*
* @param {Guacamole.Mouse.MouseEvent} event
* The mouse event to determine an angular event name for.
*
* @returns
* The name of the angular event associated with the provided
* mouse event.
*/
const getMouseEventName = event => {
switch (event.type) {
case 'mousedown':
return 'guacClientMouseDown';
case 'mouseup':
return 'guacClientMouseUp';
default:
return 'guacClientMouseMove';
}
};

/**
* Handles a mouse event originating from the user's actual mouse.
* This differs from handleEmulatedMouseEvent() in that the
Expand All @@ -220,6 +243,9 @@ angular.module('client').directive('guacClient', [function guacClient() {
display.showCursor(!localCursor);
client.sendMouseState(event.state, true);

// Broadcast the mouse event
$rootScope.$broadcast(getMouseEventName(event), event, client);

};

/**
Expand Down Expand Up @@ -248,6 +274,31 @@ angular.module('client').directive('guacClient', [function guacClient() {
scrollToMouse(event.state);
client.sendMouseState(event.state, true);

// Broadcast the mouse event
$rootScope.$broadcast(getMouseEventName(event), event, client);

};

/**
* Return the name of the angular event associated with the provided
* touch event.
*
* @param {Guacamole.Touch.TouchEvent} event
* The touch event to determine an angular event name for.
*
* @returns
* The name of the angular event associated with the provided
* touch event.
*/
const getTouchEventName = event => {
switch (event.type) {
case 'touchstart':
return 'guacClientTouchStart';
case 'touchend':
return 'guacClientTouchEnd';
default:
return 'guacClientTouchMove';
}
};

/**
Expand All @@ -269,6 +320,9 @@ angular.module('client').directive('guacClient', [function guacClient() {
display.showCursor(false);
client.sendTouchState(event.state, true);

// Broadcast the touch event
$rootScope.$broadcast(getTouchEventName(event), event, client);

};

// Attach any given managed client
Expand Down
Loading