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

Never go full retard. Now the width param is honoured in Xinerama mode.

Browse Source
This commit is contained in:
LemonBoy 2014-02-08 18:55:31 +00:00
parent edc2e2c61c
commit c349f0e39c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bar.c
View File

@ -416,6 +416,7 @@ init (void)
xia_reply = xcb_xinerama_is_active_reply (c, xcb_xinerama_is_active (c), NULL); xia_reply = xcb_xinerama_is_active_reply (c, xcb_xinerama_is_active (c), NULL);
/* Check if Xinerama is active */
if (xia_reply && xia_reply->state) { if (xia_reply && xia_reply->state) {
xcb_xinerama_query_screens_reply_t *xqs_reply; xcb_xinerama_query_screens_reply_t *xqs_reply;
xcb_xinerama_screen_info_iterator_t iter; xcb_xinerama_screen_info_iterator_t iter;
@ -425,13 +426,13 @@ init (void)
iter = xcb_xinerama_query_screens_screen_info_iterator (xqs_reply); iter = xcb_xinerama_query_screens_screen_info_iterator (xqs_reply);
/* The width is consumed across all the screens */ /* The width is consumed across all the screens */
int width_to_consume = (cfg.width == scr->width_in_pixels) ? 0 : cfg.width; int width = cfg.width;
while (iter.rem) { while (iter.rem) {
monitor_t *mon = monitor_new ( monitor_t *mon = monitor_new (
iter.data->x_org + ((iter.data->width > width_to_consume) ? width_to_consume : 0), iter.data->x_org,
iter.data->y_org + cfg.place_bottom ? (iter.data->height - cfg.height) : 0, iter.data->y_org + cfg.place_bottom ? (iter.data->height - cfg.height) : 0,
iter.data->width - MIN(iter.data->width, width_to_consume), MIN(width, iter.data->width),
iter.data->height, iter.data->height,
root, scr->root_visual); root, scr->root_visual);
@ -442,8 +443,11 @@ init (void)
else else
mons->next = mon; mons->next = mon;
if (width_to_consume) width -= iter.data->width;
width_to_consume -= MIN(iter.data->width, width_to_consume);
/* No need to check for other monitors */
if (width < 0)
break;
xcb_xinerama_screen_info_next (&iter); xcb_xinerama_screen_info_next (&iter);
} }