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

Don't send zero width rects to monitor_create_chain

Browse Source
This commit is contained in:
John Vogel 2014-05-31 21:52:48 -04:00
parent c233646012
commit caf14a0ec4
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

@ -624,7 +624,7 @@ get_randr_monitors (void)
{ {
xcb_randr_get_screen_resources_current_reply_t *rres_reply; xcb_randr_get_screen_resources_current_reply_t *rres_reply;
xcb_randr_output_t *outputs; xcb_randr_output_t *outputs;
int num, valid = 0; int i, j, num, valid = 0;
rres_reply = xcb_randr_get_screen_resources_current_reply(c, rres_reply = xcb_randr_get_screen_resources_current_reply(c,
xcb_randr_get_screen_resources_current(c, scr->root), NULL); xcb_randr_get_screen_resources_current(c, scr->root), NULL);
@ -647,7 +647,7 @@ get_randr_monitors (void)
xcb_rectangle_t rects[num]; xcb_rectangle_t rects[num];
/* Get all outputs */ /* Get all outputs */
for (int i = 0; i < num; i++) { for (i = 0; i < num; i++) {
xcb_randr_get_output_info_reply_t *oi_reply; xcb_randr_get_output_info_reply_t *oi_reply;
xcb_randr_get_crtc_info_reply_t *ci_reply; xcb_randr_get_crtc_info_reply_t *ci_reply;
@ -683,11 +683,11 @@ get_randr_monitors (void)
free(rres_reply); free(rres_reply);
/* Check for clones and inactive outputs */ /* Check for clones and inactive outputs */
for (int i = 0; i < num; i++) { for (i = 0; i < num; i++) {
if (rects[i].width == 0) if (rects[i].width == 0)
continue; continue;
for (int j = 0; j < num; j++) { for (j = 0; j < num; j++) {
/* Does I countain J ? */ /* Does I countain J ? */
if (i != j && rects[j].width) { if (i != j && rects[j].width) {
@ -705,7 +705,11 @@ get_randr_monitors (void)
return; return;
} }
monitor_create_chain(rects, num); for (i = j = 0; i < num && j < valid; i++)
if (rects[i].width != 0)
r[j++] = rects[i];
monitor_create_chain(r, valid);
} }
void void