Workspace movement with touchpad gestures by ErikReider · Pull Request #269 · wlrfx/swayfx

ErikReider · 2024-01-21T13:00:06Z

Switch between workspaces with touchpad gestures

2024-01-21.01-40-39.mp4

TODO:

To test:

bindworkspacegesture 4:horizontal
# bindworkspacegesture --inverted 4:horizontal
# bindworkspacegesture 4:vertical
# bindworkspacegesture --inverted 4:vertical

…fied one

WillPower3309 · 2024-01-26T16:43:49Z

+	transaction_commit_dirty();
+
+	// Unset focus
+	seat_set_focus_workspace(seat, NULL);


good catch - this was a pain in fade out animations haha

WillPower3309 · 2024-01-26T17:00:16Z

+	int x = 0, y = 0;
+
+	int ws_dimen;
+	int *coord;
+	switch (output->workspace_scroll.direction) {
+	case SWIPE_GESTURE_DIRECTION_NONE:
+		return;
+	case SWIPE_GESTURE_DIRECTION_HORIZONTAL:
+		ws_dimen = output->width;
+		coord = &x;
+		break;
+	case SWIPE_GESTURE_DIRECTION_VERTICAL:
+		ws_dimen = output->height;
+		coord = &y;
+		break;
+	}


this bit is confusing to me, may need some clarification - what do x and y represent if they remain at 0 - and why does coord depend on them?

Oh yeah, that is a bit confusing… xD

It's mostly there to remove duplicate code due to the gesture either needing to adjust the X or Y coordinates depending on the gesture direction. Do you have any other way of solving this without duplicating the code?

Maybe just add the x and y coords as args?

WillPower3309 · 2024-01-26T17:00:51Z

+// Clips the rendered damage to the workspace region.
+// Fixes containers being rendered across workspaces while switching.
+static void adjust_damage_to_workspace_bounds(pixman_region32_t *damage,
+		bool on_focused_workspace, struct sway_output *output) {
+	float scale = output->wlr_output->scale;
+	float scroll_percent = output->workspace_scroll.percent;
+	int x = 0, y = 0;
+
+	int ws_dimen;
+	int *coord;
+	switch (output->workspace_scroll.direction) {
+	case SWIPE_GESTURE_DIRECTION_NONE:
+		return;
+	case SWIPE_GESTURE_DIRECTION_HORIZONTAL:
+		ws_dimen = output->width;
+		coord = &x;
+		break;
+	case SWIPE_GESTURE_DIRECTION_VERTICAL:
+		ws_dimen = output->height;
+		coord = &y;
+		break;
+	}
+
+	*coord = round(-ws_dimen * scroll_percent);
+	if (!on_focused_workspace) {
+		if (scroll_percent > 0) {
+			*coord += ws_dimen;
+		} else if (scroll_percent < 0) {
+			*coord -= ws_dimen;
+		}
+	}
+
+	struct wlr_box monitor_box = get_monitor_box(output->wlr_output);
+	pixman_region32_intersect_rect(damage, damage,
+			monitor_box.x, monitor_box.y,
+			monitor_box.width, monitor_box.height);
+	pixman_region32_translate(damage, x * scale, y * scale);
+}
+


wouldn't clipping to the output size solve this? Maybe this comment is my lack of understanding of the purpose of x and y coming out 😅

That's exactly that it's doing, except that we're translating the damage to the workspaces translated bounds

WillPower3309 · 2024-01-26T17:10:55Z

+	pixman_region32_t *damage, struct sway_container *con, bool parent_focused,
+	bool is_current_ws);


parent_focused, is_current_ws: can we combine these? I'd think they'd indicate the same thing and would clean up quite a few function calls

Not sure about this. The parent_focused sometimes indicates if the container is focused or not. Could result in some cases where an unfocused container in the focused workspace would be incorrectly adjusted as if it was located on the sibling workspace

WillPower3309 · 2024-01-26T17:23:23Z

+	for (int i = 0; i < workspace->current.floating->length; ++i) {
+		struct sway_container *floater =
+			workspace->current.floating->items[i];
+		if (container_is_transient_for(floater, fullscreen_con)) {
+			render_floating_container(output, damage, floater, on_focused_workspace);
+		}
+	}


why do we render floating containers in this function? Wouldn't the fullscreen view be above floating cons?

This is for floating containers that are transient for the fullscreened application. It's what upstream does :)

ozwaldorf · 2024-01-26T19:11:29Z

Just to mention, nix build seems to be broken:

error: builder for '/nix/store/9sg0wwdj4wdkxskw6wjp2qh0mvcjrydn-sway-unwrapped-1.8.1.drv' failed with exit code 1;
       last 10 log lines:
       > [137/344] Compiling C object sway/sway.p/commands_blur_contrast.c.o
       > [138/344] Compiling C object sway/sway.p/commands_blur_radius.c.o
       > [139/344] Compiling C object sway/sway.p/commands_blur_saturation.c.o
       > [140/344] Compiling C object sway/sway.p/commands_border.c.o
       > [141/344] Compiling C object sway/sway.p/commands_blur_noise.c.o
       > [142/344] Compiling C object sway/sway.p/config_output.c.o
       > [143/344] Compiling C object sway/sway.p/commands_corner_radius.c.o
       > [144/344] Compiling C object sway/sway.p/commands_bind.c.o
       > [145/344] Compiling C object sway/sway.p/commands_client.c.o
       > ninja: build stopped: subcommand failed.
       For full logs, run 'nix log /nix/store/9sg0wwdj4wdkxskw6wjp2qh0mvcjrydn-sway-unwrapped-1.8.1.drv'.

WillPower3309 · 2024-01-26T22:07:11Z

Just to mention, nix build seems to be broken:

error: builder for '/nix/store/9sg0wwdj4wdkxskw6wjp2qh0mvcjrydn-sway-unwrapped-1.8.1.drv' failed with exit code 1;
       last 10 log lines:
       > [137/344] Compiling C object sway/sway.p/commands_blur_contrast.c.o
       > [138/344] Compiling C object sway/sway.p/commands_blur_radius.c.o
       > [139/344] Compiling C object sway/sway.p/commands_blur_saturation.c.o
       > [140/344] Compiling C object sway/sway.p/commands_border.c.o
       > [141/344] Compiling C object sway/sway.p/commands_blur_noise.c.o
       > [142/344] Compiling C object sway/sway.p/config_output.c.o
       > [143/344] Compiling C object sway/sway.p/commands_corner_radius.c.o
       > [144/344] Compiling C object sway/sway.p/commands_bind.c.o
       > [145/344] Compiling C object sway/sway.p/commands_client.c.o
       > ninja: build stopped: subcommand failed.
       For full logs, run 'nix log /nix/store/9sg0wwdj4wdkxskw6wjp2qh0mvcjrydn-sway-unwrapped-1.8.1.drv'.

The errors here are:

p/desktop_render.c.o -c ../sway/desktop/render.c
../sway/desktop/render.c: In function 'adjust_box_to_workspace_offset':
../sway/desktop/render.c:102:9: error: 'box_coord' may be used uninitialized [-Werror=maybe-uninitialized]
  102 |         *box_coord -= ws_dimen * scroll_percent;
      |         ^~~~~~~~~~
../sway/desktop/render.c:88:14: note: 'box_coord' was declared here
   88 |         int *box_coord;
      |              ^~~~~~~~~
../sway/desktop/render.c:102:32: error: 'ws_dimen' may be used uninitialized [-Werror=maybe-uninitialized]
  102 |         *box_coord -= ws_dimen * scroll_percent;
      |                       ~~~~~~~~~^~~~~~~~~~~~~~~~
../sway/desktop/render.c:87:13: note: 'ws_dimen' was declared here
   87 |         int ws_dimen;
      |             ^~~~~~~~
In function 'adjust_damage_to_workspace_bounds',
    inlined from 'render_fullscreen_con' at ../sway/desktop/render.c:1985:3:
../sway/desktop/render.c:135:16: error: 'coord' may be used uninitialized [-Werror=maybe-uninitialized]
  135 |         *coord = round(-ws_dimen * scroll_percent);
      |         ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../sway/desktop/render.c: In function 'render_fullscreen_con':
../sway/desktop/render.c:121:14: note: 'coord' was declared here
  121 |         int *coord;
      |              ^~~~~
In function 'adjust_damage_to_workspace_bounds',
    inlined from 'render_fullscreen_con' at ../sway/desktop/render.c:1985:3:
../sway/desktop/render.c:138:32: error: 'ws_dimen' may be used uninitialized [-Werror=maybe-uninitialized]
  138 |                         *coord += ws_dimen;
      |                                ^~
../sway/desktop/render.c: In function 'render_fullscreen_con':
../sway/desktop/render.c:120:13: note: 'ws_dimen' was declared here
  120 |         int ws_dimen;
      |             ^~~~~~~~
cc1: all warnings being treated as errors

ErikReider · 2024-01-27T22:30:27Z

Might have an idea of how to improve the config command syntax. Converting to draft

ErikReider · 2024-01-27T22:34:09Z

Might have an idea of how to improve the config command syntax. Converting to draft

Maybe something like this:

bindgesture --invert fluid_swipe:3:horizontal workspace_switch

WillPower3309 · 2024-02-19T23:39:50Z

Might have an idea of how to improve the config command syntax. Converting to draft

Maybe something like this:
bindgesture --invert fluid_swipe:3:horizontal workspace_switch

Looks good to me!

ErikReider · 2024-02-22T20:08:35Z

I'll wait with refining this until the sway 1.9 rebase is merged :)

ErikReider · 2024-05-05T12:19:44Z

Y'all don't need to comment here to get notifications, just creates spam. The right side panel has a button for notifications :)

ErikReider · 2024-05-06T19:14:13Z

Rebased from master

Ari-43 · 2026-01-12T11:44:28Z

Since #388 is now merged will work on this PR or one like it continue?
Thanks!

Initial implementation of workspace movement (without gestures)

4e9e7c8

ErikReider added the enhancement New feature or request label Jan 21, 2024

ErikReider self-assigned this Jan 21, 2024

ErikReider added 14 commits January 21, 2024 19:54

Fixed transition not compensating for workspace gaps

0b86078

Fixed scroll not resetting to 0 when manually switching ws

6552778

Added gesture support

0c6d69b

Removed workspace_offset command

44f54b9

Only damage the focused output

8440285

Render fullscreen containers over all layers

8afad34

Try switching workspace on gesture cancel instead of reset

9e55168

Fixed popups not compensating for transition

8da7c50

Clear transformed fullscreen damage

3ad50f9

Workspace code cleanup

29c481d

Added "Spring effect" when trying to swipe past limits

fdf764d

Added vertical gesture support

0676138

Moved to bindworkspacegesture instead of bindgesture

3480479

Added workspace_gesture_spring_size config option

519bfc4

ErikReider force-pushed the workspace-movement branch from 8bfa708 to 519bfc4 Compare January 22, 2024 17:02

ErikReider added 9 commits January 22, 2024 18:25

Added workspace_gesture_wrap_around config option

0b521ab

Added workspace_gesture_threshold config option

1113e56

Fixed gesture detecting every finger combination instead of the speci…

288b04d

…fied one

Fixed fullscreen sometimes segfaulting

42fcd6c

Updated swipe percentage calculation to also use avg_velocity

54daaa9

Use Ease-Out when swiping into the non-wrapped edges

0a619a0

Fixed regular views rendering behind fullscreen ones + code cleanup

83e0872

Draw rect and shadow on "Spring effect" for fullscreen views

bd3745c

Updated default threshold to 50%

7214db9

ErikReider force-pushed the workspace-movement branch from b71c56c to 7214db9 Compare January 24, 2024 01:30

ErikReider marked this pull request as ready for review January 24, 2024 01:34

ErikReider requested a review from WillPower3309 January 24, 2024 01:35