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.125 by ayin, Sun Nov 25 11:23:18 2007 UTC vs.
Revision 1.140 by root, Wed Jan 23 14:18:19 2008 UTC

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

Diff Legend

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