hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-24 00:06:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

use auto format for cursor

Browse source
This commit is contained in:
Vaxry 2024-06-26 19:42:50 +02:00
parent 817c2a56c9
commit b10b70eab0
1 changed files with 2 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/managers/PointerManager.cpp
View file

@ -10,28 +10,6 @@
#include <wlr/render/interface.h> #include <wlr/render/interface.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
static Aquamarine::SDRMFormat pickCursorFormat(SP<Aquamarine::IOutput> output) {
const auto fmts = output->getBackend()->getCursorFormats();
if (fmts.empty())
return {};
// try to use common formats in their order
std::vector<uint32_t> PREFERRED_FORMATS = {DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888};
for (auto& pf : PREFERRED_FORMATS) {
for (auto& fmt : fmts) {
if (pf != fmt.drmFormat)
continue;
return fmt;
}
}
return fmts.at(0);
}
CPointerManager::CPointerManager() { CPointerManager::CPointerManager() {
hooks.monitorAdded = g_pHookSystem->hookDynamic("newMonitor", [this](void* self, SCallbackInfo& info, std::any data) { hooks.monitorAdded = g_pHookSystem->hookDynamic("newMonitor", [this](void* self, SCallbackInfo& info, std::any data) {
auto PMONITOR = std::any_cast<SP<CMonitor>>(data); auto PMONITOR = std::any_cast<SP<CMonitor>>(data);
@ -390,12 +368,6 @@ SP<Aquamarine::IBuffer> CPointerManager::renderHWCursorBuffer(SP<CPointerManager
maxSize = cursorSize; maxSize = cursorSize;
if (!state->monitor->cursorSwapchain || maxSize != state->monitor->cursorSwapchain->currentOptions().size) { if (!state->monitor->cursorSwapchain || maxSize != state->monitor->cursorSwapchain->currentOptions().size) {
auto format = pickCursorFormat(output);
if (format.drmFormat == DRM_FORMAT_INVALID) {
Debug::log(TRACE, "Failed to pick an output format for hw cursor");
return nullptr;
}
if (!state->monitor->cursorSwapchain) if (!state->monitor->cursorSwapchain)
state->monitor->cursorSwapchain = Aquamarine::CSwapchain::create(g_pCompositor->m_pAqBackend->allocator, state->monitor->output->getBackend()); state->monitor->cursorSwapchain = Aquamarine::CSwapchain::create(g_pCompositor->m_pAqBackend->allocator, state->monitor->output->getBackend());
@ -403,9 +375,10 @@ SP<Aquamarine::IBuffer> CPointerManager::renderHWCursorBuffer(SP<CPointerManager
auto options = state->monitor->cursorSwapchain->currentOptions(); auto options = state->monitor->cursorSwapchain->currentOptions();
options.size = maxSize; options.size = maxSize;
options.length = 2; options.length = 2;
options.format = format.drmFormat;
options.scanout = true; options.scanout = true;
options.cursor = true; options.cursor = true;
// We do not set the format. If it's unset (DRM_FORMAT_INVALID) then the swapchain will pick for us,
// but if it's set, we don't wanna change it.
if (!state->monitor->cursorSwapchain->reconfigure(options)) { if (!state->monitor->cursorSwapchain->reconfigure(options)) {
Debug::log(TRACE, "Failed to reconfigure cursor swapchain"); Debug::log(TRACE, "Failed to reconfigure cursor swapchain");