Fix: rotated outputs #112

ErikReider · 2023-02-14T17:23:10Z

Fixes: #47

Some things don't work (mostly position dependent rounding).

Todo:

~~Per-side window rounding with titlebars~~
Window border corners
Rounded quad frag shader

Issues:

Everything else should work 🤞

Testing:

I recommend to create a local simple sway config with a different MOD key (I use alt) for testing.
Add this to said config:

output WL-1 {
	transform 270
}

Run in a terminal in nested mode with said config

sway/desktop/fx_renderer.c

WillPower3309 · 2023-04-19T03:40:04Z

Two comments:

I was going to rebase from master, but blur REALLY messes this up. I think the monitor box we create with blur may also need to be rotated
I'm not 100% sure that moving things from fx_renderer.c to render.c like I did in the most recent commit was the way to go due to the box size checking that happens at the start of the fx_renderer rendering functions

We can continue as is for now with the border corners and tackle those couple of comments later. We may want to have a separate PR for fixing the titlebar stuff as I don't think it'll be fun :S

ErikReider · 2023-04-19T13:16:13Z

I was going to rebase from master, but blur REALLY messes this up. I think the monitor box we create with blur may also need to be rotated

Fixed :)

Also rebased from master

ErikReider · 2023-04-19T13:26:15Z

sway/desktop/fx_renderer/fx_framebuffer.c

+	wlr_output_transformed_resolution(output, &monitor_box.width, &monitor_box.height);
+	wlr_box_transform(&monitor_box, &monitor_box,
+			wlr_output_transform_invert(output->transform),
+			monitor_box.width, monitor_box.height);


We could add a struct wlr_box *monitor_box as a function parameter

ErikReider · 2023-04-19T20:49:56Z

So the only thing left I guess would be "fixing" the corners with a uncomfortably long switch statement (until we rework the borders), fix the blur (doesn't work on portrait orientations) :)

WillPower3309 · 2023-04-20T02:25:06Z

Titlebars too but they can be a follow up

ErikReider · 2023-04-20T13:52:50Z

Luckily I had that ugly switch statement in a months old stash so didn't have to recreate it 😅

Everything should be "ready" now. The only thing that's not working is the titlebars which we agreed on working on in a new PR if I haven't misunderstood you completely :)

WillPower3309 · 2023-04-21T07:02:25Z

I think I could extend this to work with fixing rotated titlebars. Will do so tomorrow

GlitchyCrafting · 2023-04-22T03:33:26Z

Does your guy's vertical monitors do this?
It only happens on my vertical monitor, I am using the git version.
Different config doesn't change it.
Background and windows don't fill the whole monitor, but the mouse will go on the empty area.
My monitor is 1024x1280 not 1080p if that helps.

The GIF ruined the resoulution and framerate.

WillPower3309 · 2023-04-22T04:59:14Z

Mind trying out this branch and seeing if the issue persists? That's not behavior I've encountered :S

GlitchyCrafting · 2023-04-22T12:26:43Z

That fixed everything, thx.

sway/desktop/fx_renderer/fx_framebuffer.c

WillPower3309 · 2023-04-24T04:42:52Z

merging from master will break this (thanks to b610419 and 3d1b294). Will take a look at it tomorrow. I'm trying to clean up fx_renderer's reliance on wlr_output since we only ever use its width and height. Feel like we create and then modify too many monitor_boxes right now

WillPower3309 · 2023-04-26T23:07:57Z

Just rebased from master. Some Y axis issues with blur (only when tiled so probably with the x-ray too), but otherwise good.

WillPower3309 · 2023-04-26T23:16:24Z

sway/desktop/fx_renderer/fx_framebuffer.c

@@ -1,3 +1,4 @@
+#include <wlr/util/box.h>


nit: remove

WillPower3309

I'm going to look into the projection / matrix thing and the tradeoffs in code cleanliness, which means that this PR has two items left:

TODO:

fix blur issue
investigate where and how matrix should be computed

WillPower3309 · 2023-04-27T00:20:50Z

sway/desktop/render.c

+	struct wlr_box monitor_box = get_monitor_box(wlr_output);
+	wlr_box_transform(&monitor_box, &monitor_box,
+			wlr_output_transform_invert(wlr_output->transform),
+			monitor_box.width, monitor_box.height);
+
+	fx_renderer_begin(renderer, monitor_box.width, monitor_box.height);


This would be cleaner if there was a way to just get the width and height of the transform invert output instead of the entire box. Haven't found a way based on a quick scroll through wlroots

ErikReider added the bug Something isn't working label Feb 14, 2023

WillPower3309 force-pushed the master branch from 11a4b1c to 7d5d7a3 Compare March 20, 2023 17:00

WillPower3309 force-pushed the master branch from e1dd89a to 420364d Compare April 7, 2023 00:30

WillPower3309 force-pushed the master branch 2 times, most recently from 505ef40 to e02e338 Compare April 17, 2023 21:50

WillPower3309 reviewed Apr 18, 2023

View reviewed changes

sway/desktop/fx_renderer.c Outdated Show resolved Hide resolved

WillPower3309 force-pushed the rotation-fix branch 2 times, most recently from 8ab81ad to 788fae8 Compare April 19, 2023 03:36

ErikReider force-pushed the rotation-fix branch from 788fae8 to ec5feaa Compare April 19, 2023 13:15

ErikReider commented Apr 19, 2023

View reviewed changes

ErikReider marked this pull request as ready for review April 20, 2023 13:50

ErikReider requested a review from WillPower3309 April 20, 2023 13:52

WillPower3309 reviewed Apr 24, 2023

View reviewed changes

sway/desktop/fx_renderer/fx_framebuffer.c Outdated Show resolved Hide resolved

ErikReider and others added 7 commits April 26, 2023 18:44

Initial rotation fixes

454303e

moved transform_boxes to render.c

b89a357

Fixed rendering

a7ae235

Fixed blur not being transformed while rotated

cc063a8

Fixed corners not rendering correctly

05e1a12

improved corner rotation and began titlebar rotation work

1d5616e

fixed rotated titlebars

520d282

WillPower3309 force-pushed the rotation-fix branch from 2668e89 to ab6fd80 Compare April 26, 2023 23:06

WillPower3309 force-pushed the rotation-fix branch from ab6fd80 to 78d13a8 Compare April 26, 2023 23:09

fixed rebase issues

489bd6d

WillPower3309 force-pushed the rotation-fix branch from 78d13a8 to 489bd6d Compare April 26, 2023 23:12

WillPower3309 changed the title ~~Initial rotation fixes~~ Rotation fixes Apr 26, 2023

WillPower3309 changed the title ~~Rotation fixes~~ Fix: rotated outputs Apr 26, 2023

WillPower3309 reviewed Apr 26, 2023

View reviewed changes

sway/desktop/fx_renderer/fx_framebuffer.c Outdated

@@ -1,3 +1,4 @@

#include <wlr/util/box.h>

Copy link

Owner

WillPower3309 Apr 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: remove

WillPower3309 requested changes Apr 26, 2023

View reviewed changes

WillPower3309 reviewed Apr 27, 2023

View reviewed changes

WillPower3309 and others added 2 commits April 27, 2023 00:26

nits

7a2bbe5

Fixed blur buffer dimensions not being transformed

364c1e2

WillPower3309 approved these changes Apr 27, 2023

View reviewed changes

WillPower3309 merged commit 5366c49 into master Apr 27, 2023

WillPower3309 deleted the rotation-fix branch April 27, 2023 22:50

swwwee mentioned this pull request May 29, 2024

On vertical monitors, the upper left corner of windows with a border are rounded below the border #320

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: rotated outputs #112

Fix: rotated outputs #112

ErikReider commented Feb 14, 2023 •

edited

Loading

WillPower3309 commented Apr 19, 2023

ErikReider commented Apr 19, 2023 •

edited

Loading

ErikReider Apr 19, 2023

ErikReider commented Apr 19, 2023

WillPower3309 commented Apr 20, 2023

ErikReider commented Apr 20, 2023

WillPower3309 commented Apr 21, 2023

GlitchyCrafting commented Apr 22, 2023

WillPower3309 commented Apr 22, 2023

GlitchyCrafting commented Apr 22, 2023

WillPower3309 commented Apr 24, 2023 •

edited

Loading

WillPower3309 commented Apr 26, 2023 •

edited

Loading

WillPower3309 Apr 26, 2023

WillPower3309 left a comment •

edited by ErikReider

Loading

WillPower3309 Apr 27, 2023

Fix: rotated outputs #112

Fix: rotated outputs #112

Conversation

ErikReider commented Feb 14, 2023 • edited Loading

WillPower3309 commented Apr 19, 2023

ErikReider commented Apr 19, 2023 • edited Loading

ErikReider Apr 19, 2023

Choose a reason for hiding this comment

ErikReider commented Apr 19, 2023

WillPower3309 commented Apr 20, 2023

ErikReider commented Apr 20, 2023

WillPower3309 commented Apr 21, 2023

GlitchyCrafting commented Apr 22, 2023

WillPower3309 commented Apr 22, 2023

GlitchyCrafting commented Apr 22, 2023

WillPower3309 commented Apr 24, 2023 • edited Loading

WillPower3309 commented Apr 26, 2023 • edited Loading

WillPower3309 Apr 26, 2023

Choose a reason for hiding this comment

WillPower3309 left a comment • edited by ErikReider Loading

Choose a reason for hiding this comment

WillPower3309 Apr 27, 2023

Choose a reason for hiding this comment

ErikReider commented Feb 14, 2023 •

edited

Loading

ErikReider commented Apr 19, 2023 •

edited

Loading

WillPower3309 commented Apr 24, 2023 •

edited

Loading

WillPower3309 commented Apr 26, 2023 •

edited

Loading

WillPower3309 left a comment •

edited by ErikReider

Loading