New patches: [StackSet.hs: better comments regarding hidden/visible workspace tracking for Xinerama Brent Yorgey **20071022160239 I'm not 100% sure that I understand what's going on here, but it seems as though the comment still described an older state of affairs. I don't see any Map Workspace Screen keeping track of visible workspaces. ] { hunk ./StackSet.hs 102 --- receive keyboard events), other workspaces may be passively viewable. --- We thus need to track which virtual workspaces are associated --- (viewed) on which physical screens. We use a simple Map Workspace --- Screen for this. +-- receive keyboard events), other workspaces may be passively +-- viewable. We thus need to track which virtual workspaces are +-- associated (viewed) on which physical screens. To keep track of +-- this, StackSet keeps separate lists of visible but non-focused +-- workspaces, and non-visible workspaces. } [StackSet.hs: small grammar fix and better flow in comment Brent Yorgey **20071022160858] { hunk ./StackSet.hs 112 --- needs to be well defined. Particular in relation to 'insert' and +-- needs to be well defined, particularly in relation to 'insert' and } [StackSet.hs: align some comments Brent Yorgey **20071022161601] { hunk ./StackSet.hs 128 --- * focusUp, focusDown, -- was: rotate +-- * focusUp, focusDown, -- was: rotate hunk ./StackSet.hs 134 --- * insertUp, -- was: insert\/push +-- * insertUp, -- was: insert\/push hunk ./StackSet.hs 160 - , hidden :: [Workspace i l a] -- ^ workspaces not visible anywhere - , floating :: M.Map a RationalRect -- ^ floating windows + , hidden :: [Workspace i l a] -- ^ workspaces not visible anywhere + , floating :: M.Map a RationalRect -- ^ floating windows } [StackSet.hs: (new): better comment; 'm' is not an integer, it is a list of screen descriptions. Brent Yorgey **20071022183411] { hunk ./StackSet.hs 211 --- | /O(n)/. Create a new stackset, of empty stacks, with given tags, with --- 'm' physical screens. 'm' should be less than or equal to the number of --- workspace tags. The first workspace in the list will be current. +-- | /O(n)/. Create a new stackset, of empty stacks, with given tags, +-- with physical screens whose descriptions are given by 'm'. The +-- number of physical screens (@length 'm'@) should be less than or +-- equal to the number of workspace tags. The first workspace in the +-- list will be current. } [StackSet.hs: (peek): why use return when you just mean Just? it will just confuse the n00bs and return to haunt you later. Brent Yorgey **20071022190732] { hunk ./StackSet.hs 314 -peek = with Nothing (return . focus) +peek = with Nothing (Just . focus) } [StackSet.hs: (differentiate): 'Texture' doesn't mean anything to me; replace with a more descriptive comment. Brent Yorgey **20071022191333] { hunk ./StackSet.hs 327 --- | --- /O(n)/. Texture a list. --- +-- | +-- /O(n)/. Turn a list into a possibly empty stack (i.e., a zipper): +-- the first element of the list is current, and the rest of the list +-- is down. } [StackSet.hs: remove dead code. Brent Yorgey **20071022192636] { hunk ./StackSet.hs 354 - --- let is = t : r ++ reverse l in take (length is) (dropWhile (/= m) (cycle is)) } [StackSet.hs: (ensureTags): elaborate into a more descriptive comment. Brent Yorgey **20071022202212] { hunk ./StackSet.hs 416 --- | Ensure that a given set of tags is present. +-- | Ensure that a given set of workspace tags is present by renaming +-- existing workspaces and/or creating new hidden workspaces as +-- necessary. } [Replace 'findIndex' with 'findTag', which more accurately describes what the function does. Brent Yorgey **20071022204105 I realize this is a big change, but the name 'findIndex' was confusing for me, since I expected it to return some sort of integer. What it actually does, of course, is return a workspace tag, which might be more general than an index. Of course, this change breaks several contrib modules; I'll submit a patch to make the change there as well. ] { replace ./Config.hs [A-Za-z_0-9] findIndex findTag replace ./Main.hs [A-Za-z_0-9] findIndex findTag replace ./Operations.hs [A-Za-z_0-9] findIndex findTag hunk ./StackSet.hs 445 --- Return Just the workspace index of the given window, or Nothing +-- Return Just the workspace tag of the given window, or Nothing replace ./StackSet.hs [A-Za-z_0-9] findIndex findTag replace ./XMonad.hs [A-Za-z_0-9] findIndex findTag replace ./tests/Main.hs [A-Za-z_0-9] findIndex findTag replace ./tests/Properties.hs [A-Za-z_0-9] findIndex findTag replace ./tests/loc.hs [A-Za-z_0-9] findIndex findTag } [StackSet.hs: (insertUp): remove comments about new window being made master window, since that clearly isn't true. Brent Yorgey **20071022210856] { hunk ./StackSet.hs 457 --- /O(n)/. (Complexity due to duplicate check). Insert a new element into --- the stack, above the currently focused element. --- --- The new element is given focus, and is set as the master window. --- The previously focused element is moved down. The previously --- 'master' element is forgotten. (Thus, 'insert' will cause a retiling). +-- /O(n)/. (Complexity due to duplicate check). Insert a new element +-- into the stack, above the currently focused element. The new +-- element is given focus; the previously focused element is moved +-- down. } Context: [setInitialProperties after placing windows Spencer Janssen *-20071019201310] [setInitialProperties after placing windows Spencer Janssen **20071019201310] [Ignore borders in the stored RationalRects of floating windows. Spencer Janssen *-20071019063922 Also, add 'floatWindow' which computes the actual Rectangle for that window, including border. ] [Ignore borders in the stored RationalRects of floating windows. Spencer Janssen **20071019063922 Also, add 'floatWindow' which computes the actual Rectangle for that window, including border. ] [Only assign workspace keys up to xK_9. Related to bug #63 Spencer Janssen **20071019083746] [I prefer fmap over liftM Spencer Janssen **20071019063104] [change 0/1/3 to named states, per X11-extras darcs head Devin Mullins **20071018021651] [remove StackOrNot type synonymn. David Roundy **20071017201406] [Operations.hs: make use of notElem and notMember Eric Mertens **20071017174357] [TAG 0.4 Spencer Janssen **20071016215343] Patch bundle hash: 6b9a3ef605f8b843b1a6b90e1368db14d9e6a7b9