… | |
… | |
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 | |
… | |
… | |
43 | const char *name; |
42 | const char *name; |
44 | } fallback_fonts[] = { |
43 | } fallback_fonts[] = { |
45 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
44 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
46 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
45 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
47 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
46 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
48 | |
47 | |
49 | #if ENCODING_EU |
48 | #if ENCODING_EU |
50 | // cyrillic |
49 | // cyrillic |
51 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
50 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
52 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
51 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
53 | |
52 | |
54 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
53 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
55 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
54 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
56 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
55 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
57 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
56 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
58 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
57 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
… | |
… | |
65 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
64 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
66 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
65 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
67 | |
66 | |
68 | # if XFT |
67 | # if XFT |
69 | { CS_KOI8_U, "xft::lang=ru" }, |
68 | { CS_KOI8_U, "xft::lang=ru" }, |
70 | |
69 | |
71 | { CS_ISO8859_5, "xft::lang=ru" }, |
70 | { CS_ISO8859_5, "xft::lang=ru" }, |
72 | { CS_ISO8859_6, "xft::lang=ar" }, |
71 | { CS_ISO8859_6, "xft::lang=ar" }, |
73 | { CS_ISO8859_7, "xft::lang=el" }, |
72 | { CS_ISO8859_7, "xft::lang=el" }, |
74 | { CS_ISO8859_8, "xft::lang=he" }, |
73 | { CS_ISO8859_8, "xft::lang=he" }, |
75 | { CS_ISO8859_9, "xft::lang=tr" }, |
74 | { CS_ISO8859_9, "xft::lang=tr" }, |
… | |
… | |
231 | void |
230 | void |
232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
231 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
233 | { |
232 | { |
234 | dTermDisplay; |
233 | dTermDisplay; |
235 | dTermGC; |
234 | dTermGC; |
236 | |
235 | |
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 | bool done = false; |
|
|
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 && color >= 0 && !term->pix_colors[color].is_opaque ()) |
245 | { |
245 | { |
246 | Picture dst = XftDrawPicture (d); |
246 | Picture dst = XftDrawPicture (d); |
|
|
247 | |
247 | if (dst != 0) |
248 | if (dst != 0) |
248 | { |
249 | { |
249 | XClearArea (disp, d, x, y, w, h, false); |
250 | XClearArea (disp, d, x, y, w, h, false); |
250 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
251 | 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); |
252 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
252 | done = true; |
253 | done = true; |
253 | } |
254 | } |
254 | } |
255 | } |
255 | #endif |
256 | # endif |
256 | if (!done) |
257 | if (!done) |
257 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
258 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
|
|
259 | |
258 | #else |
260 | #else |
259 | XSetForeground (disp, gc, term->pix_colors[color]); |
261 | XSetForeground (disp, gc, term->pix_colors[color]); |
260 | XFillRectangle (disp, d, gc, x, y, w, h); |
262 | XFillRectangle (disp, d, gc, x, y, w, h); |
261 | #endif |
263 | #endif |
262 | } |
264 | } |
263 | } |
265 | } |
264 | |
266 | |
265 | ///////////////////////////////////////////////////////////////////////////// |
267 | ///////////////////////////////////////////////////////////////////////////// |
266 | |
|
|
267 | #include "table/linedraw.h" |
|
|
268 | |
268 | |
269 | struct rxvt_font_default : rxvt_font { |
269 | struct rxvt_font_default : rxvt_font { |
270 | struct rxvt_fontset *fs; |
270 | struct rxvt_fontset *fs; |
271 | |
271 | |
272 | rxvt_font_default (rxvt_fontset *fs) |
272 | rxvt_font_default (rxvt_fontset *fs) |
… | |
… | |
308 | return false; |
308 | return false; |
309 | |
309 | |
310 | if (unicode <= 0x009f) |
310 | if (unicode <= 0x009f) |
311 | return true; |
311 | return true; |
312 | |
312 | |
|
|
313 | #ifdef BUILTIN_GLYPHS |
313 | if (unicode >= 0x2500 && unicode <= 0x259f && |
314 | if (unicode >= 0x2500 && unicode <= 0x259f && |
314 | !term->option (Opt_skipBuiltinGlyphs)) |
315 | !term->option (Opt_skipBuiltinGlyphs)) |
315 | return true; |
316 | return true; |
|
|
317 | #endif |
316 | |
318 | |
317 | if (IS_COMPOSE (unicode)) |
319 | if (IS_COMPOSE (unicode)) |
318 | return true; |
320 | return true; |
319 | |
321 | |
320 | switch (unicode) |
322 | switch (unicode) |
… | |
… | |
356 | ; |
358 | ; |
357 | |
359 | |
358 | int width = text - tp; |
360 | int width = text - tp; |
359 | int fwidth = term->fwidth * width; |
361 | int fwidth = term->fwidth * width; |
360 | |
362 | |
|
|
363 | #ifdef BUILTIN_GLYPHS |
361 | if (0x2500 <= t && t <= 0x259f) |
364 | if (0x2500 <= t && t <= 0x259f) |
362 | { |
365 | { |
|
|
366 | # include "table/linedraw.h" |
363 | uint16_t offs = linedraw_offs[t - 0x2500]; |
367 | uint16_t offs = linedraw_offs[t - 0x2500]; |
364 | uint32_t *a = linedraw_command + (offs >> 4); |
368 | uint32_t *a = linedraw_command + (offs >> 4); |
365 | uint32_t *b = a + (offs & 15); |
369 | uint32_t *b = a + (offs & 15); |
366 | |
370 | |
367 | int W = fwidth; |
371 | int W = fwidth; |
… | |
… | |
405 | |
409 | |
406 | case 1: // rectangle, possibly stippled |
410 | case 1: // rectangle, possibly stippled |
407 | if (a) |
411 | if (a) |
408 | { |
412 | { |
409 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
413 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
410 | |
414 | |
411 | gcv.fill_style = FillStippled; |
415 | gcv.fill_style = FillStippled; |
412 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
416 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
413 | gcv.ts_x_origin = x; |
417 | gcv.ts_x_origin = x; |
414 | gcv.ts_y_origin = y; |
418 | gcv.ts_y_origin = y; |
415 | |
419 | |
… | |
… | |
434 | (a - 1) * 90*64, (b - 1) * 90*64); |
438 | (a - 1) * 90*64, (b - 1) * 90*64); |
435 | break; |
439 | break; |
436 | } |
440 | } |
437 | } |
441 | } |
438 | } |
442 | } |
|
|
443 | #else |
|
|
444 | if (0) |
|
|
445 | ; |
|
|
446 | #endif |
439 | #if ENABLE_COMBINING |
447 | #if ENABLE_COMBINING |
440 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
448 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
441 | { |
449 | { |
442 | min_it (width, 2); // we only support wcwidth up to 2 |
450 | min_it (width, 2); // we only support wcwidth up to 2 |
443 | |
451 | |
… | |
… | |
604 | return false; |
612 | return false; |
605 | } |
613 | } |
606 | |
614 | |
607 | // fix the size of scalable fonts |
615 | // fix the size of scalable fonts |
608 | static bool |
616 | static bool |
609 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
617 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
610 | { |
618 | { |
611 | int slashes = 0; |
619 | int slashes = 0; |
612 | const char *field, *end; |
620 | const char *field, *end; |
613 | |
621 | |
614 | for (const char *c = name; *c; c++) |
622 | for (const char *c = name; *c; c++) |
… | |
… | |
624 | break; |
632 | break; |
625 | } |
633 | } |
626 | |
634 | |
627 | if (slashes >= 13 && (!old || *field == old)) |
635 | if (slashes >= 13 && (!old || *field == old)) |
628 | { |
636 | { |
629 | // TODO: check for overflow in font-name |
637 | size_t len = field - name; |
630 | strncpy (buf, name, field - name); |
638 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
631 | buf += field - name; |
639 | memcpy (*ptr, name, len); |
632 | strcpy (buf, replace); |
640 | strcpy (*ptr + len, replace); |
633 | strcat (buf, end); |
641 | strcat (*ptr, end); |
634 | |
642 | |
635 | return true; |
643 | return true; |
636 | } |
644 | } |
637 | else |
645 | else |
638 | { |
646 | { |
639 | strcpy (buf, name); |
647 | *ptr = strdup (name); |
640 | |
648 | |
641 | return false; |
649 | return false; |
642 | } |
650 | } |
643 | } |
651 | } |
644 | |
652 | |
… | |
… | |
652 | char field_str[64]; // enough for 128 bits |
660 | char field_str[64]; // enough for 128 bits |
653 | |
661 | |
654 | // first morph the font if required |
662 | // first morph the font if required |
655 | if (force_prop) |
663 | if (force_prop) |
656 | { |
664 | { |
657 | char fname[1024]; |
665 | char *fname; |
658 | |
666 | |
659 | if (name[0] != '-') |
667 | if (name[0] != '-') |
660 | { |
668 | { |
661 | f = XLoadQueryFont (disp, name); |
669 | f = XLoadQueryFont (disp, name); |
662 | |
670 | |
… | |
… | |
674 | f = 0; |
682 | f = 0; |
675 | } |
683 | } |
676 | |
684 | |
677 | if (prop.weight != rxvt_fontprop::unset) |
685 | if (prop.weight != rxvt_fontprop::unset) |
678 | { |
686 | { |
679 | replace_field (fname, name, 2, 0, |
687 | replace_field (&fname, name, 2, 0, |
680 | prop.weight < rxvt_fontprop::bold |
688 | prop.weight < rxvt_fontprop::bold |
681 | ? "medium" : "bold"); |
689 | ? "medium" : "bold"); |
682 | set_name (strdup (fname)); |
690 | set_name (fname); |
683 | } |
691 | } |
684 | |
692 | |
685 | if (prop.slant != rxvt_fontprop::unset) |
693 | if (prop.slant != rxvt_fontprop::unset) |
686 | { |
694 | { |
687 | replace_field (fname, name, 3, 0, |
695 | replace_field (&fname, name, 3, 0, |
688 | prop.slant < rxvt_fontprop::italic |
696 | prop.slant < rxvt_fontprop::italic |
689 | ? "r" : "i"); // TODO: handle "o"blique, too |
697 | ? "r" : "i"); // TODO: handle "o"blique, too |
690 | set_name (strdup (fname)); |
698 | set_name (fname); |
691 | } |
699 | } |
692 | } |
700 | } |
693 | |
701 | |
694 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
702 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
695 | ? 0 : prop.height); |
703 | ? 0 : prop.height); |
… | |
… | |
720 | font_weight *fonts = new font_weight[count]; |
728 | font_weight *fonts = new font_weight[count]; |
721 | |
729 | |
722 | for (int i = 0; i < count; i++) |
730 | for (int i = 0; i < count; i++) |
723 | { |
731 | { |
724 | rxvt_fontprop p; |
732 | rxvt_fontprop p; |
725 | char fname[1024]; |
733 | char *fname; |
726 | |
734 | |
727 | int diff = 0; |
735 | int diff = 0; |
728 | |
736 | |
729 | if (replace_field (fname, list[i], 6, '0', field_str)) |
737 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
730 | diff += 10; // slightly penalize scalable fonts |
738 | diff += 10; // slightly penalize scalable fonts |
|
|
739 | else |
|
|
740 | { |
|
|
741 | free (fname); |
731 | else if (replace_field (fname, list[i], 11, '0', "0")) |
742 | if (replace_field (&fname, list[i], 11, '0', "0")) |
732 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
743 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
744 | } |
733 | |
745 | |
734 | if (!set_properties (p, fname)) |
746 | if (!set_properties (p, fname)) |
735 | continue; |
747 | continue; |
736 | |
748 | |
737 | if (prop.height != rxvt_fontprop::unset |
749 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
741 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
753 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
742 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
754 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
743 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
755 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
744 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
756 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
745 | |
757 | |
746 | fonts[i].name = strdup (fname); |
758 | fonts[i].name = fname; |
747 | fonts[i].diff = diff; |
759 | fonts[i].diff = diff; |
748 | } |
760 | } |
749 | |
761 | |
750 | XFreeFontNames (list); |
762 | XFreeFontNames (list); |
751 | |
763 | |
… | |
… | |
828 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
840 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
829 | |
841 | |
830 | if (encm) |
842 | if (encm) |
831 | N += (f->max_byte1 - f->min_byte1) |
843 | N += (f->max_byte1 - f->min_byte1) |
832 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
844 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
833 | |
845 | |
834 | while (N) |
846 | while (N) |
835 | { |
847 | { |
836 | if (f->per_char[N].width > width) |
848 | if (f->per_char[N].width > width) |
837 | width = f->per_char[N].width; |
849 | width = f->per_char[N].width; |
838 | |
850 | |
… | |
… | |
990 | else |
1002 | else |
991 | { |
1003 | { |
992 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1004 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
993 | |
1005 | |
994 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1006 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
995 | |
1007 | |
996 | if (slow) |
1008 | if (slow) |
997 | { |
1009 | { |
998 | do |
1010 | do |
999 | { |
1011 | { |
1000 | if (xc->byte1 || xc->byte2) |
1012 | if (xc->byte1 || xc->byte2) |
… | |
… | |
1022 | else |
1034 | else |
1023 | { |
1035 | { |
1024 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1036 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1025 | |
1037 | |
1026 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1038 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1027 | |
1039 | |
1028 | if (slow) |
1040 | if (slow) |
1029 | { |
1041 | { |
1030 | do |
1042 | do |
1031 | { |
1043 | { |
1032 | if (*xc) |
1044 | if (*xc) |
… | |
… | |
1287 | dTermGC; |
1299 | dTermGC; |
1288 | |
1300 | |
1289 | int w = term->fwidth * len; |
1301 | int w = term->fwidth * len; |
1290 | int h = term->fheight; |
1302 | int h = term->fheight; |
1291 | |
1303 | |
1292 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
1304 | /* |
1293 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
1305 | * 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. |
1306 | * good idea from the perspective of packaging for wide variety of user configs. |
1295 | */ |
1307 | */ |
1296 | bool buffered = true |
1308 | bool buffered = bg >= Color_transparent; |
1297 | #ifdef FORCE_UNBUFFERED_XFT |
1309 | #ifdef FORCE_UNBUFFERED_XFT |
1298 | && bg >= 0 |
1310 | buffered = false; |
1299 | #endif |
1311 | #endif |
1300 | ; |
1312 | |
1301 | // cut trailing spaces |
1313 | // cut trailing spaces |
1302 | while (len && text [len - 1] == ' ') |
1314 | while (len && text [len - 1] == ' ') |
1303 | len--; |
1315 | len--; |
1304 | |
1316 | |
1305 | int x_ = buffered ? 0 : x; |
1317 | int x_ = buffered ? 0 : x; |
… | |
… | |
1310 | int cwidth = term->fwidth; |
1322 | int cwidth = term->fwidth; |
1311 | FcChar32 fc = *text++; len--; |
1323 | FcChar32 fc = *text++; len--; |
1312 | |
1324 | |
1313 | while (len && *text == NOCHAR) |
1325 | while (len && *text == NOCHAR) |
1314 | text++, len--, cwidth += term->fwidth; |
1326 | text++, len--, cwidth += term->fwidth; |
1315 | |
1327 | |
1316 | if (fc != ' ') // skip spaces |
1328 | if (fc != ' ') // skip spaces |
1317 | { |
1329 | { |
1318 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1330 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1319 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1331 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1320 | |
1332 | |
… | |
… | |
1331 | x_ += cwidth; |
1343 | x_ += cwidth; |
1332 | } |
1344 | } |
1333 | |
1345 | |
1334 | if (buffered) |
1346 | if (buffered) |
1335 | { |
1347 | { |
1336 | bool back_rendered = false; |
|
|
1337 | if (ep != enc) |
1348 | if (ep != enc) |
1338 | { |
1349 | { |
|
|
1350 | bool back_rendered = false; |
1339 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1351 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1340 | |
1352 | |
1341 | #ifdef HAVE_BG_PIXMAP |
1353 | #ifdef HAVE_BG_PIXMAP |
1342 | if (term->bgPixmap.pixmap) |
1354 | if (term->bgPixmap.pixmap) |
1343 | { |
1355 | { |
1344 | Picture dst = 0; |
1356 | Picture dst = 0; |
1345 | |
1357 | |
1346 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
1358 | if (bg >= 0 && term->pix_colors[bg].is_opaque ()) |
|
|
1359 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
|
|
1360 | else |
1347 | dst = XftDrawPicture (d2); |
1361 | dst = XftDrawPicture (d2); |
1348 | |
1362 | |
1349 | if (bg < 0 || dst != 0) |
1363 | if (dst) |
1350 | { |
1364 | { |
1351 | int src_x = x, src_y = y ; |
1365 | int src_x = x, src_y = y; |
1352 | |
1366 | |
1353 | if (term->bgPixmap.is_parentOrigin ()) |
1367 | if (term->bgPixmap.is_parentOrigin ()) |
1354 | { |
1368 | { |
1355 | src_x += term->window_vt_x; |
1369 | src_x += term->window_vt_x; |
1356 | src_y += term->window_vt_y; |
1370 | src_y += term->window_vt_y; |
1357 | } |
1371 | } |
1358 | |
1372 | |
1359 | if (term->bgPixmap.pmap_width >= src_x+w |
1373 | if (term->bgPixmap.pmap_width >= src_x+w |
1360 | && term->bgPixmap.pmap_height >= src_y+h) |
1374 | && term->bgPixmap.pmap_height >= src_y+h) |
1361 | { |
1375 | { |
1362 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1376 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1363 | src_x, src_y, w, h, 0, 0); |
1377 | src_x, src_y, w, h, 0, 0); |
… | |
… | |
1390 | back_rendered = true; |
1404 | back_rendered = true; |
1391 | } |
1405 | } |
1392 | } |
1406 | } |
1393 | #endif |
1407 | #endif |
1394 | |
1408 | |
1395 | if (bg >= 0 && !back_rendered) |
1409 | if (!back_rendered) |
1396 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1410 | XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); |
1397 | |
1411 | |
1398 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1412 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1399 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1413 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1400 | } |
1414 | } |
1401 | else |
1415 | else |
… | |
… | |
1445 | |
1459 | |
1446 | rxvt_font * |
1460 | rxvt_font * |
1447 | rxvt_fontset::new_font (const char *name, codeset cs) |
1461 | rxvt_fontset::new_font (const char *name, codeset cs) |
1448 | { |
1462 | { |
1449 | rxvt_font *f; |
1463 | rxvt_font *f; |
1450 | |
1464 | |
1451 | if (!name || !*name) |
1465 | if (!name || !*name) |
1452 | { |
1466 | { |
1453 | name = ""; |
1467 | name = ""; |
1454 | f = new rxvt_font_default (this); |
1468 | f = new rxvt_font_default (this); |
1455 | } |
1469 | } |
… | |
… | |
1523 | if (!end) |
1537 | if (!end) |
1524 | end = desc + strlen (desc); |
1538 | end = desc + strlen (desc); |
1525 | |
1539 | |
1526 | if (end - desc < 511) |
1540 | if (end - desc < 511) |
1527 | { |
1541 | { |
1528 | strncpy (buf, desc, end - desc); |
1542 | memcpy (buf, desc, end - desc); |
1529 | buf[end - desc] = 0; |
1543 | buf[end - desc] = 0; |
1530 | |
1544 | |
1531 | fonts.push_back (new_font (buf, cs)); |
1545 | fonts.push_back (new_font (buf, cs)); |
1532 | } |
1546 | } |
1533 | else |
1547 | else |
… | |
… | |
1674 | if (find_font (font) < 0) |
1688 | if (find_font (font) < 0) |
1675 | { |
1689 | { |
1676 | char fontname[4096]; |
1690 | char fontname[4096]; |
1677 | sprintf (fontname, "xft:%-.4090s", font); |
1691 | sprintf (fontname, "xft:%-.4090s", font); |
1678 | |
1692 | |
1679 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1693 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1680 | } |
1694 | } |
1681 | |
1695 | |
1682 | free (font); |
1696 | free (font); |
1683 | } |
1697 | } |
1684 | #endif |
1698 | #endif |