hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-23 05:49:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

undo formatting

Browse source
This commit is contained in:
Yoni FIRROLONI 2022-06-17 20:31:15 +02:00 committed by vaxerski
parent 2feca08a67
commit f428604b6f
1 changed files with 52 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
src/events/Monitors.cpp
View file

@ -17,13 +17,11 @@
SMonitor* pMostHzMonitor = nullptr; SMonitor* pMostHzMonitor = nullptr;
void Events::listener_change(wl_listener *listener, void *data) void Events::listener_change(wl_listener* listener, void* data) {
{
// layout got changed, let's update monitors. // layout got changed, let's update monitors.
const auto CONFIG = wlr_output_configuration_v1_create(); const auto CONFIG = wlr_output_configuration_v1_create();
for (auto &m : g_pCompositor->m_lMonitors) for (auto& m : g_pCompositor->m_lMonitors) {
{
const auto CONFIGHEAD = wlr_output_configuration_head_v1_create(CONFIG, m.output); const auto CONFIGHEAD = wlr_output_configuration_head_v1_create(CONFIG, m.output);
// TODO: clients off of disabled // TODO: clients off of disabled
@ -46,19 +44,16 @@ void Events::listener_change(wl_listener *listener, void *data)
wlr_output_manager_v1_set_configuration(g_pCompositor->m_sWLROutputMgr, CONFIG); wlr_output_manager_v1_set_configuration(g_pCompositor->m_sWLROutputMgr, CONFIG);
} }
void Events::listener_newOutput(wl_listener *listener, void *data) void Events::listener_newOutput(wl_listener* listener, void* data) {
{
// new monitor added, let's accomodate for that. // new monitor added, let's accomodate for that.
const auto OUTPUT = (wlr_output*)data; const auto OUTPUT = (wlr_output*)data;
if (!OUTPUT->name) if (!OUTPUT->name) {
{
Debug::log(ERR, "New monitor has no name?? Ignoring"); Debug::log(ERR, "New monitor has no name?? Ignoring");
return; return;
} }
if (g_pCompositor->getMonitorFromName(std::string(OUTPUT->name))) if (g_pCompositor->getMonitorFromName(std::string(OUTPUT->name))) {
{
Debug::log(WARN, "Monitor with name %s already exists, not adding as new!", OUTPUT->name); Debug::log(WARN, "Monitor with name %s already exists, not adding as new!", OUTPUT->name);
return; return;
} }
@ -67,13 +62,11 @@ void Events::listener_newOutput(wl_listener *listener, void *data)
SMonitorRule monitorRule = g_pConfigManager->getMonitorRuleFor(OUTPUT->name); SMonitorRule monitorRule = g_pConfigManager->getMonitorRuleFor(OUTPUT->name);
// if it's disabled, disable and ignore // if it's disabled, disable and ignore
if (monitorRule.disabled) if (monitorRule.disabled) {
{
wlr_output_enable(OUTPUT, 0); wlr_output_enable(OUTPUT, 0);
wlr_output_commit(OUTPUT); wlr_output_commit(OUTPUT);
if (const auto PMONITOR = g_pCompositor->getMonitorFromName(std::string(OUTPUT->name)); PMONITOR) if (const auto PMONITOR = g_pCompositor->getMonitorFromName(std::string(OUTPUT->name)); PMONITOR) {
{
listener_monitorDestroy(nullptr, PMONITOR->output); listener_monitorDestroy(nullptr, PMONITOR->output);
} }
return; return;
@ -127,16 +120,13 @@ void Events::listener_newOutput(wl_listener *listener, void *data)
Debug::log(LOG, "New monitor: WORKSPACEID %d, exists: %d", WORKSPACEID, (int)(PNEWWORKSPACE != nullptr)); Debug::log(LOG, "New monitor: WORKSPACEID %d, exists: %d", WORKSPACEID, (int)(PNEWWORKSPACE != nullptr));
if (PNEWWORKSPACE) if (PNEWWORKSPACE) {
{
// workspace exists, move it to the newly connected monitor // workspace exists, move it to the newly connected monitor
g_pCompositor->moveWorkspaceToMonitor(PNEWWORKSPACE, PNEWMONITOR); g_pCompositor->moveWorkspaceToMonitor(PNEWWORKSPACE, PNEWMONITOR);
PNEWMONITOR->activeWorkspace = PNEWWORKSPACE->m_iID; PNEWMONITOR->activeWorkspace = PNEWWORKSPACE->m_iID;
g_pLayoutManager->getCurrentLayout()->recalculateMonitor(PNEWMONITOR->ID); g_pLayoutManager->getCurrentLayout()->recalculateMonitor(PNEWMONITOR->ID);
PNEWWORKSPACE->startAnim(true,true,true); PNEWWORKSPACE->startAnim(true,true,true);
} } else {
else
{
g_pCompositor->m_lWorkspaces.emplace_back(newMonitor.ID); g_pCompositor->m_lWorkspaces.emplace_back(newMonitor.ID);
PNEWWORKSPACE = &g_pCompositor->m_lWorkspaces.back(); PNEWWORKSPACE = &g_pCompositor->m_lWorkspaces.back();
@ -166,8 +156,7 @@ void Events::listener_newOutput(wl_listener *listener, void *data)
g_pCompositor->m_bReadyToProcess = true; g_pCompositor->m_bReadyToProcess = true;
} }
void Events::listener_monitorFrame(void *owner, void *data) void Events::listener_monitorFrame(void* owner, void* data) {
{
SMonitor* const PMONITOR = (SMonitor*)owner; SMonitor* const PMONITOR = (SMonitor*)owner;
static std::chrono::high_resolution_clock::time_point startRender = std::chrono::high_resolution_clock::now(); static std::chrono::high_resolution_clock::time_point startRender = std::chrono::high_resolution_clock::now();
@ -177,16 +166,14 @@ void Events::listener_monitorFrame(void *owner, void *data)
static auto *const PDEBUGOVERLAY = &g_pConfigManager->getConfigValuePtr("debug:overlay")->intValue; static auto *const PDEBUGOVERLAY = &g_pConfigManager->getConfigValuePtr("debug:overlay")->intValue;
static auto *const PDAMAGETRACKINGMODE = &g_pConfigManager->getConfigValuePtr("general:damage_tracking_internal")->intValue; static auto *const PDAMAGETRACKINGMODE = &g_pConfigManager->getConfigValuePtr("general:damage_tracking_internal")->intValue;
if (*PDEBUGOVERLAY == 1) if (*PDEBUGOVERLAY == 1) {
{
startRender = std::chrono::high_resolution_clock::now(); startRender = std::chrono::high_resolution_clock::now();
g_pDebugOverlay->frameData(PMONITOR); g_pDebugOverlay->frameData(PMONITOR);
} }
// Hack: only check when monitor with top hz refreshes, saves a bit of resources. // Hack: only check when monitor with top hz refreshes, saves a bit of resources.
// This is for stuff that should be run every frame // This is for stuff that should be run every frame
if (PMONITOR->ID == pMostHzMonitor->ID) if (PMONITOR->ID == pMostHzMonitor->ID) {
{
g_pCompositor->sanityCheckWorkspaces(); g_pCompositor->sanityCheckWorkspaces();
g_pAnimationManager->tick(); g_pAnimationManager->tick();
g_pCompositor->cleanupFadingOut(); g_pCompositor->cleanupFadingOut();
@ -199,14 +186,12 @@ void Events::listener_monitorFrame(void *owner, void *data)
g_pConfigManager->performMonitorReload(); g_pConfigManager->performMonitorReload();
} }
if (PMONITOR->framesToSkip > 0) if (PMONITOR->framesToSkip > 0) {
{
PMONITOR->framesToSkip -= 1; PMONITOR->framesToSkip -= 1;
if (!PMONITOR->noFrameSchedule) if (!PMONITOR->noFrameSchedule)
wlr_output_schedule_frame(PMONITOR->output); wlr_output_schedule_frame(PMONITOR->output);
else else {
{
Debug::log(LOG, "NoFrameSchedule hit for %s.", PMONITOR->szName.c_str()); Debug::log(LOG, "NoFrameSchedule hit for %s.", PMONITOR->szName.c_str());
} }
g_pLayoutManager->getCurrentLayout()->recalculateMonitor(PMONITOR->ID); g_pLayoutManager->getCurrentLayout()->recalculateMonitor(PMONITOR->ID);
@ -221,20 +206,17 @@ void Events::listener_monitorFrame(void *owner, void *data)
bool hasChanged; bool hasChanged;
pixman_region32_init(&damage); pixman_region32_init(&damage);
if (*PDAMAGETRACKINGMODE == -1) if (*PDAMAGETRACKINGMODE == -1) {
{
Debug::log(CRIT, "Damage tracking mode -1 ????"); Debug::log(CRIT, "Damage tracking mode -1 ????");
return; return;
} }
if (!wlr_output_damage_attach_render(PMONITOR->damage, &hasChanged, &damage)) if (!wlr_output_damage_attach_render(PMONITOR->damage, &hasChanged, &damage)){
{
Debug::log(ERR, "Couldn't attach render to display %s ???", PMONITOR->szName.c_str()); Debug::log(ERR, "Couldn't attach render to display %s ???", PMONITOR->szName.c_str());
return; return;
} }
if (!hasChanged && *PDAMAGETRACKINGMODE != DAMAGE_TRACKING_NONE) if (!hasChanged && *PDAMAGETRACKINGMODE != DAMAGE_TRACKING_NONE) {
{
pixman_region32_fini(&damage); pixman_region32_fini(&damage);
wlr_output_rollback(PMONITOR->output); wlr_output_rollback(PMONITOR->output);
wlr_output_schedule_frame(PMONITOR->output); // we update shit at the monitor's Hz so we need to schedule frames because rollback wont wlr_output_schedule_frame(PMONITOR->output); // we update shit at the monitor's Hz so we need to schedule frames because rollback wont
@ -242,19 +224,15 @@ void Events::listener_monitorFrame(void *owner, void *data)
} }
// if we have no tracking or full tracking, invalidate the entire monitor // if we have no tracking or full tracking, invalidate the entire monitor
if (*PDAMAGETRACKINGMODE == DAMAGE_TRACKING_NONE || *PDAMAGETRACKINGMODE == DAMAGE_TRACKING_MONITOR) if (*PDAMAGETRACKINGMODE == DAMAGE_TRACKING_NONE || *PDAMAGETRACKINGMODE == DAMAGE_TRACKING_MONITOR) {
{
pixman_region32_union_rect(&damage, &damage, 0, 0, (int)PMONITOR->vecTransformedSize.x, (int)PMONITOR->vecTransformedSize.y); pixman_region32_union_rect(&damage, &damage, 0, 0, (int)PMONITOR->vecTransformedSize.x, (int)PMONITOR->vecTransformedSize.y);
pixman_region32_copy(&g_pHyprOpenGL->m_rOriginalDamageRegion, &damage); pixman_region32_copy(&g_pHyprOpenGL->m_rOriginalDamageRegion, &damage);
} } else {
else
{
static auto* const PBLURENABLED = &g_pConfigManager->getConfigValuePtr("decoration:blur")->intValue; static auto* const PBLURENABLED = &g_pConfigManager->getConfigValuePtr("decoration:blur")->intValue;
// if we use blur we need to expand the damage for proper blurring // if we use blur we need to expand the damage for proper blurring
if (*PBLURENABLED == 1) if (*PBLURENABLED == 1) {
{
// TODO: can this be optimized? // TODO: can this be optimized?
static auto* const PBLURSIZE = &g_pConfigManager->getConfigValuePtr("decoration:blur_size")->intValue; static auto* const PBLURSIZE = &g_pConfigManager->getConfigValuePtr("decoration:blur_size")->intValue;
static auto* const PBLURPASSES = &g_pConfigManager->getConfigValuePtr("decoration:blur_passes")->intValue; static auto* const PBLURPASSES = &g_pConfigManager->getConfigValuePtr("decoration:blur_passes")->intValue;
@ -264,9 +242,7 @@ void Events::listener_monitorFrame(void *owner, void *data)
// now, prep the damage, get the extended damage region // now, prep the damage, get the extended damage region
wlr_region_expand(&damage, &damage, BLURRADIUS); // expand for proper blurring wlr_region_expand(&damage, &damage, BLURRADIUS); // expand for proper blurring
} } else {
else
{
pixman_region32_copy(&g_pHyprOpenGL->m_rOriginalDamageRegion, &damage); pixman_region32_copy(&g_pHyprOpenGL->m_rOriginalDamageRegion, &damage);
} }
} }
@ -285,8 +261,7 @@ void Events::listener_monitorFrame(void *owner, void *data)
g_pHyprError->draw(); g_pHyprError->draw();
// for drawing the debug overlay // for drawing the debug overlay
if (PMONITOR->ID == 0 && *PDEBUGOVERLAY == 1) if (PMONITOR->ID == 0 && *PDEBUGOVERLAY == 1) {
{
startRenderOverlay = std::chrono::high_resolution_clock::now(); startRenderOverlay = std::chrono::high_resolution_clock::now();
g_pDebugOverlay->draw(); g_pDebugOverlay->draw();
endRenderOverlay = std::chrono::high_resolution_clock::now(); endRenderOverlay = std::chrono::high_resolution_clock::now();
@ -318,32 +293,25 @@ void Events::listener_monitorFrame(void *owner, void *data)
wlr_output_schedule_frame(PMONITOR->output); wlr_output_schedule_frame(PMONITOR->output);
if (*PDEBUGOVERLAY == 1) if (*PDEBUGOVERLAY == 1) {
{
const float µs = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::high_resolution_clock::now() - startRender).count() / 1000.f; const float µs = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::high_resolution_clock::now() - startRender).count() / 1000.f;
g_pDebugOverlay->renderData(PMONITOR, µs); g_pDebugOverlay->renderData(PMONITOR, µs);
if (PMONITOR->ID == 0) if (PMONITOR->ID == 0) {
{
const float µsNoOverlay = µs - std::chrono::duration_cast<std::chrono::nanoseconds>(endRenderOverlay - startRenderOverlay).count() / 1000.f; const float µsNoOverlay = µs - std::chrono::duration_cast<std::chrono::nanoseconds>(endRenderOverlay - startRenderOverlay).count() / 1000.f;
g_pDebugOverlay->renderDataNoOverlay(PMONITOR, µsNoOverlay); g_pDebugOverlay->renderDataNoOverlay(PMONITOR, µsNoOverlay);
} } else {
else
{
g_pDebugOverlay->renderDataNoOverlay(PMONITOR, µs); g_pDebugOverlay->renderDataNoOverlay(PMONITOR, µs);
} }
} }
} }
void Events::listener_monitorDestroy(void *owner, void *data) void Events::listener_monitorDestroy(void* owner, void* data) {
{
const auto OUTPUT = (wlr_output*)data; const auto OUTPUT = (wlr_output*)data;
SMonitor* pMonitor = nullptr; SMonitor* pMonitor = nullptr;
for (auto &m : g_pCompositor->m_lMonitors) for (auto& m : g_pCompositor->m_lMonitors) {
{ if (m.szName == OUTPUT->name) {
if (m.szName == OUTPUT->name)
{
pMonitor = &m; pMonitor = &m;
break; break;
} }
@ -355,8 +323,7 @@ void Events::listener_monitorDestroy(void *owner, void *data)
// Cleanup everything. Move windows back, snap cursor, shit. // Cleanup everything. Move windows back, snap cursor, shit.
const auto BACKUPMON = &g_pCompositor->m_lMonitors.front(); const auto BACKUPMON = &g_pCompositor->m_lMonitors.front();
if (!BACKUPMON) if (!BACKUPMON) {
{
Debug::log(CRIT, "No monitors! Unplugged last! Exiting."); Debug::log(CRIT, "No monitors! Unplugged last! Exiting.");
g_pCompositor->cleanupExit(); g_pCompositor->cleanupExit();
exit(1); exit(1);
@ -370,26 +337,21 @@ void Events::listener_monitorDestroy(void *owner, void *data)
// move workspaces // move workspaces
std::deque<CWorkspace*> wspToMove; std::deque<CWorkspace*> wspToMove;
for (auto &w : g_pCompositor->m_lWorkspaces) for (auto& w : g_pCompositor->m_lWorkspaces) {
{ if (w.m_iMonitorID == pMonitor->ID) {
if (w.m_iMonitorID == pMonitor->ID)
{
wspToMove.push_back(&w); wspToMove.push_back(&w);
} }
} }
for (auto &w : wspToMove) for (auto& w : wspToMove) {
{
g_pCompositor->moveWorkspaceToMonitor(w, BACKUPMON); g_pCompositor->moveWorkspaceToMonitor(w, BACKUPMON);
w->startAnim(true, true, true); w->startAnim(true, true, true);
} }
pMonitor->activeWorkspace = -1; pMonitor->activeWorkspace = -1;
for (auto it = g_pCompositor->m_lWorkspaces.begin(); it != g_pCompositor->m_lWorkspaces.end(); ++it) for (auto it = g_pCompositor->m_lWorkspaces.begin(); it != g_pCompositor->m_lWorkspaces.end(); ++it) {
{ if (it->m_iMonitorID == pMonitor->ID) {
if (it->m_iMonitorID == pMonitor->ID)
{
it = g_pCompositor->m_lWorkspaces.erase(it); it = g_pCompositor->m_lWorkspaces.erase(it);
} }
} }
@ -401,15 +363,12 @@ void Events::listener_monitorDestroy(void *owner, void *data)
g_pCompositor->m_lMonitors.remove(*pMonitor); g_pCompositor->m_lMonitors.remove(*pMonitor);
// update the pMostHzMonitor // update the pMostHzMonitor
if (pMostHzMonitor == pMonitor) if (pMostHzMonitor == pMonitor) {
{
int mostHz = 0; int mostHz = 0;
SMonitor* pMonitorMostHz = nullptr; SMonitor* pMonitorMostHz = nullptr;
for (auto &m : g_pCompositor->m_lMonitors) for (auto& m : g_pCompositor->m_lMonitors) {
{ if (m.refreshRate > mostHz) {
if (m.refreshRate > mostHz)
{
pMonitorMostHz = &m; pMonitorMostHz = &m;
mostHz = m.refreshRate; mostHz = m.refreshRate;
} }