Compare commits
112 Commits
Author | SHA1 | Date |
---|---|---|
LemonBoy | 35183ab81d | |
Dmitri Goutnik | 09b5a9b8ba | |
LemonBoy | 2f255b1756 | |
LemonBoy | 8cd84e8edf | |
Felix Kiss | b721a37ab0 | |
LemonBoy | 1411d260a4 | |
LemonBoy | 50fe7d2083 | |
Bastien Dejean | 84be3d8dbf | |
LemonBoy | d680ea4256 | |
LemonBoy | 44a708b7a4 | |
LemonBoy | 40f08d5245 | |
LemonBoy | 3dbdf9d078 | |
LemonBoy | a3fb967ad9 | |
TheLemonMan | ae5a3a477a | |
Steven Allen | f2662d75c8 | |
Giuseppe | 3020df1923 | |
xd1le | 13dcc66cae | |
Giuseppe | c788534107 | |
Jérôme Bon | 0f2cfbab28 | |
Giuseppe | 61985278f2 | |
Bastien Dejean | d3d7a87b66 | |
LemonBoy | 7c8eb7495b | |
Giuseppe | f26b88272e | |
Adam Niederer | 214ad63925 | |
Giuseppe | 495ac4e546 | |
Adam | e4ea4071ab | |
Giuseppe | 63ed303553 | |
krypt-n | e0aee14533 | |
krypt-n | da26209013 | |
LemonBoy | 2c0f57c584 | |
Bastien Dejean | 3b5baa93b1 | |
LemonBoy | 531c575575 | |
LemonBoy | 6580e2d4f7 | |
LemonBoy | 255c93dc7a | |
LemonBoy | 38422c5014 | |
Giuseppe | 1585d7257d | |
Nathan Isom | 7f8a79131b | |
neeasade | 177deb0860 | |
Giuseppe | b331ee3927 | |
chad | 71ed0d3375 | |
Chad Voegele | 63a55dd06c | |
Giuseppe | a390ef6a5c | |
Giuseppe | 04d22b4ae5 | |
Jesper Jensen | 73d8c58286 | |
Jesper Jensen | 49fdc25f37 | |
krypt-n | a8fa2766fb | |
LemonBoy | a9f285fd28 | |
LemonBoy | 7880eac8c9 | |
LemonBoy | 25c3441925 | |
LemonBoy | b82d96a68e | |
LemonBoy | ebb625b529 | |
LemonBoy | 72106b17b1 | |
LemonBoy | 19167c2e55 | |
LemonBoy | fe4ff881dd | |
Giuseppe | 75dbf3397e | |
Otto Modinos | eeb88f8ae0 | |
LemonBoy | d32cd8bce9 | |
LemonBoy | 5186f68658 | |
LemonBoy | 4ee19586a3 | |
Giuseppe | 1ef64eab99 | |
andornaut | ab3a49962f | |
LemonBoy | 8351859593 | |
LemonBoy | 2778c81699 | |
LemonBoy | d8443785a8 | |
LemonBoy | 704ba652d9 | |
LemonBoy | 392f23ef36 | |
Giuseppe | 7f1f722965 | |
João Marques | 927c05604c | |
Giuseppe | 0affee3d2f | |
Otto Modinos | 8492309a88 | |
Otto Modinos | a313800686 | |
Otto Modinos | 4ad9cbd823 | |
Otto Modinos | bb466a8c16 | |
Otto Modinos | 3483f1b083 | |
Otto Modinos | 7d2c7ab438 | |
LemonBoy | e197a15c3a | |
LemonBoy | 6959085f8d | |
Giuseppe | 78dc0d0d21 | |
Sakari Kapanen | 3b8afc6b05 | |
Giuseppe | c39c4e4d8b | |
John Vogel | 145c66b471 | |
LemonBoy | 5746d15cf8 | |
LemonBoy | 3c2b9ff150 | |
LemonBoy | 95c41381ac | |
Giuseppe | e9cdee9701 | |
LemonBoy | dbbdf373a3 | |
rootcoma | c258d0a0fa | |
LemonBoy | 8475ff4fdb | |
LemonBoy | 28b0db1cfa | |
LemonBoy | 69e8ac6f07 | |
Giuseppe | 6df9a2dd68 | |
Grayson MacKenzie | 02627e7609 | |
Grayson MacKenzie | 1c106dbfd0 | |
LemonBoy | 1199bcd4cb | |
Grayson MacKenzie | 128e212c14 | |
Grayson MacKenzie | d22cd1561b | |
Grayson MacKenzie | f3e9df4a97 | |
Giuseppe | 5e7b44dce9 | |
Giuseppe | b66bd0a172 | |
Giuseppe | 524593d871 | |
Sprocklem | 939aead84d | |
LemonBoy | 970332ac76 | |
LemonBoy | 1ab492730b | |
Giuseppe | eb90ab7675 | |
John Vogel | 99e927ee70 | |
John Vogel | 8a7015fce2 | |
John Vogel | e81c1ff8cb | |
John Vogel | caf14a0ec4 | |
John Vogel | c233646012 | |
John Vogel | 3546890578 | |
LemonBoy | 26044f210b | |
LemonBoy | a447500477 |
|
@ -1,5 +1,4 @@
|
|||
config.h
|
||||
bar
|
||||
lemonbar
|
||||
*.o
|
||||
*.swp
|
||||
*~
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
language: c
|
||||
compiler:
|
||||
- clang
|
||||
- gcc
|
||||
before_install:
|
||||
- sudo apt-get update -qq
|
||||
- sudo apt-get install -y libx11-xcb-dev libxcb-randr0-dev libxcb-xinerama0-dev
|
||||
env:
|
||||
- CFLAGS='-DWITH_XINERAMA=1'
|
||||
script: make
|
36
Makefile
36
Makefile
|
@ -1,12 +1,19 @@
|
|||
CC ?= gcc
|
||||
STRIP ?= strip
|
||||
CFLAGS = -std=c99 -Os
|
||||
LDFLAGS = -lxcb -lxcb-xinerama -lxcb-randr
|
||||
CFDEBUG = -g3 -pedantic -Wall -Wunused-parameter -Wlong-long\
|
||||
-Wsign-conversion -Wconversion -Wimplicit-function-declaration
|
||||
# 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)
|
||||
|
||||
EXEC = bar
|
||||
SRCS = bar.c
|
||||
ifneq "$(GIT_DESC)" ""
|
||||
VERSION=$(GIT_DESC)
|
||||
endif
|
||||
|
||||
CC ?= gcc
|
||||
CFLAGS += -Wall -std=c99 -Os -DVERSION="\"$(VERSION)\""
|
||||
LDFLAGS += -lxcb -lxcb-xinerama -lxcb-randr
|
||||
CFDEBUG = -g3 -pedantic -Wall -Wunused-parameter -Wlong-long \
|
||||
-Wsign-conversion -Wconversion -Wimplicit-function-declaration
|
||||
|
||||
EXEC = lemonbar
|
||||
SRCS = lemonbar.c
|
||||
OBJS = ${SRCS:.c=.o}
|
||||
|
||||
PREFIX?=/usr
|
||||
|
@ -15,14 +22,13 @@ BINDIR=${PREFIX}/bin
|
|||
all: ${EXEC}
|
||||
|
||||
doc: README.pod
|
||||
pod2man --section=1 --center="bar Manual" --name "bar" --release="bar $(shell git describe --always)" README.pod > bar.1
|
||||
pod2man --section=1 --center="lemonbar Manual" --name "lemonbar" --release="lemonbar $(VERSION)" README.pod > lemonbar.1
|
||||
|
||||
.c.o:
|
||||
${CC} ${CFLAGS} -o $@ -c $<
|
||||
|
||||
${EXEC}: ${OBJS}
|
||||
${CC} -o ${EXEC} ${OBJS} ${LDFLAGS}
|
||||
${STRIP} -s ${EXEC}
|
||||
|
||||
debug: ${EXEC}
|
||||
debug: CC += ${CFDEBUG}
|
||||
|
@ -31,12 +37,12 @@ clean:
|
|||
rm -f ./*.o ./*.1
|
||||
rm -f ./${EXEC}
|
||||
|
||||
install: bar doc
|
||||
install -D -m 755 bar ${DESTDIR}${BINDIR}/bar
|
||||
install -D -m 644 bar.1 ${DESTDIR}${PREFIX}/share/man/man1/bar.1
|
||||
install: lemonbar doc
|
||||
install -D -m 755 lemonbar ${DESTDIR}${BINDIR}/lemonbar
|
||||
install -D -m 644 lemonbar.1 ${DESTDIR}${PREFIX}/share/man/man1/lemonbar.1
|
||||
|
||||
uninstall:
|
||||
rm -f ${DESTDIR}${BINDIR}/bar
|
||||
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/bar.1
|
||||
rm -f ${DESTDIR}${BINDIR}/lemonbar
|
||||
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/lemonbar.1
|
||||
|
||||
.PHONY: all debug clean install
|
||||
|
|
59
README.pod
59
README.pod
|
@ -1,14 +1,16 @@
|
|||
=head1 NAME
|
||||
|
||||
bar - bar ain't recursive
|
||||
lemonbar - Featherweight lemon-scented bar
|
||||
|
||||
=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<bar> [-h | -g I<width>B<x>I<height>B<+>I<x> | -b | -d | -f I<font> | -p | -u I<pixel> | -B I<color> | -F I<color>]
|
||||
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>]
|
||||
|
||||
=head1 DESCRIPTION
|
||||
|
||||
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<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.
|
||||
|
||||
=head1 OPTIONS
|
||||
|
||||
|
@ -18,9 +20,9 @@ B<bar> is a lightweight bar entirely based on XCB. Provides full UTF-8 support,
|
|||
|
||||
Display the help and exit.
|
||||
|
||||
=item B<-g> I<width>B<x>I<height>B<+>I<x>
|
||||
=item B<-g> I<width>B<x>I<height>B<+>I<x>B<+>I<y>
|
||||
|
||||
Set the window geometry. If a parameter is omitted it's filled with the default value.
|
||||
Set the window geometry. If a parameter is omitted it's filled with the default value. If the I<y> parameter is specified along with the B<-b> switch then the position is relative to the bottom of the screen.
|
||||
|
||||
=item B<-b>
|
||||
|
||||
|
@ -32,11 +34,20 @@ Force docking without asking the window manager. This is needed if the window ma
|
|||
|
||||
=item B<-f> I<font>
|
||||
|
||||
Comma separated list of fonts, bar supports a maximum of two fonts.
|
||||
Define the font to load into one of the five slots (the number of slots is hardcoded and can be tweaked by
|
||||
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 bar permanent, don't exit after the standard input is closed.
|
||||
Make the 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>
|
||||
|
||||
|
@ -44,17 +55,21 @@ Sets the underline width in pixels. The default is 1.
|
|||
|
||||
=item B<-B> I<color>
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
=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
|
||||
|
||||
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.
|
||||
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<%>).
|
||||
|
||||
=over
|
||||
|
||||
|
@ -74,6 +89,10 @@ 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.
|
||||
|
@ -82,19 +101,29 @@ 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<command>:
|
||||
=item B<A>I<button>:I<command>:
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
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 bar is rendering to. I<dir> can be either
|
||||
Change the monitor the bar is rendered to. I<dir> can be either
|
||||
|
||||
=over
|
||||
|
||||
|
@ -148,7 +177,7 @@ Draw a line under the text.
|
|||
|
||||
=head1 OUTPUT
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
=head1 WWW
|
||||
|
||||
|
@ -156,10 +185,10 @@ L<git repository|https://github.com/LemonBoy/bar>
|
|||
|
||||
=head1 AUTHOR
|
||||
|
||||
2012-2014 (C) The Lemon Man
|
||||
2012-2017 (C) The Lemon Man
|
||||
|
||||
Xinerama support was kindly contributed by Stebalien
|
||||
|
||||
RandR support was kindly contributed by jvvv
|
||||
RandR support was kindly contributed by jvvv
|
||||
|
||||
Clickable areas support was heavily based off u-ra contribution
|
||||
|
|
File diff suppressed because it is too large
Load Diff
36
palette.pl
36
palette.pl
|
@ -1,36 +0,0 @@
|
|||
#!/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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue