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.126 by ayin, Wed Dec 26 14:22:30 2007 UTC vs.
Revision 1.140 by root, Wed Jan 23 14:18:19 2008 UTC

… …
236 if (color == Color_bg || color == Color_transparent) 236 if (color == Color_bg || color == Color_transparent)
237 XClearArea (disp, d, x, y, w, h, false); 237 XClearArea (disp, d, x, y, w, h, false);
238 else if (color >= 0) 238 else if (color >= 0)
239 { 239 {
240#if XFT 240#if XFT
241 bool done = false; 241 Picture dst;
242
242#ifdef HAVE_BG_PIXMAP 243# ifdef HAVE_BG_PIXMAP
243 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 244 if (term->bgPixmap.pixmap
244 { 245 && !term->pix_colors[color].is_opaque ()
245 Picture dst = XftDrawPicture (d); 246 && ((dst = XftDrawPicture (d))))
246 if (dst != 0)
247 { 247 {
248 XClearArea (disp, d, x, y, w, h, false); 248 XClearArea (disp, d, x, y, w, h, false);
249
249 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
250 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); 251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
251 done = true;
252 } 252 }
253 } 253 else
254#endif 254# endif
255 if (!done)
256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
257#else 257#else
258 XSetForeground (disp, gc, term->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
259 XFillRectangle (disp, d, gc, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
260#endif 260#endif
261 } 261 }
… …
631 631
632 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
633 { 633 {
634 size_t len = field - name; 634 size_t len = field - name;
635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
636 strncpy (*ptr, name, len); 636 memcpy (*ptr, name, len);
637 strcpy (*ptr + len, replace); 637 strcpy (*ptr + len, replace);
638 strcat (*ptr, end); 638 strcat (*ptr, end);
639 639
640 return true; 640 return true;
641 } 641 }
… …
1296 dTermGC; 1296 dTermGC;
1297 1297
1298 int w = term->fwidth * len; 1298 int w = term->fwidth * len;
1299 int h = term->fheight; 1299 int h = term->fheight;
1300 1300
1301 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1301 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303 * good idea from the perspective of packaging for wide variety of user configs. 1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */ 1304 */
1305 bool buffered = true 1305 bool buffered = bg >= Color_transparent;
1306#ifdef FORCE_UNBUFFERED_XFT 1306#ifdef FORCE_UNBUFFERED_XFT
1307 && bg >= 0 1307 buffered = false;
1308#endif 1308#endif
1309 ; 1309 buffered=false;//D
1310
1310 // cut trailing spaces 1311 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1312 while (len && text [len - 1] == ' ')
1312 len--; 1313 len--;
1313 1314
1314 int x_ = buffered ? 0 : x; 1315 int x_ = buffered ? 0 : x;
… …
1340 x_ += cwidth; 1341 x_ += cwidth;
1341 } 1342 }
1342 1343
1343 if (buffered) 1344 if (buffered)
1344 { 1345 {
1345 bool back_rendered = false;
1346 if (ep != enc) 1346 if (ep != enc)
1347 { 1347 {
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349 1349
1350#ifdef HAVE_BG_PIXMAP 1350#ifdef HAVE_BG_PIXMAP
1351 Picture dst = 0;
1352
1351 if (term->bgPixmap.pixmap) 1353 if (term->bgPixmap.pixmap
1354 && (bg == Color_transparent || bg == Color_bg
1355 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1352 { 1356 {
1353 Picture dst = 0; 1357 int src_x = x, src_y = y;
1354 1358
1355 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1359 if (term->bgPixmap.is_parentOrigin ())
1356 dst = XftDrawPicture (d2);
1357
1358 if (bg < 0 || dst != 0)
1359 { 1360 {
1360 int src_x = x, src_y = y ;
1361
1362 if (term->bgPixmap.is_parentOrigin ())
1363 {
1364 src_x += term->window_vt_x; 1361 src_x += term->window_vt_x;
1365 src_y += term->window_vt_y; 1362 src_y += term->window_vt_y;
1366 } 1363 }
1367 1364
1368 if (term->bgPixmap.pmap_width >= src_x+w 1365 if (term->bgPixmap.pmap_width >= src_x + w
1369 && term->bgPixmap.pmap_height >= src_y+h) 1366 && term->bgPixmap.pmap_height >= src_y + h)
1370 { 1367 {
1371 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1372 src_x, src_y, w, h, 0, 0); 1369 src_x, src_y, w, h, 0, 0);
1373 } 1370 }
1374 else 1371 else
1375 { 1372 {
1376 XGCValues gcv; 1373 XGCValues gcv;
1377 1374
1378 gcv.fill_style = FillTiled; 1375 gcv.fill_style = FillTiled;
1379 gcv.tile = term->bgPixmap.pixmap; 1376 gcv.tile = term->bgPixmap.pixmap;
1380 gcv.ts_x_origin = -src_x; 1377 gcv.ts_x_origin = -src_x;
1381 gcv.ts_y_origin = -src_y; 1378 gcv.ts_y_origin = -src_y;
1382 1379
1383 XChangeGC (disp, gc, 1380 XChangeGC (disp, gc,
1384 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1381 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1385 &gcv); 1382 &gcv);
1386 1383
1387 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1384 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1388 1385
1389 gcv.fill_style = FillSolid; 1386 gcv.fill_style = FillSolid;
1390 XChangeGC (disp, gc, GCFillStyle, &gcv); 1387 XChangeGC (disp, gc, GCFillStyle, &gcv);
1391 } 1388 }
1392 1389
1393 if (bg >= 0) 1390 if (dst)
1394 { 1391 {
1395 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1393
1396 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 }
1398
1399 back_rendered = true;
1400 } 1395 }
1401 } 1396 }
1397 else
1402#endif 1398#endif
1403 1399 clear_rect (d, x, y, w, h, bg);
1404 if (bg >= 0 && !back_rendered)
1405 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1406 1400
1407 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1401 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1408 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1402 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1409 } 1403 }
1410 else 1404 else
… …
1532 if (!end) 1526 if (!end)
1533 end = desc + strlen (desc); 1527 end = desc + strlen (desc);
1534 1528
1535 if (end - desc < 511) 1529 if (end - desc < 511)
1536 { 1530 {
1537 strncpy (buf, desc, end - desc); 1531 memcpy (buf, desc, end - desc);
1538 buf[end - desc] = 0; 1532 buf[end - desc] = 0;
1539 1533
1540 fonts.push_back (new_font (buf, cs)); 1534 fonts.push_back (new_font (buf, cs));
1541 } 1535 }
1542 else 1536 else

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines