… | |
… | |
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" }, |
… | |
… | |
231 | void |
231 | void |
232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
232 | rxvt_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); |
… | |
… | |
262 | } |
262 | } |
263 | } |
263 | } |
264 | |
264 | |
265 | ///////////////////////////////////////////////////////////////////////////// |
265 | ///////////////////////////////////////////////////////////////////////////// |
266 | |
266 | |
267 | #include "table/linedraw.h" |
|
|
268 | |
|
|
269 | struct rxvt_font_default : rxvt_font { |
267 | struct 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) |
273 | : rxvt_font () |
271 | : rxvt_font () |
… | |
… | |
308 | return false; |
306 | return false; |
309 | |
307 | |
310 | if (unicode <= 0x009f) |
308 | if (unicode <= 0x009f) |
311 | return true; |
309 | return true; |
312 | |
310 | |
|
|
311 | #ifdef BUILTIN_GLYPHS |
313 | if (unicode >= 0x2500 && unicode <= 0x259f && |
312 | if (unicode >= 0x2500 && unicode <= 0x259f && |
314 | !term->option (Opt_skipBuiltinGlyphs)) |
313 | !term->option (Opt_skipBuiltinGlyphs)) |
315 | return true; |
314 | return true; |
|
|
315 | #endif |
316 | |
316 | |
317 | if (IS_COMPOSE (unicode)) |
317 | if (IS_COMPOSE (unicode)) |
318 | return true; |
318 | return true; |
319 | |
319 | |
320 | switch (unicode) |
320 | switch (unicode) |
… | |
… | |
356 | ; |
356 | ; |
357 | |
357 | |
358 | int width = text - tp; |
358 | int width = text - tp; |
359 | int fwidth = term->fwidth * width; |
359 | int fwidth = term->fwidth * width; |
360 | |
360 | |
|
|
361 | #ifdef BUILTIN_GLYPHS |
361 | if (0x2500 <= t && t <= 0x259f) |
362 | if (0x2500 <= t && t <= 0x259f) |
362 | { |
363 | { |
|
|
364 | # include "table/linedraw.h" |
363 | uint16_t offs = linedraw_offs[t - 0x2500]; |
365 | uint16_t offs = linedraw_offs[t - 0x2500]; |
364 | uint32_t *a = linedraw_command + (offs >> 4); |
366 | uint32_t *a = linedraw_command + (offs >> 4); |
365 | uint32_t *b = a + (offs & 15); |
367 | uint32_t *b = a + (offs & 15); |
366 | |
368 | |
367 | int W = fwidth; |
369 | int W = fwidth; |
… | |
… | |
405 | |
407 | |
406 | case 1: // rectangle, possibly stippled |
408 | case 1: // rectangle, possibly stippled |
407 | if (a) |
409 | if (a) |
408 | { |
410 | { |
409 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
411 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
410 | |
412 | |
411 | gcv.fill_style = FillStippled; |
413 | gcv.fill_style = FillStippled; |
412 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
414 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
413 | gcv.ts_x_origin = x; |
415 | gcv.ts_x_origin = x; |
414 | gcv.ts_y_origin = y; |
416 | gcv.ts_y_origin = y; |
415 | |
417 | |
… | |
… | |
434 | (a - 1) * 90*64, (b - 1) * 90*64); |
436 | (a - 1) * 90*64, (b - 1) * 90*64); |
435 | break; |
437 | break; |
436 | } |
438 | } |
437 | } |
439 | } |
438 | } |
440 | } |
|
|
441 | #else |
|
|
442 | if (0) |
|
|
443 | ; |
|
|
444 | #endif |
439 | #if ENABLE_COMBINING |
445 | #if ENABLE_COMBINING |
440 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
446 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
441 | { |
447 | { |
442 | min_it (width, 2); // we only support wcwidth up to 2 |
448 | min_it (width, 2); // we only support wcwidth up to 2 |
443 | |
449 | |
… | |
… | |
674 | f = 0; |
680 | f = 0; |
675 | } |
681 | } |
676 | |
682 | |
677 | if (prop.weight != rxvt_fontprop::unset) |
683 | if (prop.weight != rxvt_fontprop::unset) |
678 | { |
684 | { |
679 | replace_field (fname, name, 2, 0, |
685 | replace_field (fname, name, 2, 0, |
680 | prop.weight < rxvt_fontprop::bold |
686 | prop.weight < rxvt_fontprop::bold |
681 | ? "medium" : "bold"); |
687 | ? "medium" : "bold"); |
682 | set_name (strdup (fname)); |
688 | set_name (strdup (fname)); |
683 | } |
689 | } |
684 | |
690 | |
… | |
… | |
828 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
834 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
829 | |
835 | |
830 | if (encm) |
836 | if (encm) |
831 | N += (f->max_byte1 - f->min_byte1) |
837 | N += (f->max_byte1 - f->min_byte1) |
832 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
838 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
833 | |
839 | |
834 | while (N) |
840 | while (N) |
835 | { |
841 | { |
836 | if (f->per_char[N].width > width) |
842 | if (f->per_char[N].width > width) |
837 | width = f->per_char[N].width; |
843 | width = f->per_char[N].width; |
838 | |
844 | |
… | |
… | |
990 | else |
996 | else |
991 | { |
997 | { |
992 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
998 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
993 | |
999 | |
994 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1000 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
995 | |
1001 | |
996 | if (slow) |
1002 | if (slow) |
997 | { |
1003 | { |
998 | do |
1004 | do |
999 | { |
1005 | { |
1000 | if (xc->byte1 || xc->byte2) |
1006 | if (xc->byte1 || xc->byte2) |
… | |
… | |
1022 | else |
1028 | else |
1023 | { |
1029 | { |
1024 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1030 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1025 | |
1031 | |
1026 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1032 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1027 | |
1033 | |
1028 | if (slow) |
1034 | if (slow) |
1029 | { |
1035 | { |
1030 | do |
1036 | do |
1031 | { |
1037 | { |
1032 | if (*xc) |
1038 | if (*xc) |
… | |
… | |
1288 | |
1294 | |
1289 | int w = term->fwidth * len; |
1295 | int w = term->fwidth * len; |
1290 | int h = term->fheight; |
1296 | int h = term->fheight; |
1291 | |
1297 | |
1292 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
1298 | /* 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 |
1299 | * 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. |
1300 | * good idea from the perspective of packaging for wide variety of user configs. |
1295 | */ |
1301 | */ |
1296 | bool buffered = true |
1302 | bool buffered = true |
1297 | #ifdef FORCE_UNBUFFERED_XFT |
1303 | #ifdef FORCE_UNBUFFERED_XFT |
1298 | && bg >= 0 |
1304 | && bg >= 0 |
… | |
… | |
1310 | int cwidth = term->fwidth; |
1316 | int cwidth = term->fwidth; |
1311 | FcChar32 fc = *text++; len--; |
1317 | FcChar32 fc = *text++; len--; |
1312 | |
1318 | |
1313 | while (len && *text == NOCHAR) |
1319 | while (len && *text == NOCHAR) |
1314 | text++, len--, cwidth += term->fwidth; |
1320 | text++, len--, cwidth += term->fwidth; |
1315 | |
1321 | |
1316 | if (fc != ' ') // skip spaces |
1322 | if (fc != ' ') // skip spaces |
1317 | { |
1323 | { |
1318 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1324 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1319 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1325 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1320 | |
1326 | |
… | |
… | |
1343 | { |
1349 | { |
1344 | Picture dst = 0; |
1350 | Picture dst = 0; |
1345 | |
1351 | |
1346 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
1352 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
1347 | dst = XftDrawPicture (d2); |
1353 | dst = XftDrawPicture (d2); |
1348 | |
1354 | |
1349 | if (bg < 0 || dst != 0) |
1355 | if (bg < 0 || dst != 0) |
1350 | { |
1356 | { |
1351 | int src_x = x, src_y = y ; |
1357 | int src_x = x, src_y = y ; |
1352 | |
1358 | |
1353 | if (term->bgPixmap.is_parentOrigin ()) |
1359 | if (term->bgPixmap.is_parentOrigin ()) |
1354 | { |
1360 | { |
1355 | src_x += term->window_vt_x; |
1361 | src_x += term->window_vt_x; |
1356 | src_y += term->window_vt_y; |
1362 | src_y += term->window_vt_y; |
1357 | } |
1363 | } |
1358 | |
1364 | |
1359 | if (term->bgPixmap.pmap_width >= src_x+w |
1365 | if (term->bgPixmap.pmap_width >= src_x+w |
1360 | && term->bgPixmap.pmap_height >= src_y+h) |
1366 | && term->bgPixmap.pmap_height >= src_y+h) |
1361 | { |
1367 | { |
1362 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1368 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1363 | src_x, src_y, w, h, 0, 0); |
1369 | src_x, src_y, w, h, 0, 0); |
… | |
… | |
1445 | |
1451 | |
1446 | rxvt_font * |
1452 | rxvt_font * |
1447 | rxvt_fontset::new_font (const char *name, codeset cs) |
1453 | rxvt_fontset::new_font (const char *name, codeset cs) |
1448 | { |
1454 | { |
1449 | rxvt_font *f; |
1455 | rxvt_font *f; |
1450 | |
1456 | |
1451 | if (!name || !*name) |
1457 | if (!name || !*name) |
1452 | { |
1458 | { |
1453 | name = ""; |
1459 | name = ""; |
1454 | f = new rxvt_font_default (this); |
1460 | f = new rxvt_font_default (this); |
1455 | } |
1461 | } |
… | |
… | |
1674 | if (find_font (font) < 0) |
1680 | if (find_font (font) < 0) |
1675 | { |
1681 | { |
1676 | char fontname[4096]; |
1682 | char fontname[4096]; |
1677 | sprintf (fontname, "xft:%-.4090s", font); |
1683 | sprintf (fontname, "xft:%-.4090s", font); |
1678 | |
1684 | |
1679 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1685 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1680 | } |
1686 | } |
1681 | |
1687 | |
1682 | free (font); |
1688 | free (font); |
1683 | } |
1689 | } |
1684 | #endif |
1690 | #endif |