HiDPI #329

ddevault · 2017-10-24T12:52:22Z

emersion · 2017-10-24T12:54:37Z

include/wlr/types/wlr_surface.h

@@ -135,4 +135,8 @@ struct wlr_surface *wlr_surface_get_main_surface(struct wlr_surface *surface);
 */
 struct wlr_subsurface *wlr_surface_subsurface_at(struct wlr_surface *surface,
 		double sx, double sy, double *sub_x, double *sub_y);
+
+void wlr_surface_send_enter(struct wlr_surface *surface,
+		struct wlr_output *output);


~~We should send leave too.~~

emersion · 2017-10-24T12:57:06Z

rootston/desktop.c

+	}
+	if (output && output != view->output) {
+		view->output = output;
+		wlr_surface_send_enter(view->wlr_surface, output->wlr_output);


Shouldn't we send one enter event for each output which intersects with the view?

Good question.

Spec: https://wayland.freedesktop.org/docs/html/apa.html#protocol-spec-wl_surface-event-enter

Note that a surface may be overlapping with zero or more outputs.

So yeah, we should send enter to all outputs that intersects with the view.

emersion · 2017-10-24T13:02:32Z

types/wlr_output.c

@@ -28,8 +28,7 @@ static void wl_output_send_to_resource(struct wl_resource *resource) {
 	if (version >= WL_OUTPUT_MODE_SINCE_VERSION) {
 		struct wlr_output_mode *mode;
 		wl_list_for_each(mode, &output->modes, link) {
-			// TODO: mode->flags should just be preferred
-			uint32_t flags = mode->flags;
+			uint32_t flags = mode->flags & ~WL_OUTPUT_MODE_PREFERRED;


Does this flag break things?

I did this backwards.

Yeah, so:

WL_OUTPUT_MODE_PREFERRED has only one bit on

~WL_OUTPUT_MODE_PREFERRED has only one bit off, the preferred bit (all others on)

mode->flags & ~WL_OUTPUT_MODE_PREFERRED is mode->flags with the preferred bit off

But the comment says the contrary: mode->flags should only be able to change WL_OUTPUT_MODE_PREFERRED (ie. should not be able to set WL_OUTPUT_MODE_CURRENT).

I already said I did it backwards -_-

Oh, sorry. I though you were speaking about the ~, saying it inverts bits so it would be fine.

ddevault · 2017-10-26T03:54:06Z

I'm done for today, but if anyone is reviewing my commits and sees the reason behind this bug, I would appreciate your insight:

https://sr.ht/_HSY.png

gnome-calculator should not show up at all on the right output - but it does.

ddevault · 2017-10-26T12:30:07Z

I think I figured out an approach that will address that problem, writing it down here for poserity -

We need to treat HiDPI displays in the output layout as scaled up - that is, my 4K display should be arranged as if it were 1920x1080, and its x/y position relative to this. Then, at the renderer, we can scale it up or down depending on the scale of the surface and the genuine size of the output.

emersion · 2017-10-26T15:44:57Z

include/rootston/view.h

 	void (*activate)(struct roots_view *view, bool active);
 	void (*resize)(struct roots_view *view, uint32_t width, uint32_t height);
 	void (*set_position)(struct roots_view *view, double x, double y);
 	void (*close)(struct roots_view *view);
 };

-void view_get_size(struct roots_view *view, struct wlr_box *box);
+void view_get_size(const struct roots_view *view, struct wlr_box *box);


Maybe rename this to get_box now that this also returns the position?

A similar change should probably be applied to hardware cursors, though more complicated. Also, this doesn't actually fix the issue where the cursor is too small when over a scale=2 surface. Apparently they don't set their cursor scales to 2. Seems like a client bug? idk

Something about my math is off, but I'm not certain what. Would appreciate a second opinion.

Except for subsurfaces not rendering at the right scale. But that part is (somewhat) easy.

ddevault · 2017-11-03T03:23:03Z

Woo-hoo, got it working

emersion · 2017-11-03T07:23:14Z

rootston/desktop.c

 	set_view_focus(input, view->desktop, view);
+	wlr_seat_keyboard_notify_enter(input->wl_seat, view->wlr_surface);


This is already done in set_view_focus:

wlroots/rootston/cursor.c

Line 209 in 975b9dc

wlr_seat_keyboard_notify_enter(input->wl_seat, view->wlr_surface);

emersion · 2017-11-03T07:26:22Z

types/wlr_output.c

@@ -450,6 +451,8 @@ void wlr_output_cursor_set_surface(struct wlr_output_cursor *cursor,
 }

 bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, int x, int y) {
+	x *= cursor->output->scale;
+	y *= cursor->output->scale;


Because of this, maybe we want to accept doubles, multiply them, and cast them to ints right away.

Yes, this is in my todo list

emersion · 2017-11-03T09:52:50Z

We could add a config field for XWayland DPI:

Xwayland
-dpi int               screen resolution in dots per inch

Also see https://bugs.freedesktop.org/show_bug.cgi?id=9331

ddevault · 2017-11-03T13:09:44Z

Are you sure that's the right bugzilla link?

emersion · 2017-11-03T13:14:49Z

Whoops, here's the link: https://bugs.freedesktop.org/show_bug.cgi?id=93315

An interesting but complicated idea if we want to really support HiDPI in XWayland is this comment:

Could we run two xwayland instances? first display is lodpi, and second is hidpi?

ddevault · 2017-11-03T13:19:30Z

Could we run two xwayland instances? first display is lodpi, and second is hidpi?

We wouldn't be able to move windows between them. We should run an Xwayland server at the highest DPI among our monitors and scale down views on some displays. But it will be very messy.

We now use doubles until the last minute, which makes it so we can move the pointer more precisely. This also includes a fix for tablet tools, which move absolutely and sometimes do not update the X or Y axis.

There was an issue where it would only work within the boundaries of the unscaled resolution.

ddevault · 2017-11-07T13:40:58Z

I have a proposal for how to deal with cursor scale here. Basically, we're going to need to load xcursor themes at multiple scales for them to look good on each output in a mixed-DPI setup. I want to change wlr_cursor to distinguish the surface cursor from the fallback cursor. We'll change the set pixels guy to wlr_cursor_set_fallback_image and stash the data away on the cursor somewhere, and add a scale parameter. wlr_cursor will pick the most appropriate scaled image for the output it's showing on. Then when rootston sets an outputs scale factor, it makes sure that the cursor has the necessary images.

ddevault · 2017-11-09T13:33:26Z

Looking for feedback on this now. I'm going to spin out the remaining work into separate tickets.

emersion · 2017-11-09T13:44:25Z

types/wlr_output.c

@@ -231,14 +231,15 @@ void wlr_output_destroy(struct wlr_output *output) {

 void wlr_output_effective_resolution(struct wlr_output *output,
 		int *width, int *height) {


Maybe it's worth it to have doubles here too?

Hmm, I'm not sure we get any benefit from that. This isn't a place where loss of precision impacts anything.

Well, we use it below for the cursor code:

https://github.com/swaywm/wlroots/pull/329/files#diff-8c8783fe608815c9626588d85b00f2f4R273

What we basically do is: (int)(width / scale) * scale.

Yeah, but there are no displays (or if there are, I've never heard of them) with odd dimensions so you are always going to be dealing with integers here anyway.

Okay, so we should be fine for now. We won't be anymore when we'll introduce fractional scaling.

emersion · 2017-11-09T21:49:03Z

New views are no longer centered on screen
weston-terminal is blurry (same for all weston demos)
Subsurfaces seem to work properly
QT5 works
(Those two TODOs from the PR description)

ddevault · 2017-11-09T22:20:58Z

weston-terminal is blurry (same for all weston demos)

I'm not convinced that weston supports hidpi

New views are no longer centered on screen

Genuine bug

emersion reviewed Oct 24, 2017

View reviewed changes

emersion reviewed Oct 26, 2017

View reviewed changes

ddevault changed the title ~~HiDPI~~ [WIP] HiDPI Oct 27, 2017

ddevault added 8 commits November 1, 2017 08:44

Consider scale factor when rendering views

a744679

Send surface enter output events to clients

9861add

Handle output enter/leave correctly

a6930cd

View view_at (and pointer events) for hidpi

bafb970

Fix backwards bit banging

8c0929c

Adjust rendering to compensate for disparate scale

7f76f46

Something about my math is off, but I'm not certain what. Would appreciate a second opinion.

Fix various rebase-related bugs

ed74f47

ddevault force-pushed the hidpi branch from d40f4f8 to ed74f47 Compare November 1, 2017 12:57

Rethink HiDPI output layouts, fixes everything

ca8cf7d

Except for subsurfaces not rendering at the right scale. But that part is (somewhat) easy.

ddevault added 2 commits November 2, 2017 23:33

Fix view centering on HiDPI outputs

975b9dc

Merge remote-tracking branch 'origin/master' into hidpi

86b8729

emersion reviewed Nov 3, 2017

View reviewed changes

ddevault added 2 commits November 4, 2017 01:35

Improve input sensitivity

6d8e1ab

We now use doubles until the last minute, which makes it so we can move the pointer more precisely. This also includes a fix for tablet tools, which move absolutely and sometimes do not update the X or Y axis.

Fix software cursors on scaled outputs

2f6cfe4

There was an issue where it would only work within the boundaries of the unscaled resolution.

ddevault changed the title ~~[WIP] HiDPI~~ HiDPI Nov 9, 2017

ddevault added 2 commits November 9, 2017 08:36

Merge remote-tracking branch 'origin/master' into hidpi

66587eb

Remove extraneous keyboard send_enter

75fd9b8

emersion reviewed Nov 9, 2017

View reviewed changes

Fix centering views on scaled outputs

aafb00a

ddevault merged commit aafb00a into master Nov 10, 2017

ddevault deleted the hidpi branch November 10, 2017 13:27

main-- mentioned this pull request Nov 22, 2017

HiDPI support meta-issue swaywm/sway#797

Closed

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HiDPI #329

HiDPI #329

ddevault commented Oct 24, 2017 •

edited

Loading

emersion Oct 24, 2017 •

edited

Loading

emersion Oct 24, 2017

ddevault Oct 24, 2017

emersion Oct 24, 2017

emersion Oct 24, 2017

ddevault Oct 24, 2017

emersion Oct 24, 2017

ddevault Oct 24, 2017

emersion Oct 24, 2017

ddevault commented Oct 26, 2017

ddevault commented Oct 26, 2017

emersion Oct 26, 2017

ddevault commented Nov 3, 2017

emersion Nov 3, 2017

emersion Nov 3, 2017

ddevault Nov 3, 2017

emersion commented Nov 3, 2017 •

edited

Loading

ddevault commented Nov 3, 2017

emersion commented Nov 3, 2017

ddevault commented Nov 3, 2017

ddevault commented Nov 7, 2017

ddevault commented Nov 9, 2017

emersion Nov 9, 2017

ddevault Nov 9, 2017

emersion Nov 9, 2017

ddevault Nov 9, 2017

emersion Nov 9, 2017

emersion commented Nov 9, 2017 •

edited

Loading

ddevault commented Nov 9, 2017

		set_view_focus(input, view->desktop, view);
		wlr_seat_keyboard_notify_enter(input->wl_seat, view->wlr_surface);

		@@ -231,14 +231,15 @@ void wlr_output_destroy(struct wlr_output *output) {

		void wlr_output_effective_resolution(struct wlr_output *output,
		int width, int height) {

HiDPI #329

HiDPI #329

Conversation

ddevault commented Oct 24, 2017 • edited Loading

emersion Oct 24, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ddevault commented Oct 26, 2017

ddevault commented Oct 26, 2017

Choose a reason for hiding this comment

ddevault commented Nov 3, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emersion commented Nov 3, 2017 • edited Loading

ddevault commented Nov 3, 2017

emersion commented Nov 3, 2017

ddevault commented Nov 3, 2017

ddevault commented Nov 7, 2017

ddevault commented Nov 9, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emersion commented Nov 9, 2017 • edited Loading

ddevault commented Nov 9, 2017

ddevault commented Oct 24, 2017 •

edited

Loading

emersion Oct 24, 2017 •

edited

Loading

emersion commented Nov 3, 2017 •

edited

Loading

emersion commented Nov 9, 2017 •

edited

Loading