|
Lines 441-456
Link Here
|
| 441 |
XAllocNamedColor(disp, cmap, "black", &color, &color); |
441 |
XAllocNamedColor(disp, cmap, "black", &color, &color); |
| 442 |
|
442 |
|
| 443 |
if (scaled) { |
443 |
if (scaled) { |
|
|
444 |
|
| 444 |
pmap_d1 = XCreatePixmap(disp, root, scr->width, scr->height, depth); |
445 |
pmap_d1 = XCreatePixmap(disp, root, scr->width, scr->height, depth); |
|
|
446 |
gcval.foreground = color.pixel; |
| 447 |
gc = XCreateGC(disp, root, GCForeground, &gcval); |
| 448 |
XFillRectangle(disp, pmap_d1, gc, 0, 0, scr->width, scr->height); |
| 445 |
|
449 |
|
| 446 |
#ifdef HAVE_LIBXINERAMA |
450 |
#ifdef HAVE_LIBXINERAMA |
| 447 |
if (opt.xinerama_index >= 0) { |
|
|
| 448 |
gcval.foreground = color.pixel; |
| 449 |
gc = XCreateGC(disp, root, GCForeground, &gcval); |
| 450 |
XFillRectangle(disp, pmap_d1, gc, 0, 0, scr->width, scr->height); |
| 451 |
XFreeGC(disp, gc); |
| 452 |
} |
| 453 |
|
| 454 |
if (opt.xinerama && xinerama_screens) { |
451 |
if (opt.xinerama && xinerama_screens) { |
| 455 |
for (i = 0; i < num_xinerama_screens; i++) { |
452 |
for (i = 0; i < num_xinerama_screens; i++) { |
| 456 |
if (opt.xinerama_index < 0 || opt.xinerama_index == i) { |
453 |
if (opt.xinerama_index < 0 || opt.xinerama_index == i) { |
|
Lines 464-469
Link Here
|
| 464 |
#endif /* HAVE_LIBXINERAMA */ |
461 |
#endif /* HAVE_LIBXINERAMA */ |
| 465 |
feh_wm_set_bg_scaled(pmap_d1, im, use_filelist, |
462 |
feh_wm_set_bg_scaled(pmap_d1, im, use_filelist, |
| 466 |
0, 0, scr->width, scr->height); |
463 |
0, 0, scr->width, scr->height); |
|
|
464 |
|
| 465 |
XFreeGC(disp, gc); |
| 466 |
|
| 467 |
} else if (centered) { |
467 |
} else if (centered) { |
| 468 |
|
468 |
|
| 469 |
D(("centering\n")); |
469 |
D(("centering\n")); |
|
Lines 493-507
Link Here
|
| 493 |
} else if (filled == 1) { |
493 |
} else if (filled == 1) { |
| 494 |
|
494 |
|
| 495 |
pmap_d1 = XCreatePixmap(disp, root, scr->width, scr->height, depth); |
495 |
pmap_d1 = XCreatePixmap(disp, root, scr->width, scr->height, depth); |
|
|
496 |
gcval.foreground = color.pixel; |
| 497 |
gc = XCreateGC(disp, root, GCForeground, &gcval); |
| 498 |
XFillRectangle(disp, pmap_d1, gc, 0, 0, scr->width, scr->height); |
| 496 |
|
499 |
|
| 497 |
#ifdef HAVE_LIBXINERAMA |
500 |
#ifdef HAVE_LIBXINERAMA |
| 498 |
if (opt.xinerama_index >= 0) { |
|
|
| 499 |
gcval.foreground = color.pixel; |
| 500 |
gc = XCreateGC(disp, root, GCForeground, &gcval); |
| 501 |
XFillRectangle(disp, pmap_d1, gc, 0, 0, scr->width, scr->height); |
| 502 |
XFreeGC(disp, gc); |
| 503 |
} |
| 504 |
|
| 505 |
if (opt.xinerama && xinerama_screens) { |
501 |
if (opt.xinerama && xinerama_screens) { |
| 506 |
for (i = 0; i < num_xinerama_screens; i++) { |
502 |
for (i = 0; i < num_xinerama_screens; i++) { |
| 507 |
if (opt.xinerama_index < 0 || opt.xinerama_index == i) { |
503 |
if (opt.xinerama_index < 0 || opt.xinerama_index == i) { |
|
Lines 516-521
Link Here
|
| 516 |
feh_wm_set_bg_filled(pmap_d1, im, use_filelist |
512 |
feh_wm_set_bg_filled(pmap_d1, im, use_filelist |
| 517 |
, 0, 0, scr->width, scr->height); |
513 |
, 0, 0, scr->width, scr->height); |
| 518 |
|
514 |
|
|
|
515 |
XFreeGC(disp, gc); |
| 516 |
|
| 519 |
} else if (filled == 2) { |
517 |
} else if (filled == 2) { |
| 520 |
|
518 |
|
| 521 |
pmap_d1 = XCreatePixmap(disp, root, scr->width, scr->height, depth); |
519 |
pmap_d1 = XCreatePixmap(disp, root, scr->width, scr->height, depth); |
