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

Add back the BAR_OFFSET adjustments to init()

Browse Source
This commit is contained in:
John Vogel 2013-12-15 00:49:22 -05:00
parent 8042442b8f
commit 05f8194067
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bar.c
View File

@ -515,44 +515,40 @@ init (void)
else if ((ext_reply = xcb_get_extension_data(c, &xcb_xinerama_id)) && ext_reply->present) else if ((ext_reply = xcb_get_extension_data(c, &xcb_xinerama_id)) && ext_reply->present)
num_screens = get_xinerama_outputs(root, &screens); num_screens = get_xinerama_outputs(root, &screens);
#if 0
if (num_screens) { if (num_screens) {
int i, num_saved = num_screens;
/* Add BAR_OFFSET to the last screen */ /* Add BAR_OFFSET to the last screen */
right_bar_offset = scr->width_in_pixels - bar_width - BAR_OFFSET; right_bar_offset = scr->width_in_pixels - bar_width - BAR_OFFSET;
for (cur_screen = &screens[num_screens-1]; cur_screen >= screens; xcb_xinerama_screen_info_next (&xinerama_iter), cur_screen--) { for (i = num_screens-1; i >= 0; i--) {
cur_screen->width = xinerama_iter.data->width;
if (right_bar_offset > 0) { if (right_bar_offset > 0) {
if (right_bar_offset >= cur_screen->width) { if (right_bar_offset >= screens[i].width) {
/* Remove the screen */ /* Remove the screen */
num_screens--; num_screens--;
right_bar_offset -= cur_screen->width; right_bar_offset -= screens[i].width;
} else { } else {
cur_screen->width -= right_bar_offset; screens[i].width -= right_bar_offset;
right_bar_offset = 0; right_bar_offset = 0;
} }
} }
cur_screen->x = xinerama_iter.data->x_org - BAR_OFFSET; screens[i].x -= BAR_OFFSET;
if (cur_screen->x < 0) { if (screens[i].x < 0) {
/* First screen */ /* First screen */
cur_screen->x = 0; screens[i].x = 0;
break; break;
} }
} }
/* Remove BAR_OFFSET from the first screen */ /* Remove BAR_OFFSET from the first screen */
cur_screen->width -= BAR_OFFSET; screens[i].width -= BAR_OFFSET;
/* Shift */
if (cur_screen > screens) {
memmove (screens, cur_screen, sizeof(screen_t) * num_screens);
}
/* Reallocate */ /* Reallocate */
screens = realloc (screens, num_screens); if (num_screens > num_saved) {
if (screens == NULL) screens = realloc (screens, num_screens);
exit (1); if (screens == NULL)
exit (1);
}
} }
else
#endif
if (num_screens == 0) if (num_screens == 0)
{ {
num_screens = 1; num_screens = 1;