clean-ups, prop log, access to window title

1 files changed, 83 insertions, 35 deletions

diff --git a/xmonad.hs b/xmonad.hs
index 0bf5350..f3531bb 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -5,14 +5,18 @@ import System.Environment (lookupEnv)
 
 import XMonad hiding ( (|||) )
 import XMonad.Actions.FloatKeys (keysMoveWindow, keysResizeWindow)
-import XMonad.Actions.WindowGo (raise, runOrRaise)
+import XMonad.Actions.WindowGo (raise, runOrRaise, raiseMaybe)
 import qualified XMonad.Actions.GridSelect as GS
-import XMonad.Actions.PerWindowKeys (bindAll, bindFirst)
+import qualified XMonad.Actions.CycleWS as CWS
+import XMonad.Actions.PerWindowKeys (bindFirst)
 import XMonad.Hooks.ManageHelpers ((-?>))
 import qualified XMonad.Hooks.ManageDocks as MD
 import qualified XMonad.Hooks.ManageHelpers as MH
 import qualified XMonad.Hooks.ServerMode as SM
+import qualified XMonad.Hooks.StatusBar as SB
+import qualified XMonad.Hooks.StatusBar.PP as SBP
 import qualified XMonad.Hooks.EwmhDesktops as Ewm
+import qualified XMonad.Hooks.UrgencyHook as U
 import qualified XMonad.Layout.NoBorders as NB
 import XMonad.Layout.IM (withIM, Property(ClassName))
 import XMonad.Layout.LayoutCombinators ((|||))
@@ -20,6 +24,7 @@ import qualified XMonad.Layout.LayoutCombinators as LJ
 import qualified XMonad.Layout.Renamed as LR
 import qualified XMonad.Layout.Spacing as SP
 import qualified XMonad.Layout.Reflect as Refl
+import qualified XMonad.Layout.PerWorkspace as PW
 import qualified XMonad.Prompt as P
 import qualified XMonad.Prompt.Shell as PS
 import qualified XMonad.Prompt.XMonad as XmP
@@ -27,9 +32,16 @@ import qualified XMonad.StackSet as W
 import qualified XMonad.Util.EZConfig as EZ
 import qualified XMonad.Util.Hacks as UH
 import qualified XMonad.Util.NamedScratchpad as NS
-import XMonad.Util.Paste (sendKey)
+-- import XMonad.Util.Paste (sendKey)
 import qualified XMonad.Util.WindowProperties as WP
 
+currentWindowProp prop = do
+  d <- asks display
+  gets (W.peek . windowset) >>=
+    maybe (return Nothing) (\w -> getStringProperty d w prop)
+
+currentWindowName = currentWindowProp "WM_NAME"
+
 jaoscript scrpt = "/home/jao/etc/config/bin/" ++ scrpt
 
 defFace = "Hack-10"
@@ -75,23 +87,36 @@ lightPopConfig = popConfig { P.fgColor = "grey10"
                            , P.borderColor = "grey70"
                            }
 
-defWorkspaces = ["X"]
-
-isEmacs =
-  className =? "Emacs" <||> className =? "Pemacs" <||> className =? "Gemacs"
+defWorkspaces = ["E", "F", "D"]
 
+isEmacs = className =? "Emacs" <||> title =? "emacsclient"
 isntEmacs = not `fmap` isEmacs
 
 raiseEmacs = raise isEmacs
 runOrRaiseEmacs = do
   emacs <- liftIO $ lookupEnv "emacs"
-  runOrRaise (case emacs of Just e -> e; _ -> "emacs") isEmacs
+  runOrRaise (case emacs of Just e -> e; _ -> "eterm") isEmacs
+
+openMusicWindow = "tidal"
+isMusic = className =? "Tidal"
 
-runOrRaiseFirefox = runOrRaise "firefox" (className =? "Firefox")
+runOrRaiseFirefox = runOrRaise "firefox" $ className =? "Firefox"
+
+runOrRiseMusic = raiseMaybe (spawn openMusicWindow) isMusic
 
 toggleEmacs other = do
-  ems <- mapM (WP.focusedHasProperty . WP.ClassName) ["Emacs", "Pemacs", "Gemacs"]
-  if or ems then other else runOrRaiseEmacs
+  ems <- mapM (WP.focusedHasProperty . WP.ClassName) ["Emacs"]
+  ems' <- WP.focusedHasProperty (WP.Title "emacsclient")
+  if or (ems':ems) then other else runOrRaiseEmacs
+
+emacsclient x = spawn $ "emacsclient -e '(" ++ x ++ ")'"
+
+zathuraToEmacs = do
+  z <- WP.focusedHasProperty (WP.ClassName "Zathura")
+  tl <- if z then currentWindowName else return Nothing
+  case tl of
+    Just fn -> emacsclient ("jao-zathura-goto-org \"" ++ fn ++ "\"")
+    Nothing -> return ()
 
 keyDefs conf =
   [ ("<XF86MonBrightnessUp>", backlight "5%+")
@@ -112,17 +137,25 @@ keyDefs conf =
   , ("M-2", emacsAfio "mail")
   , ("M-3", emacsAfio "www")
   , ("M-4", emacsAfio "docs")
-  , ("M-5", jumpToL "F" >> raise (className =? "Firefox"))
+  , ("M-5", CWS.nextWS)
+  , ("C-M-5", CWS.shiftToNext)
   , ("M-C-<Right>", resize (10,0) (0,0))
   , ("M-C-<Left>", resize (-10,0) (0,1))
   , ("M-C-<Up>", resize (0,-10) (0,0))
   , ("M-C-<Down>", resize (0,10) (0,0))
   , ("M-b", sendMessage $ MD.ToggleStruts)
-  , ("M-d", NS.namedScratchpadAction scratchpads "deezer")
+  -- , ("M-d", NS.namedScratchpadAction scratchpads "tidal")
+  -- , ("M-S-d", toggleEmacs runOrRiseMusic)
+  , ("M-d", toggleEmacs $ windows (W.greedyView "D"))
   , ("M-e", toggleEmacs runOrRaiseFirefox)
+  , ("M-C-e", spawn "emacsclient -c")
+  , ("M-S-e", spawn (jaoscript "eterm"))
+  , ("M-p", zathuraToEmacs >> raiseEmacs)
+  -- , ("M-p", NS.namedScratchpadAction scratchpads "popup")
   , ("M-m", raiseEmacs >> emacsclient "jao-transient-media")
-  , ("M-S-r", PS.shellPrompt $ conf {P.position = P.Top})
-  , ("M-C-r", PS.shellPrompt $ conf {P.position = P.Top})
+  , ("M-r", bindFirst [(isntEmacs, runCmd),
+                       (pure True, emacsclient "jao-recoll-transient")])
+  , ("M-S-r", runCmd)
   , ("M-s", raiseEmacs >> emacsclient "jao-transient-streaming")
   , ("M-S-s", withFocused $ windows . W.sink)
   , ("M-t", emacsAfio "main" >> emacsclient "vterm")
@@ -145,31 +178,36 @@ keyDefs conf =
   , ("M-z h", zzCmd "hibernate")
   , ("M-z b", zzCmd "hybrid")
   , ("M-z l", i3lock)
-  ] where emacsclient x = spawn $ "emacsclient -e '(" ++ x ++ ")'"
-          jumpToL x = sendMessage (LJ.JumpToLayout x) >> return ()
+  ] where jumpToL x = sendMessage (LJ.JumpToLayout x) >> return ()
           withEmacs x = jumpToL "F" >> raiseEmacs >> emacsclient x
           emacsAfio f = withEmacs $ "jao-afio--goto-" ++ f
-          sendCtrlC = sendKey controlMask xK_c
+          -- sendCtrlC = sendKey controlMask xK_c
           jumpToLE x = emacsAfio "scratch-1" >> jumpToL x
           backlight x = spawn $ "brightnessctl -q s " ++ x
           i3lock = spawn "i3lock -e -i ~/.lockimage"
           xdgscr = spawn . ("xdg-screensaver " ++)
           zzCmd = spawn . ("sudo systemctl " ++)
           move r = withFocused $ keysMoveWindow r
+          runCmd = PS.shellPrompt $ conf {P.position = P.Top}
           resize a b = withFocused $ keysResizeWindow a b
 
-spacing n =
-  SP.spacingRaw False (SP.Border n 0 n 0) True (SP.Border 0 n 0 n) True
-namedLyt n = LR.renamed [LR.Replace n]
-lytFull = namedLyt "F" Full
-lytTall = namedLyt "T" $ spacing 1 (Tall 1 (1/100) (1/2))
-lytLeft = namedLyt "L" $ withIM (9/26) (ClassName "Emacs") Full
-lytRight = namedLyt "R" $ Refl.reflectHoriz lytLeft
-
-scratchpads = [
-  NS.NS "deezer" "deezer-desktop" (className =? "Deezer")
-    (centerFloat (3/4) (7/8))
-  ]
+layouts = PW.onWorkspace "D" lytTall lytFullTall
+  where
+    spacing n =
+      SP.spacingRaw False (SP.Border n 0 n 0) True (SP.Border 0 n 0 n) True
+    namedLyt n = LR.renamed [LR.Replace n]
+    lytFull = namedLyt "F" Full
+    lytTall = namedLyt "T" $ spacing 1 (Tall 1 (1/100) (1/2))
+    lytLeft = namedLyt "L" $ withIM (11/26) (ClassName "Zathura") Full
+    lytRight = namedLyt "R" $ Refl.reflectHoriz lytLeft
+    emacsLyts = lytLeft ||| lytRight ||| lytFullTall
+    lytFullTall = lytFull ||| lytTall
+
+scratchpads =
+  [ NS.NS "music" openMusicWindow isMusic cf
+  , NS.NS "tidal" "tidal-hifi" (className =? "tidal-hifi") cf
+  , NS.NS "popup" "firefox --class=Popup -P popup" (className =? "Popup") doFloat
+  ] where cf = (centerFloat (3/4) (7/8))
 scratchpad = NS.namedScratchpadManageHook scratchpads
 
 centerFloat width height
@@ -177,14 +215,22 @@ centerFloat width height
     where marginLeft = (1 - width) / 2
           marginTop = (1 - height) / 2
 
-mHook = MH.composeOne dlgs <+> composeAll cl
+mHook = MH.composeOne dlgs <+> composeAll (emf:cl)
     where
       dlgs = [MH.isDialog -?> MH.doCenterFloat]
-      cfs = ["Display", "Gitk", "MPlayer", "Vlc", "xli",
+      cfs = ["Display", "feh", "Gitk", "MPlayer", "Vlc", "mpv", "Mpv", "xli",
              "Blueman-services", "Blueman-manager",
-             "Pavucontrol", "Pavumeter", "Xmessage", "XLogo", "mpv", "Mpv"]
+             "Pavucontrol", "Pavumeter", "Xmessage", "XLogo"]
       cl = [className =? x --> MH.doCenterFloat | x <- cfs]
+      emf = title =? "emacs popup" --> MH.doCenterFloat
 
+simplePP = SBP.def { SBP.ppLayout = const ""
+                   , SBP.ppHidden = const ""
+                   , SBP.ppCurrent = SBP.xmobarColor "orangered4" ""
+                   , SBP.ppTitle = take 25
+                   , SBP.ppSep = " "
+                   , SBP.ppUrgent = const (SBP.xmobarColor "orangered3" "" "*")
+                   }
 main = do
   scheme <- lookupEnv "JAO_COLOR_SCHEME"
   let dark = Just "dark" == scheme
@@ -192,9 +238,11 @@ main = do
       defBorder = if dark then "grey80" else "grey70"
       defFBorder = if dark then "grey85" else "grey20"
       ehook = SM.serverModeEventHook <+> UH.trayerPaddingXmobarEventHook
-      lyt = NB.smartBorders $ lytFull ||| lytRight ||| lytLeft ||| lytTall
+      lyt = NB.smartBorders layouts
       localStartupHook = spawn "xmobars.sh" >> runOrRaiseEmacs
-  xmonad $ MD.docks $ Ewm.ewmhFullscreen $ Ewm.ewmh def {
+      sb = SB.statusBarProp "xmobar" (pure simplePP)
+      uhook = U.withUrgencyHook U.NoUrgencyHook
+  xmonad . uhook . (SB.withSB sb) . MD.docks . Ewm.ewmh $ def {
     manageHook = scratchpad <+> mHook <+> manageHook def
     , handleEventHook = ehook
     , layoutHook = MD.avoidStruts lyt