… | |
… | |
4 | * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> |
4 | * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> |
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 3 of the License, or |
10 | * (at your option) any later version. |
10 | * (at your option) any later version. |
11 | * |
11 | * |
12 | * This program is distributed in the hope that it will be useful, |
12 | * This program is distributed in the hope that it will be useful, |
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
… | |
… | |
22 | #include "../config.h" |
22 | #include "../config.h" |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
24 | #include "rxvtutil.h" |
24 | #include "rxvtutil.h" |
25 | #include "rxvtfont.h" |
25 | #include "rxvtfont.h" |
26 | |
26 | |
27 | #include <cstdlib> |
27 | #include <stdlib.h> |
28 | |
28 | |
29 | #include <inttypes.h> |
29 | #include <inttypes.h> |
30 | |
30 | |
31 | #if XFT |
31 | #if XFT |
32 | # include <fontconfig/fontconfig.h> |
32 | # include <fontconfig/fontconfig.h> |
… | |
… | |
132 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
132 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
133 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
133 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
134 | # endif |
134 | # endif |
135 | #endif |
135 | #endif |
136 | |
136 | |
137 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
138 | //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. |
137 | //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. |
139 | #if XFT |
138 | #if XFT |
140 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
139 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
141 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
140 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
142 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
141 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
… | |
… | |
241 | { |
240 | { |
242 | #if XFT |
241 | #if XFT |
243 | Picture dst; |
242 | Picture dst; |
244 | |
243 | |
245 | # ifdef HAVE_BG_PIXMAP |
244 | # ifdef HAVE_BG_PIXMAP |
246 | if (term->bg_pixmap |
245 | if (term->bg_img |
247 | && !term->pix_colors[color].is_opaque () |
246 | && !term->pix_colors[color].is_opaque () |
248 | && ((dst = XftDrawPicture (d)))) |
247 | && ((dst = XftDrawPicture (d)))) |
249 | { |
248 | { |
250 | XClearArea (disp, d, x, y, w, h, false); |
249 | XClearArea (disp, d, x, y, w, h, false); |
251 | |
250 | |
… | |
… | |
817 | XFreeFontNames (list); |
816 | XFreeFontNames (list); |
818 | |
817 | |
819 | // this loop only iterates when the guessed font-size is too small |
818 | // this loop only iterates when the guessed font-size is too small |
820 | for (;;) |
819 | for (;;) |
821 | { |
820 | { |
822 | font_weight *best = fonts + count - 1; |
821 | font_weight *best = fonts; |
823 | |
822 | |
824 | for (font_weight *w = best; w-- > fonts; ) |
823 | for (font_weight *w = fonts + 1; w < fonts + count; w++) |
825 | if (w->diff <= best->diff) |
824 | if (w->diff < best->diff) |
826 | best = w; |
825 | best = w; |
827 | |
826 | |
828 | if (!best->name |
827 | if (!best->name |
829 | || !(f = XLoadQueryFont (disp, best->name))) |
828 | || !(f = XLoadQueryFont (disp, best->name))) |
830 | break; |
829 | break; |
… | |
… | |
925 | } |
924 | } |
926 | #endif |
925 | #endif |
927 | |
926 | |
928 | width = 1; |
927 | width = 1; |
929 | |
928 | |
930 | for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; ) |
929 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
931 | { |
930 | { |
932 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
931 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
933 | continue; |
932 | continue; |
934 | |
933 | |
935 | // ignore characters we wouldn't use anyways |
934 | // ignore characters we wouldn't use anyways |
936 | bool careful; |
935 | bool careful; |
937 | if (!has_char (*t, &prop, careful)) |
936 | if (!has_char (*t, &prop, careful)) |
938 | continue; |
937 | continue; |
939 | |
938 | |
940 | XChar2b ch = { *t >> 8, *t }; |
939 | // the casts are needed in C++11 (see 8.5.1) |
|
|
940 | XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t }; |
941 | |
941 | |
942 | XCharStruct g; |
942 | XCharStruct g; |
943 | int dir_ret, asc_ret, des_ret; |
943 | int dir_ret, asc_ret, des_ret; |
944 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
944 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
945 | |
945 | |
… | |
… | |
1045 | dTermDisplay; |
1045 | dTermDisplay; |
1046 | dTermGC; |
1046 | dTermGC; |
1047 | |
1047 | |
1048 | bool slow = this->slow |
1048 | bool slow = this->slow |
1049 | || width != term->fwidth |
1049 | || width != term->fwidth |
1050 | || height != term->fheight; |
1050 | || height != term->fheight |
|
|
1051 | || ascent != f->ascent; |
1051 | |
1052 | |
1052 | int base = ascent; // sorry, incorrect: term->fbase; |
1053 | int base = ascent; // sorry, incorrect: term->fbase; |
1053 | |
1054 | |
1054 | XGCValues v; |
1055 | XGCValues v; |
1055 | v.foreground = term->pix_colors[fg]; |
1056 | v.foreground = term->pix_colors[fg]; |
… | |
… | |
1247 | |
1248 | |
1248 | XftUnlockFace (f); |
1249 | XftUnlockFace (f); |
1249 | |
1250 | |
1250 | int glheight = height; |
1251 | int glheight = height; |
1251 | |
1252 | |
1252 | for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; ) |
1253 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
1253 | { |
1254 | { |
1254 | FcChar16 ch = *t; |
1255 | FcChar16 ch = *t; |
1255 | |
1256 | |
1256 | if (cs != CS_UNICODE |
1257 | if (cs != CS_UNICODE |
1257 | && ch > 0x100 |
1258 | && ch > 0x100 |
… | |
… | |
1412 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1413 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1413 | |
1414 | |
1414 | #ifdef HAVE_BG_PIXMAP |
1415 | #ifdef HAVE_BG_PIXMAP |
1415 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1416 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1416 | |
1417 | |
1417 | if (term->bg_pixmap |
1418 | if (term->bg_img |
1418 | && (bg == Color_transparent || bg == Color_bg |
1419 | && (bg == Color_transparent || bg == Color_bg |
1419 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1420 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1420 | { |
1421 | { |
1421 | int src_x = x, src_y = y; |
1422 | int src_x = x, src_y = y; |
1422 | |
1423 | |
… | |
… | |
1424 | { |
1425 | { |
1425 | src_x += term->window_vt_x; |
1426 | src_x += term->window_vt_x; |
1426 | src_y += term->window_vt_y; |
1427 | src_y += term->window_vt_y; |
1427 | } |
1428 | } |
1428 | |
1429 | |
1429 | if (term->bg_pmap_width >= src_x + w |
1430 | if (term->bg_img->w >= src_x + w |
1430 | && term->bg_pmap_height >= src_y + h) |
1431 | && term->bg_img->h >= src_y + h) |
1431 | { |
1432 | { |
1432 | XCopyArea (disp, term->bg_pixmap, d2, gc, |
1433 | XCopyArea (disp, term->bg_img->pm, d2, gc, |
1433 | src_x, src_y, w, h, 0, 0); |
1434 | src_x, src_y, w, h, 0, 0); |
1434 | } |
1435 | } |
1435 | else |
1436 | else |
1436 | { |
1437 | { |
1437 | XGCValues gcv; |
1438 | XGCValues gcv; |
1438 | |
1439 | |
1439 | gcv.fill_style = FillTiled; |
1440 | gcv.fill_style = FillTiled; |
1440 | gcv.tile = term->bg_pixmap; |
1441 | gcv.tile = term->bg_img->pm; |
1441 | gcv.ts_x_origin = -src_x; |
1442 | gcv.ts_x_origin = -src_x; |
1442 | gcv.ts_y_origin = -src_y; |
1443 | gcv.ts_y_origin = -src_y; |
1443 | |
1444 | |
1444 | XChangeGC (disp, gc, |
1445 | XChangeGC (disp, gc, |
1445 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1446 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
… | |
… | |
1786 | while (hi >= fmap.size ()) |
1787 | while (hi >= fmap.size ()) |
1787 | fmap.push_back (0); |
1788 | fmap.push_back (0); |
1788 | |
1789 | |
1789 | if (!fmap[hi]) |
1790 | if (!fmap[hi]) |
1790 | { |
1791 | { |
1791 | fmap[hi] = (pagemap *)new pagemap; |
1792 | fmap[hi] = new pagemap; |
1792 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1793 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1793 | } |
1794 | } |
1794 | |
1795 | |
1795 | (*fmap[hi])[unicode & 0xff] = i; |
1796 | (*fmap[hi])[unicode & 0xff] = i; |
1796 | } |
1797 | } |