From df00727310b8a428a4977878cdf5597373a2ad31 Mon Sep 17 00:00:00 2001 From: Vaxry Date: Wed, 25 Oct 2023 00:27:16 +0100 Subject: [PATCH] deps: update wlroots --- src/Compositor.cpp | 3 --- src/Compositor.hpp | 1 - src/events/Monitors.cpp | 2 +- src/includes.hpp | 1 - src/protocols/Screencopy.cpp | 4 ++-- src/protocols/ToplevelExport.cpp | 2 +- subprojects/wlroots | 2 +- 7 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 1163acca..e5242054 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -215,7 +215,6 @@ void CCompositor::initServer() { m_sWLRPresentation = wlr_presentation_create(m_sWLDisplay, m_sWLRBackend); - m_sWLRIdle = wlr_idle_create(m_sWLDisplay); m_sWLRIdleNotifier = wlr_idle_notifier_v1_create(m_sWLDisplay); m_sWLRLayerShell = wlr_layer_shell_v1_create(m_sWLDisplay, 4); @@ -2580,12 +2579,10 @@ CWindow* CCompositor::getForceFocus() { } void CCompositor::notifyIdleActivity() { - wlr_idle_notify_activity(g_pCompositor->m_sWLRIdle, g_pCompositor->m_sSeat.seat); wlr_idle_notifier_v1_notify_activity(g_pCompositor->m_sWLRIdleNotifier, g_pCompositor->m_sSeat.seat); } void CCompositor::setIdleActivityInhibit(bool enabled) { - wlr_idle_set_enabled(g_pCompositor->m_sWLRIdle, g_pCompositor->m_sSeat.seat, enabled); wlr_idle_notifier_v1_set_inhibited(g_pCompositor->m_sWLRIdleNotifier, !enabled); } void CCompositor::arrangeMonitors() { diff --git a/src/Compositor.hpp b/src/Compositor.hpp index fdbac136..ae536c91 100644 --- a/src/Compositor.hpp +++ b/src/Compositor.hpp @@ -54,7 +54,6 @@ class CCompositor { wlr_drm_lease_v1_manager* m_sWRLDRMLeaseMgr; wlr_xdg_activation_v1* m_sWLRXDGActivation; wlr_output_layout* m_sWLROutputLayout; - wlr_idle* m_sWLRIdle; wlr_idle_notifier_v1* m_sWLRIdleNotifier; wlr_layer_shell_v1* m_sWLRLayerShell; wlr_xdg_shell* m_sWLRXDGShell; diff --git a/src/events/Monitors.cpp b/src/events/Monitors.cpp index 8619ade3..fa36c53c 100644 --- a/src/events/Monitors.cpp +++ b/src/events/Monitors.cpp @@ -251,7 +251,7 @@ void Events::listener_monitorCommit(void* owner, void* data) { const auto E = (wlr_output_event_commit*)data; - if (E->committed & WLR_OUTPUT_STATE_BUFFER) { + if (E->state->committed & WLR_OUTPUT_STATE_BUFFER) { g_pProtocolManager->m_pScreencopyProtocolManager->onOutputCommit(PMONITOR, E); g_pProtocolManager->m_pToplevelExportProtocolManager->onOutputCommit(PMONITOR, E); } diff --git a/src/includes.hpp b/src/includes.hpp index 1205f55c..a70815dc 100644 --- a/src/includes.hpp +++ b/src/includes.hpp @@ -47,7 +47,6 @@ extern "C" { #include #include #include -#include #include #include #include diff --git a/src/protocols/Screencopy.cpp b/src/protocols/Screencopy.cpp index a84f853f..aaec0fab 100644 --- a/src/protocols/Screencopy.cpp +++ b/src/protocols/Screencopy.cpp @@ -263,7 +263,7 @@ void CScreencopyProtocolManager::copyFrame(wl_client* client, wl_resource* resou return; } - const auto PBUFFER = wlr_buffer_from_resource(buffer); + const auto PBUFFER = wlr_buffer_try_from_resource(buffer); if (!PBUFFER) { Debug::log(ERR, "[sc] invalid buffer in {:x}", (uintptr_t)PFRAME); wl_resource_post_error(PFRAME->resource, ZWLR_SCREENCOPY_FRAME_V1_ERROR_INVALID_BUFFER, "invalid buffer"); @@ -332,7 +332,7 @@ void CScreencopyProtocolManager::copyFrame(wl_client* client, wl_resource* resou } void CScreencopyProtocolManager::onOutputCommit(CMonitor* pMonitor, wlr_output_event_commit* e) { - m_pLastMonitorBackBuffer = e->buffer; + m_pLastMonitorBackBuffer = e->state->buffer; shareAllFrames(pMonitor); m_pLastMonitorBackBuffer = nullptr; } diff --git a/src/protocols/ToplevelExport.cpp b/src/protocols/ToplevelExport.cpp index 828ad35f..3515d652 100644 --- a/src/protocols/ToplevelExport.cpp +++ b/src/protocols/ToplevelExport.cpp @@ -229,7 +229,7 @@ void CToplevelExportProtocolManager::copyFrame(wl_client* client, wl_resource* r return; } - const auto PBUFFER = wlr_buffer_from_resource(buffer); + const auto PBUFFER = wlr_buffer_try_from_resource(buffer); if (!PBUFFER) { wl_resource_post_error(PFRAME->resource, HYPRLAND_TOPLEVEL_EXPORT_FRAME_V1_ERROR_INVALID_BUFFER, "invalid buffer"); removeFrame(PFRAME); diff --git a/subprojects/wlroots b/subprojects/wlroots index 3406c1b1..47bf87ad 160000 --- a/subprojects/wlroots +++ b/subprojects/wlroots @@ -1 +1 @@ -Subproject commit 3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc +Subproject commit 47bf87ade2bd32395615a385ebde1fefbcdf79a2