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.121 by ayin, Sun Oct 28 11:25:04 2007 UTC vs.
Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC

… …
43 const char *name; 43 const char *name;
44} fallback_fonts[] = { 44} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
48 48
49#if ENCODING_EU 49#if ENCODING_EU
50 // cyrillic 50 // cyrillic
51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
53 53
54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
67 67
68# if XFT 68# if XFT
69 { CS_KOI8_U, "xft::lang=ru" }, 69 { CS_KOI8_U, "xft::lang=ru" },
70 70
71 { CS_ISO8859_5, "xft::lang=ru" }, 71 { CS_ISO8859_5, "xft::lang=ru" },
72 { CS_ISO8859_6, "xft::lang=ar" }, 72 { CS_ISO8859_6, "xft::lang=ar" },
73 { CS_ISO8859_7, "xft::lang=el" }, 73 { CS_ISO8859_7, "xft::lang=el" },
74 { CS_ISO8859_8, "xft::lang=he" }, 74 { CS_ISO8859_8, "xft::lang=he" },
75 { CS_ISO8859_9, "xft::lang=tr" }, 75 { CS_ISO8859_9, "xft::lang=tr" },
… …
231void 231void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 233{
234 dTermDisplay; 234 dTermDisplay;
235 dTermGC; 235 dTermGC;
236 236
237 if (color == Color_bg || color == Color_transparent) 237 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
239 else if (color >= 0) 239 else if (color >= 0)
240 { 240 {
241#if XFT 241#if XFT
… …
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; 252 done = true;
253 } 253 }
254 } 254 }
255#endif 255#endif
256 if (!done) 256 if (!done)
257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258#else 258#else
259 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 261#endif
262 } 262 }
263} 263}
264 264
265///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
266
267#include "table/linedraw.h"
268 266
269struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font {
270 struct rxvt_fontset *fs; 268 struct rxvt_fontset *fs;
271 269
272 rxvt_font_default (rxvt_fontset *fs) 270 rxvt_font_default (rxvt_fontset *fs)
… …
356 ; 354 ;
357 355
358 int width = text - tp; 356 int width = text - tp;
359 int fwidth = term->fwidth * width; 357 int fwidth = term->fwidth * width;
360 358
359#ifdef BUILTIN_GLYPHS
361 if (0x2500 <= t && t <= 0x259f) 360 if (0x2500 <= t && t <= 0x259f)
362 { 361 {
362# include "table/linedraw.h"
363 uint16_t offs = linedraw_offs[t - 0x2500]; 363 uint16_t offs = linedraw_offs[t - 0x2500];
364 uint32_t *a = linedraw_command + (offs >> 4); 364 uint32_t *a = linedraw_command + (offs >> 4);
365 uint32_t *b = a + (offs & 15); 365 uint32_t *b = a + (offs & 15);
366 366
367 int W = fwidth; 367 int W = fwidth;
… …
405 405
406 case 1: // rectangle, possibly stippled 406 case 1: // rectangle, possibly stippled
407 if (a) 407 if (a)
408 { 408 {
409 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 409 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
410 410
411 gcv.fill_style = FillStippled; 411 gcv.fill_style = FillStippled;
412 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 412 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
413 gcv.ts_x_origin = x; 413 gcv.ts_x_origin = x;
414 gcv.ts_y_origin = y; 414 gcv.ts_y_origin = y;
415 415
… …
434 (a - 1) * 90*64, (b - 1) * 90*64); 434 (a - 1) * 90*64, (b - 1) * 90*64);
435 break; 435 break;
436 } 436 }
437 } 437 }
438 } 438 }
439#else
440 if (0)
441 ;
442#endif
439#if ENABLE_COMBINING 443#if ENABLE_COMBINING
440 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 444 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
441 { 445 {
442 min_it (width, 2); // we only support wcwidth up to 2 446 min_it (width, 2); // we only support wcwidth up to 2
443 447
… …
674 f = 0; 678 f = 0;
675 } 679 }
676 680
677 if (prop.weight != rxvt_fontprop::unset) 681 if (prop.weight != rxvt_fontprop::unset)
678 { 682 {
679 replace_field (fname, name, 2, 0, 683 replace_field (fname, name, 2, 0,
680 prop.weight < rxvt_fontprop::bold 684 prop.weight < rxvt_fontprop::bold
681 ? "medium" : "bold"); 685 ? "medium" : "bold");
682 set_name (strdup (fname)); 686 set_name (strdup (fname));
683 } 687 }
684 688
… …
828 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 832 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
829 833
830 if (encm) 834 if (encm)
831 N += (f->max_byte1 - f->min_byte1) 835 N += (f->max_byte1 - f->min_byte1)
832 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 836 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
833 837
834 while (N) 838 while (N)
835 { 839 {
836 if (f->per_char[N].width > width) 840 if (f->per_char[N].width > width)
837 width = f->per_char[N].width; 841 width = f->per_char[N].width;
838 842
… …
990 else 994 else
991 { 995 {
992 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 996 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
993 997
994 XChangeGC (disp, gc, GCForeground | GCFont, &v); 998 XChangeGC (disp, gc, GCForeground | GCFont, &v);
995 999
996 if (slow) 1000 if (slow)
997 { 1001 {
998 do 1002 do
999 { 1003 {
1000 if (xc->byte1 || xc->byte2) 1004 if (xc->byte1 || xc->byte2)
… …
1022 else 1026 else
1023 { 1027 {
1024 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1028 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1025 1029
1026 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1030 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1027 1031
1028 if (slow) 1032 if (slow)
1029 { 1033 {
1030 do 1034 do
1031 { 1035 {
1032 if (*xc) 1036 if (*xc)
… …
1288 1292
1289 int w = term->fwidth * len; 1293 int w = term->fwidth * len;
1290 int h = term->fheight; 1294 int h = term->fheight;
1291 1295
1292 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1296 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
1293 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1297 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1294 * good idea from the perspective of packaging for wide variety of user configs. 1298 * good idea from the perspective of packaging for wide variety of user configs.
1295 */ 1299 */
1296 bool buffered = true 1300 bool buffered = true
1297#ifdef FORCE_UNBUFFERED_XFT 1301#ifdef FORCE_UNBUFFERED_XFT
1298 && bg >= 0 1302 && bg >= 0
… …
1310 int cwidth = term->fwidth; 1314 int cwidth = term->fwidth;
1311 FcChar32 fc = *text++; len--; 1315 FcChar32 fc = *text++; len--;
1312 1316
1313 while (len && *text == NOCHAR) 1317 while (len && *text == NOCHAR)
1314 text++, len--, cwidth += term->fwidth; 1318 text++, len--, cwidth += term->fwidth;
1315 1319
1316 if (fc != ' ') // skip spaces 1320 if (fc != ' ') // skip spaces
1317 { 1321 {
1318 FT_UInt glyph = XftCharIndex (disp, f, fc); 1322 FT_UInt glyph = XftCharIndex (disp, f, fc);
1319 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1323 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1320 1324
… …
1343 { 1347 {
1344 Picture dst = 0; 1348 Picture dst = 0;
1345 1349
1346 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1350 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1347 dst = XftDrawPicture (d2); 1351 dst = XftDrawPicture (d2);
1348 1352
1349 if (bg < 0 || dst != 0) 1353 if (bg < 0 || dst != 0)
1350 { 1354 {
1351 int src_x = x, src_y = y ; 1355 int src_x = x, src_y = y ;
1352 1356
1353 if (term->bgPixmap.is_parentOrigin ()) 1357 if (term->bgPixmap.is_parentOrigin ())
1354 { 1358 {
1355 src_x += term->window_vt_x; 1359 src_x += term->window_vt_x;
1356 src_y += term->window_vt_y; 1360 src_y += term->window_vt_y;
1357 } 1361 }
1358 1362
1359 if (term->bgPixmap.pmap_width >= src_x+w 1363 if (term->bgPixmap.pmap_width >= src_x+w
1360 && term->bgPixmap.pmap_height >= src_y+h) 1364 && term->bgPixmap.pmap_height >= src_y+h)
1361 { 1365 {
1362 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1366 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1363 src_x, src_y, w, h, 0, 0); 1367 src_x, src_y, w, h, 0, 0);
… …
1445 1449
1446rxvt_font * 1450rxvt_font *
1447rxvt_fontset::new_font (const char *name, codeset cs) 1451rxvt_fontset::new_font (const char *name, codeset cs)
1448{ 1452{
1449 rxvt_font *f; 1453 rxvt_font *f;
1450 1454
1451 if (!name || !*name) 1455 if (!name || !*name)
1452 { 1456 {
1453 name = ""; 1457 name = "";
1454 f = new rxvt_font_default (this); 1458 f = new rxvt_font_default (this);
1455 } 1459 }
… …
1674 if (find_font (font) < 0) 1678 if (find_font (font) < 0)
1675 { 1679 {
1676 char fontname[4096]; 1680 char fontname[4096];
1677 sprintf (fontname, "xft:%-.4090s", font); 1681 sprintf (fontname, "xft:%-.4090s", font);
1678 1682
1679 fonts.push_back (new_font (fontname, CS_UNICODE)); 1683 fonts.push_back (new_font (fontname, CS_UNICODE));
1680 } 1684 }
1681 1685
1682 free (font); 1686 free (font);
1683 } 1687 }
1684#endif 1688#endif

Diff Legend

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