… | |
… | |
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 |
|
|
241 | Picture dst; |
|
|
242 | |
|
|
243 | # ifdef HAVE_BG_PIXMAP |
|
|
244 | if (term->bgPixmap.pixmap |
|
|
245 | && !term->pix_colors[color].is_opaque () |
|
|
246 | && ((dst = XftDrawPicture (d)))) |
|
|
247 | { |
|
|
248 | XClearArea (disp, d, x, y, w, h, false); |
|
|
249 | |
|
|
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); |
|
|
252 | } |
|
|
253 | else |
|
|
254 | # endif |
242 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
255 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
|
|
256 | |
243 | #else |
257 | #else |
244 | XSetForeground (disp, gc, term->pix_colors[color]); |
258 | XSetForeground (disp, gc, term->pix_colors[color]); |
245 | XFillRectangle (disp, d, gc, x, y, w, h); |
259 | XFillRectangle (disp, d, gc, x, y, w, h); |
246 | #endif |
260 | #endif |
247 | } |
261 | } |
248 | } |
262 | } |
249 | |
263 | |
250 | ///////////////////////////////////////////////////////////////////////////// |
264 | ///////////////////////////////////////////////////////////////////////////// |
251 | |
|
|
252 | #include "table/linedraw.h" |
|
|
253 | |
265 | |
254 | struct rxvt_font_default : rxvt_font { |
266 | struct rxvt_font_default : rxvt_font { |
255 | struct rxvt_fontset *fs; |
267 | struct rxvt_fontset *fs; |
256 | |
268 | |
257 | rxvt_font_default (rxvt_fontset *fs) |
269 | rxvt_font_default (rxvt_fontset *fs) |
… | |
… | |
293 | return false; |
305 | return false; |
294 | |
306 | |
295 | if (unicode <= 0x009f) |
307 | if (unicode <= 0x009f) |
296 | return true; |
308 | return true; |
297 | |
309 | |
|
|
310 | #ifdef BUILTIN_GLYPHS |
298 | if (unicode >= 0x2500 && unicode <= 0x259f && |
311 | if (unicode >= 0x2500 && unicode <= 0x259f && |
299 | !term->option (Opt_skipBuiltinGlyphs)) |
312 | !term->option (Opt_skipBuiltinGlyphs)) |
300 | return true; |
313 | return true; |
|
|
314 | #endif |
301 | |
315 | |
302 | if (IS_COMPOSE (unicode)) |
316 | if (IS_COMPOSE (unicode)) |
303 | return true; |
317 | return true; |
304 | |
318 | |
305 | switch (unicode) |
319 | switch (unicode) |
… | |
… | |
341 | ; |
355 | ; |
342 | |
356 | |
343 | int width = text - tp; |
357 | int width = text - tp; |
344 | int fwidth = term->fwidth * width; |
358 | int fwidth = term->fwidth * width; |
345 | |
359 | |
|
|
360 | #ifdef BUILTIN_GLYPHS |
346 | if (0x2500 <= t && t <= 0x259f) |
361 | if (0x2500 <= t && t <= 0x259f) |
347 | { |
362 | { |
|
|
363 | # include "table/linedraw.h" |
348 | uint16_t offs = linedraw_offs[t - 0x2500]; |
364 | uint16_t offs = linedraw_offs[t - 0x2500]; |
349 | uint32_t *a = linedraw_command + (offs >> 4); |
365 | uint32_t *a = linedraw_command + (offs >> 4); |
350 | uint32_t *b = a + (offs & 15); |
366 | uint32_t *b = a + (offs & 15); |
351 | |
367 | |
352 | int W = fwidth; |
368 | int W = fwidth; |
… | |
… | |
390 | |
406 | |
391 | case 1: // rectangle, possibly stippled |
407 | case 1: // rectangle, possibly stippled |
392 | if (a) |
408 | if (a) |
393 | { |
409 | { |
394 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
410 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
395 | |
411 | |
396 | gcv.fill_style = FillStippled; |
412 | gcv.fill_style = FillStippled; |
397 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
413 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
398 | gcv.ts_x_origin = x; |
414 | gcv.ts_x_origin = x; |
399 | gcv.ts_y_origin = y; |
415 | gcv.ts_y_origin = y; |
400 | |
416 | |
… | |
… | |
419 | (a - 1) * 90*64, (b - 1) * 90*64); |
435 | (a - 1) * 90*64, (b - 1) * 90*64); |
420 | break; |
436 | break; |
421 | } |
437 | } |
422 | } |
438 | } |
423 | } |
439 | } |
|
|
440 | #else |
|
|
441 | if (0) |
|
|
442 | ; |
|
|
443 | #endif |
424 | #if ENABLE_COMBINING |
444 | #if ENABLE_COMBINING |
425 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
445 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
426 | { |
446 | { |
427 | min_it (width, 2); // we only support wcwidth up to 2 |
447 | min_it (width, 2); // we only support wcwidth up to 2 |
428 | |
448 | |
… | |
… | |
497 | unsigned long value; |
517 | unsigned long value; |
498 | |
518 | |
499 | if (XGetFontProperty (f, property, &value)) |
519 | if (XGetFontProperty (f, property, &value)) |
500 | return XGetAtomName (term->dpy, value); |
520 | return XGetAtomName (term->dpy, value); |
501 | else |
521 | else |
502 | return rxvt_strdup (repl); |
522 | return repl ? strdup (repl) : 0; |
503 | } |
523 | } |
504 | |
524 | |
505 | rxvt_fontprop |
525 | rxvt_fontprop |
506 | rxvt_font_x11::properties () |
526 | rxvt_font_x11::properties () |
507 | { |
527 | { |
… | |
… | |
589 | return false; |
609 | return false; |
590 | } |
610 | } |
591 | |
611 | |
592 | // fix the size of scalable fonts |
612 | // fix the size of scalable fonts |
593 | static bool |
613 | static bool |
594 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
614 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
595 | { |
615 | { |
596 | int slashes = 0; |
616 | int slashes = 0; |
597 | const char *field, *end; |
617 | const char *field, *end; |
598 | |
618 | |
599 | for (const char *c = name; *c; c++) |
619 | for (const char *c = name; *c; c++) |
… | |
… | |
609 | break; |
629 | break; |
610 | } |
630 | } |
611 | |
631 | |
612 | if (slashes >= 13 && (!old || *field == old)) |
632 | if (slashes >= 13 && (!old || *field == old)) |
613 | { |
633 | { |
614 | // TODO: check for overflow in font-name |
634 | size_t len = field - name; |
615 | strncpy (buf, name, field - name); |
635 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
616 | buf += field - name; |
636 | memcpy (*ptr, name, len); |
617 | strcpy (buf, replace); |
637 | strcpy (*ptr + len, replace); |
618 | strcat (buf, end); |
638 | strcat (*ptr, end); |
619 | |
639 | |
620 | return true; |
640 | return true; |
621 | } |
641 | } |
622 | else |
642 | else |
623 | { |
643 | { |
624 | strcpy (buf, name); |
644 | *ptr = strdup (name); |
625 | |
645 | |
626 | return false; |
646 | return false; |
627 | } |
647 | } |
628 | } |
648 | } |
629 | |
649 | |
… | |
… | |
637 | char field_str[64]; // enough for 128 bits |
657 | char field_str[64]; // enough for 128 bits |
638 | |
658 | |
639 | // first morph the font if required |
659 | // first morph the font if required |
640 | if (force_prop) |
660 | if (force_prop) |
641 | { |
661 | { |
642 | char fname[1024]; |
662 | char *fname; |
643 | |
663 | |
644 | if (name[0] != '-') |
664 | if (name[0] != '-') |
645 | { |
665 | { |
646 | f = XLoadQueryFont (disp, name); |
666 | f = XLoadQueryFont (disp, name); |
647 | |
667 | |
… | |
… | |
659 | f = 0; |
679 | f = 0; |
660 | } |
680 | } |
661 | |
681 | |
662 | if (prop.weight != rxvt_fontprop::unset) |
682 | if (prop.weight != rxvt_fontprop::unset) |
663 | { |
683 | { |
664 | replace_field (fname, name, 2, 0, |
684 | replace_field (&fname, name, 2, 0, |
665 | prop.weight < rxvt_fontprop::bold |
685 | prop.weight < rxvt_fontprop::bold |
666 | ? "medium" : "bold"); |
686 | ? "medium" : "bold"); |
667 | set_name (strdup (fname)); |
687 | set_name (fname); |
668 | } |
688 | } |
669 | |
689 | |
670 | if (prop.slant != rxvt_fontprop::unset) |
690 | if (prop.slant != rxvt_fontprop::unset) |
671 | { |
691 | { |
672 | replace_field (fname, name, 3, 0, |
692 | replace_field (&fname, name, 3, 0, |
673 | prop.slant < rxvt_fontprop::italic |
693 | prop.slant < rxvt_fontprop::italic |
674 | ? "r" : "i"); // TODO: handle "o"blique, too |
694 | ? "r" : "i"); // TODO: handle "o"blique, too |
675 | set_name (strdup (fname)); |
695 | set_name (fname); |
676 | } |
696 | } |
677 | } |
697 | } |
678 | |
698 | |
679 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
699 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
680 | ? 0 : prop.height); |
700 | ? 0 : prop.height); |
… | |
… | |
705 | font_weight *fonts = new font_weight[count]; |
725 | font_weight *fonts = new font_weight[count]; |
706 | |
726 | |
707 | for (int i = 0; i < count; i++) |
727 | for (int i = 0; i < count; i++) |
708 | { |
728 | { |
709 | rxvt_fontprop p; |
729 | rxvt_fontprop p; |
710 | char fname[1024]; |
730 | char *fname; |
711 | |
731 | |
712 | int diff = 0; |
732 | int diff = 0; |
713 | |
733 | |
714 | if (replace_field (fname, list[i], 6, '0', field_str)) |
734 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
715 | diff += 10; // slightly penalize scalable fonts |
735 | diff += 10; // slightly penalize scalable fonts |
|
|
736 | else |
|
|
737 | { |
|
|
738 | free (fname); |
716 | else if (replace_field (fname, list[i], 11, '0', "0")) |
739 | if (replace_field (&fname, list[i], 11, '0', "0")) |
717 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
740 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
741 | } |
718 | |
742 | |
719 | if (!set_properties (p, fname)) |
743 | if (!set_properties (p, fname)) |
720 | continue; |
744 | continue; |
721 | |
745 | |
722 | if (prop.height != rxvt_fontprop::unset |
746 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
726 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
750 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
727 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
751 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
728 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
752 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
729 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
753 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
730 | |
754 | |
731 | fonts[i].name = strdup (fname); |
755 | fonts[i].name = fname; |
732 | fonts[i].diff = diff; |
756 | fonts[i].diff = diff; |
733 | } |
757 | } |
734 | |
758 | |
735 | XFreeFontNames (list); |
759 | XFreeFontNames (list); |
736 | |
760 | |
… | |
… | |
813 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
837 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
814 | |
838 | |
815 | if (encm) |
839 | if (encm) |
816 | N += (f->max_byte1 - f->min_byte1) |
840 | N += (f->max_byte1 - f->min_byte1) |
817 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
841 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
818 | |
842 | |
819 | while (N) |
843 | while (N) |
820 | { |
844 | { |
821 | if (f->per_char[N].width > width) |
845 | if (f->per_char[N].width > width) |
822 | width = f->per_char[N].width; |
846 | width = f->per_char[N].width; |
823 | |
847 | |
… | |
… | |
975 | else |
999 | else |
976 | { |
1000 | { |
977 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1001 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
978 | |
1002 | |
979 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1003 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
980 | |
1004 | |
981 | if (slow) |
1005 | if (slow) |
982 | { |
1006 | { |
983 | do |
1007 | do |
984 | { |
1008 | { |
985 | if (xc->byte1 || xc->byte2) |
1009 | if (xc->byte1 || xc->byte2) |
… | |
… | |
1007 | else |
1031 | else |
1008 | { |
1032 | { |
1009 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1033 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1010 | |
1034 | |
1011 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1035 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1012 | |
1036 | |
1013 | if (slow) |
1037 | if (slow) |
1014 | { |
1038 | { |
1015 | do |
1039 | do |
1016 | { |
1040 | { |
1017 | if (*xc) |
1041 | if (*xc) |
… | |
… | |
1043 | |
1067 | |
1044 | void draw (rxvt_drawable &d, int x, int y, |
1068 | void draw (rxvt_drawable &d, int x, int y, |
1045 | const text_t *text, int len, |
1069 | const text_t *text, int len, |
1046 | int fg, int bg); |
1070 | int fg, int bg); |
1047 | |
1071 | |
1048 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1072 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
1049 | |
1073 | |
1050 | protected: |
1074 | protected: |
1051 | XftFont *f; |
1075 | XftFont *f; |
1052 | }; |
1076 | }; |
1053 | |
1077 | |
… | |
… | |
1272 | dTermGC; |
1296 | dTermGC; |
1273 | |
1297 | |
1274 | int w = term->fwidth * len; |
1298 | int w = term->fwidth * len; |
1275 | int h = term->fheight; |
1299 | int h = term->fheight; |
1276 | |
1300 | |
1277 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
1301 | /* |
1278 | * 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 |
1279 | * 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. |
1280 | */ |
1304 | */ |
1281 | bool buffered = true |
1305 | bool buffered = bg >= Color_transparent; |
1282 | #ifdef FORCE_UNBUFFERED_XFT |
1306 | #ifdef FORCE_UNBUFFERED_XFT |
1283 | && bg >= 0 |
1307 | buffered = false; |
1284 | #endif |
1308 | #endif |
1285 | ; |
1309 | buffered=false;//D |
|
|
1310 | |
1286 | // cut trailing spaces |
1311 | // cut trailing spaces |
1287 | while (len && text [len - 1] == ' ') |
1312 | while (len && text [len - 1] == ' ') |
1288 | len--; |
1313 | len--; |
1289 | |
1314 | |
1290 | int x_ = buffered ? 0 : x; |
1315 | int x_ = buffered ? 0 : x; |
… | |
… | |
1295 | int cwidth = term->fwidth; |
1320 | int cwidth = term->fwidth; |
1296 | FcChar32 fc = *text++; len--; |
1321 | FcChar32 fc = *text++; len--; |
1297 | |
1322 | |
1298 | while (len && *text == NOCHAR) |
1323 | while (len && *text == NOCHAR) |
1299 | text++, len--, cwidth += term->fwidth; |
1324 | text++, len--, cwidth += term->fwidth; |
1300 | |
1325 | |
1301 | if (fc != ' ') // skip spaces |
1326 | if (fc != ' ') // skip spaces |
1302 | { |
1327 | { |
1303 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1328 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1304 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1329 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1305 | |
1330 | |
… | |
… | |
1319 | if (buffered) |
1344 | if (buffered) |
1320 | { |
1345 | { |
1321 | if (ep != enc) |
1346 | if (ep != enc) |
1322 | { |
1347 | { |
1323 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1348 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1324 | bool back_rendered = false; |
|
|
1325 | |
1349 | |
1326 | #ifdef HAVE_BG_PIXMAP |
1350 | #ifdef HAVE_BG_PIXMAP |
|
|
1351 | Picture dst = 0; |
|
|
1352 | |
1327 | 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)))))) |
1328 | { |
1356 | { |
1329 | Picture dst = 0; |
1357 | int src_x = x, src_y = y; |
1330 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
1358 | |
1331 | dst = XftDrawPicture(d2); |
1359 | if (term->bgPixmap.is_parentOrigin ()) |
1332 | |
|
|
1333 | if (bg < 0 || dst != 0) |
|
|
1334 | { |
1360 | { |
|
|
1361 | src_x += term->window_vt_x; |
|
|
1362 | src_y += term->window_vt_y; |
|
|
1363 | } |
|
|
1364 | |
1335 | if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w |
1365 | if (term->bgPixmap.pmap_width >= src_x + w |
1336 | && term->bgPixmap.pmap_height >= y + term->window_vt_y+h) |
1366 | && term->bgPixmap.pmap_height >= src_y + h) |
1337 | { |
1367 | { |
1338 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1368 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1339 | x + term->window_vt_x, y + term->window_vt_y, |
|
|
1340 | w, h, 0, 0); |
1369 | src_x, src_y, w, h, 0, 0); |
1341 | } |
1370 | } |
1342 | else |
1371 | else |
1343 | { |
1372 | { |
1344 | XGCValues gcv; |
1373 | XGCValues gcv; |
1345 | |
1374 | |
1346 | gcv.fill_style = FillTiled; |
1375 | gcv.fill_style = FillTiled; |
1347 | gcv.tile = term->bgPixmap.pixmap; |
1376 | gcv.tile = term->bgPixmap.pixmap; |
1348 | gcv.ts_x_origin = -x; |
1377 | gcv.ts_x_origin = -src_x; |
1349 | gcv.ts_y_origin = -y; |
1378 | gcv.ts_y_origin = -src_y; |
1350 | |
1379 | |
1351 | XChangeGC (disp, gc, |
1380 | XChangeGC (disp, gc, |
1352 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1381 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1353 | &gcv); |
1382 | &gcv); |
1354 | |
1383 | |
1355 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1384 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1356 | |
1385 | |
1357 | gcv.fill_style = FillSolid; |
1386 | gcv.fill_style = FillSolid; |
1358 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1387 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1359 | } |
1388 | } |
1360 | |
1389 | |
1361 | if (bg >= 0) |
1390 | if (dst) |
1362 | { |
1391 | { |
1363 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
1392 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1393 | |
1364 | 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); |
1365 | } |
|
|
1366 | |
|
|
1367 | back_rendered = true; |
|
|
1368 | } |
1395 | } |
1369 | } |
1396 | } |
|
|
1397 | else |
1370 | #endif |
1398 | #endif |
1371 | |
|
|
1372 | if(bg >= 0 && !back_rendered) |
|
|
1373 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1399 | XftDrawRect (d2, &term->pix_colors[bg == Color_transparent ? Color_bg : bg].c, 0, 0, w, h); |
1374 | |
1400 | |
1375 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1401 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1376 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1402 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1377 | } |
1403 | } |
1378 | else |
1404 | else |
… | |
… | |
1422 | |
1448 | |
1423 | rxvt_font * |
1449 | rxvt_font * |
1424 | rxvt_fontset::new_font (const char *name, codeset cs) |
1450 | rxvt_fontset::new_font (const char *name, codeset cs) |
1425 | { |
1451 | { |
1426 | rxvt_font *f; |
1452 | rxvt_font *f; |
1427 | |
1453 | |
1428 | if (!name || !*name) |
1454 | if (!name || !*name) |
1429 | { |
1455 | { |
1430 | name = ""; |
1456 | name = ""; |
1431 | f = new rxvt_font_default (this); |
1457 | f = new rxvt_font_default (this); |
1432 | } |
1458 | } |
… | |
… | |
1500 | if (!end) |
1526 | if (!end) |
1501 | end = desc + strlen (desc); |
1527 | end = desc + strlen (desc); |
1502 | |
1528 | |
1503 | if (end - desc < 511) |
1529 | if (end - desc < 511) |
1504 | { |
1530 | { |
1505 | strncpy (buf, desc, end - desc); |
1531 | memcpy (buf, desc, end - desc); |
1506 | buf[end - desc] = 0; |
1532 | buf[end - desc] = 0; |
1507 | |
1533 | |
1508 | fonts.push_back (new_font (buf, cs)); |
1534 | fonts.push_back (new_font (buf, cs)); |
1509 | } |
1535 | } |
1510 | else |
1536 | else |
… | |
… | |
1651 | if (find_font (font) < 0) |
1677 | if (find_font (font) < 0) |
1652 | { |
1678 | { |
1653 | char fontname[4096]; |
1679 | char fontname[4096]; |
1654 | sprintf (fontname, "xft:%-.4090s", font); |
1680 | sprintf (fontname, "xft:%-.4090s", font); |
1655 | |
1681 | |
1656 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1682 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1657 | } |
1683 | } |
1658 | |
1684 | |
1659 | free (font); |
1685 | free (font); |
1660 | } |
1686 | } |
1661 | #endif |
1687 | #endif |