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

GUACAMOLE-113: Refactor the hotkey to avoid sending unnecessary keystrokes.

Browse Source
This commit is contained in:
Nick Couchman
2018-01-03 14:01:18 -05:00
parent d6e9a02c43
commit ae9248fbe3
1 changed files with 23 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
guacamole/src/main/webapp/app/client/controllers/clientController.js
View File

@@ -299,16 +299,6 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
return true; return true;
} }
function checkCADHotkeyActive() {
for(var keysym in keysCurrentlyPressed) {
if(!CAD_KEYS[keysym]) {
return false;
}
}
return true;
}
// Hide menu when the user swipes from the right // Hide menu when the user swipes from the right
$scope.menuDrag = function menuDrag(inProgress, startX, startY, currentX, currentY, deltaX, deltaY) { $scope.menuDrag = function menuDrag(inProgress, startX, startY, currentX, currentY, deltaX, deltaY) {
@@ -524,12 +514,12 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
* If only menu keys are pressed, and we have one keysym from each group, * If only menu keys are pressed, and we have one keysym from each group,
* and one of the keys is being released, show the menu. * and one of the keys is being released, show the menu.
*/ */
if(checkMenuModeActive()) { if (checkMenuModeActive()) {
// Check that there is a key pressed for each of the required key classes // Check that there is a key pressed for each of the required key classes
if(!_.isEmpty(_.pick(SHIFT_KEYS, currentKeysPressedKeys)) && if (!_.isEmpty(_.pick(SHIFT_KEYS, currentKeysPressedKeys)) &&
!_.isEmpty(_.pick(ALT_KEYS, currentKeysPressedKeys)) && !_.isEmpty(_.pick(ALT_KEYS, currentKeysPressedKeys)) &&
!_.isEmpty(_.pick(CTRL_KEYS, currentKeysPressedKeys)) !_.isEmpty(_.pick(CTRL_KEYS, currentKeysPressedKeys))
) { ) {
// Don't send this key event through to the client // Don't send this key event through to the client
@@ -550,29 +540,13 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
* If only Ctrl-Alt-End is pressed, and we have a one keysym from each * If only Ctrl-Alt-End is pressed, and we have a one keysym from each
* group, and one key is being released, send Ctrl-Alt-Delete. * group, and one key is being released, send Ctrl-Alt-Delete.
*/ */
if(checkCADHotkeyActive()) { if (END_KEYS[keysym] &&
!_.isEmpty(_.pick(ALT_KEYS, currentKeysPressedKeys)) &&
// Check that there is a key pressed for each of the required key classes !_.isEmpty(_.pick(CTRL_KEYS, currentKeysPressedKeys))
if(!_.isEmpty(_.pick(ALT_KEYS, currentKeysPressedKeys)) && ) {
!_.isEmpty(_.pick(CTRL_KEYS, currentKeysPressedKeys)) && event.preventDefault();
!_.isEmpty(_.pick(END_KEYS, currentKeysPressedKeys)) delete keysCurrentlyPressed[keysym];
) { $rootScope.$broadcast('guacSyntheticKeydown', DEL_KEY);
// Don't send this key event through to the client
event.preventDefault();
// Reset the keys pressed
keysCurrentlyPressed = {};
keyboard.reset();
// Send the Ctrl-Alt-Delete event.
$rootScope.$broadcast('guacSyntheticKeydown', CTRL_KEY);
$rootScope.$broadcast('guacSyntheticKeydown', ALT_KEY);
$rootScope.$broadcast('guacSyntheticKeydown', DEL_KEY);
$rootScope.$broadcast('guacSyntheticKeyup', DEL_KEY);
$rootScope.$broadcast('guacSyntheticKeyup', ALT_KEY);
$rootScope.$broadcast('guacSyntheticKeyup', CTRL_KEY);
}
} }
}); });
@@ -581,12 +555,24 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
// with any data that appears to have come from those key presses // with any data that appears to have come from those key presses
$scope.$on('guacKeyup', function keyupListener(event, keysym, keyboard) { $scope.$on('guacKeyup', function keyupListener(event, keysym, keyboard) {
var currentKeysPressedKeys = Object.keys(keysCurrentlyPressed);
// Sync local clipboard with any clipboard data received while this // Sync local clipboard with any clipboard data received while this
// key was pressed (if any) as long as the menu is not open // key was pressed (if any) as long as the menu is not open
var clipboardData = clipboardDataFromKey[keysym]; var clipboardData = clipboardDataFromKey[keysym];
if (clipboardData && !$scope.menu.shown) if (clipboardData && !$scope.menu.shown)
clipboardService.setLocalClipboard(clipboardData); clipboardService.setLocalClipboard(clipboardData);
if (END_KEYS[keysym] &&
!_.isEmpty(_.pick(ALT_KEYS, currentKeysPressedKeys)) &&
!_.isEmpty(_.pick(CTRL_KEYS, currentKeysPressedKeys))
) {
event.preventDefault();
$rootScope.$broadcast('guacSyntheticKeyup', DEL_KEY);
}
// Mark key as released // Mark key as released
delete clipboardDataFromKey[keysym]; delete clipboardDataFromKey[keysym];
delete keysCurrentlyPressed[keysym]; delete keysCurrentlyPressed[keysym];