Commit upstream/0.23.1 - xmobar

+16

-0

news.md less more

0	0	% xmobar - Release notes
	1
	2	## Version 0.23.1 (Apr 14, 2015)
	3
	4	_Bug fixes_
	5
	6	- Vertical alignment for icons, [issue #216]
	7	- Improvements to vertical text alignment, with many thanks to Jan
	8	Palus (see ongoing discussion in [issue #221]).
	9	- Better error handling in `Volume` monitor, [issue #215]
	10	- Compilation with ghc 7.8 and 7.10 (thanks to Edward Tjörnhammar,
	11	see [issue #225]).
	12
	13	[issue #225]: https://github.com/jaor/xmobar/issues/225
	14	[issue #221]: https://github.com/jaor/xmobar/issues/221
	15	[issue #216]: https://github.com/jaor/xmobar/issues/216
	16	[issue #215]: https://github.com/jaor/xmobar/issues/215
1	17
2	18	## Version 0.23 (Mar 8, 2015)
3	19

+12

-12

readme.md less more

9	9	features, like dynamic color management, icons, output templates, and
10	10	extensibility through plugins.
11	11
12		This page documents xmobar 0.23 (see [release notes]).
	12	This page documents xmobar 0.23.1 (see [release notes]).
13	13
14	14	[This screenshot] shows xmobar running under [sawfish], with
15	15	antialiased fonts. And [this one] is my desktop with [xmonad] and two

197	197	- `<fc=#FF0000>string</fc>` will print `string` with `#FF0000` color
198	198	(red).
199	199
200		- `<fn=1>string</fn>` will print `string` with the first font from `additionalFonts`.
201		The index `0` corresponds to the standard font.
	200	- `<fn=1>string</fn>` will print `string` with the first font from
	201	`additionalFonts`. The index `0` corresponds to the standard font.
202	202
203	203	- `<icon=/path/to/icon.xbm/>` will insert the given bitmap. XPM image
204	204	format is also supported when compiled with `--flags="with_xpm"`.
205	205
206		- ```<action=`command` button=12345>``` will execute given command when
207		clicked with specified buttons. If not specified, button is equal to 1
208		(left mouse button). Using old syntax (without backticks surrounding `command`)
209		will result in `button` attribute being ignored.
	206	- ```<action=`command` button=12345>``` will execute given command
	207	when clicked with specified buttons. If not specified, button is
	208	equal to 1 (left mouse button). Using old syntax (without backticks
	209	surrounding `command`) will result in `button` attribute being
	210	ignored.
210	211
211	212	- `<raw=len:str/>` allows the encapsulation of arbitrary text `str` (which
212	213	must be `len` `Char`s long, where `len` is encoded as a decimal sequence).

218	219
219	220	and receives on standard input the line
220	221
221		```<action=`echo test` button=1><raw=41:<action=`echo mooo`
222		button=1>foo</action>/></action>```
	222	```<action=`echo test` button=1><raw=41:<action=`echo mooo` button=1>foo</action>/></action>```
223	223
224	224	then it will display the text ```<action=`echo mooo` button=1>foo</action>```,
225	225	which, when clicked, will cause `test` to be echoed.

1526	1526	Perner, Jens Petersen, Alexander Polakov, Petr Rockai, Andrew
1527	1527	Sackville-West, Markus Scherer, Alexander Shabalin, Peter Simons,
1528	1528	Alexander Solovyov, John Soros, Travis Staton, Artem Tarasov, Samuli
1529		Thomasson, Sergei Trofimovich, Thomas Tuegel, Jan Vornberger, Anton
1530		Vorontsov, Daniel Wagner, Phil Xiaojun Hu, Edward Z. Yang and Norbert
1531		Zeh.
	1529	Thomasson, Edward Tjörnhammar, Sergei Trofimovich, Thomas Tuegel, Jan
	1530	Vornberger, Anton Vorontsov, Daniel Wagner, Phil Xiaojun Hu, Edward
	1531	Z. Yang and Norbert Zeh.
1532	1532
1533	1533	[jao]: http://jao.io
1534	1534	[incorporates patches]: http://www.ohloh.net/p/xmobar/contributors

+2

-2

src/Bitmap.hs less more

1	1	-----------------------------------------------------------------------------
2	2	-- \|
3	3	-- Module : Bitmap
4		-- Copyright : (C) 2013 Alexander Polakov
	4	-- Copyright : (C) 2013, 2015 Alexander Polakov
5	5	-- License : BSD3
6	6	--
7	7	-- Maintainer : jao@gnu.org

15	15	, drawBitmap
16	16	, Bitmap(..)) where
17	17
18		import Control.Applicative((<\|>))
19	18	import Control.Monad
20	19	import Control.Monad.Trans(MonadIO(..))
21	20	import Data.Map hiding (foldr, map, filter)

29	28
30	29	#ifdef XPM
31	30	import XPMFile(readXPMFile)
	31	import Control.Applicative((<\|>))
32	32	#endif
33	33
34	34	#if MIN_VERSION_mtl(2, 2, 1)

+4

-0

src/Localize.hsc less more

18	18	) where
19	19
20	20	import Foreign.C
	21	#if ! MIN_VERSION_time(1,5,0)
21	22	import qualified System.Locale as L
	23	#else
	24	import qualified Data.Time.Format as L
	25	#endif
22	26
23	27	#ifdef UTF8
24	28	import Codec.Binary.UTF8.String

+3

-0

src/Plugins/Date.hs less more

	0	{-# LANGUAGE CPP #-}
0	1	-----------------------------------------------------------------------------
1	2	-- \|
2	3	-- Module : Plugins.Date

19	20
20	21	import Plugins
21	22
	23	#if ! MIN_VERSION_time(1,5,0)
22	24	import System.Locale
	25	#endif
23	26	import Control.Monad (liftM)
24	27	import Data.Time
25	28

+3

-1

src/Plugins/DateZone.hs less more

30	30	import System.IO.Unsafe
31	31
32	32	import Localize
	33	import Data.Time.Format
33	34	import Data.Time.LocalTime
34		import Data.Time.Format
35	35	import Data.Time.LocalTime.TimeZone.Olson
36	36	import Data.Time.LocalTime.TimeZone.Series
37	37
	38	#if ! MIN_VERSION_time(1,5,0)
38	39	import System.Locale (TimeLocale)
	40	#endif
39	41	#else
40	42	import System.IO
41	43	import Plugins.Date

+3

-2

src/Plugins/EWMH.hs less more

0	0	{-# OPTIONS_GHC -w #-}
1		{-# LANGUAGE CPP, NamedFieldPuns, GeneralizedNewtypeDeriving #-}
	1	{-# LANGUAGE CPP, NamedFieldPuns, GeneralizedNewtypeDeriving, FlexibleContexts #-}
2	2
3	3	-----------------------------------------------------------------------------
4	4	-- \|

16	16
17	17	module Plugins.EWMH (EWMH(..)) where
18	18
	19	import Control.Applicative (Applicative(..))
19	20	import Control.Monad.State
20	21	import Control.Monad.Reader
21	22	import Graphics.X11 hiding (Modifier, Color)

175	176	, ("_NET_WM_DESKTOP", updateDesktop) ]
176	177
177	178	newtype M a = M (ReaderT EwmhConf (StateT EwmhState IO) a)
178		deriving (Monad, Functor, MonadIO, MonadReader EwmhConf, MonadState EwmhState)
	179	deriving (Monad, Functor, Applicative, MonadIO, MonadReader EwmhConf, MonadState EwmhState)
179	180
180	181	execM :: M a -> IO a
181	182	execM (M m) = do

+17

-12

src/Plugins/Monitors/Volume.hs less more

0	0	-----------------------------------------------------------------------------
1	1	-- \|
2	2	-- Module : Plugins.Monitors.Volume
3		-- Copyright : (c) 2011, 2013 Thomas Tuegel
	3	-- Copyright : (c) 2011, 2013, 2015 Thomas Tuegel
4	4	-- License : BSD-style (see LICENSE)
5	5	--
6	6	-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org>

121	121	runVolume :: String -> String -> [String] -> Monitor String
122	122	runVolume mixerName controlName argv = do
123	123	opts <- io $ parseOpts argv
124		(lo, hi, val, db, sw) <- io $ withMixer mixerName $ \mixer -> do
125		control <- getControlByName mixer controlName
126		(lo, hi) <- liftMaybe $ getRange <$> volumeControl control
127		val <- getVal $ volumeControl control
128		db <- getDB $ volumeControl control
129		sw <- getSw $ switchControl control
130		return (lo, hi, val, db, sw)
	124	(lo, hi, val, db, sw) <- io readMixer
131	125	p <- liftMonitor $ liftM3 formatVol lo hi val
132	126	b <- liftMonitor $ liftM3 formatVolBar lo hi val
133	127	v <- liftMonitor $ liftM3 formatVolVBar lo hi val

137	131	parseTemplate [p, b, v, d, s, ipat]
138	132
139	133	where
	134
	135	readMixer =
	136	AE.catch (withMixer mixerName $ \mixer -> do
	137	control <- getControlByName mixer controlName
	138	(lo, hi) <- liftMaybe $ getRange <$> volumeControl control
	139	val <- getVal $ volumeControl control
	140	db <- getDB $ volumeControl control
	141	sw <- getSw $ switchControl control
	142	return (lo, hi, val, db, sw))
	143	(const $ return (Nothing, Nothing, Nothing, Nothing, Nothing))
140	144
141	145	volumeControl :: Maybe Control -> Maybe Volume
142	146	volumeControl c = join $

153	157	liftMonitor Nothing = unavailable
154	158	liftMonitor (Just m) = m
155	159
	160	channel v r = AE.catch (getChannel FrontLeft v) (const $ return $ Just r)
	161
156	162	getDB :: Maybe Volume -> IO (Maybe Integer)
157	163	getDB Nothing = return Nothing
158		getDB (Just v) = AE.catch (getChannel FrontLeft $ dB v)
159		(const $ return $ Just 0)
	164	getDB (Just v) = channel (dB v) 0
160	165
161	166	getVal :: Maybe Volume -> IO (Maybe Integer)
162	167	getVal Nothing = return Nothing
163		getVal (Just v) = getChannel FrontLeft $ value v
	168	getVal (Just v) = channel (value v) 0
164	169
165	170	getSw :: Maybe Switch -> IO (Maybe Bool)
166	171	getSw Nothing = return Nothing
167		getSw (Just s) = getChannel FrontLeft s
	172	getSw (Just s) = channel s False
168	173
169	174	getFormatDB :: VolumeOpts -> Maybe Integer -> Monitor String
170	175	getFormatDB _ Nothing = unavailable

+8

-6

src/Window.hs less more

0	0	-----------------------------------------------------------------------------
1	1	-- \|
2	2	-- Module : Window
3		-- Copyright : (c) 2011-14 Jose A. Ortega Ruiz
	3	-- Copyright : (c) 2011-15 Jose A. Ortega Ruiz
4	4	-- : (c) 2012 Jochen Keil
5	5	-- License : BSD-style (see LICENSE)
6	6	--

170	170	TopB -> drawBorder (TopBM 0) lw d p gc c wi ht
171	171	BottomB -> drawBorder (BottomBM 0) lw d p gc c wi ht
172	172	FullB -> drawBorder (FullBM 0) lw d p gc c wi ht
173		TopBM m -> sf >> sla >> drawLine d p gc 0 (fi m + boff) (fi wi) (fi m + boff)
	173	TopBM m -> sf >> sla >>
	174	drawLine d p gc 0 (fi m + boff) (fi wi) (fi m + boff)
174	175	BottomBM m -> let rw = fi ht - fi m + boff in
175	176	sf >> sla >> drawLine d p gc 0 rw (fi wi) rw
176		FullBM m -> let pad = 2 * fi m + 2 * fi boff'; mp = fi m + fi boff' in
177		sf >> sla >> drawRectangle d p gc mp mp (wi - pad) (ht - pad)
	177	FullBM m -> let mp = fi m
	178	pad = 2 * fi mp + fi lw
	179	in sf >> sla >>
	180	drawRectangle d p gc mp mp (wi - pad + 1) (ht - pad)
178	181	where sf = setForeground d gc c
179	182	sla = setLineAttributes d gc (fi lw) lineSolid capNotLast joinMiter
180	183	boff = borderOffset b lw
181		boff' = calcBorderOffset lw :: Int
	184	-- boff' = calcBorderOffset lw :: Int
182	185
183	186	hideWindow :: Display -> Window -> IO ()
184	187	hideWindow d w = do

208	211	calcBorderOffset :: (Integral a) => Int -> a
209	212	calcBorderOffset = ceiling . (/2) . toDouble
210	213	where toDouble = fi :: (Integral a) => a -> Double
211

+2

-3

src/XUtil.hsc less more

183	183	when (al == 255) $ do
184	184	(a,d) <- textExtents fs s
185	185	gi <- xftTxtExtents' dpy fonts s
186		drawXftRect draw bc' (x + 1 - fi (xglyphinfo_x gi))
187		(y - (a + d) + 1) (xglyphinfo_xOff gi) (a + d)
188		(drawXftString' draw fc' fonts (toInteger x) (toInteger (y - 2)) s)
	186	drawXftRect draw bc' x (y - a + 1) (xglyphinfo_xOff gi) (a + d + 1)
	187	drawXftString' draw fc' fonts (toInteger x) (toInteger y) s
189	188	#endif
190	189
191	190

+8

-11

src/Xmobar.hs less more

201	201	eventLoop tv xc as signal
202	202
203	203	reposWindow rcfg = do
204		r' <- repositionWin d w (fs!!0) rcfg
	204	r' <- repositionWin d w (head fs) rcfg
205	205	eventLoop tv (XConf d r' w fs is rcfg) as signal
206	206
207	207	updateConfigPosition ocfg =

305	305	printStrings p gc fs 1 L =<< strLn left
306	306	printStrings p gc fs 1 R =<< strLn right
307	307	printStrings p gc fs 1 C =<< strLn center
308		-- draw 1 pixel border if requested
	308	-- draw border if requested
309	309	io $ drawBorder (border c) (borderWidth c) d p gc bdcolor wid ht
310	310	-- copy the pixmap with the new string to the window
311	311	io $ copyArea d p w gc 0 0 wid ht 0 0

315	315	-- resync
316	316	io $ sync d True
317	317
318		verticalOffset :: (Integral b, Integral a, MonadIO m) =>
319		a -> Widget -> XFont -> Config -> m b
	318	verticalOffset :: (Integral b, Integral a, MonadIO m) =>
	319	a -> Widget -> XFont -> Config -> m b
320	320	verticalOffset ht (Text t) fontst conf
321	321	\| textOffset conf > -1 = return $ fi (textOffset conf)
322	322	\| otherwise = do
323	323	(as,ds) <- io $ textExtents fontst t
324		let bwidth = borderOffset (border conf) (borderWidth conf)
325		verticalMargin = fi ht - fi (as + ds) - 2 * fi (abs bwidth)
326		return $ fi ht - fi ds - (verticalMargin `div` 2) + bwidth + 1
327		verticalOffset _ (Icon _) _ conf
	324	let margin = (fi ht - fi ds - fi as) `div` 2
	325	return $ fi as + margin - 1
	326	verticalOffset ht (Icon _) _ conf
328	327	\| iconOffset conf > -1 = return $ fi (iconOffset conf)
329		\| otherwise = do
330		let bwidth = borderOffset (border conf) (borderWidth conf)
331		return $ bwidth + 1
	328	\| otherwise = return $ fi (ht `div` 2) - 1
332	329
333	330	-- \| An easy way to print the stuff we need to print
334	331	printStrings :: Drawable -> GC -> [XFont] -> Position

+3

-3

xmobar.cabal less more

0	0	name: xmobar
1		version: 0.23
	1	version: 0.23.1
2	2	homepage: http://xmobar.org
3	3	synopsis: A Minimalistic Text Based Status Bar
4	4	description: Xmobar is a minimalistic text based status bar.

127	127	cpp-options: -DGHC6
128	128
129	129	if flag(with_xft) \|\| flag(all_extensions)
130		build-depends: utf8-string == 0.3.*, X11-xft >= 0.2 && < 0.4
	130	build-depends: utf8-string >= 0.3 && < 1.1, X11-xft >= 0.2 && < 0.4
131	131	other-modules: MinXft
132	132	cpp-options: -DXFT
133	133
134	134	if flag(with_utf8) \|\| flag(all_extensions)
135		build-depends: utf8-string == 0.3.*
	135	build-depends: utf8-string >= 0.3 && < 1.1
136	136	cpp-options: -DUTF8
137	137
138	138	if flag(with_inotify) \|\| flag(all_extensions)