Skip to content

Commit

Permalink
core: conform to output transforms (#224)
Browse files Browse the repository at this point in the history
  • Loading branch information
caffeine01 authored Dec 19, 2024
1 parent eb9db3b commit f15e678
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
23 changes: 21 additions & 2 deletions src/helpers/Monitor.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
#include "Monitor.hpp"
#include "../Hyprpaper.hpp"
#include "MiscFunctions.hpp"

void SMonitor::registerListeners() {
output->setMode([this](CCWlOutput* r, uint32_t flags, int32_t width, int32_t height, int32_t refresh) { size = Vector2D(width, height); });
output->setMode([this](CCWlOutput* r, uint32_t flags, int32_t width, int32_t height, int32_t refresh) {
size = Vector2D(width, height);

//ensures any transforms are also taken care of when setting the mode
if (transform & 1)
std::swap(size.x, size.y);
});

output->setDone([this](CCWlOutput* r) {
readyForLS = true;
Expand All @@ -21,4 +28,16 @@ void SMonitor::registerListeners() {

description = desc;
});
}

output->setGeometry([this](CCWlOutput* r, int32_t x, int32_t y, int32_t width_mm, int32_t height_mm, int32_t subpixel, const char* make, const char* model,
int32_t transform_) { //
/*
see https://wayland.freedesktop.org/docs/html/apa.html#protocol-spec-wl_output-enum-transform
If there is a difference in parity of the old vs new transforms, the size needs to be swapped.
*/
if ((transform ^ transform_) & 1)
std::swap(size.x, size.y);

transform = (wl_output_transform)transform_;
});
}
1 change: 1 addition & 0 deletions src/helpers/Monitor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ struct SMonitor {
uint32_t wayland_name = 0;
Vector2D size;
int scale;
wl_output_transform transform = WL_OUTPUT_TRANSFORM_NORMAL;

bool readyForLS = false;
bool hasATarget = true;
Expand Down

0 comments on commit f15e678

Please sign in to comment.