From 028b45a549cf50a0e682ee6fb6885c330f86550c Mon Sep 17 00:00:00 2001 From: sirux88 Date: Mon, 5 Jun 2023 14:00:45 +0200 Subject: [PATCH] commit --- .../client/controllers/clientController.js | 18 +++++- .../src/app/client/services/guacFullscreen.js | 58 +++++++++++++++++++ .../src/app/client/types/ManagedClient.js | 8 +++ .../main/frontend/src/translations/de.json | 1 + .../main/frontend/src/translations/en.json | 1 + 5 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 guacamole/src/main/frontend/src/app/client/services/guacFullscreen.js diff --git a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js index 2821146f8a..24c3a1f113 100644 --- a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js +++ b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js @@ -44,7 +44,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams const requestService = $injector.get('requestService'); const tunnelService = $injector.get('tunnelService'); const userPageService = $injector.get('userPageService'); - + const fullscreenService = $injector.get('guacFullscreen'); /** * The minimum number of pixels a drag gesture must move to result in the * menu being shown or hidden. @@ -683,8 +683,22 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams callback : $scope.disconnect }; + /** + * Action that locks the keyboard using the Keyboard Lock API within the + * current client, and then closes the menu. + */ + var FULLSCREEN_MENU_ACTION = { + name : 'CLIENT.ACTION_FULLSCREEN', + classname : 'fullscreen action', + callback : function fullscreen() { + + fullscreenService.toggleFullscreenMode(); + $scope.menu.shown = false; + } + }; + // Set client-specific menu actions - $scope.clientMenuActions = [ DISCONNECT_MENU_ACTION ]; + $scope.clientMenuActions = [ DISCONNECT_MENU_ACTION,FULLSCREEN_MENU_ACTION ]; /** * @borrows Protocol.getNamespace diff --git a/guacamole/src/main/frontend/src/app/client/services/guacFullscreen.js b/guacamole/src/main/frontend/src/app/client/services/guacFullscreen.js new file mode 100644 index 0000000000..8175b5f08b --- /dev/null +++ b/guacamole/src/main/frontend/src/app/client/services/guacFullscreen.js @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * A service for providing true fullscreen and keyboard lock support. + * Keyboard lock is currently only supported by Chromium based browsers + * (Edge >= V79, Chrome >= V68 and Opera >= V55) + */ +angular.module('client').factory('guacFullscreen', ['$injector', + + + function guacFullscreen($injector) { + + var service = {}; + + // toggles current fullscreen mode (off if on, on if off) + service.toggleFullscreenMode = function toggleFullscreenMode(){ + if(!service.isInFullscreenMode()){ + service.setFullscreenMode(true); + }else{ + service.setFullscreenMode(false); + } + } + + // check is browser in true fullscreen mode + service.isInFullscreenMode=function isInFullscreenMode(){ + return document.fullscreenElement; + } + + // set fullscreen mode + service.setFullscreenMode = function setFullscreenMode(state) { + if(document.fullscreenEnabled){ + + if(state && !service.isInFullscreenMode()) document.documentElement.requestFullscreen().then(navigator.keyboard.lock()); + else if(!state && service.isInFullscreenMode()) document.exitFullscreen().then(navigator.keyboard.unlock()); + + } + } + + return service; + } +]) \ No newline at end of file diff --git a/guacamole/src/main/frontend/src/app/client/types/ManagedClient.js b/guacamole/src/main/frontend/src/app/client/types/ManagedClient.js index 6a32235d1e..598d509714 100644 --- a/guacamole/src/main/frontend/src/app/client/types/ManagedClient.js +++ b/guacamole/src/main/frontend/src/app/client/types/ManagedClient.js @@ -53,6 +53,7 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector', const guacHistory = $injector.get('guacHistory'); const guacImage = $injector.get('guacImage'); const guacVideo = $injector.get('guacVideo'); + const fullscreen = $injector.get('guacFullscreen'); /** * The minimum amount of time to wait between updates to the client @@ -432,6 +433,13 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector', // Connection has closed case Guacamole.Tunnel.State.CLOSED: + + // force restore non fullscreen mode after any disconnect + // otherwise user may be confused what to do + if(fullscreen.isInFullscreenMode){ + fullscreen.setFullscreenMode(false); + } + ManagedClientState.setConnectionState(managedClient.clientState, ManagedClientState.ConnectionState.DISCONNECTED); break; diff --git a/guacamole/src/main/frontend/src/translations/de.json b/guacamole/src/main/frontend/src/translations/de.json index 982cf599ff..e44e639f89 100644 --- a/guacamole/src/main/frontend/src/translations/de.json +++ b/guacamole/src/main/frontend/src/translations/de.json @@ -52,6 +52,7 @@ "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE", "ACTION_CLEAR_COMPLETED_TRANSFERS" : "Entferne abgeschlossene Übertragungen", "ACTION_DISCONNECT" : "Trennen", + "ACTION_FULLSCREEN" : "Vollbild", "ACTION_LOGOUT" : "@:APP.ACTION_LOGOUT", "ACTION_NAVIGATE_BACK" : "@:APP.ACTION_NAVIGATE_BACK", "ACTION_NAVIGATE_HOME" : "@:APP.ACTION_NAVIGATE_HOME", diff --git a/guacamole/src/main/frontend/src/translations/en.json b/guacamole/src/main/frontend/src/translations/en.json index 036949b1a4..bcf230cb0c 100644 --- a/guacamole/src/main/frontend/src/translations/en.json +++ b/guacamole/src/main/frontend/src/translations/en.json @@ -62,6 +62,7 @@ "ACTION_CANCEL" : "@:APP.ACTION_CANCEL", "ACTION_CLEAR_CLIENT_MESSAGES" : "Clear", "ACTION_CLEAR_COMPLETED_TRANSFERS" : "Clear", + "ACTION_FULLSCREEN" : "Fullscreen", "ACTION_CONTINUE" : "@:APP.ACTION_CONTINUE", "ACTION_DISCONNECT" : "Disconnect", "ACTION_LOGOUT" : "@:APP.ACTION_LOGOUT",