EWMH: Improve interface for custom sorting, filtering, renaming and window activation

CHANGES.md

@@ -40,13 +40,18 @@
       `XMonad.Layout.Fullscreen.fullscreenSupport` now advertises it as well,
       and no configuration changes are required in this case.
 
-    - `ewmh` function will use `logHook` for handling activated window. And now
-      by default window activation will do nothing.
-
-      You can use regular `ManageHook` combinators for changing window
-      activation behavior and then add resulting `ManageHook` using
-      `activateLogHook` to your `logHook`. Also, module `X.H.Focus` provides
-      additional combinators.
+    - Deprecated `ewmhDesktopsLogHookCustom` and `ewmhDesktopsEventHookCustom`;
+      these are now replaced by a composable `XMonad.Util.ExtensibleConf`-based
+      interface. Users are advised to just use the `ewmh` XConfig combinator
+      and customize behaviour using the provided `addEwmhWorkspaceSort`,
+      `addEwmhWorkspaceRename` functions, or better still, use integrations
+      provided by modules such as `XMonad.Actions.WorkspaceNames`.
+
+      This interface now additionally allows customization of what happens
+      when clients request window activation. This can be used to ignore
+      activation of annoying applications, to mark windows as urgent instead
+      of focusing them, and more. There's also a new `XMonad.Hooks.Focus`
+      module extending the ManageHook EDSL with useful combinators.
 
     - Ordering of windows that are set to `_NET_CLIENT_LIST` and `_NET_CLIENT_LIST_STACKING`
       was changed to be closer to the spec. From now these two lists will have
@@ -538,8 +543,8 @@
 
   * `XMonad.Actions.WorkspaceNames`
 
-    - Added `workspaceNamesListTransform` which makes workspace names visible
-      to external pagers.
+    - Added `workspaceNamesEwmh` which makes workspace names visible to
+      external pagers.
 
   * `XMonad.Util.PureX`
 
@@ -637,6 +642,10 @@
     - Added a variant of `filterUrgencyHook` that takes a generic `Query Bool`
       to select which windows should never be marked urgent.
 
+    - Added `askUrgent` and a `doAskUrgent` manage hook helper for marking
+      windows as urgent from inside of xmonad. This can be used as a less
+      intrusive action for windows requesting focus.
+
   * `XMonad.Hooks.ServerMode`
 
     - To make it easier to use, the `xmonadctl` client is now included in

XMonad/Actions/WorkspaceNames.hs

@@ -22,7 +22,6 @@ module XMonad.Actions.WorkspaceNames (
 
     -- * Workspace naming
     renameWorkspace,
-    workspaceNamesPP,
     getWorkspaceNames',
     getWorkspaceNames,
     getWorkspaceName,
@@ -38,8 +37,9 @@ module XMonad.Actions.WorkspaceNames (
     -- * Workspace prompt
     workspaceNamePrompt,
 
-    -- * EwmhDesktops integration
-    workspaceNamesListTransform
+    -- * StatusBar, EwmhDesktops integration
+    workspaceNamesPP,
+    workspaceNamesEwmh,
     ) where
 
 import XMonad
@@ -50,6 +50,7 @@ import qualified XMonad.Util.ExtensibleState as XS
 import XMonad.Actions.CycleWS (findWorkspace, WSType(..), Direction1D(..), anyWS)
 import qualified XMonad.Actions.SwapWorkspaces as Swap
 import XMonad.Hooks.StatusBar.PP (PP(..))
+import XMonad.Hooks.EwmhDesktops (addEwmhWorkspaceRename)
 import XMonad.Prompt (mkXPrompt, XPConfig)
 import XMonad.Prompt.Workspace (Wor(Wor))
 import XMonad.Util.WorkspaceCompare (getSortByIndex)
@@ -72,6 +73,11 @@ import qualified Data.Map as M
 -- Check "XMonad.Hooks.StatusBar" for more information on how to incorprate
 -- this into your status bar.
 --
+-- To expose workspace names to pagers and other EWMH clients, integrate this
+-- with "XMonad.Hooks.EwmhDesktops":
+--
+-- > main = xmonad $ … . workspaceNamesEwmh . ewmh . … $ def{…}
+--
 -- We also provide a modification of "XMonad.Actions.SwapWorkspaces"\'s
 -- functionality, which may be used this way:
 --
@@ -135,11 +141,6 @@ renameWorkspace conf =
     mkXPrompt pr conf (const (return [])) setCurrentWorkspaceName
     where pr = Wor "Workspace name: "
 
--- | Modify 'XMonad.Hooks.StatusBar.PP.PP'\'s pretty-printing format to show
--- workspace names as well.
-workspaceNamesPP :: PP -> X PP
-workspaceNamesPP pp = getWorkspaceNames ":" <&> \ren -> pp{ ppRename = ppRename pp >=> ren }
-
 -- | See 'XMonad.Actions.SwapWorkspaces.swapTo'. This is the same with names.
 swapTo :: Direction1D -> X ()
 swapTo dir = swapTo' dir anyWS
@@ -177,12 +178,12 @@ workspaceNamePrompt conf job = do
         contains completions input =
           return $ filter (isInfixOf input) completions
 
--- | Workspace list transformation for
--- 'XMonad.Hooks.EwmhDesktops.ewmhDesktopsLogHookCustom' that exposes
--- workspace names to pagers and other EWMH-aware clients.
---
--- Usage:
--- > logHook = (workspaceNamesListTransform >>= ewmhDesktopsLogHookCustom) <+> …
-workspaceNamesListTransform :: X ([WindowSpace] -> [WindowSpace])
-workspaceNamesListTransform =
-    getWorkspaceNames ":" <&> \names -> map $ \ws -> ws{ W.tag = names (W.tag ws) ws }
+-- | Modify 'XMonad.Hooks.StatusBar.PP.PP'\'s pretty-printing format to show
+-- workspace names as well.
+workspaceNamesPP :: PP -> X PP
+workspaceNamesPP pp = getWorkspaceNames ":" <&> \ren -> pp{ ppRename = ppRename pp >=> ren }
+
+-- | Tell "XMonad.Hooks.EwmhDesktops" to append workspace names to desktop
+-- names.
+workspaceNamesEwmh :: XConfig l -> XConfig l
+workspaceNamesEwmh = addEwmhWorkspaceRename $ getWorkspaceNames ":"

XMonad/Config/Bluetile.hs

@@ -197,15 +197,13 @@ bluetileLayoutHook = avoidStruts $ minimize $ boringWindows $
             floatingDeco l = buttonDeco shrinkText defaultThemeWithButtons l
 
 bluetileConfig =
-    docks $
+    docks . ewmhFullscreen . ewmh $
     def
         { modMask = mod4Mask,   -- logo key
           manageHook = bluetileManageHook,
           layoutHook = bluetileLayoutHook,
-          logHook = currentWorkspaceOnTop >> ewmhDesktopsLogHook,
-          handleEventHook = ewmhDesktopsEventHook
-                                `mappend` fullscreenEventHook
-                                `mappend` minimizeEventHook
+          logHook = currentWorkspaceOnTop,
+          handleEventHook = minimizeEventHook
                                 `mappend` serverModeEventHook' bluetileCommands
                                 `mappend` positionStoreEventHook,
           workspaces = bluetileWorkspaces,

XMonad/Config/Desktop.hs

@@ -60,7 +60,6 @@ import XMonad.Hooks.ManageDocks
 import XMonad.Hooks.EwmhDesktops
 import XMonad.Layout.LayoutModifier (ModifiedLayout)
 import XMonad.Util.Cursor
-import qualified XMonad.StackSet as W
 
 import qualified Data.Map as M
 
@@ -172,7 +171,6 @@ desktopConfig :: XConfig (ModifiedLayout AvoidStruts
 desktopConfig = docks $ ewmh def
     { startupHook     = setDefaultCursor xC_left_ptr <+> startupHook def
     , layoutHook      = desktopLayoutModifiers $ layoutHook def
-    , logHook         = desktopLogHook <+> logHook def
     , keys            = desktopKeys <+> keys def }
 
 desktopKeys :: XConfig l -> M.Map (KeyMask, KeySym) (X ())
@@ -181,8 +179,3 @@ desktopKeys XConfig{modMask = modm} = M.fromList
 
 desktopLayoutModifiers :: LayoutClass l a => l a -> ModifiedLayout AvoidStruts l a
 desktopLayoutModifiers = avoidStruts
-
--- | 'logHook' preserving old 'ewmh' behavior to switch workspace and focus to
--- activated window.
-desktopLogHook :: X ()
-desktopLogHook      = activateLogHook (reader W.focusWindow >>= doF)