fbt/lemonbar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 58705e5d1bd8d19fc68f44e886f99d6030a8ffb8 into 6959085f8dbe944bc86121a36376efdbc6e47017

Browse Source
This commit is contained in:
Sam Adam Day 2015-01-29 04:15:33 +00:00
commit 6111aec1fd
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.pod
View File

@ -32,6 +32,10 @@ Dock the bar at the bottom of the screen.
Force docking without asking the window manager. This is needed if the window manager isn't EWMH compliant.
=item B<-c>
Fix the bar being positioned incorrectly by the window manager. This is only necessary for some window managers. It may break a multi-monitor setup.
=item B<-f> I<font>
Comma separated list of fonts, bar supports a maximum of five fonts (the limit can be tweaked by changing the MAX_FONT_COUNT parameter in the source).

17
bar.c
View File

@ -28,6 +28,7 @@ typedef struct font_t {
typedef struct monitor_t {
int x, width;
int y;
xcb_window_t window;
xcb_pixmap_t pixmap;
struct monitor_t *prev, *next;
@ -77,6 +78,7 @@ static int font_count = 0;
static int font_index = -1;
static uint32_t attrs = 0;
static bool dock = false;
static bool fix_position = false;
static bool topbar = true;
static int bw = -1, bh = -1, bx = 0, by = 0;
static int bu = 1; // Underline height
@ -606,6 +608,7 @@ monitor_new (int x, int y, int width, int height)
}
ret->x = x;
ret->y = (topbar ? by : height - bh - by) + y;
ret->width = width;
ret->next = ret->prev = NULL;
@ -614,7 +617,7 @@ monitor_new (int x, int y, int width, int height)
int depth = (visual == scr->root_visual) ? XCB_COPY_FROM_PARENT : 32;
xcb_create_window(c, depth, ret->window, scr->root,
x, win_y, width, bh, 0,
x, ret->y, width, bh, 0,
XCB_WINDOW_CLASS_INPUT_OUTPUT, visual,
XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL | XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK | XCB_CW_COLORMAP,
(const uint32_t []){ bgc, bgc, dock, XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTTON_PRESS, colormap });
@ -1048,6 +1051,14 @@ init (void)
for (monitor_t *mon = monhead; mon; mon = mon->next) {
fill_rect(mon->pixmap, gc[GC_CLEAR], 0, 0, mon->width, bh);
xcb_map_window(c, mon->window);
/* Make sure the WM puts the window in the right place, since some don't
* take (X,Y) coorinates into account when xcb_create_window is called */
if (fix_position)
{
const uint32_t coords[] = {mon->x,mon->y};
xcb_configure_window(c,mon->window,XCB_CONFIG_WINDOW_X|XCB_CONFIG_WINDOW_Y,coords);
}
}
xcb_flush(c);
@ -1118,7 +1129,7 @@ main (int argc, char **argv)
ugc = fgc;
char ch;
while ((ch = getopt(argc, argv, "hg:bdf:a:pu:B:F:")) != -1) {
while ((ch = getopt(argc, argv, "hg:bdcf:a:pu:B:F:")) != -1) {
switch (ch) {
case 'h':
printf ("usage: %s [-h | -g | -b | -d | -f | -a | -p | -u | -B | -F]\n"
@ -1126,6 +1137,7 @@ main (int argc, char **argv)
"\t-g Set the bar geometry {width}x{height}+{xoffset}+{yoffset}\n"
"\t-b Put bar at the bottom of the screen\n"
"\t-d Force docking (use this if your WM isn't EWMH compliant)\n"
"\t-c Coordinate fix (use if your WM doesn't position the bar correctly)\n"
"\t-f Bar font list, comma separated\n"
"\t-p Don't close after the data ends\n"
"\t-u Set the underline/overline height in pixels\n"
@ -1136,6 +1148,7 @@ main (int argc, char **argv)
case 'p': permanent = true; break;
case 'b': topbar = false; break;
case 'd': dock = true; break;
case 'c': fix_position = true; break;
case 'f': parse_font_list(optarg); break;
case 'u': bu = strtoul(optarg, NULL, 10); break;
case 'B': dbgc = bgc = parse_color(optarg, NULL, scr->black_pixel); break;