mirror of
https://github.com/hyprwm/Hyprland.git
synced 2025-09-29 14:48:28 +00:00
monitor: report a scheduled frame when tearing on cursor move
This commit is contained in:
@@ -1441,6 +1441,24 @@ void CMonitor::onMonitorFrame() {
|
|||||||
g_pHyprRenderer->renderMonitor(self.lock());
|
g_pHyprRenderer->renderMonitor(self.lock());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CMonitor::onCursorMovedOnMonitor() {
|
||||||
|
if (!tearingState.activelyTearing || !solitaryClient || !g_pHyprRenderer->shouldRenderCursor())
|
||||||
|
return;
|
||||||
|
|
||||||
|
// submit a frame immediately. This will only update the cursor pos.
|
||||||
|
// output->state->setBuffer(output->state->state().buffer);
|
||||||
|
// output->state->addDamage(CRegion{});
|
||||||
|
// output->state->setPresentationMode(Aquamarine::eOutputPresentationMode::AQ_OUTPUT_PRESENTATION_IMMEDIATE);
|
||||||
|
// if (!output->commit())
|
||||||
|
// Debug::log(ERR, "onCursorMovedOnMonitor: tearing and wanted to update cursor, failed.");
|
||||||
|
|
||||||
|
// FIXME: try to do the above. We currently can't just render because drm is a fucking bitch
|
||||||
|
// and throws a "nO pRoP cAn Be ChAnGeD dUrInG AsYnC fLiP" on crtc_x
|
||||||
|
// this will throw too but fix it if we use sw cursors
|
||||||
|
|
||||||
|
tearingState.frameScheduledWhileBusy = true;
|
||||||
|
}
|
||||||
|
|
||||||
CMonitorState::CMonitorState(CMonitor* owner) : m_pOwner(owner) {
|
CMonitorState::CMonitorState(CMonitor* owner) : m_pOwner(owner) {
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
@@ -186,6 +186,7 @@ class CMonitor {
|
|||||||
void scheduleDone();
|
void scheduleDone();
|
||||||
bool attemptDirectScanout();
|
bool attemptDirectScanout();
|
||||||
void setCTM(const Mat3x3& ctm);
|
void setCTM(const Mat3x3& ctm);
|
||||||
|
void onCursorMovedOnMonitor();
|
||||||
|
|
||||||
void debugLastPresentation(const std::string& message);
|
void debugLastPresentation(const std::string& message);
|
||||||
void onMonitorFrame();
|
void onMonitorFrame();
|
||||||
|
@@ -17,6 +17,9 @@
|
|||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <gbm.h>
|
#include <gbm.h>
|
||||||
#include <cairo/cairo.h>
|
#include <cairo/cairo.h>
|
||||||
|
#include <hyprutils/utils/ScopeGuard.hpp>
|
||||||
|
|
||||||
|
using namespace Hyprutils::Utils;
|
||||||
|
|
||||||
CPointerManager::CPointerManager() {
|
CPointerManager::CPointerManager() {
|
||||||
hooks.monitorAdded = g_pHookSystem->hookDynamic("monitorAdded", [this](void* self, SCallbackInfo& info, std::any data) {
|
hooks.monitorAdded = g_pHookSystem->hookDynamic("monitorAdded", [this](void* self, SCallbackInfo& info, std::any data) {
|
||||||
@@ -310,7 +313,12 @@ void CPointerManager::onCursorMoved() {
|
|||||||
recalc = true;
|
recalc = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->hardwareFailed || !state->entered)
|
if (!state->entered)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
CScopeGuard x([m] { m->onCursorMovedOnMonitor(); });
|
||||||
|
|
||||||
|
if (state->hardwareFailed)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
const auto CURSORPOS = getCursorPosForMonitor(m);
|
const auto CURSORPOS = getCursorPosForMonitor(m);
|
||||||
|
Reference in New Issue
Block a user