From e2f3f5fe63323ef6477b312f770083be485d53d7 Mon Sep 17 00:00:00 2001 From: Dashie Date: Sat, 26 Nov 2022 21:44:40 +0100 Subject: Add nofullscreen to windowrules (#1107) * feat: add windowrule to prevent fullscreen --- src/events/Windows.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/events/Windows.cpp') diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index 964e7bc7..256b58d7 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -164,6 +164,8 @@ void Events::listener_mapWindow(void* owner, void* data) { PWINDOW->m_bIsPseudotiled = true; } else if (r.szRule.find("nofocus") == 0) { PWINDOW->m_bNoFocus = true; + } else if (r.szRule.find("nofullscreenrequest") == 0) { + PWINDOW->m_bNoFullscreenRequest = true; } else if (r.szRule == "fullscreen") { requestsFullscreen = true; } else if (r.szRule == "windowdance") { @@ -442,7 +444,7 @@ void Events::listener_mapWindow(void* owner, void* data) { const auto TIMER = wl_event_loop_add_timer(g_pCompositor->m_sWLEventLoop, setAnimToMove, PWINDOW); wl_event_source_timer_update(TIMER, PWINDOW->m_vRealPosition.getDurationLeftMs() + 5); - if (requestsFullscreen) { + if (requestsFullscreen && !PWINDOW->m_bNoFullscreenRequest) { // fix fullscreen on requested (basically do a switcheroo) if (PWORKSPACE->m_bHasFullscreenWindow) { const auto PFULLWINDOW = g_pCompositor->getFullscreenWindowOnWorkspace(PWORKSPACE->m_iID); @@ -726,7 +728,7 @@ void Events::listener_fullscreenWindow(void* owner, void* data) { return; } - if (PWINDOW->isHidden()) + if (PWINDOW->isHidden() || PWINDOW->m_bNoFullscreenRequest) return; if (!PWINDOW->m_bIsX11) { @@ -912,8 +914,10 @@ void Events::listener_NewXDGDeco(wl_listener* listener, void* data) { void Events::listener_requestMaximize(void* owner, void* data) { const auto PWINDOW = (CWindow*)owner; - Debug::log(LOG, "Maximize request for %x", PWINDOW); + if (PWINDOW->m_bNoFullscreenRequest) + return; + Debug::log(LOG, "Maximize request for %x", PWINDOW); if (!PWINDOW->m_bIsX11) { const auto EV = (wlr_foreign_toplevel_handle_v1_maximized_event*)data; -- cgit v1.2.3