colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[XMonad] Update bindBringAndRaise to have more behaviors

Browse Source
This commit is contained in:
Ivan Malison 2016-12-28 21:38:48 -08:00
parent 937d60f854
commit bdc95c969b
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dotfiles/xmonad/xmonad.hs
View File

@ -419,6 +419,10 @@ maximizedOtherClass =
intersect <$> maximizedWindows <*> intersect <$> maximizedWindows <*>
(currentWS >>= maybe (return []) windowsWithUnfocusedClass) (currentWS >>= maybe (return []) windowsWithUnfocusedClass)
minimizedSameClass =
intersect <$> minimizedWindows <*>
(currentWS >>= maybe (return []) windowsWithFocusedClass)
getClassMatchesWindow w = (==) <$> getClass w getClassMatchesWindow w = (==) <$> getClass w
getClassMatchesCurrent = join $ withFocusedD (`seq` False) getClassMatchesWindow getClassMatchesCurrent = join $ withFocusedD (`seq` False) getClassMatchesWindow
@ -470,11 +474,16 @@ maybeUnminimizeClassAfter = (>> maximizeSameClassesInWorkspace)
sameClassOnly action = sameClassOnly action =
action >> minimizeOtherClassesInWorkspace >> maximizeSameClassesInWorkspace action >> minimizeOtherClassesInWorkspace >> maximizeSameClassesInWorkspace
restoreAllMinimized = void $ join $ mapM maximizeWindow <$> minimizedWindows restoreAll windows = mapM_ maximizeWindow windows
restoreAllMinimized = minimizedWindows >>= restoreAll
restoreOrMinimizeOtherClasses = null <$> maximizedOtherClass >>= restoreOrMinimizeOtherClasses = null <$> maximizedOtherClass >>=
ifL restoreAllMinimized minimizeOtherClassesInWorkspace ifL restoreAllMinimized minimizeOtherClassesInWorkspace
restoreThisClassOrMinimizeOtherClasses = minimizedSameClass >>= \windows ->
if' (null windows) minimizeOtherClassesInWorkspace $ restoreAll windows
getClassPair w = flip (,) w <$> getClass w getClassPair w = flip (,) w <$> getClass w
windowClassPairs = withWindowSet $ mapM getClassPair . W.allWindows windowClassPairs = withWindowSet $ mapM getClassPair . W.allWindows
@ -569,7 +578,7 @@ doScratchpad =
-- Raise or spawn -- Raise or spawn
myRaiseNextMaybe = myRaiseNextMaybe =
((deactivateFullAnd . maybeUnminimizeClassAfter) .) . ((deactivateFullAnd . maybeUnminimizeAfter) .) .
raiseNextMaybeCustomFocus greedyFocusWindow raiseNextMaybeCustomFocus greedyFocusWindow
myBringNextMaybe = myBringNextMaybe =
@ -578,11 +587,13 @@ myBringNextMaybe =
bindBringAndRaise :: KeyMask -> KeySym -> X () -> Query Bool -> [((KeyMask, KeySym), X ())] bindBringAndRaise :: KeyMask -> KeySym -> X () -> Query Bool -> [((KeyMask, KeySym), X ())]
bindBringAndRaise mask sym start query = bindBringAndRaise mask sym start query =
[ ((mask, sym), doRaiseNext) [ ((mask, sym),
alreadyFocused >>= ifL restoreThisClassOrMinimizeOtherClasses doRaiseNext)
, ((mask .|. controlMask, sym), myBringNextMaybe start query) , ((mask .|. controlMask, sym), myBringNextMaybe start query)
, ((mask .|. shiftMask, sym), doRaiseNext >> minimizeOtherClassesInWorkspace) , ((mask .|. shiftMask, sym), doRaiseNext)
] ]
where doRaiseNext = myRaiseNextMaybe start query where doRaiseNext = myRaiseNextMaybe start query
alreadyFocused = join $ withFocusedD False $ runQuery query
bindBringAndRaiseMany :: [(KeyMask, KeySym, X (), Query Bool)] -> [((KeyMask, KeySym), X())] bindBringAndRaiseMany :: [(KeyMask, KeySym, X (), Query Bool)] -> [((KeyMask, KeySym), X())]
bindBringAndRaiseMany = concatMap (\(a, b, c, d) -> bindBringAndRaise a b c d) bindBringAndRaiseMany = concatMap (\(a, b, c, d) -> bindBringAndRaise a b c d)