mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-02 15:45:59 +01:00
parent
121c6ac3ea
commit
1423707dbe
6 changed files with 49 additions and 3 deletions
|
@ -184,6 +184,9 @@ void CMonitor::onConnect(bool noRule) {
|
||||||
forceFullFrames = 3; // force 3 full frames to make sure there is no blinking due to double-buffering.
|
forceFullFrames = 3; // force 3 full frames to make sure there is no blinking due to double-buffering.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
if (!activeMonitorRule.mirrorOf.empty())
|
||||||
|
setMirror(activeMonitorRule.mirrorOf);
|
||||||
|
|
||||||
g_pEventManager->postEvent(SHyprIPCEvent{"monitoradded", szName});
|
g_pEventManager->postEvent(SHyprIPCEvent{"monitoradded", szName});
|
||||||
g_pEventManager->postEvent(SHyprIPCEvent{"monitoraddedv2", std::format("{},{},{}", ID, szName, szShortDescription)});
|
g_pEventManager->postEvent(SHyprIPCEvent{"monitoraddedv2", std::format("{},{},{}", ID, szName, szShortDescription)});
|
||||||
EMIT_HOOK_EVENT("monitorAdded", this);
|
EMIT_HOOK_EVENT("monitorAdded", this);
|
||||||
|
@ -517,6 +520,8 @@ void CMonitor::setMirror(const std::string& mirrorOf) {
|
||||||
|
|
||||||
g_pCompositor->sanityCheckWorkspaces();
|
g_pCompositor->sanityCheckWorkspaces();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
events.modeChanged.emit();
|
||||||
}
|
}
|
||||||
|
|
||||||
float CMonitor::getDefaultScale() {
|
float CMonitor::getDefaultScale() {
|
||||||
|
|
|
@ -46,21 +46,47 @@
|
||||||
#include "../helpers/Monitor.hpp"
|
#include "../helpers/Monitor.hpp"
|
||||||
#include "../render/Renderer.hpp"
|
#include "../render/Renderer.hpp"
|
||||||
|
|
||||||
|
void CProtocolManager::onMonitorModeChange(CMonitor* pMonitor) {
|
||||||
|
const bool ISMIRROR = pMonitor->isMirror();
|
||||||
|
|
||||||
|
// onModeChanged we check if the current mirror status matches the global.
|
||||||
|
// mirrored outputs should have their global removed, as they are not physical parts of the
|
||||||
|
// layout.
|
||||||
|
|
||||||
|
if (ISMIRROR && PROTO::outputs.contains(pMonitor->szName))
|
||||||
|
PROTO::outputs.at(pMonitor->szName)->remove();
|
||||||
|
else if (!ISMIRROR && (!PROTO::outputs.contains(pMonitor->szName) || PROTO::outputs.at(pMonitor->szName)->isDefunct())) {
|
||||||
|
if (PROTO::outputs.contains(pMonitor->szName))
|
||||||
|
PROTO::outputs.erase(pMonitor->szName);
|
||||||
|
PROTO::outputs.emplace(pMonitor->szName,
|
||||||
|
std::make_unique<CWLOutputProtocol>(&wl_output_interface, 4, std::format("WLOutput ({})", pMonitor->szName), pMonitor->self.lock()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
CProtocolManager::CProtocolManager() {
|
CProtocolManager::CProtocolManager() {
|
||||||
|
|
||||||
// Outputs are a bit dumb, we have to agree.
|
// Outputs are a bit dumb, we have to agree.
|
||||||
static auto P = g_pHookSystem->hookDynamic("monitorAdded", [](void* self, SCallbackInfo& info, std::any param) {
|
static auto P = g_pHookSystem->hookDynamic("monitorAdded", [this](void* self, SCallbackInfo& info, std::any param) {
|
||||||
auto M = std::any_cast<CMonitor*>(param);
|
auto M = std::any_cast<CMonitor*>(param);
|
||||||
|
|
||||||
|
// ignore mirrored outputs. I don't think this will ever be hit as mirrors are applied after
|
||||||
|
// this event is emitted iirc.
|
||||||
|
if (M->isMirror())
|
||||||
|
return;
|
||||||
|
|
||||||
if (PROTO::outputs.contains(M->szName))
|
if (PROTO::outputs.contains(M->szName))
|
||||||
PROTO::outputs.erase(M->szName);
|
PROTO::outputs.erase(M->szName);
|
||||||
PROTO::outputs.emplace(M->szName, std::make_unique<CWLOutputProtocol>(&wl_output_interface, 4, std::format("WLOutput ({})", M->szName), M->self.lock()));
|
PROTO::outputs.emplace(M->szName, std::make_unique<CWLOutputProtocol>(&wl_output_interface, 4, std::format("WLOutput ({})", M->szName), M->self.lock()));
|
||||||
|
|
||||||
|
m_mModeChangeListeners[M->szName] = M->events.modeChanged.registerListener([M, this](std::any d) { onMonitorModeChange(M); });
|
||||||
});
|
});
|
||||||
|
|
||||||
static auto P2 = g_pHookSystem->hookDynamic("monitorRemoved", [](void* self, SCallbackInfo& info, std::any param) {
|
static auto P2 = g_pHookSystem->hookDynamic("monitorRemoved", [this](void* self, SCallbackInfo& info, std::any param) {
|
||||||
auto M = std::any_cast<CMonitor*>(param);
|
auto M = std::any_cast<CMonitor*>(param);
|
||||||
if (!PROTO::outputs.contains(M->szName))
|
if (!PROTO::outputs.contains(M->szName))
|
||||||
return;
|
return;
|
||||||
PROTO::outputs.at(M->szName)->remove();
|
PROTO::outputs.at(M->szName)->remove();
|
||||||
|
m_mModeChangeListeners.erase(M->szName);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Core
|
// Core
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
#include "../protocols/TextInputV1.hpp"
|
#include "../protocols/TextInputV1.hpp"
|
||||||
#include "../protocols/GlobalShortcuts.hpp"
|
#include "../protocols/GlobalShortcuts.hpp"
|
||||||
#include "../protocols/Screencopy.hpp"
|
#include "../protocols/Screencopy.hpp"
|
||||||
|
#include "../helpers/memory/WeakPtr.hpp"
|
||||||
|
#include <unordered_map>
|
||||||
|
|
||||||
class CProtocolManager {
|
class CProtocolManager {
|
||||||
public:
|
public:
|
||||||
|
@ -15,6 +17,11 @@ class CProtocolManager {
|
||||||
std::unique_ptr<CTextInputV1ProtocolManager> m_pTextInputV1ProtocolManager;
|
std::unique_ptr<CTextInputV1ProtocolManager> m_pTextInputV1ProtocolManager;
|
||||||
std::unique_ptr<CGlobalShortcutsProtocolManager> m_pGlobalShortcutsProtocolManager;
|
std::unique_ptr<CGlobalShortcutsProtocolManager> m_pGlobalShortcutsProtocolManager;
|
||||||
std::unique_ptr<CScreencopyProtocolManager> m_pScreencopyProtocolManager;
|
std::unique_ptr<CScreencopyProtocolManager> m_pScreencopyProtocolManager;
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::unordered_map<std::string, CHyprSignalListener> m_mModeChangeListeners;
|
||||||
|
|
||||||
|
void onMonitorModeChange(CMonitor* pMonitor);
|
||||||
};
|
};
|
||||||
|
|
||||||
inline std::unique_ptr<CProtocolManager> g_pProtocolManager;
|
inline std::unique_ptr<CProtocolManager> g_pProtocolManager;
|
||||||
|
|
|
@ -105,3 +105,7 @@ void CWLOutputProtocol::remove() {
|
||||||
defunct = true;
|
defunct = true;
|
||||||
removeGlobal();
|
removeGlobal();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CWLOutputProtocol::isDefunct() {
|
||||||
|
return defunct;
|
||||||
|
}
|
||||||
|
|
|
@ -40,6 +40,7 @@ class CWLOutputProtocol : public IWaylandProtocol {
|
||||||
|
|
||||||
// will mark the protocol for removal, will be removed when no. of bound outputs is 0 (or when overwritten by a new global)
|
// will mark the protocol for removal, will be removed when no. of bound outputs is 0 (or when overwritten by a new global)
|
||||||
void remove();
|
void remove();
|
||||||
|
bool isDefunct(); // true if above was called
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void destroyResource(CWLOutputResource* resource);
|
void destroyResource(CWLOutputResource* resource);
|
||||||
|
|
|
@ -1353,7 +1353,7 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) {
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
g_pHyprRenderer->renderWindow(pMonitor->solitaryClient.lock(), pMonitor, &now, false, RENDER_PASS_MAIN /* solitary = no popups */);
|
g_pHyprRenderer->renderWindow(pMonitor->solitaryClient.lock(), pMonitor, &now, false, RENDER_PASS_MAIN /* solitary = no popups */);
|
||||||
} else {
|
} else if (!pMonitor->isMirror()) {
|
||||||
sendFrameEventsToWorkspace(pMonitor, pMonitor->activeWorkspace, &now);
|
sendFrameEventsToWorkspace(pMonitor, pMonitor->activeWorkspace, &now);
|
||||||
if (pMonitor->activeSpecialWorkspace)
|
if (pMonitor->activeSpecialWorkspace)
|
||||||
sendFrameEventsToWorkspace(pMonitor, pMonitor->activeSpecialWorkspace, &now);
|
sendFrameEventsToWorkspace(pMonitor, pMonitor->activeSpecialWorkspace, &now);
|
||||||
|
@ -1869,6 +1869,9 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
|
||||||
!memcmp(&pMonitor->customDrmMode, &RULE->drmMode, sizeof(pMonitor->customDrmMode))) {
|
!memcmp(&pMonitor->customDrmMode, &RULE->drmMode, sizeof(pMonitor->customDrmMode))) {
|
||||||
|
|
||||||
Debug::log(LOG, "Not applying a new rule to {} because it's already applied!", pMonitor->szName);
|
Debug::log(LOG, "Not applying a new rule to {} because it's already applied!", pMonitor->szName);
|
||||||
|
|
||||||
|
pMonitor->setMirror(RULE->mirrorOf);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue