hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-05-13 07:10:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

input-capture: fix build

Browse source
This commit is contained in:
Gwilherm Folliot 2025-05-11 21:12:49 +02:00
parent e69f6ddf5c
commit b9631756b9
No known key found for this signature in database
GPG key ID: 90236D3623DCD660
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/managers/input/InputManager.cpp
View file

@ -617,7 +617,7 @@ void CInputManager::onMouseButton(IPointer::SButtonEvent e) {
if (PROTO::inputCapture->isCaptured()) if (PROTO::inputCapture->isCaptured())
return; return;
m_tmrLastCursorMovement.reset(); m_lastCursorMovement.reset();
if (e.state == WL_POINTER_BUTTON_STATE_PRESSED) { if (e.state == WL_POINTER_BUTTON_STATE_PRESSED) {
m_currentlyHeldButtons.push_back(e.button); m_currentlyHeldButtons.push_back(e.button);
@ -947,12 +947,12 @@ void CInputManager::onMouseFrame() {
return; return;
bool shouldSkip = false; bool shouldSkip = false;
if (!g_pSeatManager->mouse.expired() && g_pInputManager->isLocked()) { if (!g_pSeatManager->m_mouse.expired() && g_pInputManager->isLocked()) {
auto PMONITOR = g_pCompositor->m_pLastMonitor.get(); auto PMONITOR = g_pCompositor->m_lastMonitor.get();
shouldSkip = PMONITOR && PMONITOR->shouldSkipScheduleFrameOnMouseEvent(); shouldSkip = PMONITOR && PMONITOR->shouldSkipScheduleFrameOnMouseEvent();
} }
g_pSeatManager->isPointerFrameSkipped = shouldSkip; g_pSeatManager->m_isPointerFrameSkipped = shouldSkip;
if (!g_pSeatManager->isPointerFrameSkipped) if (!g_pSeatManager->m_isPointerFrameSkipped)
g_pSeatManager->sendPointerFrame(); g_pSeatManager->sendPointerFrame();
} }

6
src/protocols/InputCapture.cpp
View file

@ -24,7 +24,7 @@ void CInputCaptureProtocol::bindManager(wl_client* client, void* data, uint32_t
g_pHyprRenderer->ensureCursorRenderingMode(); g_pHyprRenderer->ensureCursorRenderingMode();
}); });
sendKeymap(g_pSeatManager->keyboard.lock(), RESOURCE); sendKeymap(g_pSeatManager->m_keyboard.lock(), RESOURCE);
} }
bool CInputCaptureProtocol::isCaptured() { bool CInputCaptureProtocol::isCaptured() {
@ -33,7 +33,7 @@ bool CInputCaptureProtocol::isCaptured() {
void CInputCaptureProtocol::updateKeymap() { void CInputCaptureProtocol::updateKeymap() {
for (const auto& manager : m_vManagers) for (const auto& manager : m_vManagers)
sendKeymap(g_pSeatManager->keyboard.lock(), manager); sendKeymap(g_pSeatManager->m_keyboard.lock(), manager);
} }
void CInputCaptureProtocol::sendMotion(const Vector2D& absolutePosition, const Vector2D& delta) { void CInputCaptureProtocol::sendMotion(const Vector2D& absolutePosition, const Vector2D& delta) {
@ -45,7 +45,7 @@ void CInputCaptureProtocol::sendMotion(const Vector2D& absolutePosition, const V
void CInputCaptureProtocol::sendKeymap(SP<IKeyboard> keyboard, const UP<CHyprlandInputCaptureManagerV1>& manager) { void CInputCaptureProtocol::sendKeymap(SP<IKeyboard> keyboard, const UP<CHyprlandInputCaptureManagerV1>& manager) {
if (!keyboard) if (!keyboard)
return; return;
manager->sendKeymap(HYPRLAND_INPUT_CAPTURE_MANAGER_V1_KEYMAP_FORMAT_XKB_V1, keyboard->xkbKeymapFD.get(), keyboard->xkbKeymapString.length() + 1); manager->sendKeymap(HYPRLAND_INPUT_CAPTURE_MANAGER_V1_KEYMAP_FORMAT_XKB_V1, keyboard->m_xkbKeymapFD.get(), keyboard->m_xkbKeymapString.length() + 1);
} }
void CInputCaptureProtocol::forceRelease() { void CInputCaptureProtocol::forceRelease() {

4
src/protocols/core/Output.cpp
View file

@ -76,8 +76,8 @@ void CWLOutputResource::updateState() {
m_resource->sendMode((wl_output_mode)(WL_OUTPUT_MODE_CURRENT), m_monitor->m_pixelSize.x, m_monitor->m_pixelSize.y, m_monitor->m_refreshRate * 1000.0); m_resource->sendMode((wl_output_mode)(WL_OUTPUT_MODE_CURRENT), m_monitor->m_pixelSize.x, m_monitor->m_pixelSize.y, m_monitor->m_refreshRate * 1000.0);
resource->sendGeometry(monitor->vecPosition.x, monitor->vecPosition.y, monitor->output->physicalSize.x, monitor->output->physicalSize.y, (wl_output_subpixel)monitor->output->subpixel, monitor->output->make.c_str(), m_resource->sendGeometry(m_monitor->m_position.x, m_monitor->m_position.y, m_monitor->m_output->physicalSize.x, m_monitor->m_output->physicalSize.y, (wl_output_subpixel)m_monitor->m_output->subpixel, m_monitor->m_output->make.c_str(),
monitor->output->model.c_str(), monitor->transform); m_monitor->m_output->model.c_str(), m_monitor->m_transform);
if (m_resource->version() >= 2) if (m_resource->version() >= 2)
m_resource->sendDone(); m_resource->sendDone();

2
subprojects/hyprland-protocols

@ -1 +1 @@
Subproject commit 3a5c2bda1c1a4e55cc1330c782547695a93f05b2 Subproject commit 5433c38e9755e83905376ed0faf5c624869e24b9