twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-01 12:41:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

allow border colour to be specified in GSConfig

Browse Source
This commit is contained in:
Sam Doshi
2017-02-16 19:12:57 +00:00
parent 54ef9f6f8d
commit b1dee9b0b4
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES.md
View File

@@ -2,6 +2,12 @@
## 0.14 (Not Yet) ## 0.14 (Not Yet)
### Breaking Changes
* `XMonad.Actions.GridSelect`
- Added field `gs_bordercolor` to `GSConfig` to specify border color.
### Bug Fixes and Minor Changes ### Bug Fixes and Minor Changes
* `XMonad.Util.WindowProperties` * `XMonad.Util.WindowProperties`

17
XMonad/Actions/GridSelect.hs
View File

@@ -205,7 +205,8 @@ data GSConfig a = GSConfig {
gs_navigate :: TwoD a (Maybe a), gs_navigate :: TwoD a (Maybe a),
gs_rearranger :: Rearranger a, gs_rearranger :: Rearranger a,
gs_originFractX :: Double, gs_originFractX :: Double,
gs_originFractY :: Double gs_originFractY :: Double,
gs_bordercolor :: String
} }
-- | That is 'fromClassName' if you are selecting a 'Window', or -- | That is 'fromClassName' if you are selecting a 'Window', or
@@ -322,15 +323,15 @@ diamondRestrict x y originX originY =
findInElementMap :: (Eq a) => a -> [(a, b)] -> Maybe (a, b) findInElementMap :: (Eq a) => a -> [(a, b)] -> Maybe (a, b)
findInElementMap pos = find ((== pos) . fst) findInElementMap pos = find ((== pos) . fst)
drawWinBox :: Window -> XMonadFont -> (String, String) -> Integer -> Integer -> String -> Integer -> Integer -> Integer -> X () drawWinBox :: Window -> XMonadFont -> (String, String) -> String -> Integer -> Integer -> String -> Integer -> Integer -> Integer -> X ()
drawWinBox win font (fg,bg) ch cw text x y cp = drawWinBox win font (fg,bg) bc ch cw text x y cp =
withDisplay $ \dpy -> do withDisplay $ \dpy -> do
gc <- liftIO $ createGC dpy win gc <- liftIO $ createGC dpy win
bordergc <- liftIO $ createGC dpy win bordergc <- liftIO $ createGC dpy win
liftIO $ do liftIO $ do
Just fgcolor <- initColor dpy fg Just fgcolor <- initColor dpy fg
Just bgcolor <- initColor dpy bg Just bgcolor <- initColor dpy bg
Just bordercolor <- initColor dpy borderColor Just bordercolor <- initColor dpy bc
setForeground dpy gc fgcolor setForeground dpy gc fgcolor
setBackground dpy gc bgcolor setBackground dpy gc bgcolor
setForeground dpy bordergc bordercolor setForeground dpy bordergc bordercolor
@@ -378,6 +379,7 @@ updateElementsWithColorizer colorizer elementmap = do
colors <- colorizer element (pos == curpos) colors <- colorizer element (pos == curpos)
drawWinBox win font drawWinBox win font
colors colors
(gs_bordercolor gsconfig)
cellheight cellheight
cellwidth cellwidth
text text
@@ -390,7 +392,7 @@ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) contEventloop stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) contEventloop
| t == buttonRelease = do | t == buttonRelease = do
s @ TwoDState { td_paneX = px, td_paneY = py, s @ TwoDState { td_paneX = px, td_paneY = py,
td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _) } <- get td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- get
let gridX = (fi x - (px - cw) `div` 2) `div` cw let gridX = (fi x - (px - cw) `div` 2) `div` cw
gridY = (fi y - (py - ch) `div` 2) `div` ch gridY = (fi y - (py - ch) `div` 2) `div` ch
case lookup (gridX,gridY) (td_elementmap s) of case lookup (gridX,gridY) (td_elementmap s) of
@@ -714,10 +716,7 @@ decorateName' w = do
-- | Builds a default gs config from a colorizer function. -- | Builds a default gs config from a colorizer function.
buildDefaultGSConfig :: (a -> Bool -> X (String,String)) -> GSConfig a buildDefaultGSConfig :: (a -> Bool -> X (String,String)) -> GSConfig a
buildDefaultGSConfig col = GSConfig 50 130 10 col "xft:Sans-8" defaultNavigation noRearranger (1/2) (1/2) buildDefaultGSConfig col = GSConfig 50 130 10 col "xft:Sans-8" defaultNavigation noRearranger (1/2) (1/2) "white"
borderColor :: String
borderColor = "white"
-- | Brings selected window to the current workspace. -- | Brings selected window to the current workspace.
bringSelected :: GSConfig Window -> X () bringSelected :: GSConfig Window -> X ()