ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.194 by root, Fri Nov 14 11:06:49 2014 UTC vs.
Revision 1.196 by sf-exg, Thu Jul 14 05:33:26 2016 UTC

239 else if (color >= 0) 239 else if (color >= 0)
240 { 240 {
241#if XFT 241#if XFT
242 Picture dst; 242 Picture dst;
243 243
244# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_IMG
245 if (term->bg_img 245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
247 && ((dst = XftDrawPicture (d)))) 247 && ((dst = XftDrawPicture (d))))
248 { 248 {
249 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
1410 { 1410 {
1411 if (ep != enc) 1411 if (ep != enc)
1412 { 1412 {
1413 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1413 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1414 1414
1415#ifdef HAVE_BG_PIXMAP 1415#ifdef HAVE_IMG
1416 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1416 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1417 1417
1418 if (term->bg_img 1418 if (term->bg_img
1419 && (bg == Color_transparent || bg == Color_bg 1419 && (bg == Color_transparent || bg == Color_bg
1420 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1420 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1606 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1606 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1607 else 1607 else
1608 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1608 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1609 1609
1610 desc++; 1610 desc++;
1611 while (*desc <= ' ') desc++; 1611 while (*desc <= ' ' && *desc) desc++;
1612 } 1612 }
1613 1613
1614 end = strchr (desc, ','); 1614 end = strchr (desc, ',');
1615 if (!end) 1615 if (!end)
1616 end = desc + strlen (desc); 1616 end = desc + strlen (desc);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines