From f86bbb8ca5d3ba0d18e333cbe6cb57cc17e3ae07 Mon Sep 17 00:00:00 2001 From: jao Date: Sun, 25 Nov 2018 15:26:44 +0000 Subject: doc, examples --- .gitignore | 12 ++--- doc/web/Makefile | 32 ++++++++++++++ doc/web/xmobar-sawfish.png | Bin 0 -> 9924 bytes doc/web/xmobar-xmonad.png | Bin 0 -> 490277 bytes doc/web/xmobar.css | 88 +++++++++++++++++++++++++++++++++++++ examples/Plugins/HelloWorld.hs | 24 ++++++++++ examples/Plugins/helloworld.config | 12 +++++ examples/padding-icon.sh | 56 +++++++++++++++++++++++ examples/status.sh | 54 +++++++++++++++++++++++ examples/xmobar.config | 38 ++++++++++++++++ examples/xmonadpropwrite.hs | 41 +++++++++++++++++ readme.md | 16 +++---- samples/Plugins/HelloWorld.hs | 24 ---------- samples/Plugins/helloworld.config | 12 ----- samples/padding-icon.sh | 56 ----------------------- samples/status.sh | 54 ----------------------- samples/xmobar.config | 38 ---------------- samples/xmonadpropwrite.hs | 41 ----------------- web/Makefile | 32 -------------- web/xmobar-sawfish.png | Bin 9924 -> 0 bytes web/xmobar-xmonad.png | Bin 490277 -> 0 bytes web/xmobar.css | 88 ------------------------------------- xmobar.cabal | 8 ++-- 23 files changed, 360 insertions(+), 366 deletions(-) create mode 100644 doc/web/Makefile create mode 100644 doc/web/xmobar-sawfish.png create mode 100644 doc/web/xmobar-xmonad.png create mode 100644 doc/web/xmobar.css create mode 100644 examples/Plugins/HelloWorld.hs create mode 100644 examples/Plugins/helloworld.config create mode 100755 examples/padding-icon.sh create mode 100755 examples/status.sh create mode 100644 examples/xmobar.config create mode 100644 examples/xmonadpropwrite.hs delete mode 100644 samples/Plugins/HelloWorld.hs delete mode 100644 samples/Plugins/helloworld.config delete mode 100755 samples/padding-icon.sh delete mode 100755 samples/status.sh delete mode 100644 samples/xmobar.config delete mode 100644 samples/xmonadpropwrite.hs delete mode 100644 web/Makefile delete mode 100644 web/xmobar-sawfish.png delete mode 100644 web/xmobar-xmonad.png delete mode 100644 web/xmobar.css diff --git a/.gitignore b/.gitignore index 6f15bc8..add7d32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,13 @@ /dist/ /dist-newstyle/ /TAGS -/IWlib.hs -/StatFS.hs -/XUtil.hs -/src/IWlib.hs -/src/StatFS.hs -/src/XUtil.hs -/web/index.html -/web/releases.html +/doc/web/index.html +/doc/web/releases.html /cabal-dev/ .cabal-sandbox cabal.sandbox.config .stack-work -/web/readme.md +/doc/web/readme.md /.idea/ /xmobar.iml /out/ diff --git a/doc/web/Makefile b/doc/web/Makefile new file mode 100644 index 0000000..411f589 --- /dev/null +++ b/doc/web/Makefile @@ -0,0 +1,32 @@ +index.src = ../readme.md +index = readme.md +releases = ../news.md +css = xmobar.css +images = xmobar-sawfish.png xmobar-xmonad.png +remote = community.haskell.org:/srv/projects/xmobar/ +htmls = index.html releases.html +title = % xmobar - a minimalistic status bar + +default: index.html + +$(index): $(index.src) + @tail -n+3 $(index.src) | sed "1s/^/$(title)\n/" > $(index) + +index.html: releases.html $(index) $(css) + pandoc -f markdown -t html -c $(css) --toc -N -s \ + $(index) > index.html + +releases.html: $(releases) $(css) + pandoc -f markdown -t html -c $(css) -s \ + $(releases) > releases.html + +upload-images: + rsync -zav $(images) $(remote) + +upload-pages: $(htmls) + scp $(htmls) $(css) $(remote) + +upload: upload-images upload-pages + +clean: + rm -f $(htmls) $(index) diff --git a/doc/web/xmobar-sawfish.png b/doc/web/xmobar-sawfish.png new file mode 100644 index 0000000..13c236e Binary files /dev/null and b/doc/web/xmobar-sawfish.png differ diff --git a/doc/web/xmobar-xmonad.png b/doc/web/xmobar-xmonad.png new file mode 100644 index 0000000..3a3160e Binary files /dev/null and b/doc/web/xmobar-xmonad.png differ diff --git a/doc/web/xmobar.css b/doc/web/xmobar.css new file mode 100644 index 0000000..54a44c6 --- /dev/null +++ b/doc/web/xmobar.css @@ -0,0 +1,88 @@ +body { + margin: auto; + padding-right: 1em; + padding-left: 1em; + max-width: 75%; + border-left: 1px solid black; + border-right: 1px solid black; + color: black; + font-family: Verdana, sans-serif; + font-size: 100%; + line-height: 140%; + color: #333; +} +pre { + border: 1px dotted gray; + background-color: #efebe7; + color: #111111; + padding: 0.5em; +} +code { + font-family: monospace; + font-size: 110%; +} +h1 a, h2 a, h3 a, h4 a, h5 a { + text-decoration: none; + color: #009900; +} +h1, h2, h3, h4, h5 { font-family: verdana; + font-weight: bold; + color: #000000; } +h1 { + font-size: 130%; +} + +h2 { + font-size: 110%; + border-bottom: 1px dotted black; +} + +h3 { + font-size: 95%; +} + +h4 { + font-size: 90%; + font-style: italic; +} + +h5 { + font-size: 90%; + font-style: italic; +} + +h1.title { + font-size: 150%; + font-weight: bold; + text-align: left; + border: none; +} + +dt code { + font-weight: bold; +} +dd p { + margin-top: 0; +} + +a:link { + color: #000036 +} + +a:visited { + color: #000000 +} +a:hover { + color: #000046 +} +a:active { + color: #000046 +} + +#footer { + padding-top: 1em; + font-size: 70%; + color: gray; + text-align: center; +} + diff --git a/examples/Plugins/HelloWorld.hs b/examples/Plugins/HelloWorld.hs new file mode 100644 index 0000000..d2267ae --- /dev/null +++ b/examples/Plugins/HelloWorld.hs @@ -0,0 +1,24 @@ +----------------------------------------------------------------------------- +-- | +-- Module : Plugins.HelloWorld +-- Copyright : (c) Andrea Rossato +-- License : BSD-style (see LICENSE) +-- +-- Maintainer : Jose A. Ortega Ruiz +-- Stability : unstable +-- Portability : unportable +-- +-- A plugin example for Xmobar, a text based status bar +-- +----------------------------------------------------------------------------- + +module Xmobar.Plugins.HelloWorld where + +import Xmobar.Plugins + +data HelloWorld = HelloWorld + deriving (Read, Show) + +instance Exec HelloWorld where + alias HelloWorld = "helloWorld" + run HelloWorld = return "Hello World!!" diff --git a/examples/Plugins/helloworld.config b/examples/Plugins/helloworld.config new file mode 100644 index 0000000..3818bfa --- /dev/null +++ b/examples/Plugins/helloworld.config @@ -0,0 +1,12 @@ +Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" + , bgColor = "#000000" + , fgColor = "#BFBFBF" + , position = TopW C 90 + , commands = [ Run Cpu [] 10 + , Run Weather "LIPB" [] 36000 + , Run HelloWorld + ] + , sepChar = "%" + , alignSep = "}{" + , template = "%cpu% } %helloWorld% { %LIPB% | %date%" + } diff --git a/examples/padding-icon.sh b/examples/padding-icon.sh new file mode 100755 index 0000000..31f5eeb --- /dev/null +++ b/examples/padding-icon.sh @@ -0,0 +1,56 @@ +#!/bin/bash + +# Detects the width of running window with name given as first +# argument (xprop name '$1') and creates an XPM icon of that width, +# 1px height, and transparent. Outputs an -tag for use in +# xmobar to display the generated XPM icon. +# +# Run script from xmobar and trayer: +# `Run Com "/where/ever/padding-icon.sh" ["panel"] "trayerpad" 10` +# and use `%trayerpad%` in your template. +# or, if you're using for instance stalonetray: +# `Run Com "/where/ever/padding-icon.sh" ["stalonetray"] "tray" 10` + +# Very heavily based on Jonas Camillus Jeppensen code +# https://github.com/jaor/xmobar/issues/239#issuecomment-233206552 + +# Function to create a transparent Wx1 px XPM icon +create_xpm_icon () { +timestamp=$(date) +pixels=$(for i in `seq $1`; do echo -n "."; done) + +cat << EOF > "$2" +/* XPM * +static char * trayer_pad_xpm[] = { +/* This XPM icon is used for padding in xmobar to */ +/* leave room for trayer-srg. It is dynamically */ +/* updated by by trayer-pad-icon.sh which is run */ +/* by xmobar. */ +/* Created: ${timestamp} */ +/* */ +"$1 1 1 1", +/* Colors (none: transparent) */ +". c none", +/* Pixels */ +"$pixels" +}; +EOF +} + +# panel window name +pname=${1:-panel} + +# Width of the trayer window +width=$(xprop -name $pname | grep 'program specified minimum size' | cut -d ' ' -f 5) + +# Icon file name +iconfile="/tmp/$pname-padding-${width:-0}px.xpm" + +# If the desired icon does not exist create it +if [ ! -f $iconfile ] +then + create_xpm_icon $width $iconfile +fi + +# Output the icon tag for xmobar +echo "" diff --git a/examples/status.sh b/examples/status.sh new file mode 100755 index 0000000..94e8fe7 --- /dev/null +++ b/examples/status.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +STATUSPIPE="/tmp/xmobar_status_jrk" + +function isMuted () { + # retrieve mute status + # return an arbitrary string for true or nothing at all + echo +} + +function getPercent () { + # somehow retrieve the percent value as plain int (e.g. "66") + echo "66" +} + +function percentBar () { + local i=1 res= + normal=47 high=80 + fgColor='#657b83' mutedColor='#cb4b16' + lowColor='#859900' midColor='#b58900' + highColor='#cb4b16' + + bar="$(echo -ne "\u2588")" + percent="$( getPercent )" + muted="$( isMuted )" + + if [ -n "$muted" ]; then + res="" + else + res="" + fi + + while [ $i -lt $percent ]; do + if [ $i -eq $normal -a -z "$muted" ]; then + res+="" + elif [ $i -eq $high -a -z "$muted" ]; then + res+="" + fi + + res+=$bar + i=$((i+1)) + done + + res+="" + + while [ $i -lt 100 ]; do + res+='-' + i=$((i+1)) + done + + echo "$res" +} + +echo "$( percentBar )" > "$STATUSPIPE" diff --git a/examples/xmobar.config b/examples/xmobar.config new file mode 100644 index 0000000..c0d4cdc --- /dev/null +++ b/examples/xmobar.config @@ -0,0 +1,38 @@ +Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" + , additionalFonts = [] + , borderColor = "black" + , border = TopB + , bgColor = "black" + , fgColor = "grey" + , alpha = 255 + , position = Top + , textOffset = -1 + , iconOffset = -1 + , lowerOnStart = True + , pickBroadest = False + , persistent = False + , hideOnStart = False + , iconRoot = "." + , allDesktops = True + , overrideRedirect = True + , commands = [ Run Weather "EGPF" ["-t",": 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: %"] 10 + , Run Swap [] 10 + , Run Com "uname" ["-s","-r"] "" 36000 + , Run Date "%a %b %_d %Y %H:%M:%S" "date" 10 + ] + , sepChar = "%" + , alignSep = "}{" + , template = "%cpu% | %memory% * %swap% | %eth0% - %eth1% }\ + \{ %date%| %EGPF% | %uname%" + } diff --git a/examples/xmonadpropwrite.hs b/examples/xmonadpropwrite.hs new file mode 100644 index 0000000..f3f4a5d --- /dev/null +++ b/examples/xmonadpropwrite.hs @@ -0,0 +1,41 @@ +-- Copyright Spencer Janssen +-- Tomas Janousek +-- BSD3 (see LICENSE) +-- +-- Reads from standard input and writes to an X propery on root window. +-- To be used with XPropertyLog: +-- Add it to commands: +-- Run XPropertyLog "_XMONAD_LOG_CUSTOM" +-- Add it to the template: +-- template = "... %_XMONAD_LOG_CUSTOM% ..." +-- Run: +-- $ blah blah | xmonadpropwrite _XMONAD_LOG_CUSTOM + +import Control.Monad +import Graphics.X11 +import Graphics.X11.Xlib.Extras +import qualified Data.ByteString as B +import Foreign.C (CChar) +import System.IO +import System.Environment + +main = do + atom <- flip fmap getArgs $ \args -> case args of + [a] -> a + _ -> "_XMONAD_LOG" + + d <- openDisplay "" + xlog <- internAtom d atom False + ustring <- internAtom d "UTF8_STRING" False + + root <- rootWindow d (defaultScreen d) + + forever $ do + msg <- B.getLine + changeProperty8 d root xlog ustring propModeReplace (encodeCChar msg) + sync d True + + return () + +encodeCChar :: B.ByteString -> [CChar] +encodeCChar = map fromIntegral . B.unpack diff --git a/readme.md b/readme.md index 3c3d5c0..9332c52 100644 --- a/readme.md +++ b/readme.md @@ -173,9 +173,9 @@ Since 0.14 xmobar reacts to SIGUSR1 and SIGUSR2: ## Quick Start -See [samples/xmobar.config] for an example. +See [examples/xmobar.config] for an example. -[samples/xmobar.config]: http://github.com/jaor/xmobar/raw/master/samples/xmobar.config +[examples/xmobar.config]: http://github.com/jaor/xmobar/raw/master/examples/xmobar.config For the output template: @@ -348,7 +348,7 @@ See [this idea] by Jonas Camillus Jeppensen for a way of adapting dynamically xmobar's size and run it alongside a system tray widget such as trayer or stalonetray (although the idea is not limited to trays, really). For your convenience, there is a version of Jonas' -script in [samples/padding-icon.sh](./samples/padding-icon.sh). +script in [examples/padding-icon.sh](./examples/padding-icon.sh). [this idea]: https://github.com/jaor/xmobar/issues/239#issuecomment-233206552 @@ -1202,11 +1202,11 @@ Like [Volume](#volume-mixer-element-args-refreshrate), but with the following di - Aliases to `PropName` - Reads the X property named by `PropName` (a string) and displays its - value. The [samples/xmonadpropwrite.hs script] in xmobar's + value. The [examples/xmonadpropwrite.hs script] in xmobar's distribution can be used to set the given property from the output of any other program or script. -[samples/xmonadpropwrite.hs script]: https://github.com/jaor/xmobar/raw/master/samples/xmonadpropwrite.hs +[examples/xmonadpropwrite.hs script]: https://github.com/jaor/xmobar/raw/master/examples/xmonadpropwrite.hs ### `UnsafeXPropertyLog PropName` @@ -1420,10 +1420,10 @@ will display "N/A" if for some reason the `date` invocation fails. your xmobar. Sending some status information to `"/tmp/xmobar_status"` will reveal xmonad for 1.5 seconds and temporarily overwrite the window titles. -- Take a look at [samples/status.sh] +- Take a look at [examples/status.sh] - Expands environment variables for the pipe path -[samples/status.sh]: http://github.com/jaor/xmobar/raw/master/samples/status.sh +[examples/status.sh]: http://github.com/jaor/xmobar/raw/master/examples/status.sh **`XMonadLog`** @@ -1517,7 +1517,7 @@ configuration options. This requires importing your plugin into `Config.hs` and adding your type to the type list in the type signature of `Config.runnableTypes`. -For a very basic example see `samples/Plugins/HelloWorld.hs` or the +For a very basic example see `examples/Plugins/HelloWorld.hs` or the other plugins that are distributed with xmobar. ## Installing/Removing a Plugin diff --git a/samples/Plugins/HelloWorld.hs b/samples/Plugins/HelloWorld.hs deleted file mode 100644 index d2267ae..0000000 --- a/samples/Plugins/HelloWorld.hs +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------------------------------------------------ --- | --- Module : Plugins.HelloWorld --- Copyright : (c) Andrea Rossato --- License : BSD-style (see LICENSE) --- --- Maintainer : Jose A. Ortega Ruiz --- Stability : unstable --- Portability : unportable --- --- A plugin example for Xmobar, a text based status bar --- ------------------------------------------------------------------------------ - -module Xmobar.Plugins.HelloWorld where - -import Xmobar.Plugins - -data HelloWorld = HelloWorld - deriving (Read, Show) - -instance Exec HelloWorld where - alias HelloWorld = "helloWorld" - run HelloWorld = return "Hello World!!" diff --git a/samples/Plugins/helloworld.config b/samples/Plugins/helloworld.config deleted file mode 100644 index 3818bfa..0000000 --- a/samples/Plugins/helloworld.config +++ /dev/null @@ -1,12 +0,0 @@ -Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" - , bgColor = "#000000" - , fgColor = "#BFBFBF" - , position = TopW C 90 - , commands = [ Run Cpu [] 10 - , Run Weather "LIPB" [] 36000 - , Run HelloWorld - ] - , sepChar = "%" - , alignSep = "}{" - , template = "%cpu% } %helloWorld% { %LIPB% | %date%" - } diff --git a/samples/padding-icon.sh b/samples/padding-icon.sh deleted file mode 100755 index 31f5eeb..0000000 --- a/samples/padding-icon.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -# Detects the width of running window with name given as first -# argument (xprop name '$1') and creates an XPM icon of that width, -# 1px height, and transparent. Outputs an -tag for use in -# xmobar to display the generated XPM icon. -# -# Run script from xmobar and trayer: -# `Run Com "/where/ever/padding-icon.sh" ["panel"] "trayerpad" 10` -# and use `%trayerpad%` in your template. -# or, if you're using for instance stalonetray: -# `Run Com "/where/ever/padding-icon.sh" ["stalonetray"] "tray" 10` - -# Very heavily based on Jonas Camillus Jeppensen code -# https://github.com/jaor/xmobar/issues/239#issuecomment-233206552 - -# Function to create a transparent Wx1 px XPM icon -create_xpm_icon () { -timestamp=$(date) -pixels=$(for i in `seq $1`; do echo -n "."; done) - -cat << EOF > "$2" -/* XPM * -static char * trayer_pad_xpm[] = { -/* This XPM icon is used for padding in xmobar to */ -/* leave room for trayer-srg. It is dynamically */ -/* updated by by trayer-pad-icon.sh which is run */ -/* by xmobar. */ -/* Created: ${timestamp} */ -/* */ -"$1 1 1 1", -/* Colors (none: transparent) */ -". c none", -/* Pixels */ -"$pixels" -}; -EOF -} - -# panel window name -pname=${1:-panel} - -# Width of the trayer window -width=$(xprop -name $pname | grep 'program specified minimum size' | cut -d ' ' -f 5) - -# Icon file name -iconfile="/tmp/$pname-padding-${width:-0}px.xpm" - -# If the desired icon does not exist create it -if [ ! -f $iconfile ] -then - create_xpm_icon $width $iconfile -fi - -# Output the icon tag for xmobar -echo "" diff --git a/samples/status.sh b/samples/status.sh deleted file mode 100755 index 94e8fe7..0000000 --- a/samples/status.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -STATUSPIPE="/tmp/xmobar_status_jrk" - -function isMuted () { - # retrieve mute status - # return an arbitrary string for true or nothing at all - echo -} - -function getPercent () { - # somehow retrieve the percent value as plain int (e.g. "66") - echo "66" -} - -function percentBar () { - local i=1 res= - normal=47 high=80 - fgColor='#657b83' mutedColor='#cb4b16' - lowColor='#859900' midColor='#b58900' - highColor='#cb4b16' - - bar="$(echo -ne "\u2588")" - percent="$( getPercent )" - muted="$( isMuted )" - - if [ -n "$muted" ]; then - res="" - else - res="" - fi - - while [ $i -lt $percent ]; do - if [ $i -eq $normal -a -z "$muted" ]; then - res+="" - elif [ $i -eq $high -a -z "$muted" ]; then - res+="" - fi - - res+=$bar - i=$((i+1)) - done - - res+="" - - while [ $i -lt 100 ]; do - res+='-' - i=$((i+1)) - done - - echo "$res" -} - -echo "$( percentBar )" > "$STATUSPIPE" diff --git a/samples/xmobar.config b/samples/xmobar.config deleted file mode 100644 index c0d4cdc..0000000 --- a/samples/xmobar.config +++ /dev/null @@ -1,38 +0,0 @@ -Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" - , additionalFonts = [] - , borderColor = "black" - , border = TopB - , bgColor = "black" - , fgColor = "grey" - , alpha = 255 - , position = Top - , textOffset = -1 - , iconOffset = -1 - , lowerOnStart = True - , pickBroadest = False - , persistent = False - , hideOnStart = False - , iconRoot = "." - , allDesktops = True - , overrideRedirect = True - , commands = [ Run Weather "EGPF" ["-t",": 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: %"] 10 - , Run Swap [] 10 - , Run Com "uname" ["-s","-r"] "" 36000 - , Run Date "%a %b %_d %Y %H:%M:%S" "date" 10 - ] - , sepChar = "%" - , alignSep = "}{" - , template = "%cpu% | %memory% * %swap% | %eth0% - %eth1% }\ - \{ %date%| %EGPF% | %uname%" - } diff --git a/samples/xmonadpropwrite.hs b/samples/xmonadpropwrite.hs deleted file mode 100644 index f3f4a5d..0000000 --- a/samples/xmonadpropwrite.hs +++ /dev/null @@ -1,41 +0,0 @@ --- Copyright Spencer Janssen --- Tomas Janousek --- BSD3 (see LICENSE) --- --- Reads from standard input and writes to an X propery on root window. --- To be used with XPropertyLog: --- Add it to commands: --- Run XPropertyLog "_XMONAD_LOG_CUSTOM" --- Add it to the template: --- template = "... %_XMONAD_LOG_CUSTOM% ..." --- Run: --- $ blah blah | xmonadpropwrite _XMONAD_LOG_CUSTOM - -import Control.Monad -import Graphics.X11 -import Graphics.X11.Xlib.Extras -import qualified Data.ByteString as B -import Foreign.C (CChar) -import System.IO -import System.Environment - -main = do - atom <- flip fmap getArgs $ \args -> case args of - [a] -> a - _ -> "_XMONAD_LOG" - - d <- openDisplay "" - xlog <- internAtom d atom False - ustring <- internAtom d "UTF8_STRING" False - - root <- rootWindow d (defaultScreen d) - - forever $ do - msg <- B.getLine - changeProperty8 d root xlog ustring propModeReplace (encodeCChar msg) - sync d True - - return () - -encodeCChar :: B.ByteString -> [CChar] -encodeCChar = map fromIntegral . B.unpack diff --git a/web/Makefile b/web/Makefile deleted file mode 100644 index 411f589..0000000 --- a/web/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -index.src = ../readme.md -index = readme.md -releases = ../news.md -css = xmobar.css -images = xmobar-sawfish.png xmobar-xmonad.png -remote = community.haskell.org:/srv/projects/xmobar/ -htmls = index.html releases.html -title = % xmobar - a minimalistic status bar - -default: index.html - -$(index): $(index.src) - @tail -n+3 $(index.src) | sed "1s/^/$(title)\n/" > $(index) - -index.html: releases.html $(index) $(css) - pandoc -f markdown -t html -c $(css) --toc -N -s \ - $(index) > index.html - -releases.html: $(releases) $(css) - pandoc -f markdown -t html -c $(css) -s \ - $(releases) > releases.html - -upload-images: - rsync -zav $(images) $(remote) - -upload-pages: $(htmls) - scp $(htmls) $(css) $(remote) - -upload: upload-images upload-pages - -clean: - rm -f $(htmls) $(index) diff --git a/web/xmobar-sawfish.png b/web/xmobar-sawfish.png deleted file mode 100644 index 13c236e..0000000 Binary files a/web/xmobar-sawfish.png and /dev/null differ diff --git a/web/xmobar-xmonad.png b/web/xmobar-xmonad.png deleted file mode 100644 index 3a3160e..0000000 Binary files a/web/xmobar-xmonad.png and /dev/null differ diff --git a/web/xmobar.css b/web/xmobar.css deleted file mode 100644 index 54a44c6..0000000 --- a/web/xmobar.css +++ /dev/null @@ -1,88 +0,0 @@ -body { - margin: auto; - padding-right: 1em; - padding-left: 1em; - max-width: 75%; - border-left: 1px solid black; - border-right: 1px solid black; - color: black; - font-family: Verdana, sans-serif; - font-size: 100%; - line-height: 140%; - color: #333; -} -pre { - border: 1px dotted gray; - background-color: #efebe7; - color: #111111; - padding: 0.5em; -} -code { - font-family: monospace; - font-size: 110%; -} -h1 a, h2 a, h3 a, h4 a, h5 a { - text-decoration: none; - color: #009900; -} -h1, h2, h3, h4, h5 { font-family: verdana; - font-weight: bold; - color: #000000; } -h1 { - font-size: 130%; -} - -h2 { - font-size: 110%; - border-bottom: 1px dotted black; -} - -h3 { - font-size: 95%; -} - -h4 { - font-size: 90%; - font-style: italic; -} - -h5 { - font-size: 90%; - font-style: italic; -} - -h1.title { - font-size: 150%; - font-weight: bold; - text-align: left; - border: none; -} - -dt code { - font-weight: bold; -} -dd p { - margin-top: 0; -} - -a:link { - color: #000036 -} - -a:visited { - color: #000000 -} -a:hover { - color: #000046 -} -a:active { - color: #000046 -} - -#footer { - padding-top: 1em; - font-size: 70%; - color: gray; - text-align: center; -} - diff --git a/xmobar.cabal b/xmobar.cabal index 7f82725..8fd836a 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -17,10 +17,10 @@ cabal-version: >= 1.8 build-type: Simple extra-source-files: readme.md, changelog.md, - samples/padding-icon.sh, - samples/xmobar.config, samples/xmonadpropwrite.hs - samples/Plugins/helloworld.config, - samples/Plugins/HelloWorld.hs + examples/padding-icon.sh, + examples/xmobar.config, examples/xmonadpropwrite.hs + examples/Plugins/helloworld.config, + examples/Plugins/HelloWorld.hs source-repository head type: git -- cgit v1.2.3