Files
OpenSpace/modules/webbrowser/include/browserclient.h
Ylva Selling e3f5b83f74 Feature/2025 UI rewrite (#3608)
* Remove Escape keybind; move gui keybind to F2

* Clear up keybinds properly

* Workaround for CEF focus bug

* Add TODO comment

* Guard against null ptr dereferencing

* Remove shift tab

* add additional keyboard mapping from glfw to cef

* Change dashboards to make prototype for first user test

* add mission added/removed event, disptached when a mission has been loaded/unloaded

* send missions as map instaed of array, rename missionName -> name

* Set keybind for toggling overlays to shift+f2

* Remove property for showing the title in the gui skybrowser module

* Remove default setting for skybrowser

* First implementation of setting the ui panel visibility from the launcher

* Add profile topic

* Coding style adjustment

* Add markNodes to the profiletopic

* Change format of additional data of options in engine

* Address PR comments

* map escape key from glfw to cef correctly

* fix issue with "Enter" key not working on buttons and other input fields in CEF

* Add test for new profile version

* Send skybrowser data although we are outside the solar system

* Update webgui to new ui

* Add name to profile topic

* Add cef variable to javascript context for when browser is in cef

* Use camelcase for cef variable

* Rewrite shortcuts topic to ActionKeybind and pass data in a better way (#3590)

* Rewrite shortcuts topic to ActionKeybind and pass data in a better way

* Fix strange error with file structure

* Address PR comments

* Address PR comments

* Address PR comments

* Make numbers in asset file prettier

* Rename name to identifier for missions event

* Clean up browser code

* Update UI hash (to fix the actions panel not working)

And update outdated comment. The backend is not part of this

* Feature/notify meta data change (#3605)

* Add notifyMetaDataChangeListener to topic

* First round of clean up the data passing

* Convert from string to json for metadata

* Update additional data to json

* Use nlohmann::json for additional data

* Pass meta data in new structure to topics

* Remove meta data method

* Fix mistake in merge

* Update src/properties/property.cpp

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* remove TODO comment that will be fixed by this PR

* Address PR comments

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Emma Broman <emma.broman@liu.se>

* Address PR comment

* Remove function for setting the endpoint

* Update frontend hash

* Remove enabled property from exoplanets module

* Remove enabled property from skybrowser module

* Update default UI panels json

* Remove setting of enabled properties for skybrowser and exoplanets

* Update gui hash

* Auto format json

---------

Co-authored-by: Andreas Engberg <adde.engberg@gmail.com>
Co-authored-by: Emma Broman <emma.broman@liu.se>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-04-29 15:43:56 +02:00

112 lines
5.0 KiB
C++

/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2025 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_WEBBROWSER___BROWSER_CLIENT___H__
#define __OPENSPACE_MODULE_WEBBROWSER___BROWSER_CLIENT___H__
#ifdef _MSC_VER
#pragma warning (push)
#pragma warning (disable : 4100)
#endif // _MSC_VER
#include <include/cef_client.h>
#ifdef _MSC_VER
#pragma warning (pop)
#endif // _MSC_VER
namespace openspace {
class WebRenderHandler;
class WebKeyboardHandler;
class BrowserClient : public CefClient {
public:
class NoContextMenuHandler : public CefContextMenuHandler {
bool RunContextMenu(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>,
CefRefPtr<CefContextMenuParams>, CefRefPtr<CefMenuModel>,
CefRefPtr<CefRunContextMenuCallback>) override;
IMPLEMENT_REFCOUNTING(NoContextMenuHandler);
};
class DisplayHandler : public CefDisplayHandler {
bool OnCursorChange(CefRefPtr<CefBrowser>,
CefCursorHandle,
cef_cursor_type_t type,
const CefCursorInfo&) override;
IMPLEMENT_REFCOUNTING(DisplayHandler);
};
// This is a fallback to fix a bug with the focus that CEF has. The browser can lose
// the focus and this is a hacky way to recover it. Solution from this post:
// https://magpcss.org/ceforum/viewtopic.php?f=6&t=20161&p=56949&hilit=css+focus#
// TODO (ylvse 2025-02-18): Update CEF when they have fixed this issue
// https://github.com/chromiumembedded/cef/issues/3870
class FocusHandler : public CefFocusHandler {
void OnTakeFocus(CefRefPtr<CefBrowser>, bool) override;
bool OnSetFocus(CefRefPtr<CefBrowser>, FocusSource) override;
IMPLEMENT_REFCOUNTING(FocusHandler);
};
class LoadHandler : public CefLoadHandler {
void OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame>, int) override;
IMPLEMENT_REFCOUNTING(LoadHandler);
};
BrowserClient(WebRenderHandler* handler, WebKeyboardHandler* keyboardHandler);
CefRefPtr<CefRenderHandler> GetRenderHandler() override;
CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() override;
CefRefPtr<CefRequestHandler> GetRequestHandler() override;
CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() override;
CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() override;
CefRefPtr<CefDisplayHandler> GetDisplayHandler() override;
CefRefPtr<CefLoadHandler> GetLoadHandler() override;
CefRefPtr<CefFocusHandler> GetFocusHandler() override;
protected:
static bool _hasFocus;
private:
CefRefPtr<CefRenderHandler> _renderHandler;
CefRefPtr<CefKeyboardHandler> _keyboardHandler;
CefRefPtr<CefLifeSpanHandler> _lifeSpanHandler;
CefRefPtr<CefRequestHandler> _requestHandler;
CefRefPtr<CefContextMenuHandler> _contextMenuHandler;
CefRefPtr<CefDisplayHandler> _displayHandler;
// Try to fix the focus bug
CefRefPtr<CefLoadHandler> _loadHandler;
CefRefPtr<CefFocusHandler> _focusHandler;
IMPLEMENT_REFCOUNTING(BrowserClient);
};
} // namespace openspace
#endif // __OPENSPACE_MODULE_WEBBROWSER___BROWSER_CLIENT___H__