This updates xmobar to version 0.11.1.
I also implemented the Battery monitor for OpenBSD. In contrast to the
upstream version this also lets you see your battery life in terms of
minutes left, as illustrated in the sample config file.
No other Monitor module has been ported yet.
New files in this diff:
files/Batt.hs
files/Binding.hsc
files/apm.c
files/apm.h
patches/patch-StatFS_hsc
patches/patch-xmobar_cabal
Best regards,
Jona
--
Worse is better
Richard P. Gabriel
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/xmobar/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 30 Jun 2010 15:41:02 -0000 1.3
+++ Makefile 12 Jul 2010 14:19:37 -0000
@@ -2,8 +2,7 @@
COMMENT = minimalistic text based status bar
-DISTNAME = xmobar-0.9.2
-PKGNAME = ${DISTNAME}p1
+DISTNAME = xmobar-0.11.1
CATEGORIES = x11
HOMEPAGE = http://code.haskell.org/~arossato/xmobar/
@@ -29,6 +28,13 @@ BUILD_DEPENDS = :hs-X11->=1.3.0:x11/hs-
USE_X11 = Yes
EXAMPLEDIR = ${PREFIX}/share/examples/xmobar
+
+post-patch:
+ @cp ${FILESDIR}/Batt.hs ${WRKBUILD}/Plugins/Monitors
+ @mkdir ${WRKBUILD}/Plugins/Monitors/Batt
+ @cp ${FILESDIR}/Binding.hsc ${WRKBUILD}/Plugins/Monitors/Batt
+ @cp ${FILESDIR}/apm.c ${WRKBUILD}/Plugins/Monitors/Batt
+ @cp ${FILESDIR}/apm.h ${WRKBUILD}/Plugins/Monitors/Batt
post-install:
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/xmobar/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 10 May 2010 08:07:06 -0000 1.1.1.1
+++ distinfo 12 Jul 2010 14:19:37 -0000
@@ -1,5 +1,5 @@
-MD5 (xmobar-0.9.2.tar.gz) = EXfu+fAyJWzPNwI5oHA+qw==
-RMD160 (xmobar-0.9.2.tar.gz) = /+AAqTsY6fdjjgmgaSSzRkC6/Mo=
-SHA1 (xmobar-0.9.2.tar.gz) = r1fCDSWxdHFXKd2blzvxkhPwB9c=
-SHA256 (xmobar-0.9.2.tar.gz) = NhKV9dyRJRKi62ROzTMVYqJxJDGSvmIVywceRPUMfGY=
-SIZE (xmobar-0.9.2.tar.gz) = 29334
+MD5 (xmobar-0.11.1.tar.gz) = dm/lBJCThGKDIft0cv22IQ==
+RMD160 (xmobar-0.11.1.tar.gz) = pu3ektCASdWtDq8JOJnXVnPljYs=
+SHA1 (xmobar-0.11.1.tar.gz) = O5oSpOA/W2F026cyNvhUaNnJzBs=
+SHA256 (xmobar-0.11.1.tar.gz) = dTt1W5aFIAi7v4x5kz2eu4dVS/flYoiOjW+1uDIKanM=
+SIZE (xmobar-0.11.1.tar.gz) = 45872
Index: files/Batt.hs
===================================================================
RCS file: files/Batt.hs
diff -N files/Batt.hs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/Batt.hs 12 Jul 2010 14:19:37 -0000
@@ -0,0 +1,46 @@
+module Plugins.Monitors.Batt where
+
+import Control.Monad
+
+import Plugins.Monitors.Common
+import Plugins.Monitors.Batt.Binding
+
+battConfig :: IO MConfig
+battConfig = mkMConfig
+ "Batt: <left>" -- default template
+ ["left", "leftbar", "minleft", "status"] -- progress bar, percent left,
minutes left, status
+
+runBatt :: [String] -> Monitor String
+runBatt _ = do
+ mpowerinfo <- io getApmPowerInfo
+ case mpowerinfo of
+ Nothing -> parseTemplate $ take 4 $ repeat "N/A"
+ Just powerinfo -> do
+ left <- renderLeft powerinfo
+ leftbar <- renderLeftBar powerinfo
+ minleft <- renderMinLeft powerinfo
+ status <- renderStatus powerinfo
+ parseTemplate ( left : leftbar : minleft : status : [] )
+
+renderLeft :: ApmPowerInfo -> Monitor String
+renderLeft powerinfo = case (apmBatteryState powerinfo) of
+ BatAbsent -> return []
+ BatUnknown -> return []
+ _ -> return $ (show $ apmBatteryPercent powerinfo) ++ "%"
+
+renderLeftBar :: ApmPowerInfo -> Monitor String
+renderLeftBar powerinfo = case (apmBatteryState powerinfo) of
+ BatAbsent -> render 0
+ BatUnknown -> render 0
+ _ -> render $ fromIntegral (apmBatteryPercent powerinfo)
+ where
+ render x = showPercentBar x (x / 100)
+
+renderMinLeft :: ApmPowerInfo -> Monitor String
+renderMinLeft powerinfo = case (apmAcState powerinfo) of
+ AcOnline -> return []
+ AcUnknown -> return []
+ _ -> return $ (show $ apmMinutesLeft powerinfo) ++ "min"
+
+renderStatus :: ApmPowerInfo -> Monitor String
+renderStatus powerinfo = return.show $ apmAcState powerinfo
Index: files/Binding.hsc
===================================================================
RCS file: files/Binding.hsc
diff -N files/Binding.hsc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/Binding.hsc 12 Jul 2010 14:19:37 -0000
@@ -0,0 +1,70 @@
+{-# LANGUAGE CPP, ForeignFunctionInterface #-}
+
+module Plugins.Monitors.Batt.Binding (
+ getApmPowerInfo,
+ ApmPowerInfo (..),
+ AcState (..), BatteryState(..)
+) where
+
+import Foreign
+import Foreign.C
+
+#include <machine/apmvar.h>
+type CApmPowerInfo = ()
+foreign import ccall "apm.h get_power_info"
+ c_getPowerInfo :: Ptr CApmPowerInfo -> IO CInt
+
+data BatteryState = BatHigh | BatLow | BatCritical | BatCharging | BatAbsent |
BatUnknown
+ deriving (Show,Eq)
+
+data AcState = AcOnline | AcOffline | AcBackup | AcUnknown
+ deriving (Eq)
+
+instance Show AcState where
+ show AcOnline = "online"
+ show AcOffline = "offline"
+ show AcBackup = "backup"
+ show AcUnknown = "unknown"
+
+data ApmPowerInfo = ApmPowerInfo {
+ apmBatteryState :: BatteryState,
+ apmAcState :: AcState,
+ apmBatteryPercent :: Int,
+ apmMinutesLeft :: Int
+} deriving (Show, Eq)
+
+getApmPowerInfo :: IO (Maybe ApmPowerInfo)
+getApmPowerInfo =
+ allocaBytes (#size struct apm_power_info) $ \powerinfo -> do
+ res <- c_getPowerInfo powerinfo
+ if res == -1 then return Nothing
+ else do
+ bstate <- (#peek struct apm_power_info, battery_state) powerinfo
+ acstate <- (#peek struct apm_power_info, ac_state) powerinfo
+ blife <- (#peek struct apm_power_info, battery_life) powerinfo
+ minleft <- (#peek struct apm_power_info, minutes_left) powerinfo
+ return $ Just ApmPowerInfo
+ {
+ apmBatteryState = transBatState (bstate :: CUChar),
+ apmAcState = transAcState (acstate :: CUChar),
+ apmBatteryPercent = fromIntegral (blife :: CUChar),
+ apmMinutesLeft = fromIntegral (minleft :: CUInt)
+ }
+
+transBatState :: Integral a => a -> BatteryState
+transBatState s = case s of
+ (#const APM_BATT_HIGH) -> BatHigh
+ (#const APM_BATT_LOW) -> BatLow
+ (#const APM_BATT_CRITICAL) -> BatCritical
+ (#const APM_BATT_CHARGING) -> BatCharging
+ (#const APM_BATTERY_ABSENT) -> BatAbsent
+ _ -> BatUnknown
+
+transAcState :: Integral a => a -> AcState
+transAcState s = case s of
+ (#const APM_AC_ON) -> AcOnline
+ (#const APM_AC_OFF) -> AcOffline
+ (#const APM_AC_BACKUP) -> AcBackup
+ _ -> AcUnknown
+
+{- vim: set filetype=haskell : -}
Index: files/apm.c
===================================================================
RCS file: files/apm.c
diff -N files/apm.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/apm.c 12 Jul 2010 14:19:37 -0000
@@ -0,0 +1,27 @@
+#include "apm.h"
+
+int get_power_info(struct apm_power_info *power_info)
+{
+ int fd, ret;
+
+ fd = open(APMDEV, O_RDONLY, 0);
+ if(fd == -1)
+ {
+ warn("Could not open " APMDEV);
+ goto ERR;
+ }
+
+ ret = ioctl(fd, APM_IOC_GETPOWER, power_info);
+ if(ret == -1)
+ {
+ warn("Could not ioctl " APMDEV);
+ goto ERR;
+ }
+
+ close(fd);
+ return 0;
+
+ ERR:
+ close(fd);
+ return -1;
+}
Index: files/apm.h
===================================================================
RCS file: files/apm.h
diff -N files/apm.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/apm.h 12 Jul 2010 14:19:37 -0000
@@ -0,0 +1,14 @@
+#ifndef _CBATT_H_
+#define _CBATT_H_
+
+#include <err.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <machine/apmvar.h>
+
+#define APMDEV "/dev/apm"
+
+int get_power_info(struct apm_power_info *power_info);
+
+#endif /* _CBATT_H_ */
Index: patches/patch-Plugins_Monitors_hs
===================================================================
RCS file: /cvs/ports/x11/xmobar/patches/patch-Plugins_Monitors_hs,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Plugins_Monitors_hs
--- patches/patch-Plugins_Monitors_hs 10 May 2010 08:07:06 -0000 1.1.1.1
+++ patches/patch-Plugins_Monitors_hs 12 Jul 2010 14:19:37 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Plugins_Monitors_hs,v 1.1.1.1 2010/05/10 08:07:06 dcoppa Exp $
---- Plugins/Monitors.hs.orig Wed Apr 28 23:59:48 2010
-+++ Plugins/Monitors.hs Thu Apr 29 00:00:33 2010
-@@ -18,25 +18,25 @@ import Plugins
+$OpenBSD$
+--- Plugins/Monitors.hs.orig Tue Jul 6 13:08:05 2010
++++ Plugins/Monitors.hs Tue Jul 6 13:09:37 2010
+@@ -20,17 +20,17 @@ import Plugins
import Plugins.Monitors.Common ( runM )
import Plugins.Monitors.Weather
@@ -9,42 +9,61 @@ $OpenBSD: patch-Plugins_Monitors_hs,v 1.
-import Plugins.Monitors.Mem
-import Plugins.Monitors.Swap
-import Plugins.Monitors.Cpu
--import Plugins.Monitors.Batt
--import Plugins.Monitors.Thermal
--import Plugins.Monitors.CpuFreq
--import Plugins.Monitors.CoreTemp
+-import Plugins.Monitors.MultiCpu
+--import Plugins.Monitors.Net
+--import Plugins.Monitors.Mem
+--import Plugins.Monitors.Swap
+--import Plugins.Monitors.Cpu
-+--import Plugins.Monitors.Batt
++--import Plugins.Monitors.MultiCpu
+ import Plugins.Monitors.Batt
+-import Plugins.Monitors.Thermal
+-import Plugins.Monitors.CpuFreq
+-import Plugins.Monitors.CoreTemp
+-import Plugins.Monitors.Disk
+-import Plugins.Monitors.Top
+--import Plugins.Monitors.Thermal
+--import Plugins.Monitors.CpuFreq
+--import Plugins.Monitors.CoreTemp
++--import Plugins.Monitors.Disk
++--import Plugins.Monitors.Top
+ #ifdef IWLIB
+ import Plugins.Monitors.Wireless
+ #endif
+@@ -39,20 +39,20 @@ import Plugins.Monitors.MPD
+ #endif
- data Monitors = Weather Station Args Rate
-- | Network Interface Args Rate
-- | Memory Args Rate
-- | Swap Args Rate
-- | Cpu Args Rate
-- | Battery Args Rate
-- | BatteryP [String] Args Rate
-- | Thermal Zone Args Rate
-- | CpuFreq Args Rate
-- | CoreTemp Args Rate
-+-- | Network Interface Args Rate
-+-- | Memory Args Rate
-+-- | Swap Args Rate
-+-- | Cpu Args Rate
-+-- | Battery Args Rate
-+-- | BatteryP [String] Args Rate
-+-- | Thermal Zone Args Rate
-+-- | CpuFreq Args Rate
-+-- | CoreTemp Args Rate
- deriving (Show,Read,Eq)
-
- type Args = [String]
-@@ -49,22 +49,22 @@ type Rate = Int
+ data Monitors = Weather Station Args Rate
+- | Network Interface Args Rate
+- | Memory Args Rate
+- | Swap Args Rate
+- | Cpu Args Rate
+- | MultiCpu Args Rate
++-- | Network Interface Args Rate
++-- | Memory Args Rate
++-- | Swap Args Rate
++-- | Cpu Args Rate
++-- | MultiCpu Args Rate
+ | Battery Args Rate
+- | BatteryP [String] Args Rate
+- | DiskU DiskSpec Args Rate
+- | DiskIO DiskSpec Args Rate
+- | Thermal Zone Args Rate
+- | CpuFreq Args Rate
+- | CoreTemp Args Rate
+- | TopProc Args Rate
+- | TopMem Args Rate
++-- | BatteryP [String] Args Rate
++-- | DiskU DiskSpec Args Rate
++-- | DiskIO DiskSpec Args Rate
++-- | Thermal Zone Args Rate
++-- | CpuFreq Args Rate
++-- | CoreTemp Args Rate
++-- | TopProc Args Rate
++-- | TopMem Args Rate
+ #ifdef IWLIB
+ | Wireless Interface Args Rate
+ #endif
+@@ -72,20 +72,20 @@ type DiskSpec = [(String, String)]
instance Exec Monitors where
alias (Weather s _ _) = s
@@ -53,35 +72,62 @@ $OpenBSD: patch-Plugins_Monitors_hs,v 1.
- alias (Memory _ _) = "memory"
- alias (Swap _ _) = "swap"
- alias (Cpu _ _) = "cpu"
-- alias (Battery _ _) = "battery"
-- alias (BatteryP _ _ _)= "battery"
-- alias (CpuFreq _ _) = "cpufreq"
-- alias (CoreTemp _ _) = "coretemp"
+- alias (MultiCpu _ _) = "multicpu"
+-- alias (Network i _ _) = i
+-- alias (Thermal z _ _) = z
+-- alias (Memory _ _) = "memory"
+-- alias (Swap _ _) = "swap"
+-- alias (Cpu _ _) = "cpu"
-+-- alias (Battery _ _) = "battery"
++-- alias (MultiCpu _ _) = "multicpu"
+ alias (Battery _ _) = "battery"
+- alias (BatteryP _ _ _)= "battery"
+- alias (CpuFreq _ _) = "cpufreq"
+- alias (TopProc _ _) = "top"
+- alias (TopMem _ _) = "topmem"
+- alias (CoreTemp _ _) = "coretemp"
+- alias (DiskU _ _ _) = "disku"
+- alias (DiskIO _ _ _) = "diskio"
+-- alias (BatteryP _ _ _)= "battery"
+-- alias (CpuFreq _ _) = "cpufreq"
++-- alias (TopProc _ _) = "top"
++-- alias (TopMem _ _) = "topmem"
+-- alias (CoreTemp _ _) = "coretemp"
- start (Weather s a r) = runM (a ++ [s]) weatherConfig runWeather r
-- start (Network i a r) = runM (a ++ [i]) netConfig runNet r
-- start (Thermal z a r) = runM (a ++ [z]) thermalConfig runThermal r
-- start (Memory a r) = runM a memConfig runMem r
-- start (Swap a r) = runM a swapConfig runSwap r
-- start (Cpu a r) = runM a cpuConfig runCpu r
-- start (Battery a r) = runM a battConfig runBatt r
-- start (BatteryP s a r) = runM a battConfig (runBatt' s) r
-- start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r
-- start (CoreTemp a r) = runM a coreTempConfig runCoreTemp r
-+-- start (Network i a r) = runM (a ++ [i]) netConfig runNet r
-+-- start (Thermal z a r) = runM (a ++ [z]) thermalConfig runThermal r
-+-- start (Memory a r) = runM a memConfig runMem r
-+-- start (Swap a r) = runM a swapConfig runSwap r
-+-- start (Cpu a r) = runM a cpuConfig runCpu r
-+-- start (Battery a r) = runM a battConfig runBatt r
-+-- start (BatteryP s a r) = runM a battConfig (runBatt' s) r
-+-- start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r
-+-- start (CoreTemp a r) = runM a coreTempConfig runCoreTemp r
++-- alias (DiskU _ _ _) = "disku"
++-- alias (DiskIO _ _ _) = "diskio"
+ #ifdef IWLIB
+ alias (Wireless i _ _) = i ++ "wi"
+ #endif
+@@ -93,20 +93,20 @@ instance Exec Monitors where
+ alias (MPD _ _) = "mpd"
+ #endif
+ start (Weather s a r) = runM (a ++ [s]) weatherConfig runWeather r
+- start (Network i a r) = runM (a ++ [i]) netConfig runNet r
+- start (Thermal z a r) = runM (a ++ [z]) thermalConfig runThermal r
+- start (Memory a r) = runM a memConfig runMem r
+- start (Swap a r) = runM a swapConfig runSwap r
+- start (Cpu a r) = runM a cpuConfig runCpu r
+- start (MultiCpu a r) = runM a multiCpuConfig runMultiCpu r
++-- start (Network i a r) = runM (a ++ [i]) netConfig runNet r
++-- start (Thermal z a r) = runM (a ++ [z]) thermalConfig runThermal r
++-- start (Memory a r) = runM a memConfig runMem r
++-- start (Swap a r) = runM a swapConfig runSwap r
++-- start (Cpu a r) = runM a cpuConfig runCpu r
++-- start (MultiCpu a r) = runM a multiCpuConfig runMultiCpu r
+ start (Battery a r) = runM a battConfig runBatt r
+- start (BatteryP s a r) = runM a battConfig (runBatt' s) r
+- start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r
+- start (CoreTemp a r) = runM a coreTempConfig runCoreTemp r
+- start (DiskU s a r) = runM a diskUConfig (runDiskU s) r
+- start (DiskIO s a r) = runM a diskIOConfig (runDiskIO s) r
+- start (TopMem a r) = runM a topMemConfig runTopMem r
+- start (TopProc a r) = startTop a r
++-- start (BatteryP s a r) = runM a battConfig (runBatt' s) r
++-- start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r
++-- start (CoreTemp a r) = runM a coreTempConfig runCoreTemp r
++-- start (DiskU s a r) = runM a diskUConfig (runDiskU s) r
++-- start (DiskIO s a r) = runM a diskIOConfig (runDiskIO s) r
++-- start (TopMem a r) = runM a topMemConfig runTopMem r
++-- start (TopProc a r) = startTop a r
+ #ifdef IWLIB
+ start (Wireless i a r) = runM (a ++ [i]) wirelessConfig runWireless r
+ #endif
Index: patches/patch-StatFS_hsc
===================================================================
RCS file: patches/patch-StatFS_hsc
diff -N patches/patch-StatFS_hsc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-StatFS_hsc 12 Jul 2010 14:19:37 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- StatFS.hsc.orig Mon May 17 12:17:50 2010
++++ StatFS.hsc Tue Jul 6 12:29:51 2010
+@@ -23,8 +23,11 @@ import Foreign.C.String
+ import Data.ByteString (useAsCString)
+ import Data.ByteString.Char8 (pack)
+
+-#if defined (__FreeBSD__)
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
+ # include <sys/param.h>
++#endif
++
++#if defined (BSD4_4)
+ # include <sys/mount.h>
+ #else
+ #include <sys/vfs.h>
+@@ -47,7 +50,7 @@ data FileSystemStats = FileSystemStats {
+
+ data CStatfs
+
+-#if defined(__FreeBSD__)
++#if defined(BSD4_4)
+ foreign import ccall unsafe "sys/mount.h statfs"
+ #else
+ foreign import ccall unsafe "sys/vfs.h statfs64"
Index: patches/patch-xmobar_cabal
===================================================================
RCS file: patches/patch-xmobar_cabal
diff -N patches/patch-xmobar_cabal
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-xmobar_cabal 12 Jul 2010 14:19:37 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- xmobar.cabal.orig Mon May 17 12:17:50 2010
++++ xmobar.cabal Tue Jul 6 18:56:36 2010
+@@ -15,8 +15,6 @@ maintainer: andrea.ross...@unitn.it
+ cabal-version: >= 1.6
+ build-type: Simple
+
+-data-files: xmobar.config-sample
+-
+ flag small_base
+ description: Choose the new smaller, split-up base package.
+
+@@ -42,8 +40,9 @@ flag with_mpd
+
+ executable xmobar
+ main-is: Main.hs
+- other-modules: Xmobar, Config, Parsers, Commands, XUtil, StatFS,
Runnable, Plugins
++ other-modules: Xmobar, Config, Parsers, Commands, XUtil, StatFS,
Runnable, Plugins, Plugins.Monitors.Batt.Binding
+ ghc-prof-options: -prof -auto-all
++ c-sources: Plugins/Monitors/Batt/apm.c
+
+ if true
+ ghc-options: -funbox-strict-fields -Wall
Index: patches/patch-xmobar_config-sample
===================================================================
RCS file: /cvs/ports/x11/xmobar/patches/patch-xmobar_config-sample,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-xmobar_config-sample
--- patches/patch-xmobar_config-sample 10 May 2010 08:07:06 -0000 1.1.1.1
+++ patches/patch-xmobar_config-sample 12 Jul 2010 14:19:37 -0000
@@ -1,23 +1,22 @@
-$OpenBSD: patch-xmobar_config-sample,v 1.1.1.1 2010/05/10 08:07:06 dcoppa Exp $
---- xmobar.config-sample.orig Wed Apr 28 23:53:28 2010
-+++ xmobar.config-sample Wed Apr 28 23:57:36 2010
-@@ -3,16 +3,11 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
- , fgColor = "grey"
+$OpenBSD$
+--- xmobar.config-sample.orig Mon May 17 12:17:50 2010
++++ xmobar.config-sample Mon Jul 12 16:03:46 2010
+@@ -4,15 +4,11 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
, position = Top
, lowerOnStart = True
-- , commands = [ Run Weather "EGPF" ["-t","<station>:
<tempC>C","-L","18","-H","25","--normal","green","--high","red","--low","lightblue"]
36000
+ , commands = [ Run Weather "EGPF" ["-t","<station>:
<tempC>C","-L","18","-H","25","--normal","green","--high","red","--low","lightblue"]
36000
- , Run Network "eth0"
["-L","0","-H","32","--normal","green","--high","red"] 10
- , Run Network "eth1"
["-L","0","-H","32","--normal","green","--high","red"] 10
- , Run Cpu
["-L","3","-H","50","--normal","green","--high","red"] 10
- , Run Memory ["-t","Mem: <usedratio>%"] 10
- , Run Swap [] 10
-+ , commands = [ Run Weather "ELLX" ["-t","<station>:
<tempC>C","-L","18","-H","25","--normal","green","--high","red","--low","lightblue"]
36000
, Run Com "uname" ["-s","-r"] "" 36000
- , Run Date "%a %b %_d %Y %H:%M:%S" "date" 10
++ , Run Battery ["-t","Batt: <left> <minleft>"] 10
+ , Run Date "%a %b %_d %Y %H:%M:%S" "date" 10
]
, sepChar = "%"
, alignSep = "}{"
- , template = "%cpu% | %memory% * %swap% | %eth0% - %eth1% }{
<fc=#ee9a00>%date%</fc>| %EGPF% | %uname%"
-+ , template = "%ELLX% }{ <fc=#ee9a00>%date%</fc> | %uname%"
++ , template = "%battery% }{ <fc=#ee9a00>%date%</fc>| %EGPF% | %uname%"
}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/xmobar/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 10 May 2010 08:07:06 -0000 1.1.1.1
+++ pkg/PLIST 12 Jul 2010 14:19:37 -0000
@@ -1,4 +1,4 @@
-...@comment $OpenBSD: PLIST,v 1.1.1.1 2010/05/10 08:07:06 dcoppa Exp $
+...@comment $OpenBSD$
@bin bin/xmobar
@comment share/doc/${DISTNAME}/
@comment share/doc/${DISTNAME}/LICENSE
