twin/xmonad
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad.git synced 2025-05-19 08:30:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Untabify

Browse Source
This commit is contained in:
Spencer Janssen 2007-03-20 05:40:45 +00:00
parent 437167d34c
commit 21f6e90b4a
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Main.hs
View File

@ -76,8 +76,8 @@ main = do
let st = XState let st = XState
{ display = dpy { display = dpy
, screen = dflt , screen = dflt
, xineScreens = xinesc , xineScreens = xinesc
, wsOnScreen = M.fromList $ map (\n -> (n,n)) [0..((length xinesc)-1)] , wsOnScreen = M.fromList $ map (\n -> (n,n)) [0..((length xinesc)-1)]
, theRoot = rootw , theRoot = rootw
, wmdelete = wmdelt , wmdelete = wmdelt
, wmprotocols = wmprot , wmprotocols = wmprot
@ -225,13 +225,13 @@ refresh = do
ws2sc <- gets wsOnScreen ws2sc <- gets wsOnScreen
xinesc <- gets xineScreens xinesc <- gets xineScreens
forM_ (M.assocs ws2sc) $ \(n, scn) -> forM_ (M.assocs ws2sc) $ \(n, scn) ->
whenJust (W.peekStack n ws) $ \w -> withDisplay $ \d -> do whenJust (W.peekStack n ws) $ \w -> withDisplay $ \d -> do
let sc = xinesc !! scn let sc = xinesc !! scn
io $ do moveResizeWindow d w (rect_x sc) io $ do moveResizeWindow d w (rect_x sc)
(rect_y sc) (rect_y sc)
(rect_width sc) (rect_width sc)
(rect_height sc) (rect_height sc)
raiseWindow d w raiseWindow d w
whenJust (W.peek ws) setFocus whenJust (W.peek ws) setFocus
-- | windows. Modify the current window list with a pure function, and refresh -- | windows. Modify the current window list with a pure function, and refresh
@ -320,7 +320,7 @@ tag o = do
let m = W.current ws let m = W.current ws
when (n /= m) $ when (n /= m) $
whenJust (W.peek ws) $ \w -> do whenJust (W.peek ws) $ \w -> do
hide w hide w
windows $ W.shift n windows $ W.shift n
where n = o-1 where n = o-1
@ -331,21 +331,21 @@ view o = do
ws2sc <- gets wsOnScreen ws2sc <- gets wsOnScreen
let m = W.current ws let m = W.current ws
when (n /= m) $ do when (n /= m) $ do
-- is the workspace we want to switch to currently visible? -- is the workspace we want to switch to currently visible?
if M.member n ws2sc if M.member n ws2sc
then windows $ W.view n then windows $ W.view n
else do else do
sc <- case M.lookup m ws2sc of sc <- case M.lookup m ws2sc of
Nothing -> do Nothing -> do
trace "Current workspace isn't visible! This should never happen!" trace "Current workspace isn't visible! This should never happen!"
-- we don't know what screen to use, just use the first one. -- we don't know what screen to use, just use the first one.
return 0 return 0
Just sc -> return sc Just sc -> return sc
modify $ \s -> s { wsOnScreen = M.insert n sc (M.filter (/=sc) ws2sc) } modify $ \s -> s { wsOnScreen = M.insert n sc (M.filter (/=sc) ws2sc) }
gets wsOnScreen >>= trace . show gets wsOnScreen >>= trace . show
windows $ W.view n windows $ W.view n
mapM_ hide (W.index m ws) mapM_ hide (W.index m ws)
setTopFocus setTopFocus
where n = o-1 where n = o-1
-- | True if window is under management by us -- | True if window is under management by us