diff options
| author | Vaxry <vaxry@vaxry.net> | 2024-01-27 13:58:13 +0000 |
|---|---|---|
| committer | Vaxry <vaxry@vaxry.net> | 2024-01-27 13:58:28 +0000 |
| commit | 7b3d03938888f399c3c14adfce73ea22bbe461ea (patch) | |
| tree | 871448bf8b8b3a942629793af27132686247a3ed /src/managers | |
| parent | 12d79d63421e2ed3f31130755c7a37f0e4fb5cb1 (diff) | |
deps: update wlroots
drops requirement for WLR_DRM_NO_ATOMIC provided kernel >= 6.8
Diffstat (limited to 'src/managers')
| -rw-r--r-- | src/managers/KeybindManager.cpp | 4 | ||||
| -rw-r--r-- | src/managers/input/InputManager.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index a08c95f5..7d31a039 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -1852,11 +1852,11 @@ void CKeybindManager::dpms(std::string arg) { if (!port.empty() && m->szName != port) continue; - wlr_output_enable(m->output, enable); + wlr_output_state_set_enabled(&m->outputState, enable); m->dpmsStatus = enable; - if (!wlr_output_commit(m->output)) { + if (!wlr_output_commit_state(m->output, &m->outputState)) { Debug::log(ERR, "Couldn't commit output {}", m->szName); } diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index 8a98fe67..2c46cf85 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -695,7 +695,8 @@ void CInputManager::onMouseWheel(wlr_pointer_axis_event* e) { return; } - wlr_seat_pointer_notify_axis(g_pCompositor->m_sSeat.seat, e->time_msec, e->orientation, factor * e->delta, std::round(factor * e->delta_discrete), e->source); + wlr_seat_pointer_notify_axis(g_pCompositor->m_sSeat.seat, e->time_msec, e->orientation, factor * e->delta, std::round(factor * e->delta_discrete), e->source, + WLR_AXIS_RELATIVE_DIRECTION_IDENTICAL); } Vector2D CInputManager::getMouseCoordsInternal() { |