feat: add a new dispatcher that can move windows in and out of groups, or swap windows #3006

memchr · 2023-08-17T10:10:19Z

[Breaking change] Add a new dispatcher `movewindoworgroup` that implements the behaviour of moveintowindow, swapwindow and moveoutofwindow.

Partial implementation of #2851

Beehaviour

active window	window in direction	default / ignore group lock	implemented	notes
group	group	`moveIntoGroup`	✔️	Because the direction of moveoutofgroup is not currently controllable, new dispatcher will not behave as `moveOutOfGroup` until directional control is implemented
group locked	group	`moveWindowTo` / `moveIntoGroup`	✔️
window	group	`moveIntoGroup`	✔️
group / group locked / window	group locked	`moveWindowTo` / `moveIntoGroup`	✔️
group	window	`moveOutOfGroup`	✔️
group locked	window	`moveWindowTo` / `moveOutOfGroup`	✔️
window	window	`moveWindowTo`	✔️
group	null	`moveOutOfGroup`	✔️	By default, the window retains its floating state for consistency. The name of a possible configuration flag is up for discussion.
group locked	null	no-op / `moveOutOfGroup`	✔️
window	null	no-op	✔️

legend:

group: The window is in a group.
group locked: m_sGroupData.pNextWindow is true.
window: The window is not in a group.
null: No window in direction

NOTE:

Window in direction is not null implies active window is not floating.
Alternative behaviour is toggled via binds:ignore_group_lock

TODO:

Give the dispatcher a meaningful name.
Give configuration variable a meaningful name.
moveWindowOutOfGroup: Make call to focusWindow configurable.
Remove debug logging in the dispatcher when PR is complete.
Implement alternative behaviour.
Toggle group lock checking using setignoregrouplock dispatcher

Other Changes

Move the behaviour code of moveIntoGroup and moveOutOfGroup to standalone functions.
Call g_pCompositor->focusWindow in moveWindowOutOfGroup.
Fix moveintogroup locking check.
Remove moveintogroup_lock_check, moveintogroup will check binds:ignore_group_lock instead
misc:group_focus_removed_window

vaxerski · 2023-08-21T18:56:28Z

request my review when ready

memchr · 2023-08-21T19:00:53Z

request my review when ready

PR is ready for review (I removed the draft status 3 days ago). However, I would not be able to respond until around 6 UTC tomorrow.

side notes:

IIRC, Github doesn't allow non-collaborators to request reviews.

vaxerski · 2023-08-21T19:06:53Z

IIRC, Github doesn't allow non-collaborators to request reviews.

didn't know that? I've had a review requested from me a buncha times, iirc.

However, I would not be able to respond until around 6 UTC tomorrow.

Just because I reply within minutes if awake doesnt mean you have to. No pressure, lol

memchr · 2023-08-21T19:10:55Z

didn't know that? I've had a review requested from me a buncha times, iirc

¿¿, I think its on the docs.

Pull request authors can't request reviews unless they are either a repository owner or collaborator with write access to the repository

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review

src/managers/KeybindManager.cpp

src/config/ConfigManager.cpp

…, or swap windows. This is a work in progress.

…orTo

…tcher

…p_lock

…oup in moveoutofgroup

…:middle()

…ndow

memchr · 2023-09-09T22:31:44Z

All right, I'm going to ask for another round of review. I hope this is not very discourteous.
@vaxerski

vaxerski · 2023-09-10T11:56:09Z

fix the conflict and then request my review :)

memchr · 2023-09-10T22:19:44Z

Conflict with #3229 resolved, ready.

vaxerski

lgtm, just needs a wiki mr.

In addition: - Implement directional moveWindowOutOfGroup for `movewindoworgroup` when using dwindle layout. (augmentation of hyprwm#3006) - Replace `DWindleLayout::OneTimeFocus` with `IHyprLayout::eDirection`. - Slight formatting change (clang-format).

* feat(layout): add direction parameter to onWindowCreated and friends In addition: - Implement directional moveWindowOutOfGroup for `movewindoworgroup` when using dwindle layout. (augmentation of #3006) - Replace `DWindleLayout::OneTimeFocus` with `IHyprLayout::eDirection`. - Slight formatting change (clang-format). * fix: nullptr dereference in dwindle window creation * refactor: generalized eDirection * refactor: eliminate DIRECTION_NONE * Update IHyprLayout.hpp

…m#3269) * feat(layout): add direction parameter to onWindowCreated and friends In addition: - Implement directional moveWindowOutOfGroup for `movewindoworgroup` when using dwindle layout. (augmentation of hyprwm#3006) - Replace `DWindleLayout::OneTimeFocus` with `IHyprLayout::eDirection`. - Slight formatting change (clang-format). * fix: nullptr dereference in dwindle window creation * refactor: generalized eDirection * refactor: eliminate DIRECTION_NONE * Update IHyprLayout.hpp

memchr force-pushed the feat_2851 branch 6 times, most recently from ee38dda to b306b52 Compare August 17, 2023 10:49

memchr mentioned this pull request Aug 17, 2023

Dispatcher movewindoworgroup to move into/out-of an unlocked group #2851

Open

memchr changed the title ~~[WIP] feat: add a new dispatcher that can move windows in and out of groups, or swap windows~~ feat: add a new dispatcher that can move windows in and out of groups, or swap windows Aug 17, 2023

memchr marked this pull request as ready for review August 17, 2023 15:29

memchr mentioned this pull request Aug 20, 2023

groups: document movewindoworgroup and other changes hyprwm/hyprland-wiki#309

Merged

memchr force-pushed the feat_2851 branch from e5adddf to b943d89 Compare August 22, 2023 08:29

vaxerski reviewed Aug 23, 2023

View reviewed changes

src/managers/KeybindManager.cpp Show resolved Hide resolved

src/managers/KeybindManager.cpp Outdated Show resolved Hide resolved

src/config/ConfigManager.cpp Show resolved Hide resolved

memchr force-pushed the feat_2851 branch from 0c87f3c to 341c12f Compare August 31, 2023 01:57

memchr added 13 commits September 7, 2023 01:26

refactor: Extract the behaviour code of moveIntoGroup and moveOutOfGroup

c59a2b5

chore: clang-format

2c3571c

feat: Add a new dispatcher that can move windows in and out of groups…

8e4e785

…, or swap windows. This is a work in progress.

fix(KeybindManger): In moveWindowOutOfGroup, use goalv() for warpCurs…

7f6dd34

…orTo

feat: implement alternative behaviour for new move window/group dispa…

d078d63

…tcher

refactor: name the new dispatcher to movewindoworgroup

5c57ef3

refactor: replace misc:moveintogroup_lock_check with binds:check_grou…

11e4939

…p_lock

feat: add misc:group_focus_removed_window to focus moved window or gr…

219fc86

…oup in moveoutofgroup

fix: remove static keyword from PWINDOWPREV declaration

e144fea

feat: add dispatcher setGroupLockChecking

c2971ae

refactor: remove debug logging

62bb798

refactor: minor changes

49c7a4a

refactor: replace manual calculation of target position with CWindow:…

280ed9e

…:middle()

memchr added 2 commits September 7, 2023 01:26

fix(group): moveWindowIntoGroup() warp cursor to centre of focused wi…

b287a35

…ndow

chore: clang-format

761f9f2

memchr force-pushed the feat_2851 branch from 341c12f to 761f9f2 Compare September 7, 2023 01:28

memchr added 5 commits September 9, 2023 21:23

Merge remote-tracking branch 'upstream/main' into feat_2851

3d5786c

refactor: make moveWindow(Into|OutOf)Group private methods.

026277a

refactor: replace "check_group_lock" with "ignore_group_lock"

255a3af

refactor: use moveWindowTo instead of switchWindows

cf32e38

feat: post an IPC event when ignoregrouplock changes

fba284e

Merge remote-tracking branch 'upstream/main' into feat_2851

3dfa89a

vaxerski approved these changes Sep 10, 2023

View reviewed changes

vaxerski merged commit ac2f1a9 into hyprwm:main Sep 10, 2023
8 checks passed

memchr mentioned this pull request Sep 12, 2023

layout: add direction parameter to onWindowCreated and friends #3269

Merged

memchr mentioned this pull request Sep 13, 2023

group_focus_removed_window doesn't work #3287

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add a new dispatcher that can move windows in and out of groups, or swap windows #3006

feat: add a new dispatcher that can move windows in and out of groups, or swap windows #3006

memchr commented Aug 17, 2023 •

edited

Loading

vaxerski commented Aug 21, 2023

memchr commented Aug 21, 2023 •

edited

Loading

vaxerski commented Aug 21, 2023

memchr commented Aug 21, 2023

memchr commented Sep 9, 2023

vaxerski commented Sep 10, 2023

memchr commented Sep 10, 2023

vaxerski left a comment

feat: add a new dispatcher that can move windows in and out of groups, or swap windows #3006

feat: add a new dispatcher that can move windows in and out of groups, or swap windows #3006

Conversation

memchr commented Aug 17, 2023 • edited Loading

[Breaking change] Add a new dispatcher movewindoworgroup that implements the behaviour of moveintowindow, swapwindow and moveoutofwindow.

Beehaviour

TODO:

Other Changes

vaxerski commented Aug 21, 2023

memchr commented Aug 21, 2023 • edited Loading

vaxerski commented Aug 21, 2023

memchr commented Aug 21, 2023

memchr commented Sep 9, 2023

vaxerski commented Sep 10, 2023

memchr commented Sep 10, 2023

vaxerski left a comment

Choose a reason for hiding this comment

memchr commented Aug 17, 2023 •

edited

Loading

[Breaking change] Add a new dispatcher `movewindoworgroup` that implements the behaviour of moveintowindow, swapwindow and moveoutofwindow.

memchr commented Aug 21, 2023 •

edited

Loading