Actual PerScreen implementation #813

geekosaur · 2023-05-03T20:26:11Z

Description

I have implemented an actual PerScreen layout (onScreen and onScreens). The old ifWidth is moved to a new module XMonad.Layout.ByWidth, and re-exported with a deprecation warning pointing to the new module.

I'd like someone who can to test a corner case with respect to rescreen. I think it will usually work, but may glitch if you rapidly plug and unplug an external monitor to which this layout would apply. This can't do more than a brief glitch though, as anything that would trigger it will have another rescreen pending and xmonad will fix itself.

Checklist

I've read CONTRIBUTING.md
I've considered how to best test these changes (property, unit,
manually, ...) and concluded: manually tested except for the corner case mentioned above
I updated the CHANGES.md file

geekosaur · 2023-05-04T22:17:14Z

I squashed it down a bit.

TheMC47

LGTM, one minor nitpick.

TheMC47 · 2023-05-05T07:31:04Z

XMonad/Layout/PerScreen.hs

+--   to use the 'S' constructor.
+onScreens :: (LayoutClass l1 a, LayoutClass l2 a)
+          => [ScreenId] -> l1 a -> l2 a -> OnScreen l1 l2 a
+onScreens ss l1 l2 = OnScreen ss l1 l2 False -- @@@ is this right?


@@@ is this right?

Are you asking about the flag? I think so since as soon as runLayout is executed the flag will be set correctly

That was what I figured but I can't recall if there are special cases where the default might be used inappropriately. But even if there were it would be on an inactive screen by definition, which is why I used False.

I don't think there are cases where it might be used inappropriately. But we're also not using the flag enough. We need to Hide whenever the flag flips, and dispatch ReleaseResources to both layouts.

(Might be better to finish #582 and get #75 fixed for free, like I mentioned in another comment.)

This should be done, although I cheated a bit on ReleaseResources: should I check for a new constructor being produced by the forwarded message?

Also, if we receive Hide, should it be relayed to both sublayouts or only the active one?

I now have both fully implemented ReleaseResources and a direct implementation of Hide which sends to both sublayouts because it's a PITA to send only to the active one. Also I'm relying in a few places on Hide being idempotent, but we may have other issues if it's not anyway.

XMonad/Layout/PerScreen.hs

geekosaur · 2023-05-07T09:10:38Z

In case anyone's wondering, @liskin expressed a concern and plans to review this within the next few days, so don't rush into committing it just yet.

liskin · 2023-05-09T13:19:55Z

XMonad/Layout/ByWidth.hs

+    runLayout (W.Workspace i p@(PerScreen w _ lt lf) ms) r
+        | rect_width r > w    = do (wrs, mlt') <- runLayout (W.Workspace i lt ms) r
+                                   return (wrs, Just $ mkNewPerScreenT p mlt')
+        | otherwise           = do (wrs, mlt') <- runLayout (W.Workspace i lf ms) r


Just doing runLayout with the other layout whenever the condition changes will leave decorations (and other stuff like this) around. In other words, this suffers from #75. You need to send Hide to the last layout first before runLayouting the new one, like this: #582 (comment)

Also, you need to handle ReleaseResources and pass it on to both layouts.

Oh, now I see you're just moving stuff around and this is still the same code that was there. So I guess that's an argument for not fixing it in the scope of this PR.

That then leads me to a thought whether it wouldn't be better to not hijack the PerScreen name and just add an X.L.OnScreen module… Deprecating PerScreen in favor of ByWidth or IfWidth can stay, of course.

Oh, and related to my previous comment about #75 - the plan was to implement #582 generic enough so that IfWidth can be implemented using it and thus get #75 fixed for free. So we may want to limit the exports a bit… although we can always use pattern for backwards compat.

The main reason I reused PerScreen is consistency with PerWorkspace and friends. Also, PerScreen was never the right name for a module whose only combinator was ifWidth.

And yes, the only changes I made to ByWidth were renames; everything else is the same, including the weirdnesses @TheMC47 noticed. I was actually somewhat afraid to touch them, because @ezyang is more of a Haskeller than I am and I tend to assume "fancy" code has some reason not visible to me.

Re Hide and ReleaseResources: I did think about that, but thought we had a more global plan to deal with those somewhere. I can add that. What worries me is I don't think it scales; are there, or will there at some point be, more "global" messages that need to be dealt with by individual layouts?

liskin · 2023-05-09T13:27:12Z

XMonad/Layout/PerScreen.hs

+    runLayout (W.Workspace i p@(OnScreen ss l1 l2 _) ms) r = do
+        -- this sucks.
+        -- You might think we could use the existing screen detail, but we may be
+        -- invoked from 'rescreen' in which case only 'rescreen' and 'windows'


But windows does modify (\s -> s { windowset = ws }) pretty early (definitely before running any layouts) so why can't you just withWindowSet like X.L.NoBorders does (it also has logic to detect which screen is which based on the rect passed)?

By not using the windowset this won't work with XMonad.Layout.LayoutScreens.

I think LayoutScreens should be deprecated in favor of using xrandr: applications can't ever work with LayoutScreens.

liskin · 2023-05-09T13:34:40Z

XMonad/Layout/PerScreen.hs

+--   to use the 'S' constructor.
+onScreens :: (LayoutClass l1 a, LayoutClass l2 a)
+          => [ScreenId] -> l1 a -> l2 a -> OnScreen l1 l2 a
+onScreens ss l1 l2 = OnScreen ss l1 l2 False -- @@@ is this right?


I don't think there are cases where it might be used inappropriately. But we're also not using the flag enough. We need to Hide whenever the flag flips, and dispatch ReleaseResources to both layouts.

(Might be better to finish #582 and get #75 fixed for free, like I mentioned in another comment.)

geekosaur · 2023-09-06T22:47:40Z

I renamed ByWidth.hs to IfWidth.hs for consistency with IfMax.hs and with its ifWidth function, and squashed everything in the process. AFAIK this is just waiting on someone to confirm that I'm handling the Hide and ReleaseResources messages properly.

The old PerScreen module has been renamed to X.L.IfWidth, and is re-exported for backward compatibility with a deprecation notice. The new PerScreen supports specifying screens by ScreenId (literal numbers will work because it has a Num instance).

geekosaur force-pushed the OnScreen branch from 8ea47cb to 9ee052c Compare May 4, 2023 22:10

geekosaur marked this pull request as ready for review May 4, 2023 22:16

geekosaur changed the title ~~Actual PerScreen implementation (WIP)~~ Actual PerScreen implementation May 4, 2023

TheMC47 approved these changes May 5, 2023

View reviewed changes

liskin reviewed May 9, 2023

View reviewed changes

geekosaur mentioned this pull request May 12, 2023

X.L.ByWidth handle LayoutMessages #815

Open

3 tasks

geekosaur force-pushed the OnScreen branch from b5d9641 to c0fbd49 Compare May 14, 2023 16:56

geekosaur mentioned this pull request Aug 30, 2023

New module: X.L.ConditionalLayout #825

Draft

6 tasks

geekosaur force-pushed the OnScreen branch from c0fbd49 to 655b613 Compare September 6, 2023 22:42

True PerScreen implementation

29f200d

The old PerScreen module has been renamed to X.L.IfWidth, and is re-exported for backward compatibility with a deprecation notice. The new PerScreen supports specifying screens by ScreenId (literal numbers will work because it has a Num instance).

geekosaur force-pushed the OnScreen branch from 655b613 to 29f200d Compare September 26, 2023 00:24

geekosaur mentioned this pull request May 18, 2024

Add a new layout Columns #887

Merged

3 tasks

Uh oh!

Actual PerScreen implementation #813

Are you sure you want to change the base?

Actual PerScreen implementation #813

Uh oh!

Conversation

geekosaur commented May 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Uh oh!

geekosaur commented May 4, 2023

Uh oh!

TheMC47 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

geekosaur commented May 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

geekosaur May 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

geekosaur commented Sep 6, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

geekosaur commented May 3, 2023 •

edited

Loading

geekosaur commented May 7, 2023 •

edited

Loading

geekosaur May 9, 2023 •

edited

Loading