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

Better screen sorting. Fix a use after free. Clone/overlapping monitor detection

Browse Source
This commit is contained in:
LemonBoy 2014-02-18 00:23:35 +00:00
parent a66f6bb097
commit 3f4ed1600a
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bar.c
View File

@ -396,7 +396,15 @@ monitor_add (monitor_t *mon)
int int
rect_sort_cb (const void *p1, const void *p2) rect_sort_cb (const void *p1, const void *p2)
{ {
return ((xcb_rectangle_t *)p1)->x - ((xcb_rectangle_t *)p2)->x; const xcb_rectangle_t *r1 = (xcb_rectangle_t *)p1;
const xcb_rectangle_t *r2 = (xcb_rectangle_t *)p2;
if (r1->x < r2->x || r1->y < r2->y)
return -1;
if (r1->x > r2->x || r1->y > r2->y)
return 1;
return 0;
} }
void void
@ -421,9 +429,10 @@ get_randr_outputs(void)
num = xcb_randr_get_screen_resources_current_outputs_length(rres_reply); num = xcb_randr_get_screen_resources_current_outputs_length(rres_reply);
outputs = xcb_randr_get_screen_resources_current_outputs(rres_reply); outputs = xcb_randr_get_screen_resources_current_outputs(rres_reply);
config_timestamp = rres_reply->config_timestamp; config_timestamp = rres_reply->config_timestamp;
free(rres_reply);
if (num < 1) { if (num < 1) {
fprintf(stderr, "Failed to get current randr outputs\n"); fprintf(stderr, "Failed to get current randr outputs\n");
free(rres_reply);
return; return;
} }
@ -450,15 +459,19 @@ get_randr_outputs(void)
free(output_reply); free(output_reply);
continue; continue;
} }
rects[i].x = crtc_reply->x;
rects[i].y = crtc_reply->y; if (crtc_reply->rotation&(XCB_RANDR_ROTATION_ROTATE_90|XCB_RANDR_ROTATION_ROTATE_270))
rects[i].width = crtc_reply->width; rects[i] = (xcb_rectangle_t){ crtc_reply->x, crtc_reply->y, crtc_reply->height, crtc_reply->width };
rects[i].height = crtc_reply->height; else
rects[i] = (xcb_rectangle_t){ crtc_reply->x, crtc_reply->y, crtc_reply->width, crtc_reply->height };
free(crtc_reply); free(crtc_reply);
free(output_reply); free(output_reply);
cnt++; cnt++;
} }
free(rres_reply);
if (cnt < 1) { if (cnt < 1) {
fprintf(stderr, "No usable randr outputs\n"); fprintf(stderr, "No usable randr outputs\n");
return; return;
@ -468,16 +481,18 @@ get_randr_outputs(void)
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
if (rects[i].width == 0) if (rects[i].width == 0)
continue; continue;
for (j = 0; j < num; j++) { for (j = 0; j < num; j++) {
if (i == j || rects[j].width == 0 || rects[i].x != rects[j].x || rects[i].y != rects[j].y) /* Does I countain J ? */
continue; if (i != j && rects[j].width) {
/* clone found, only keep one */ if (rects[j].x >= rects[i].x && rects[j].x <= rects[i].x + rects[j].width &&
rects[i].width = (rects[i].width < rects[j].width) ? rects[i].width : rects[j].width; rects[j].y >= rects[i].y && rects[j].y <= rects[i].y + rects[i].height) {
rects[i].height = (rects[i].height < rects[j].height) ? rects[i].height : rects[j].height;
rects[j].width = 0; rects[j].width = 0;
cnt--; cnt--;
} }
} }
}
}
if (cnt < 1) { if (cnt < 1) {
fprintf(stderr, "No usable randr outputs\n"); fprintf(stderr, "No usable randr outputs\n");
@ -806,7 +821,6 @@ main (int argc, char **argv)
if (redraw) { /* Copy our temporary pixmap onto the window */ if (redraw) { /* Copy our temporary pixmap onto the window */
for (monitor_t *mon = monhead; mon; mon = mon->next) { for (monitor_t *mon = monhead; mon; mon = mon->next) {
// if (mon->width)
xcb_copy_area (c, canvas, mon->window, draw_gc, mon->x, 0, 0, 0, mon->width, cfg.height); xcb_copy_area (c, canvas, mon->window, draw_gc, mon->x, 0, 0, 0, mon->width, cfg.height);
} }
} }