From 50a655aa87f9db906209b73bc2e52a702ad92cc7 Mon Sep 17 00:00:00 2001
From: Leon Kowarschick <lkowarschick@gmail.com>
Date: Sat, 13 Jun 2020 15:17:00 +0200
Subject: [PATCH] asdf

---
 files/.xmonad/.stack-work/stack.sqlite3 | Bin 327680 -> 327680 bytes
 files/.xmonad/lib/WindowSwallowing.hs   |  18 +++++-------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/files/.xmonad/.stack-work/stack.sqlite3 b/files/.xmonad/.stack-work/stack.sqlite3
index e7e35342953a6c65b5a132cb2fb0e8fe95a587c3..1089c7f1fc6a60fdfdc2a0ce3537d7922fd8769d 100644
GIT binary patch
delta 177
zcmZo@5NT)-nIO&hZ=#Gd<G+mwFF&wZn41|GTWvP{D#h5G`Kdkg6C)5aZO{C~JeOB!
z5d$9&j|7(nhb@~YOC(bo!=lNG0$n`KjvibL^^%R;oGta!4Y?S#r+?^R;h*}PC7#^`
zZk{CL_H-te`L$ec8TdqaG}zyAS#DMoc*(l`XDiERMm~lXPj7C9Ci`@VDTN`-OQ+B4
QV5w$<n6O=;ljT7f0NXb@Y5)KL

delta 178
zcmZo@5NT)-nIO&hW}=KU<C~2MFF&vuSQr@^S#37_D#h5G`Kdkg6C)5aZO{C~JeOB!
zAp;)|j|7(nhb@~YOC(bo!@|jm0-Zd~P99tg^^%R;oUM%04Y?S#r|T_e7M=QzC6dF?
zzygFo21+t+PiJD8U(5A|flq`-gZ&Mc<z_{Jm#o`=wz7O?<Zbct=4NQJPluRN7{a`C
T`uq--YIdjz+Z8%l9+Uw9g2FiQ

diff --git a/files/.xmonad/lib/WindowSwallowing.hs b/files/.xmonad/lib/WindowSwallowing.hs
index 7f75f5b..410c316 100644
--- a/files/.xmonad/lib/WindowSwallowing.hs
+++ b/files/.xmonad/lib/WindowSwallowing.hs
@@ -12,6 +12,7 @@ import           Data.Semigroup                 ( All(..) )
 import qualified Data.Map.Strict               as M
 import           Data.List                      ( isInfixOf )
 import           Control.Monad                  ( when )
+import qualified XMonad.Layout.Hidden          as Hidden
 
 
 swallowEventHook :: [Query Bool] -> [Query Bool] -> Event -> X All
@@ -28,17 +29,16 @@ swallowEventHook parentQueries childQueries event = do
         oldFloating          <- XS.gets floatingBeforeClosing
         case (maybeSwallowedParent, maybeOldStack) of
           (Just parent, Just oldStack) -> do
+            Hidden.popHiddenWindow parent
             windows
               (\ws ->
                 updateCurrentStack
                     (const $ Just $ oldStack { W.focus = parent })
-                  $ onWorkspace "NSP" (W.delete' parent)
                   $ copyFloatingState childWindow parent
                   $ ws { W.floating = oldFloating }
               )
-            XS.modify
-              (removeSwallowed childWindow . setStackBeforeWindowClosing Nothing
-              )
+            XS.modify $ removeSwallowed childWindow
+            XS.modify $ setStackBeforeWindowClosing Nothing
           _ -> return ()
         return ()
 
@@ -53,13 +53,12 @@ swallowEventHook parentQueries childQueries event = do
             (Just (parentPid : _), Just (childPid : _)) -> do
               isChild <- liftIO $ fi childPid `isChildOf` fi parentPid
               when isChild $ do
-                -- TODO use https://hackage.haskell.org/package/xmonad-contrib-0.16/docs/XMonad-Layout-Hidden.html
                 windows
                   (updateCurrentStack (fmap (\x -> x { W.focus = childWindow }))
-                  . onWorkspace "NSP" (W.insertUp parentWindow)
                   . copyFloatingState parentWindow childWindow
                   )
                 XS.modify (addSwallowedParent parentWindow childWindow)
+                Hidden.hideWindow parentWindow
             _ -> return ()
           return ()
     _ -> return ()
@@ -88,13 +87,6 @@ copyFloatingState from to ws = ws
                        (M.lookup from (W.floating ws))
   }
 
-onWorkspace
-  :: (Eq i, Eq s)
-  => i
-  -> (W.StackSet i l a s sd -> W.StackSet i l a s sd)
-  -> (W.StackSet i l a s sd -> W.StackSet i l a s sd)
-onWorkspace n f s = W.view (W.currentTag s) . f . W.view n $ s
-
 
 -- | check if a given process is a child of another process. This depends on "pstree" being in the PATH
 -- NOTE: this does not work if the child process does any kind of process-sharing.