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

Tabbed.hs: Get correct color values instead of assuming a 24-bit display

Browse Source 
Using, eg, 0xBBBBBB directly makes assumptions about the server's colormap and
only works on 24-bit displays.

This patch fetches the colors on every doLayout call, which is ugly, but works.
It would be nice if we could do all the required initColors only once.
This commit is contained in:
Jason Creighton 2007-06-13 23:50:49 +00:00
parent ef28919910
commit 60a6b53e39
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Tabbed.hs
View File

@ -24,7 +24,7 @@ import Control.Monad.State ( gets )
import Graphics.X11.Xlib import Graphics.X11.Xlib
import XMonad import XMonad
import XMonadContrib.Decoration import XMonadContrib.Decoration
import Operations ( focus ) import Operations ( focus, initColor )
import qualified StackSet as W import qualified StackSet as W
import XMonadContrib.NamedWindows import XMonadContrib.NamedWindows
@ -44,17 +44,21 @@ tabbed = Layout { doLayout = dolay, modifyLayout = const (return Nothing) }
dolay :: Rectangle -> W.Stack Window -> X [(Window, Rectangle)] dolay :: Rectangle -> W.Stack Window -> X [(Window, Rectangle)]
dolay sc (W.Stack w [] []) = return [(w,sc)] dolay sc (W.Stack w [] []) = return [(w,sc)]
dolay sc@(Rectangle x y wid _) s@(W.Stack w _ _) = dolay sc@(Rectangle x y wid _) s@(W.Stack w _ _) = withDisplay $ \d ->
do let ws = W.integrate s do activecolor <- io $ initColor d "#BBBBBB"
inactivecolor <- io $ initColor d "#888888"
textcolor <- io $ initColor d "#000000"
bgcolor <- io $ initColor d "#000000"
let ws = W.integrate s
ts = gentabs x y wid (length ws) ts = gentabs x y wid (length ws)
tws = zip ts ws tws = zip ts ws
maketab (t,w) = newDecoration w t 1 0x000000 0x777777 (drawtab t w) (focus w) maketab (t,w) = newDecoration w t 1 bgcolor activecolor (drawtab t w) (focus w)
drawtab r@(Rectangle _ _ wt ht) w d w' gc = drawtab r@(Rectangle _ _ wt ht) w d w' gc =
do nw <- getName w do nw <- getName w
tabcolor <- (maybe 0x888888 (\focusw -> if focusw == w then 0xBBBBBB else 0x888888) . W.peek) `liftM` gets windowset tabcolor <- (maybe inactivecolor (\focusw -> if focusw == w then activecolor else inactivecolor) . W.peek) `liftM` gets windowset
io $ setForeground d gc tabcolor io $ setForeground d gc tabcolor
io $ fillRectangles d w' gc [Rectangle 0 0 wt ht] io $ fillRectangles d w' gc [Rectangle 0 0 wt ht]
io $ setForeground d gc 0x000000 io $ setForeground d gc textcolor
centerText d w' gc r (show nw) centerText d w' gc r (show nw)
centerText d w' gc (Rectangle _ _ wt ht) name = centerText d w' gc (Rectangle _ _ wt ht) name =
do font <- io (fontFromGC d gc >>= queryFont d) do font <- io (fontFromGC d gc >>= queryFont d)