diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Pager/Backend.hs | 43 | ||||
| -rw-r--r-- | src/Pager/Backend/Rivermonad.hs | 61 | ||||
| -rw-r--r-- | src/Pager/Backend/X11.hs | 129 | ||||
| -rw-r--r-- | src/desktop-pager.hs | 116 | ||||
| -rw-r--r-- | src/desktops.hs | 81 |
5 files changed, 303 insertions, 127 deletions
diff --git a/src/Pager/Backend.hs b/src/Pager/Backend.hs new file mode 100644 index 0000000..e126dcc --- /dev/null +++ b/src/Pager/Backend.hs @@ -0,0 +1,43 @@ +-- | What the pager needs from a window manager. +module Pager.Backend + ( Backend(..) + , getBackend + ) where + +import Data.Text (Text) +import Pager.Types +import qualified Pager.Backend.Rivermonad +import qualified Pager.Backend.X11 +import qualified Rivermonad.Client + + +data Backend = Backend + { getScreenGeometry :: IO Geometry + , getWorkspaces :: Geometry -> [Int] -> IO [Workspace] + -- ^ Screen geometry and the focused window of every workspace, as + -- given on the command line. + , viewWorkspace :: Text -> IO () + , shiftWindowToWorkspace :: Int -> Text -> IO () + } + + +-- | rivermonad if its socket is there, EWMH on X11 otherwise. See +-- 'Rivermonad.Client.selected'. +getBackend :: IO Backend +getBackend = do + rivermonad <- Rivermonad.Client.selected + return $ + if rivermonad then + Backend + { getScreenGeometry = Pager.Backend.Rivermonad.getScreenGeometry + , getWorkspaces = Pager.Backend.Rivermonad.getWorkspaces + , viewWorkspace = Pager.Backend.Rivermonad.viewWorkspace + , shiftWindowToWorkspace = Pager.Backend.Rivermonad.shiftWindowToWorkspace + } + else + Backend + { getScreenGeometry = Pager.Backend.X11.getScreenGeometry + , getWorkspaces = Pager.Backend.X11.getWorkspaces + , viewWorkspace = Pager.Backend.X11.viewWorkspace + , shiftWindowToWorkspace = Pager.Backend.X11.shiftWindowToWorkspace + } diff --git a/src/Pager/Backend/Rivermonad.hs b/src/Pager/Backend/Rivermonad.hs new file mode 100644 index 0000000..b2d6365 --- /dev/null +++ b/src/Pager/Backend/Rivermonad.hs @@ -0,0 +1,61 @@ +-- | The pager on rivermonad (a window manager for the river Wayland +-- compositor), over its IPC socket. +module Pager.Backend.Rivermonad + ( getScreenGeometry + , getWorkspaces + , viewWorkspace + , shiftWindowToWorkspace + ) where + +import Data.Text (Text) +import Pager.Types +import qualified Data.List as List +import qualified Rivermonad.Client as Client + + +geometry :: Client.Rect -> Geometry +geometry r = + Geometry + { geometry_x = Client.rect_x r + , geometry_y = Client.rect_y r + , geometry_width = Client.rect_width r + , geometry_height = Client.rect_height r + } + +getScreenGeometry :: IO Geometry +getScreenGeometry = + geometry . Client.snapshot_screen <$> Client.getSnapshot + +-- The window manager knows which window every workspace focuses, so the +-- window ids from the command line are not needed here. +getWorkspaces :: Geometry -> [Int] -> IO [Workspace] +getWorkspaces screenGeometry _focusWindows = + map workspace . Client.snapshot_workspaces <$> Client.getSnapshot + where + workspace ws = + Workspace + { workspace_geometry = screenGeometry + , workspace_focused = Client.workspace_focused ws + , workspace_name = Client.workspace_name ws + , workspace_windows = + uncurry (<>) $ + List.partition window_focused $ + map window (Client.workspace_windows ws) + } + + window w = + Window + { window_id = Client.window_id w + , window_title = Client.window_title w + , window_geometry = geometry (Client.window_rect w) + , window_focused = Client.window_focused w + -- River cannot tell the window manager yet that a window wants + -- attention. + , window_urgent = False + } + +viewWorkspace :: Text -> IO () +viewWorkspace = Client.viewWorkspace + +shiftWindowToWorkspace :: Int -> Text -> IO () +shiftWindowToWorkspace = Client.shiftWindow diff --git a/src/Pager/Backend/X11.hs b/src/Pager/Backend/X11.hs new file mode 100644 index 0000000..9df5212 --- /dev/null +++ b/src/Pager/Backend/X11.hs @@ -0,0 +1,129 @@ +-- | The pager on an EWMH window manager on X11. +module Pager.Backend.X11 + ( getScreenGeometry + , getWorkspaces + , viewWorkspace + , shiftWindowToWorkspace + ) where + +import Data.Bits (testBit) +import Data.Maybe (fromMaybe) +import Data.Set (Set) +import Data.Text (Text) +import Pager.Types +import qualified Data.List as List +import qualified Data.Map as Map +import qualified Data.Set as Set +import qualified Data.Text as Text +import qualified Graphics.X11 as X11 +import qualified Graphics.X11.EWMH as X11 +import qualified Graphics.X11.Extra as X11 +import qualified Graphics.X11.Xlib.Extras as X11 + + +getGeometry :: X11.Display -> X11.Window -> IO Geometry +getGeometry d w = do + (_, x, y, width, height, _, _) <- X11.getGeometry d w + return Geometry + { geometry_x = fromIntegral x + , geometry_y = fromIntegral y + , geometry_width = fromIntegral width + , geometry_height = fromIntegral height + } + +getScreenGeometry :: IO Geometry +getScreenGeometry = + X11.withDefaultDisplay $ \display -> + getGeometry display (X11.defaultRootWindow display) + +getWorkspaces :: Geometry -> [Int] -> IO [Workspace] +getWorkspaces screenGeometry focusWindows = + X11.withDefaultDisplay $ \display -> + getWorkspaces' display screenGeometry (Set.fromList (map fromIntegral focusWindows)) + +getWorkspaces' :: X11.Display -> Geometry -> Set X11.Window -> IO [Workspace] +getWorkspaces' display screenGeometry focusWindows = do + + let rootWindow = X11.defaultRootWindow display + + currentDesktop <- fromMaybe 0 <$> X11.getCurrentDesktop display + + workspaces <- do + names <- zip [0..] . fromMaybe [] <$> X11.getDesktopNames display + let + ws = + flip map names $ \(index, name) -> + Workspace + { workspace_geometry = screenGeometry + , workspace_focused = currentDesktop == index + , workspace_name = Text.pack name + , workspace_windows = [] + } + return $ Map.fromList $ zip [0..] ws + + clientList <- + maybe [] (map fromIntegral) <$> + X11.getWindowProperty32 display X11._NET_CLIENT_LIST rootWindow + + let + f w = do + title <- X11.getWindowTitle display w + desktop <- fromMaybe 0 <$> X11.getWindowDesktop display w + geometry <- getGeometry display w + + wm_hints <- X11.getWMHints display w + + wm_state <- + maybe [] (map fromIntegral) <$> + X11.getWindowProperty32 display X11._NET_WM_STATE w + + let urgent = + testBit (X11.wmh_flags wm_hints) X11.urgencyHintBit || + elem X11._NET_WM_STATE_DEMANDS_ATTENTION wm_state + + let + window = + Window + { window_id = fromIntegral w + , window_title = Text.pack $ fromMaybe "" title + , window_geometry = geometry + , window_focused = Set.member w focusWindows + , window_urgent = urgent + } + + return ( window, desktop ) + + clientList' <- mapM f clientList + + return + $ map (\ws -> ws { workspace_windows = + uncurry (<>) $ + List.partition window_focused (workspace_windows ws) + }) + $ Map.elems + $ foldr + (\(w, i) -> + Map.adjust (\ws -> ws { workspace_windows = w : workspace_windows ws }) + i + ) + workspaces + clientList' + +-- EWMH addresses desktops by index. +withDesktopIndex :: Text -> (X11.Display -> Int -> IO ()) -> IO () +withDesktopIndex name f = + X11.withDefaultDisplay $ \display -> do + names <- fromMaybe [] <$> X11.getDesktopNames display + case Text.unpack name `List.elemIndex` names of + Just index -> f display index + Nothing -> fail $ "no such desktop: " <> show name + +viewWorkspace :: Text -> IO () +viewWorkspace name = + withDesktopIndex name $ \display index -> + X11.switchToDesktop display (fromIntegral index) + +shiftWindowToWorkspace :: Int -> Text -> IO () +shiftWindowToWorkspace window name = + withDesktopIndex name $ \display index -> + X11.moveWindowToDesktop display (fromIntegral window) (fromIntegral index) diff --git a/src/desktop-pager.hs b/src/desktop-pager.hs index a689b72..4fb05c3 100644 --- a/src/desktop-pager.hs +++ b/src/desktop-pager.hs @@ -5,18 +5,16 @@ module Main (main) where import Blessings (Blessings(Plain,SGR),pp) import Control.Concurrent -import Control.Monad (forM) import Control.Monad (forever) -import Data.Bits (testBit) import Data.Default (def) import Data.Function ((&)) import Data.List.Extra ((!!?)) import Data.Maybe (catMaybes,fromMaybe) import Data.Monoid.Extra (mintercalate) import Data.Sequences qualified as S -import Data.Set (Set) import Data.Text (Text) import Much.Screen (Screen(Screen), withScreen) +import Pager.Backend (Backend(..), getBackend) import Pager.Types import Scanner import State (State(..)) @@ -26,98 +24,16 @@ import System.Posix.Signals (Handler(Catch), Signal, installHandler, sigINT) import qualified Data.Char as Char import qualified Data.List as List import qualified Data.Map as Map -import qualified Data.Set as Set import qualified Data.Text as Text import qualified Data.Text.Encoding as Text import qualified Data.Text.IO as Text import qualified Data.Text.Read as Text -import qualified Graphics.X11 as X11 -import qualified Graphics.X11.EWMH as X11; -import qualified Graphics.X11.Extra as X11 -import qualified Graphics.X11.Xlib.Extras as X11 import qualified Hack.Buffer as Buffer import qualified Hack.Buffer.Extra as Buffer import qualified Pager.Sixelerator as Pager import qualified System.Console.Terminal.Size as Term -getGeometry :: X11.Display -> X11.Window -> IO Geometry -getGeometry d w = do - (_, x, y, width, height, _, _) <- X11.getGeometry d w - return Geometry - { geometry_x = fromIntegral x - , geometry_y = fromIntegral y - , geometry_width = fromIntegral width - , geometry_height = fromIntegral height - } - -getWorkspaces :: X11.Display -> Geometry -> Set X11.Window -> IO [Workspace] -getWorkspaces display screenGeometry focusWindows = do - let rootWindow = X11.defaultRootWindow display - - currentDesktop <- fromMaybe 0 <$> X11.getCurrentDesktop display - - workspaces <- do - names <- zip [0..] . fromMaybe [] <$> X11.getDesktopNames display - ws <- - forM names $ \(index, name) -> do - return Workspace - { workspace_geometry = screenGeometry - , workspace_focused = currentDesktop == index - , workspace_name = Text.pack name - , workspace_windows = [] - } - return $ Map.fromList $ zip [0..] ws - - clientList <- - maybe [] (map fromIntegral) <$> - X11.getWindowProperty32 display X11._NET_CLIENT_LIST rootWindow - - let - f w = do - title <- X11.getWindowTitle display w - desktop <- fromMaybe 0 <$> X11.getWindowDesktop display w - geometry <- getGeometry display w - - wm_hints <- X11.getWMHints display w - - wm_state <- - maybe [] (map fromIntegral) <$> - X11.getWindowProperty32 display X11._NET_WM_STATE w - - let urgent = - testBit (X11.wmh_flags wm_hints) X11.urgencyHintBit || - elem X11._NET_WM_STATE_DEMANDS_ATTENTION wm_state - - let - window = - Window - { window_id = fromIntegral w - , window_title = Text.pack $ fromMaybe "" title - , window_geometry = geometry - , window_focused = Set.member w focusWindows - , window_urgent = urgent - } - - return ( window, desktop ) - - clientList' <- mapM f clientList - - return - $ map (\ws -> ws { workspace_windows = - uncurry (<>) $ - List.partition window_focused (workspace_windows ws) - }) - $ Map.elems - $ foldr - (\(w, i) -> - Map.adjust (\ws -> ws { workspace_windows = w : workspace_windows ws }) - i - ) - workspaces - clientList' - - main :: IO () main = do args <- getArgs @@ -150,14 +66,11 @@ main = do error $ "bad arguments: " <> show args - screenGeometry <- - X11.withDefaultDisplay $ \display -> do - let rootWindow = X11.defaultRootWindow display - getGeometry display rootWindow + backend <- getBackend + + screenGeometry <- getScreenGeometry backend - workspaces <- - X11.withDefaultDisplay $ \display -> do - getWorkspaces display screenGeometry (Set.fromList focusWindows) + workspaces <- getWorkspaces backend screenGeometry focusWindows let screen0 = Screen False NoBuffering (BlockBuffering $ Just 4096) [ 1000 -- X & Y on button press and release @@ -218,28 +131,17 @@ main = do -- wmpost manager ("/workspace/" <> Text.unpack name <> "/view") () :: IO (Maybe ()) ViewWorkspace -> do -- XXX [xmonad-http] wmpost manager ("/workspace/" <> Text.unpack name <> "/view") () :: IO (Maybe ()) - X11.withDefaultDisplay $ \d -> do - let Just s = name `List.elemIndex` map workspace_name workspaces - X11.switchToDesktop d (fromIntegral s) + viewWorkspace backend name ShiftWindowToWorkspace window -> do -- XXX [xmonad-http] wmpost manager ("/workspace/" <> Text.unpack name <> "/shift/" <> Text.unpack wid) () :: IO (Maybe ()) - X11.withDefaultDisplay $ \d -> - let - Just s = name `List.elemIndex` map workspace_name workspaces - in - --debug (name, s, activeWindow, window) >> - --X11.moveWindowToDesktop d activeWindow (fromIntegral s) - X11.moveWindowToDesktop d (fromIntegral window) (fromIntegral s) + shiftWindowToWorkspace backend window name ShiftWindowToAndViewWorkspace window -> do -- XXX [xmonad-http] wmpost manager ("/workspace/" <> Text.unpack name <> "/shiftview/" <> show wid) () :: IO (Maybe ()) - X11.withDefaultDisplay $ \d -> do - let Just s = name `List.elemIndex` map workspace_name workspaces - --X11.moveWindowToDesktop d activeWindow (fromIntegral s) - X11.moveWindowToDesktop d (fromIntegral window) (fromIntegral s) - X11.switchToDesktop d (fromIntegral s) + shiftWindowToWorkspace backend window name + viewWorkspace backend name _ -> return () diff --git a/src/desktops.hs b/src/desktops.hs index 7bf5f65..12d227e 100644 --- a/src/desktops.hs +++ b/src/desktops.hs @@ -1,10 +1,13 @@ module Main (main) where import Data.List (elemIndex) +import qualified Data.List as List import Data.Map (Map) import Data.Maybe (fromMaybe) -import Graphics.X11.EWMH (getCurrentDesktop, getDesktopNames, setDesktopNames, switchToDesktop) import Graphics.X11.Extra (withDefaultDisplay) +import qualified Data.Text as Text +import qualified Graphics.X11.EWMH as EWMH +import qualified Rivermonad.Client as Rivermonad import System.Environment (getArgs) import qualified Data.Aeson as Aeson import qualified Data.ByteString.Lazy.Char8 as LBS8 @@ -31,48 +34,86 @@ main = "switch" : name : [] -> switchToWorkspace name x -> error $ "bad command: " <> show x +-- | The list of desktops of the running window manager. +data Desktops = Desktops + { getDesktopNames :: IO (Maybe [String]) + , setDesktopNames :: [String] -> IO () + -- ^ Create, remove and rename desktops to get this list. + , getCurrentDesktop :: IO (Maybe Int) + , switchToDesktopNamed :: String -> IO () + } + +-- | rivermonad if its socket is there, EWMH on X11 otherwise. +withDesktops :: (Desktops -> IO a) -> IO a +withDesktops f = + Rivermonad.selected >>= \case + True -> f rivermonad + False -> withDefaultDisplay (f . ewmh) + where + ewmh dpy = + Desktops + { getDesktopNames = EWMH.getDesktopNames dpy + , setDesktopNames = \names -> EWMH.setDesktopNames names dpy + , getCurrentDesktop = fmap fromIntegral <$> EWMH.getCurrentDesktop dpy + , switchToDesktopNamed = \name -> do + names <- fromMaybe [] <$> EWMH.getDesktopNames dpy + let Just i = name `elemIndex` names + EWMH.switchToDesktop dpy (fromIntegral i) + } + + rivermonad = + Desktops + { getDesktopNames = + Just . map (Text.unpack . Rivermonad.workspace_name) <$> snapshot + , setDesktopNames = + Rivermonad.setWorkspaces . map Text.pack + , getCurrentDesktop = + List.findIndex Rivermonad.workspace_focused <$> snapshot + , switchToDesktopNamed = + Rivermonad.viewWorkspace . Text.pack + } + + snapshot = Rivermonad.snapshot_workspaces <$> Rivermonad.getSnapshot + getWorkspaces :: IO () getWorkspaces = - LBS8.putStrLn =<< Aeson.encode <$> withDefaultDisplay getDesktopNames + LBS8.putStrLn =<< Aeson.encode <$> withDesktops getDesktopNames addWorkspaces :: [String] -> IO () addWorkspaces names = - withDefaultDisplay $ \dpy -> do + withDesktops $ \wm -> do names' <- (<>names) . - fromMaybe [] <$> getDesktopNames dpy - setDesktopNames names' dpy + fromMaybe [] <$> getDesktopNames wm + setDesktopNames wm names' removeWorkspaces :: [String] -> IO () removeWorkspaces names = - withDefaultDisplay $ \dpy -> do + withDesktops $ \wm -> do names' <- filter (not . flip Set.member (Set.fromList names)) . - fromMaybe [] <$> getDesktopNames dpy - setDesktopNames names' dpy + fromMaybe [] <$> getDesktopNames wm + setDesktopNames wm names' renameCurrentWorkspace :: String -> IO () renameCurrentWorkspace name = - withDefaultDisplay $ \dpy -> do - i <- maybe 0 fromIntegral <$> getCurrentDesktop dpy - names <- fromMaybe [] <$> getDesktopNames dpy + withDesktops $ \wm -> do + i <- fromMaybe 0 <$> getCurrentDesktop wm + names <- fromMaybe [] <$> getDesktopNames wm let names' = take i names <> [name] <> drop (i + 1) names - setDesktopNames names' dpy + setDesktopNames wm names' renameWorkspaces :: Map String String-> IO () renameWorkspaces renames = do - withDefaultDisplay $ \dpy -> do + withDesktops $ \wm -> do names' <- map (\name -> fromMaybe name (Map.lookup name renames)) . - fromMaybe [] <$> getDesktopNames dpy - setDesktopNames names' dpy + fromMaybe [] <$> getDesktopNames wm + setDesktopNames wm names' setWorkspaces :: [String] -> IO () -setWorkspaces = withDefaultDisplay . setDesktopNames +setWorkspaces names = withDesktops (`setDesktopNames` names) switchToWorkspace :: String -> IO () switchToWorkspace name = - withDefaultDisplay $ \dpy -> do - names <- fromMaybe [] <$> getDesktopNames dpy - let Just i = name `elemIndex` names - switchToDesktop dpy (fromIntegral i) + withDesktops (`switchToDesktopNamed` name) |
