Fix #69. Thanks @matchew !

.gitignore

@@ -1,4 +1,5 @@
-lemonbar
+config.h
+bar
 *.o
 *.swp
 *~

.travis.yml

@@ -3,8 +3,5 @@ compiler:
     - clang
     - gcc
 before_install:
-    - sudo apt-get update -qq
+    - sudo apt-get install -qq libx11-xcb-dev libxcb-randr0-dev libxcb-xinerama0-dev
-    - sudo apt-get install -y libx11-xcb-dev libxcb-randr0-dev libxcb-xinerama0-dev
-env:
-    - CFLAGS='-DWITH_XINERAMA=1'
 script: make

Makefile

@@ -1,19 +1,12 @@
-# This snippet has been shmelessly stol^Hborrowed from thestinger's repose Makefile
-VERSION = 1.3
-GIT_DESC=$(shell test -d .git && git describe --always 2>/dev/null)
-
-ifneq "$(GIT_DESC)" ""
-	VERSION=$(GIT_DESC)
-endif
-
 CC	?= gcc
-CFLAGS += -Wall -std=c99 -Os -DVERSION="\"$(VERSION)\""
+STRIP ?= strip
-LDFLAGS += -lxcb -lxcb-xinerama -lxcb-randr
+CFLAGS = -std=c99 -Os
-CFDEBUG = -g3 -pedantic -Wall -Wunused-parameter -Wlong-long \
+LDFLAGS = -lxcb -lcairo -lxcb-xinerama -lxcb-randr
+CFDEBUG = -g3 -pedantic -Wall -Wunused-parameter -Wlong-long\
 		  -Wsign-conversion -Wconversion -Wimplicit-function-declaration
 
-EXEC = lemonbar
+EXEC = bar
-SRCS = lemonbar.c
+SRCS = bar.c
 OBJS = ${SRCS:.c=.o}
 
 PREFIX?=/usr
@@ -22,13 +15,14 @@ BINDIR=${PREFIX}/bin
 all: ${EXEC}
 
 doc: README.pod
-	pod2man --section=1 --center="lemonbar Manual" --name "lemonbar" --release="lemonbar $(VERSION)" README.pod > lemonbar.1
+	pod2man --section=1 --center="bar Manual" --name "bar" --release="bar $(shell git describe --always)" README.pod > bar.1
 
 .c.o:
 	${CC} ${CFLAGS} -o $@ -c $<
 
 ${EXEC}: ${OBJS}
 	${CC} -o ${EXEC} ${OBJS} ${LDFLAGS}
+	${STRIP} -s ${EXEC}
 
 debug: ${EXEC}
 debug: CC += ${CFDEBUG}
@@ -37,12 +31,12 @@ clean:
 	rm -f ./*.o ./*.1
 	rm -f ./${EXEC}
 
-install: lemonbar doc
+install: bar doc
-	install -D -m 755 lemonbar ${DESTDIR}${BINDIR}/lemonbar
+	install -D -m 755 bar ${DESTDIR}${BINDIR}/bar
-	install -D -m 644 lemonbar.1 ${DESTDIR}${PREFIX}/share/man/man1/lemonbar.1
+	install -D -m 644 bar.1 ${DESTDIR}${PREFIX}/share/man/man1/bar.1
 
 uninstall:
-	rm -f ${DESTDIR}${BINDIR}/lemonbar
+	rm -f ${DESTDIR}${BINDIR}/bar
-	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/lemonbar.1
+	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/bar.1
 
 .PHONY: all debug clean install

README.pod

@@ -1,16 +1,16 @@
 =head1 NAME
 
-lemonbar - Featherweight lemon-scented bar
+bar - bar ain't recursive
 
 =for HTML <a href="https://travis-ci.org/LemonBoy/bar"><img src="https://travis-ci.org/LemonBoy/bar.svg?branch=master"></a>
 
 =head1 SYNOPSIS
 
-I<lemonbar> [-h | -g I<width>B<x>I<height>B<+>I<x>B<+>I<y> | -b | -d | -f I<font> | -p | -n I<name> | -u I<pixel> | -B I<color> | -F I<color> | -U I<color>]
+I<bar> [-h | -g I<width>B<x>I<height>B<+>I<x>B<+>I<y> | -b | -d | -f I<font> | -p | -u I<pixel> | -B I<color> | -F I<color>]
 
 =head1 DESCRIPTION
 
-B<lemonbar> (formerly known as B<bar>) is a lightweight bar entirely based on XCB. Provides full UTF-8 support, basic formatting, RandR and Xinerama support and EWMH compliance without wasting your precious memory.
+B<bar> is a lightweight bar entirely based on XCB. Provides full UTF-8 support, basic formatting, RandR and Xinerama support and EWMH compliance without wasting your precious memory.
 
 =head1 OPTIONS
 
@@ -34,20 +34,11 @@ Force docking without asking the window manager. This is needed if the window ma
 
 =item B<-f> I<font>
 
-Define the font to load into one of the five slots (the number of slots is hardcoded and can be tweaked by
+Comma separated list of fonts, bar supports a maximum of two fonts.
-changing the MAX_FONT_COUNT parameter in the source code).
-
-=item B<-a> I<number>
-
-Set number of clickable areas (default is 10)
 
 =item B<-p>
 
-Make the bar permanent, don't exit after the standard input is closed.
+Make bar permanent, don't exit after the standard input is closed.
-
-=item B<-n> I<name>
-
-Set the WM_NAME atom value for the bar.
 
 =item B<-u> I<pixel>
 
@@ -55,21 +46,17 @@ Sets the underline width in pixels. The default is 1.
 
 =item B<-B> I<color>
 
-Set the background color of the bar. I<color> must be specified in the hex format (#aarrggbb, #rrggbb, #rgb). If no compositor such as compton or xcompmgr is running the alpha channel is silently ignored.
+Set the background color of the bar. I<color> might be either in hex format (#aarrggbb) or in the symbolic name format (eg. white, brightred, darkgray). If no compositor such as compton or xcompmgr is running the alpha channel is silently ignored.
 
 =item B<-F> I<color>
 
 Set the foreground color of the bar. Accepts the same color formats as B<-B>.
 
-=item B<-U> I<color>
-
-Set the underline color of the bar. Accepts the same color formats as B<-B>.
-
 =back
 
 =head1 FORMATTING
 
-lemonbar provides a screenrc-inspired formatting syntax to allow full customization at runtime. Every formatting block is opened with C<%{> and closed by C<}> and accepts the following commands, the parser tries its best to handle malformed input. Use C<%%> to get a literal percent sign (C<%>).
+bar provides a screenrc-inspired formatting syntax to allow full customization at runtime. Every formatting block is opened with B<%{> and closed by B<}> and accepts the following commands, the parser tries it's best to handle malformed input.
 
 =over
 
@@ -89,10 +76,6 @@ Aligns the following text to the center of the screen.
 
 Aligns the following text to the right side of the screen.
 
-=item B<O>I<width>
-
-Offset the current position by I<width> pixels in the alignment direction.
-
 =item B<B>I<color>
 
 Set the text background color. The parameter I<color> can be I<-> or a color in one of the formats mentioned before. The special value I<-> resets the color to the default one.
@@ -101,29 +84,21 @@ Set the text background color. The parameter I<color> can be I<-> or a color in
 
 Set the text foreground color. The parameter I<color> can be I<-> or a color in one of the formats mentioned before. The special value I<-> resets the color to the default one.
 
-=item B<T>I<index>
-
-Set the font used to draw the following text. The parameter I<index> can either be I<-> or the 1-based index of the slot which contains the desired font. If the parameter is I<-> lemonbar resets to the normal behavior (matching the first font that can be used for the character). If the selected font can't be used to draw a character, lemonbar will fall back to normal behavior for that character
-
 =item B<U>I<color>
 
 Set the text underline color. The parameter I<color> can be I<-> or a color in one of the formats mentioned before. The special value I<-> resets the color to the default one.
 
 =item B<A>I<button>:I<command>:
 
-Create a clickable area starting from the current position, when the area is clicked I<command> is printed on stdout. The area is closed when a B<A> token, not followed by : is encountered.
+Create a clickable area starting from the current position, when the area is clicked I<command> is executed. The area is closed when a B<A> token, not followed by : is encountered.
 
 Eg. I<%{A:reboot:} Click here to reboot %{A}>
 
-The I<button> field is optional, it defaults to the left button, and it's a number ranging from 1 to 5 which maps to the left, middle, right, scroll up and scroll down movements. Your mileage may vary.
+The I<button> field is optional, it defaults to the left button, and it's a number ranging from 1 to 5 which maps to the left, middle, right, scroll down and scroll up movements. Your mileage may vary.
-
-Nested clickable areas can trigger different commands.
-
-Eg. I<%{A:reboot:}%{A3:halt:} Left click to reboot, right click to shutdown %{A}%{A}>
 
 =item B<S>I<dir>
 
-Change the monitor the bar is rendered to. I<dir> can be either
+Change the monitor bar is rendering to. I<dir> can be either
 
 =over
 
@@ -177,7 +152,7 @@ Draw a line under the text.
 
 =head1 OUTPUT
 
-Clicking on an area makes lemonbar output the command to stdout, followed by a newline, allowing the user to pipe it into a script, execute it or simply ignore it. Simple and powerful, that's it.
+Clicking on an area makes bar output the command to stdout, followed by a newline, allowing the user to pipe it into a script, execute it or simply ignore it. Simple and powerful, that's it.
 
 =head1 WWW
 
@@ -185,7 +160,7 @@ L<git repository|https://github.com/LemonBoy/bar>
 
 =head1 AUTHOR
 
-2012-2017 (C) The Lemon Man
+2012-2014 (C) The Lemon Man
 
 Xinerama support was kindly contributed by Stebalien
 

palette.pl

@@ -0,0 +1,36 @@
+#!/usr/bin/env perl
+#
+# palette.pl
+#
+# Converts your .Xdefault/.Xresources colors into a ready to paste palette
+# for bar. It takes your foreground/background settings into account and if
+# it cant find them it leaves COLOR0/COLOR1 undefined.
+#
+
+use strict;
+use warnings;
+
+open (F, "<".$ARGV[0]) || die "Can't open!";
+
+our %vars = ();
+
+while (<F>) {
+    # Don't match comments
+    if ($_ !~ m/^\s*!/) {
+        # It's a define!
+        if ($_ =~ m/^\s*#define\s+(\w+)\s+#([0-9A-Fa-f]{1,6})/) {
+            $vars{"$1"} = hex($2);
+        }
+        elsif ($_ =~ m/^\s*\w*\*(background|foreground|color\d)\s*:\s*([\w\d#]+)/) {
+            my ($name, $value) = (uc $1, $2); 
+            # Check if it's a color
+            if (substr($value, 0, 1) eq '#') {
+                $value = hex(substr($value, 1));
+            } else {
+                $value = $vars{"$value"};
+            }
+            printf "#define $name 0x%06x\n", $value;
+        }
+    }
+}
+