summaryrefslogtreecommitdiff
path: root/src/desktop/Window.hpp
diff options
context:
space:
mode:
authorMightyPlaza <123664421+MightyPlaza@users.noreply.github.com>2024-07-31 17:55:52 +0000
committerGitHub <noreply@github.com>2024-07-31 19:55:52 +0200
commite989a0bcffac81092ed2a7e371f5225c113f689d (patch)
treec4a92933b863fde9ab0cee4e3f993f543596258c /src/desktop/Window.hpp
parent8a5f9bbb394ddeb4be9a9df6248b41b07d84ea66 (diff)
internal: refactor fullscreen states (#7104)
* refactor fullscreen modified: src/Compositor.cpp modified: src/Compositor.hpp modified: src/config/ConfigManager.cpp modified: src/config/ConfigManager.hpp modified: src/debug/HyprCtl.cpp modified: src/desktop/LayerSurface.cpp modified: src/desktop/Window.cpp modified: src/desktop/Window.hpp modified: src/desktop/Workspace.cpp modified: src/desktop/Workspace.hpp modified: src/events/Windows.cpp modified: src/helpers/Monitor.cpp modified: src/layout/DwindleLayout.cpp modified: src/layout/DwindleLayout.hpp modified: src/layout/IHyprLayout.cpp modified: src/layout/IHyprLayout.hpp modified: src/layout/MasterLayout.cpp modified: src/layout/MasterLayout.hpp modified: src/managers/KeybindManager.cpp modified: src/managers/KeybindManager.hpp modified: src/managers/input/IdleInhibitor.cpp modified: src/managers/input/InputManager.cpp modified: src/managers/input/Swipe.cpp modified: src/protocols/ForeignToplevelWlr.cpp modified: src/render/Renderer.cpp modified: src/render/decorations/CHyprGroupBarDecoration.cpp * clean up modified: src/config/ConfigManager.cpp modified: src/debug/HyprCtl.cpp modified: src/desktop/Window.hpp modified: src/desktop/Workspace.cpp modified: src/events/Windows.cpp modified: src/managers/KeybindManager.cpp modified: src/managers/input/Swipe.cpp * fix mapWindow fullscreen modified: src/events/Windows.cpp * fix typo modified: src/desktop/Workspace.cpp * add fullscreenstate modified: src/config/ConfigManager.cpp modified: src/events/Windows.cpp * change syncFullscreen to lower modified: src/config/ConfigManager.hpp * initialize fs state modified: src/desktop/Window.hpp
Diffstat (limited to 'src/desktop/Window.hpp')
-rw-r--r--src/desktop/Window.hpp43
1 files changed, 24 insertions, 19 deletions
diff --git a/src/desktop/Window.hpp b/src/desktop/Window.hpp
index 108b804c..11bf662a 100644
--- a/src/desktop/Window.hpp
+++ b/src/desktop/Window.hpp
@@ -16,6 +16,7 @@
#include "Popup.hpp"
#include "Subsurface.hpp"
#include "WLSurface.hpp"
+#include "Workspace.hpp"
class CXDGSurfaceResource;
class CXWaylandSurface;
@@ -170,6 +171,7 @@ struct SWindowData {
CWindowOverridableVar<bool> noShortcutsInhibit = false;
CWindowOverridableVar<bool> opaque = false;
CWindowOverridableVar<bool> RGBX = false;
+ CWindowOverridableVar<bool> syncFullscreen = true;
CWindowOverridableVar<bool> tearing = false;
CWindowOverridableVar<bool> xray = false;
@@ -208,6 +210,11 @@ struct SInitialWorkspaceToken {
std::string workspace;
};
+struct sFullscreenState {
+ eFullscreenMode internal = FSMODE_NONE;
+ eFullscreenMode client = FSMODE_NONE;
+};
+
class CWindow {
public:
static PHLWINDOW create(SP<CXDGSurfaceResource>);
@@ -256,24 +263,23 @@ class CWindow {
Vector2D m_vPseudoSize = Vector2D(1280, 720);
// for recovering relative cursor position
- Vector2D m_vRelativeCursorCoordsOnLastWarp = Vector2D(-1, -1);
+ Vector2D m_vRelativeCursorCoordsOnLastWarp = Vector2D(-1, -1);
- bool m_bFirstMap = false; // for layouts
- bool m_bIsFloating = false;
- bool m_bDraggingTiled = false; // for dragging around tiled windows
- bool m_bIsFullscreen = false;
- bool m_bDontSendFullscreen = false;
- bool m_bWasMaximized = false;
- uint64_t m_iMonitorID = -1;
- std::string m_szTitle = "";
- std::string m_szClass = "";
- std::string m_szInitialTitle = "";
- std::string m_szInitialClass = "";
- PHLWORKSPACE m_pWorkspace;
+ bool m_bFirstMap = false; // for layouts
+ bool m_bIsFloating = false;
+ bool m_bDraggingTiled = false; // for dragging around tiled windows
+ bool m_bWasMaximized = false;
+ sFullscreenState m_sFullscreenState = {.internal = FSMODE_NONE, .client = FSMODE_NONE};
+ uint64_t m_iMonitorID = -1;
+ std::string m_szTitle = "";
+ std::string m_szClass = "";
+ std::string m_szInitialTitle = "";
+ std::string m_szInitialClass = "";
+ PHLWORKSPACE m_pWorkspace;
- bool m_bIsMapped = false;
+ bool m_bIsMapped = false;
- bool m_bRequestsFloat = false;
+ bool m_bRequestsFloat = false;
// This is for fullscreen apps
bool m_bCreatedOverFullscreen = false;
@@ -322,9 +328,6 @@ class CWindow {
// urgency hint
bool m_bIsUrgent = false;
- // fakefullscreen
- bool m_bFakeFullscreenState = false;
-
// for proper cycling. While cycling we can't just move the pointers, so we need to keep track of the last cycled window.
PHLWINDOWREF m_pLastCycledWindow;
@@ -416,7 +419,6 @@ class CWindow {
bool opaque();
float rounding();
bool canBeTorn();
- bool shouldSendFullscreenState();
void setSuspended(bool suspend);
bool visibleOnMonitor(CMonitor* pMonitor);
int workspaceID();
@@ -424,6 +426,9 @@ class CWindow {
void activate(bool force = false);
int surfacesCount();
+ bool isFullscreen();
+ bool isEffectiveInternalFSMode(const eFullscreenMode);
+
int getRealBorderSize();
void updateWindowData();
void updateWindowData(const struct SWorkspaceRule&);