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.134 by root, Wed Jan 23 09:42:02 2008 UTC vs.
Revision 1.151 by root, Sat Apr 4 13:58:55 2009 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
79 79
80 // japanese 80 // japanese
81#if ENCODING_JP || ENCODING_JP_EXT 81#if ENCODING_JP || ENCODING_JP_EXT
82# if XFT 82# if XFT
83 // prefer xft for complex scripts 83 // prefer xft for complex scripts
84 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
84 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
88# endif 88# endif
89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{ 217{
218} 218}
219 219
220void 220void
221rxvt_font::set_name (char *name) 221rxvt_font::set_name (char *name_)
222{ 222{
223 if (this->name == name) 223 if (name == name_)
224 return; 224 return;
225 225
226 if (this->name) free (this->name); // let the compiler optimize 226 if (name) free (name); // let the compiler optimize
227 this->name = name; 227 name = name_;
228} 228}
229 229
230void 230void
231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
232{ 232{
… …
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
243# ifdef HAVE_BG_PIXMAP 243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ()) 244 if (term->bgPixmap.pixmap
245 { 245 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 246 && ((dst = XftDrawPicture (d))))
247
248 if (dst != 0)
249 { 247 {
250 XClearArea (disp, d, x, y, w, h, false); 248 XClearArea (disp, d, x, y, w, h, false);
249
251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
252 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);
253 done = true;
254 } 252 }
255 } 253 else
256# endif 254# endif
257 if (!done)
258 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
259 256
260#else 257#else
261 XSetForeground (disp, gc, term->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
262 XFillRectangle (disp, d, gc, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
… …
1136 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1137 1134
1138#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1139 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1140 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1141 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1142#endif 1139#endif
1143 1140
1144 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1145 FcPatternAddBool (p, FC_MINSPACE, 1); 1142 FcPatternAddBool (p, FC_MINSPACE, 1);
1146 1143
… …
1299 dTermGC; 1296 dTermGC;
1300 1297
1301 int w = term->fwidth * len; 1298 int w = term->fwidth * len;
1302 int h = term->fheight; 1299 int h = term->fheight;
1303 1300
1304 /*
1305 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1306 * good idea from the perspective of packaging for wide variety of user configs.
1307 */
1308 bool buffered = bg >= Color_transparent; 1301 bool buffered = bg >= Color_transparent
1309#ifdef FORCE_UNBUFFERED_XFT 1302 && term->option (Opt_buffered);
1310 buffered = false;
1311#endif
1312 1303
1313 // cut trailing spaces 1304 // cut trailing spaces
1314 while (len && text [len - 1] == ' ') 1305 while (len && text [len - 1] == ' ')
1315 len--; 1306 len--;
1316 1307
… …
1345 1336
1346 if (buffered) 1337 if (buffered)
1347 { 1338 {
1348 if (ep != enc) 1339 if (ep != enc)
1349 { 1340 {
1350 bool back_rendered = false;
1351 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1341 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1352 1342
1353#ifdef HAVE_BG_PIXMAP 1343#ifdef HAVE_BG_PIXMAP
1344 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1354 1345
1355 if (term->bgPixmap.pixmap 1346 if (term->bgPixmap.pixmap
1356 && !(bg >= 0 && term->pix_colors[bg].is_opaque ())) 1347 && (bg == Color_transparent || bg == Color_bg
1348 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1357 { 1349 {
1358 Picture dst = XftDrawPicture (d2);
1359
1360 int src_x = x, src_y = y; 1350 int src_x = x, src_y = y;
1361 1351
1362 if (term->bgPixmap.is_parentOrigin ()) 1352 if (term->bgPixmap.is_parentOrigin ())
1363 { 1353 {
1364 src_x += term->window_vt_x; 1354 src_x += term->window_vt_x;
1365 src_y += term->window_vt_y; 1355 src_y += term->window_vt_y;
1366 } 1356 }
1367 1357
1368 if (term->bgPixmap.pmap_width >= src_x+w 1358 if (term->bgPixmap.pmap_width >= src_x + w
1369 && term->bgPixmap.pmap_height >= src_y+h) 1359 && term->bgPixmap.pmap_height >= src_y + h)
1370 { 1360 {
1371 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1361 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1372 src_x, src_y, w, h, 0, 0); 1362 src_x, src_y, w, h, 0, 0);
1373 } 1363 }
1374 else 1364 else
… …
1388 1378
1389 gcv.fill_style = FillSolid; 1379 gcv.fill_style = FillSolid;
1390 XChangeGC (disp, gc, GCFillStyle, &gcv); 1380 XChangeGC (disp, gc, GCFillStyle, &gcv);
1391 } 1381 }
1392 1382
1393 if (bg >= 0 && dst) // colour must be (and is) non-opaque here 1383 if (dst)
1394 { 1384 {
1395 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1385 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1386
1387 // dst can only be set when bg >= 0
1396 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1388 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 } 1389 }
1398
1399 back_rendered = true;
1400 } 1390 }
1391 else
1401#endif 1392#endif
1402
1403 if (!back_rendered)
1404 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); 1393 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1405 1394
1406 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1395 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1407 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1396 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1408 } 1397 }
1409 else 1398 else

Diff Legend

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