From 252f3c6f4728c19a7ee171b446e1ce168686b44b Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 12 Nov 2026 02:35:57 +0000 Subject: add a rivermonad backend next to the EWMH one desktop-pager and desktops now also work on rivermonad, a window manager for the river Wayland compositor, over its IPC socket. The window manager access of desktop-pager moves behind Pager.Backend, with the existing code in Pager.Backend.X11 and the new one in Pager.Backend.Rivermonad. desktops gets the same choice. rivermonad is used when its socket for this Wayland display exists; DESKTOP_PAGER_BACKEND=x11 or =rivermonad overrides that. Rivermonad.Client, in the library, is the IPC client: a snapshot of all workspaces and windows, and actions to view a workspace, move a window and set the list of workspaces. On X11, desktops are now looked up by name when the pager acts instead of in the list read at startup. --- src/desktop-pager.hs | 116 ++++----------------------------------------------- 1 file changed, 9 insertions(+), 107 deletions(-) (limited to 'src/desktop-pager.hs') 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 () -- cgit v1.3.1