Added a couple of draggable bindings.

These new bindings allow the user to click on a window and "drag" it to
a different window. This will swap the two windows once the drag button
is released. The other binding is similar, but for whole workspaces.

1 files changed, 25 insertions, 19 deletions

diff --git a/src/Rahm/Desktop/Common.hs b/src/Rahm/Desktop/Common.hs
index 4787598..005eeca 100644
--- a/src/Rahm/Desktop/Common.hs
+++ b/src/Rahm/Desktop/Common.hs
@@ -15,6 +15,7 @@ module Rahm.Desktop.Common
     getCurrentWorkspace,
     getCurrentLocation,
     runMaybeT_,
+    setBorderColor,
     Location (..),
   )
 where
@@ -133,29 +134,34 @@ myFinallyE m closer = catchE (m <* closer) (\e -> closer >> throwE e)
 -- Temporarily set the border color of the given windows.
 withBorderColorE :: String -> [Window] -> ExceptT e X a -> ExceptT e X a
 withBorderColorE color wins fn = do
-  d <- lift $ asks display
+  cleanup <- lift (setBorderColor color wins)
+  myFinallyE fn (lift cleanup)
+
+-- Set the border color for the given windows. This function returns another
+-- function that should be used to clean up the border changes.
+setBorderColor :: String -> [Window] -> X (X ())
+setBorderColor color wins = do
+  d <- asks display
   (px, oPx, fPx) <-
-    lift $
-      (,,)
-        <$> stringToPixel d color
-        <*> (stringToPixel d =<< asks (normalBorderColor . config))
-        <*> (stringToPixel d =<< asks (focusedBorderColor . config))
+    (,,)
+      <$> stringToPixel d color
+      <*> (stringToPixel d =<< asks (normalBorderColor . config))
+      <*> (stringToPixel d =<< asks (focusedBorderColor . config))
 
   (colorName, oColorName, fColorName) <-
-    lift $
-      (,,)
-        <$> io (pixelToString d px)
-        <*> io (pixelToString d oPx)
-        <*> io (pixelToString d fPx)
+    (,,)
+      <$> io (pixelToString d px)
+      <*> io (pixelToString d oPx)
+      <*> io (pixelToString d fPx)
 
   forM_ wins $ \w ->
-    lift $ setWindowBorderWithFallback d w colorName px
+    setWindowBorderWithFallback d w colorName px
 
-  myFinallyE fn $
-    lift $ do
-      forM_ wins $ \w ->
-        setWindowBorderWithFallback d w oColorName oPx
-      withFocused $ \fw ->
+  return $ do
+    forM_ wins $ \w ->
+      setWindowBorderWithFallback d w oColorName oPx
+    withFocused $ \fw ->
+      when (fw `elem` wins) $
         setWindowBorderWithFallback d fw fColorName fPx
 
 withBorderColorM :: String -> [Window] -> MaybeT X a -> MaybeT X a
@@ -186,8 +192,8 @@ withBorderWidth width ws fn = do
 
 gotoWorkspace :: WorkspaceId -> X ()
 gotoWorkspace wid = do
-   logs Debug "GotoWorkspace %s" wid
-   windows $ S.greedyView wid
+  logs Debug "GotoWorkspace %s" wid
+  windows $ S.greedyView wid
 
 moveLocationToWorkspace :: Location -> WorkspaceId -> X ()
 moveLocationToWorkspace (Location _ (Just win)) wid =