ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/defaultfont.C
(Generate patch)

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.5 by pcg, Thu Dec 4 00:43:26 2003 UTC vs.
Revision 1.53 by root, Mon Jun 21 19:09:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: defaultfont.C 2 * File: defaultfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003 Marc Lehmann rxvt@plan9.de> 4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
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 2 of the License, or
… …
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "defaultfont.h" 24#include "defaultfont.h"
25 25
26#include <cstdlib>
27
26#define DISPLAY r->Xdisplay 28#define DISPLAY r->display->display
27#define DRAWABLE r->TermWin.vt
28#define GC r->TermWin.gc 29#define TGC r->TermWin.gc
29 30
30const struct rxvt_fallback_font { 31const struct rxvt_fallback_font {
31 codeset cs; 32 codeset cs;
32 const char *name; 33 const char *name;
33} fallback_fonts[] = { 34} fallback_fonts[] = {
34 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
35 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
37 38
38#if ENCODING_EU 39#if ENCODING_EU
39 // cyrillic 40 // cyrillic
40 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
41 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
42 43
43 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
44 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
45 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
46 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
47 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
48 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, 49 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" },
49 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, 50 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" },
50 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, 51 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" },
51 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, 52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },
52 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, 53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },
53 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
54 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
55 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
56#endif 57#endif
57 58
58 // japanese 59 // japanese
59#if ENCODING_JP || ENCODING_JP_EXT 60#if ENCODING_JP || ENCODING_JP_EXT
60# if XFT 61# if XFT
61 // prefer xft for complex scripts 62 // prefer xft for complex scripts
62 { CS_UNICODE, "xft:Kochi Gothic" }, 63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
63# endif 64# endif
64 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 65 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
65 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
66 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 67 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
67#endif 68#endif
68 69
69#if ENCODING_CN || ENCODING_CN_EXT 70#if ENCODING_CN || ENCODING_CN_EXT
70# if XFT 71# if XFT
71 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
72 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 73 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
73 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 74 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
74 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 75 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
75# endif 76# endif
77 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
78 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
79 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
80 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
76 { CS_CNS11643_1992_1, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 81 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
77 { CS_CNS11643_1992_2, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 82 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
78 { CS_CNS11643_1992_3, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 83 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
79 { CS_CNS11643_1992_4, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 84 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
80 { CS_CNS11643_1992_5, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 85 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
81 { CS_CNS11643_1992_6, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 86 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
82 { CS_CNS11643_1992_7, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 87 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
83 { CS_CNS11643_1992_F, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 88 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
84#endif 89#endif
85 90
86#if XFT 91#if XFT
87 { CS_UNICODE, "xft:Andale Mono" }, 92 { CS_UNICODE, "xft:Andale Mono" },
88 { CS_UNICODE, "xft:Arial Unicode MS" }, 93 { CS_UNICODE, "xft:Arial Unicode MS" },
94 { CS_UNICODE, "xft:FreeMono" },
89#endif 95#endif
90 { CS_UNICODE, "-*-lucidatypewriter-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 96 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
91 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
92 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 100
93 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
94 104
95 { CS_UNKNOWN, 0 } 105 { CS_UNKNOWN, 0 }
96}; 106};
97 107
98///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
99 109
110#if XFT
111rxvt_drawable::~rxvt_drawable ()
112{
113 if (xftdrawable)
114 XftDrawDestroy (xftdrawable);
115}
116
117rxvt_drawable::operator XftDraw *()
118{
119 if (!xftdrawable)
120 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
121
122 return xftdrawable;
123}
124#endif
125
126/////////////////////////////////////////////////////////////////////////////
127
100static void *enc_buf; 128static void *enc_buf;
101static uint32_t enc_len; 129static uint32_t enc_len;
102 130
103static inline void * 131static inline void *
104get_enc_buf (int len) 132get_enc_buf (uint32_t len)
105{ 133{
106 if (len > enc_len) 134 if (len > enc_len)
107 { 135 {
108 free (enc_buf); 136 free (enc_buf);
109 enc_buf = malloc (len); 137 enc_buf = malloc (len);
… …
111 139
112 return enc_buf; 140 return enc_buf;
113} 141}
114 142
115static const char * 143static const char *
116enc_char (const text_t *text, int len, codeset cs, bool &zero) 144enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
117{ 145{
118 uint8_t *buf = (uint8_t *)get_enc_buf (len); 146 uint8_t *buf = (uint8_t *)get_enc_buf (len);
119 147
120 while (len--) 148 while (len--)
121 { 149 {
… …
132 160
133 return (const char *)enc_buf; 161 return (const char *)enc_buf;
134} 162}
135 163
136static const XChar2b * 164static const XChar2b *
137enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 165enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
138{ 166{
139 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 167 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
140 168
141 while (len--) 169 while (len--)
142 { 170 {
… …
157} 185}
158 186
159///////////////////////////////////////////////////////////////////////////// 187/////////////////////////////////////////////////////////////////////////////
160 188
161void 189void
162rxvt_font::clear_rect (int x, int y, int w, int h, int color) 190rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
163{ 191{
164 if (color == Color_bg) 192 if (color == Color_bg)
165 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 193 XClearArea (d.display->display, d, x, y, w, h, FALSE);
166 else if (color >= 0) 194 else if (color >= 0)
167 { 195 {
196#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else
168 XSetForeground (DISPLAY, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
169 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif
170 } 202 }
171} 203}
172 204
173static const char *linedraw_cmds[128] = { 205#include "table/linedraw.h"
174 "1hH", "2hH", "1vV", "2vV",
175 0, 0, 0, 0,
176 0, 0, 0, 0,
177 "1HV", "2H1V", "1H2V", "2HV",
178
179 // 2510
180 "1hV", "2h1V", "1h2V", "2hV",
181 "1Hv", "2H1v", "1H2v", "2Hv",
182 "1hv", "2h1v", "1h2v", "2hv",
183 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
184
185 // 2520
186 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
187 "1hvV", "2h1vV", "1hV2v", "1hv2V",
188 "1h2vV", "2hv1V", "1v2hV", "2hvV",
189 "1hHV", "2h1HV", "2H1hV", "2hH1V",
190
191 // 2530
192 "1hH2V", "2hV1H", "1h2HV", "2hHV",
193 "1hHv", "1vH2h", "1hv2H", "1v2hH",
194 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
195 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
196
197 // 2540
198 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
199 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
200 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
201 0, 0, 0, 0,
202
203 // 2550
204 0, 0, 0, 0,
205 0, 0, 0, 0,
206 0, 0, 0, 0,
207 0, 0, 0, 0,
208
209 // 2560
210 0, 0, 0, 0,
211 0, 0, 0, 0,
212 0, 0, 0, 0,
213 0, 0, 0, 0,
214
215 // 2570
216 0, "1a", "1b", "1ab",
217 "1h", "1v", "1H", "1V",
218 "2h", "2v", "2H", "2V",
219 "1h2H", "1v2V", "1H2h", "1V2v"
220
221 // to be done
222};
223 206
224struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
225 bool load (int maxheight) 208
209 rxvt_fontprop properties ()
210 {
211 rxvt_fontprop p;
212
213 p.width = p.height = 1;
214 p.weight = rxvt_fontprop::medium;
215 p.slant = rxvt_fontprop::roman;
216
217 return p;
218 }
219
220 bool load (const rxvt_fontprop &prop)
226 { 221 {
227 width = 1; height = 1; 222 width = 1; height = 1;
228 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
229 224
225 set_name (strdup ("built-in pseudofont"));
226
230 return true; 227 return true;
231 } 228 }
232 229
233 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
234 { 231 {
235 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
236 return true; 233 return true;
237 if (unicode >= 0x0080 && unicode <= 0x009f) 234
235 if (unicode <= 0x007f)
236 return false;
237
238 if (unicode <= 0x009f)
238 return true; 239 return true;
239 240
240 if (unicode >= 0x2500 && unicode <= 0x257f 241 if (unicode >= 0x2500 && unicode <= 0x259f)
241 && linedraw_cmds[unicode - 0x2500]) 242 return true;
243
244 if (IS_COMPOSE (unicode))
242 return true; 245 return true;
243 246
244 switch (unicode) 247 switch (unicode)
245 { 248 {
246 case ZERO_WIDTH_CHAR: 249 case ZERO_WIDTH_CHAR:
… …
248 } 251 }
249 252
250 return false; 253 return false;
251 } 254 }
252 255
253 void draw (int x, int y, 256 void draw (rxvt_drawable &d, int x, int y,
254 const text_t *text, int len, 257 const text_t *text, int len,
255 int fg, int bg); 258 int fg, int bg);
256}; 259};
257 260
258void 261void
259rxvt_font_default::draw (int x, int y, 262rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
260 const text_t *text, int len, 263 const text_t *text, int len,
261 int fg, int bg) 264 int fg, int bg)
262{ 265{
263 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 266 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
264 267
265 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 268 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
266 269
267 while (len--) 270 while (len--)
268 { 271 {
272#if ENABLE_COMBINING
273 compose_char *cc;
274#endif
269 text_t t = *text++; 275 text_t t = *text++;
270 276
271 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 277 if (0x2500 <= t && t <= 0x259f)
278 {
279 uint16_t offs = linedraw_offs[t - 0x2500];
280 uint32_t *a = linedraw_command + (offs >> 4);
281 uint32_t *b = a + (offs & 15);
282
283 int W = r->TermWin.fwidth;
284 int H = r->TermWin.fheight;
285
286 int x_[16];
287 int y_[16];
288
289 for (int i = 0; i <= 8; i++)
272 { 290 {
273 const char *p = linedraw_cmds[t - 0x2500]; 291 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
292 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
293 }
274 294
275 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 295 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
276 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 296 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
277 297
278 XGCValues gcv; 298 XGCValues gcv;
279 299
300 gcv.cap_style = CapButt;
301 gcv.line_width = 0;
302 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
303
280 while (*p) 304 while (a < b)
281 { 305 {
306 uint32_t command = *a++;
307
308 int op = (command >> 24) & 255;
309 int a = (command >> 20) & 15;
310 int b = (command >> 16) & 15;
311 int x1 = x_[(command >> 12) & 15];
312 int y1 = y_[(command >> 8) & 15];
313 int x2 = x_[(command >> 4) & 15];
314 int y2 = y_[(command >> 0) & 15];
315
282 switch (*p++) 316 switch (op)
283 { 317 {
284 case '1': 318 case 0: // line
285 gcv.line_width = 0; 319 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
286 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
287 break; 320 break;
288 321
289 case '2': 322 case 1: // rectangle, possibly stippled
323 if (a)
324 {
325 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
326
327 gcv.fill_style = FillStippled;
328 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
329 gcv.ts_x_origin = x;
330 gcv.ts_y_origin = y;
331
332 XChangeGC (d.display->display, TGC,
333 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
334 &gcv);
335 }
336
337 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
338
339 if (a)
340 {
341 XFreePixmap (d.display->display, gcv.stipple);
290 gcv.line_width = 2; 342 gcv.stipple = 0;
291 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 343 gcv.fill_style = FillSolid;
344 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
345 }
292 break; 346 break;
293 347 case 2: // arc
294 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 348 XDrawArc (d.display->display, d, TGC,
295 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 349 x1 - W/2, y1 - H/2, W-1, H-1,
296 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 350 (a - 1) * 90*64, (b - 1) * 90*64);
297 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 351 break;
298 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;
299 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;
300 } 352 }
301 } 353 }
302 354 }
303 gcv.line_width = 0; 355#if ENABLE_COMBINING
304 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 356 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
305 } 357 {
358 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
359 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
360 if (cc->c2 != NOCHAR)
361 {
362 // prefer font of first character, for no good reasons
363 rxvt_font *f2 = f1->has_codepoint (cc->c2)
364 ? f1
365 : (*fs)[fs->find_font (cc->c2)];
366
367 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
368 }
369 }
370#endif
306 else 371 else
307 switch (*text++) 372 switch (t)
308 { 373 {
309 case NOCHAR:
310 case ZERO_WIDTH_CHAR: 374 case ZERO_WIDTH_CHAR:
311 break; 375 break;
376
312 default: 377 default:
313 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 378 int w = 0;
379 while (len > 0 && *text == NOCHAR)
380 {
381 ++text;
382 --len;
383 w += r->TermWin.fwidth;
384 }
385
386 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
387 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
388 x += w;
314 } 389 }
315 390
316 x += r->TermWin.fwidth; 391 x += r->TermWin.fwidth;
317 } 392 }
318} 393}
… …
322struct rxvt_font_x11 : rxvt_font { 397struct rxvt_font_x11 : rxvt_font {
323 rxvt_font_x11 () { f = 0; } 398 rxvt_font_x11 () { f = 0; }
324 399
325 void clear (); 400 void clear ();
326 401
327 bool load (int maxheight); 402 rxvt_fontprop properties ();
328 403
404 bool load (const rxvt_fontprop &prop);
405
329 bool has_codepoint (uint32_t unicode); 406 bool has_codepoint (unicode_t unicode);
330 407
331 void draw (int x, int y, 408 void draw (rxvt_drawable &d, int x, int y,
332 const text_t *text, int len, 409 const text_t *text, int len,
333 int fg, int bg); 410 int fg, int bg);
334 411
335 XFontStruct *f; 412 XFontStruct *f;
336 codeset cs; 413 codeset cs;
337 bool enc2b, encm; 414 bool enc2b, encm;
338 415
339 const char *get_property (const char *property, const char *repl) const; 416 char *get_property (XFontStruct *f, const char *property, const char *repl) const;
417 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
418 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
419 bool set_properties (rxvt_fontprop &p, const char *name);
340}; 420};
341 421
342const char * 422char *
343rxvt_font_x11::get_property (const char *property, const char *repl) const 423rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
344{ 424{
345 unsigned long value; 425 unsigned long value;
346 426
347 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
348 return XGetAtomName (DISPLAY, value); 428 return XGetAtomName (DISPLAY, value);
349 else 429 else
430 return rxvt_strdup (repl);
431}
432
433rxvt_fontprop
434rxvt_font_x11::properties ()
435{
436 rxvt_fontprop p;
437 set_properties (p, f);
350 return repl; 438 return p;
351} 439}
352 440
353bool 441bool
354rxvt_font_x11::load (int maxheight) 442rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
443{
444 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
445 p.height = height;
446 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
447 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
448
449 return true;
450}
451
452bool
453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
454{
455 unsigned long height;
456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
457 return false;
458
459 unsigned long avgwidth;
460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
461 avgwidth = 0;
462
463 char *weight = get_property (f, "WEIGHT_NAME", "medium");
464 char *slant = get_property (f, "SLANT", "r");
465
466 set_properties (p, height, weight, slant, avgwidth);
467
468 free (weight);
469 free (slant);
470
471 return true;
472}
473
474bool
475rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
476{
477 int slashes = 0;
478 const char *comp[13];
479
480 for (const char *c = name; *c; c++)
481 if (*c == '-')
482 {
483 comp[slashes++] = c + 1;
484 if (slashes >= 13)
485 break;
486 }
487
488 /* can we short-circuit the costly XLoadQueryFont? */
489 if (slashes >= 13
490 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
491 && (*comp[11] >= '0' && *comp[11] <= '9'))
492 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
493
494 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
495
496 if (f)
497 {
498 // the font should really exist now. if not, we have a problem
499 // (e.g. if the user did xset fp rehash just when we were searching fonts).
500 // in that case, just return garbage.
501 bool ret = set_properties (p, f);
502 XFreeFont (DISPLAY, f);
503 return ret;
504 }
505 else
506 return false;
507}
508
509// fix the size of scalable fonts
510static void
511fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop)
512{
513 int slashes = 0;
514 const char *size;
515
516 for (const char *c = name; *c; c++)
517 if (*c == '-')
518 {
519 if (slashes == 6)
520 size = c + 1;
521
522 if (++slashes >= 13)
523 break;
524 }
525
526 if (slashes >= 13 && size[0] == '0')
527 {
528 strncpy (buf, name, size - name);
529 buf += size - name;
530 buf += sprintf (buf, "%d", prop.height);
531 strcpy (buf, size + 1);
532 }
533 else
534 strcpy (buf, name);
535}
536
537bool
538rxvt_font_x11::load (const rxvt_fontprop &prop)
355{ 539{
356 clear (); 540 clear ();
541
542 char **list;
543 int count;
544 list = XListFonts (DISPLAY, name, 512, &count);
545 set_name (0);
546
547 if (!list)
548 return false;
549
550 int bestdiff = 0x7fffffff;
551 for (int i = 0; i < count; i++)
552 {
553 rxvt_fontprop p;
554 char fname[1024];
555 fix_scalable (fname, list[i], prop);
556
557 if (!set_properties (p, fname))
558 continue;
559
560 if (p.height > prop.height) // weed out too large fonts
561 continue;
562
563 int diff = (prop.height - p.height) * 32
564 + abs (prop.weight - p.weight)
565 + abs (prop.slant - p.slant );
566
567 if (!name // compare against best found so far
568 || diff < bestdiff)
569 {
570 set_name (strdup (fname));
571 bestdiff = diff;
572 }
573 }
574
575 XFreeFontNames (list);
576
577 if (!name)
578 return false;
357 579
358 f = XLoadQueryFont (DISPLAY, name); 580 f = XLoadQueryFont (DISPLAY, name);
359 581
360 if (!f) 582 if (!f)
361 return false; 583 return false;
362 584
363 unsigned long value;
364
365 const char *registry = get_property ("CHARSET_REGISTRY", 0); 585 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
366 const char *encoding = get_property ("CHARSET_ENCODING", 0); 586 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
367 587
368 if (registry && encoding) 588 if (registry && encoding)
369 { 589 {
370 char charset[64]; 590 char charset[64];
371 snprintf (charset, 64, "%s-%s", registry, encoding); 591 snprintf (charset, 64, "%s-%s", registry, encoding);
372 592
373 cs = codeset_from_name (charset); 593 cs = codeset_from_name (charset);
374 } 594 }
375 else 595 else
376 { 596 {
377 const char *charset = get_property ("FONT", 0); 597 const char *charset = get_property (f, "FONT", 0);
378 598
379 if (!charset) 599 if (!charset)
380 charset = name; 600 charset = name;
381 601
382 int count = 13; 602 int count = 13;
… …
385 break; 605 break;
386 606
387 cs = codeset_from_name (charset); 607 cs = codeset_from_name (charset);
388 } 608 }
389 609
610 free (registry);
611 free (encoding);
612
390 if (cs == CS_UNICODE) 613 if (cs == CS_UNICODE)
391 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 614 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
392 615
393 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 616 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
394 enc2b = encm || f->max_char_or_byte2 > 255; 617 enc2b = encm || f->max_char_or_byte2 > 255;
395 618
396 ascent = f->ascent; 619 ascent = f->ascent;
397 descent = f->descent; 620 descent = f->descent;
398 height = ascent + descent; 621 height = ascent + descent;
399 622
400 prop = false; 623 slow = false;
401 624
402 if (f->min_bounds.width == f->max_bounds.width) 625 if (f->min_bounds.width == f->max_bounds.width)
403 width = f->min_bounds.width; 626 width = f->min_bounds.width;
404 else if (f->per_char == NULL) 627 else if (f->per_char == NULL)
405 width = f->max_bounds.width; 628 width = f->max_bounds.width;
406 else 629 else
407 { 630 {
408 prop = true; 631 slow = true;
409 632
410 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 633 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
411 634
412 if (encm) 635 if (encm)
413 N += (f->max_byte1 - f->min_byte1) 636 N += (f->max_byte1 - f->min_byte1)
… …
443 f = 0; 666 f = 0;
444 } 667 }
445} 668}
446 669
447bool 670bool
448rxvt_font_x11::has_codepoint (uint32_t unicode) 671rxvt_font_x11::has_codepoint (unicode_t unicode)
449{ 672{
450 uint32_t ch = FROM_UNICODE (cs, unicode); 673 uint32_t ch = FROM_UNICODE (cs, unicode);
451 674
452 if (ch == NOCHAR) 675 if (ch == NOCHAR)
453 return false; 676 return false;
… …
455 /* check wether the character exists in _this_ font. horrible. */ 678 /* check wether the character exists in _this_ font. horrible. */
456 XCharStruct *xcs; 679 XCharStruct *xcs;
457 680
458 if (encm) 681 if (encm)
459 { 682 {
460 int byte1 = ch >> 8; 683 unsigned char byte1 = ch >> 8;
461 int byte2 = ch & 255; 684 unsigned char byte2 = ch & 255;
462 685
463 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 686 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
464 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 687 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
465 return false; 688 return false;
466 689
… …
489 712
490 return true; 713 return true;
491} 714}
492 715
493void 716void
494rxvt_font_x11::draw (int x, int y, 717rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
495 const text_t *text, int len, 718 const text_t *text, int len,
496 int fg, int bg) 719 int fg, int bg)
497{ 720{
498 // this looks like a mess /. 721 // this looks like a mess /.
499 // and it is a mess /. 722 // and it is a mess /.
500 // yet we are trying to be perfect /. 723 // yet we are trying to be perfect /.
501 // but the result still isn't perfect /. 724 // but the result still isn't perfect /.
502 725
503 bool slow = prop 726 bool slow = this->slow
504 || width != r->TermWin.fwidth 727 || width != r->TermWin.fwidth
505 || height != r->TermWin.fheight; 728 || height != r->TermWin.fheight;
506 729
507 int base = r->TermWin.fbase; 730 int base = r->TermWin.fbase;
508 731
509 XGCValues v; 732 XGCValues v;
510 v.foreground = r->PixColors[fg]; 733 v.foreground = r->PixColors[fg];
511 v.background = r->PixColors[bg];
512 v.font = f->fid; 734 v.font = f->fid;
513 735
514 if (enc2b) 736 if (enc2b)
515 { 737 {
516 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 738 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
517 739
518 if (bg == Color_bg && !slow) 740 if (bg == Color_bg && !slow)
519 { 741 {
742 v.background = r->PixColors[bg];
520 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 743 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
521 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 744 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
522 } 745 }
523 else 746 else
524 { 747 {
525 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 748 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
526 749
527 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 750 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
528 751
529 if (slow) 752 if (slow)
530 { 753 {
531 do 754 do
532 { 755 {
533 if (xc->byte1 || xc->byte2) 756 if (xc->byte1 || xc->byte2)
534 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 757 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
535 758
536 x += r->TermWin.fwidth; 759 x += r->TermWin.fwidth;
537 xc++; len--; 760 xc++; len--;
538 } 761 }
539 while (len); 762 while (len);
540 } 763 }
541 else 764 else
542 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 765 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
543 } 766 }
544 } 767 }
545 else 768 else
546 { 769 {
547 const char *xc = enc_char (text, len, cs, slow); 770 const char *xc = enc_char (text, len, cs, slow);
548 771
549 if (bg == Color_bg && !slow) 772 if (bg == Color_bg && !slow)
550 { 773 {
774 v.background = r->PixColors[bg];
551 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 775 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
552 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 776 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
553 } 777 }
554 else 778 else
555 { 779 {
556 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 780 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
557 781
558 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 782 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
559 783
560 if (slow) 784 if (slow)
561 { 785 {
562 do 786 do
563 { 787 {
564 if (*xc) 788 if (*xc)
565 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 789 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
566 790
567 x += r->TermWin.fwidth; 791 x += r->TermWin.fwidth;
568 xc++; len--; 792 xc++; len--;
569 } 793 }
570 while (len); 794 while (len);
571 } 795 }
572 else 796 else
573 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 797 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
574 } 798 }
575 } 799 }
576} 800}
577 801
578///////////////////////////////////////////////////////////////////////////// 802/////////////////////////////////////////////////////////////////////////////
… …
583//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 807//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
584#define SWATHBITS 8 808#define SWATHBITS 8
585#endif 809#endif
586 810
587struct rxvt_font_xft : rxvt_font { 811struct rxvt_font_xft : rxvt_font {
588#if 0
589 enum {
590 SWATHCOUNT = 1 << (21 - UNIBITS),
591 SWATHSIZE = 1 << (SWATHBITS - 5)
592 };
593 typedef uint32_t swath[SWATHSIZE];
594
595 swath *cvr[SWATHCOUNT];
596#endif
597
598#if 0
599 void gen_coverage_swath (unsigned int page);
600
601 bool has_char (uint32_t ch)
602 {
603 unsigned int page = ch >> SWATHBITS;
604 unsigned int idx = ch & ((1 << SWATHBITS) - 1);
605
606 if (page >= SWATHCOUNT)
607 return false;
608
609 if (!cvr[page]) gen_coverage_swath (page);
610
611 return cvr[page][idx >> 5] & (1 << (idx & 31));
612 }
613#endif
614 rxvt_font_xft () { f = 0; d = 0; } 812 rxvt_font_xft () { f = 0; }
615 813
616 void clear (); 814 void clear ();
617 815
618 bool load (int maxheight); 816 rxvt_fontprop properties ();
619 817
620 void draw (int x, int y, 818 bool load (const rxvt_fontprop &prop);
819
820 void draw (rxvt_drawable &d, int x, int y,
621 const text_t *text, int len, 821 const text_t *text, int len,
622 int fg, int bg); 822 int fg, int bg);
623 823
624 bool has_codepoint (uint32_t unicode); 824 bool has_codepoint (unicode_t unicode);
625 825
626protected: 826protected:
627 XftFont *f; 827 XftFont *f;
628 XftDraw *d;
629
630#if 0
631 virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
632 void set_swath (uint32_t ch)
633 {
634 cvr[ch >> SWATHBITS] |= 1 << (ch & ((1 << SWATHBITS) - 1));
635 }
636#endif
637}; 828};
638 829
639void 830void
640rxvt_font_xft::clear () 831rxvt_font_xft::clear ()
641{ 832{
642 if (f) 833 if (f)
643 { 834 {
644 XftFontClose (DISPLAY, f); 835 XftFontClose (DISPLAY, f);
645 f = 0; 836 f = 0;
646 } 837 }
838}
647 839
648 if (d) 840rxvt_fontprop
649 { 841rxvt_font_xft::properties ()
650 XftDrawDestroy (d); 842{
651 d = 0; 843 rxvt_fontprop p;
652 }
653 844
654#if 0 845 FT_Face face = XftLockFace (f);
655 for (int i = 0; i < SWATHCOUNT; i++) 846
656 delete cvr[i]; 847 p.width = width; p.height = height;
657#endif 848 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
849 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
850
851 XftUnlockFace (f);
852
853 return p;
658} 854}
659 855
660bool 856bool
661rxvt_font_xft::load (int maxheight) 857rxvt_font_xft::load (const rxvt_fontprop &prop)
662{ 858{
663#if 0 859#if 0
664 for (int i = 0; i < SWATHCOUNT; i++) 860 for (int i = 0; i < SWATHCOUNT; i++)
665 cvr[i] = 0; 861 cvr[i] = 0;
666#endif 862#endif
667 863
668 clear (); 864 clear ();
669 865
670 f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name); 866 FcPattern *p = FcNameParse ((FcChar8 *) name);
867
868 if (!p)
869 return false;
870
871 FcValue v;
872
873 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
874 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
875
876 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
877 FcPatternAddInteger (p, FC_SLANT, prop.slant);
878
879#if 0 // clipping unfortunately destroys our precious double-width-characters
880 // clip width, we can't do better, or can we?
881 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
882 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
883#endif
884
885 //FcPatternAddBool (p, FC_MINSPACE, 1);
886
887 XftResult result;
888 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
889
890 FcPatternDestroy (p);
891
892 if (!match)
893 return false;
894
895 f = XftFontOpenPattern (DISPLAY, match);
671 896
672 if (!f) 897 if (!f)
898 {
899 FcPatternDestroy (match);
673 return false; 900 return false;
901 }
674 902
675 FT_Face face = XftLockFace (f); 903 FT_Face face = XftLockFace (f);
676 904
677 prop = !FT_IS_FIXED_WIDTH (face); 905 slow = !FT_IS_FIXED_WIDTH (face);
678 906
679 int ftheight = 0; 907 int ftheight = 0;
680 908
681 for (;;) 909 for (;;)
682 { 910 {
… …
684 FcChar8 c; 912 FcChar8 c;
685 913
686 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 914 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
687 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 915 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
688 916
689 prop = prop || g1.xOff != g2.xOff; // don't simply trust the font 917 if (g1.xOff != g2.xOff) // don't simply trust the font
918 slow = true;
690 919
691 width = g2.xOff; 920 width = g2.xOff;
692 ascent = (face->size->metrics.ascender + 63) >> 6; 921 ascent = (face->size->metrics.ascender + 63) >> 6;
693 descent = (-face->size->metrics.descender + 63) >> 6; 922 descent = (-face->size->metrics.descender + 63) >> 6;
694 height = ascent + descent; 923 height = ascent + descent;
695 924
696 if (height <= maxheight || !maxheight) 925 if (height <= prop.height || !prop.height)
697 break; 926 break;
698 927
699 if (ftheight) 928 if (ftheight)
700 { 929 {
701 // take smaller steps near the end 930 // take smaller steps near the end
702 if (height > maxheight + 1) ftheight++; 931 if (height > prop.height + 1) ftheight++;
703 if (height > maxheight + 2) ftheight++; 932 if (height > prop.height + 2) ftheight++;
704 if (height > maxheight + 3) ftheight++; 933 if (height > prop.height + 3) ftheight++;
705 934
706 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight); 935 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
707 } 936 }
708 else 937 else
709 FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight); 938 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
710 } 939 }
711 940
712 XftUnlockFace (f); 941 XftUnlockFace (f);
713 942
714 return true; 943 return true;
715} 944}
716 945
717#if 0
718void rxvt_font::gen_coverage_swath (unsigned int page)
719{
720 cvr[page] = new swath;
721
722 for (int i = 0; i < SWATHSIZE; i++)
723 cvr[page][i] = 0;
724
725 populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
726}
727#endif
728
729bool 946bool
730rxvt_font_xft::has_codepoint (uint32_t unicode) 947rxvt_font_xft::has_codepoint (unicode_t unicode)
731{ 948{
732 return XftCharExists (DISPLAY, f, unicode); 949 return XftCharExists (DISPLAY, f, unicode);
733} 950}
734 951
735void 952void
736rxvt_font_xft::draw (int x, int y, 953rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
737 const text_t *text, int len, 954 const text_t *text, int len,
738 int fg, int bg) 955 int fg, int bg)
739{ 956{
740 if (!d)
741 {
742 dR;
743 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
744 }
745
746 if (bg >= 0 && bg != Color_bg)
747 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
748 else
749 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 957 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
750 958
751 if (!prop && width == r->TermWin.fwidth) 959 if (!slow && width == r->TermWin.fwidth && 0)
752 { 960 {
753 if (sizeof (text_t) == sizeof (FcChar16)) 961 if (sizeof (text_t) == sizeof (FcChar16))
754 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 962 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
755 else 963 else
756 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 964 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
… …
759 { 967 {
760 while (len) 968 while (len)
761 { 969 {
762 if (*text != NOCHAR && *text != ' ') 970 if (*text != NOCHAR && *text != ' ')
763 { 971 {
972 int fwidth = r->TermWin.fwidth;
973 if (len >= 2 && text[1] == NOCHAR)
974 fwidth *= 2;
975
976 XGlyphInfo extents;
764 if (sizeof (text_t) == sizeof (FcChar16)) 977 if (sizeof (text_t) == sizeof (FcChar16))
765 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); 978 {
979 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
980 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
981 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
982 }
766 else 983 else
767 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); 984 {
985 XGlyphInfo extents;
986 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
987 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
988 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
989 }
768 } 990 }
769 991
770 x += r->TermWin.fwidth; 992 x += r->TermWin.fwidth;
771 text++; 993 text++;
772 len--; 994 len--;
… …
776#endif 998#endif
777 999
778///////////////////////////////////////////////////////////////////////////// 1000/////////////////////////////////////////////////////////////////////////////
779 1001
780rxvt_fontset::rxvt_fontset (rxvt_t r) 1002rxvt_fontset::rxvt_fontset (rxvt_t r)
781#ifdef EXPLICIT_CONTEXT 1003: r (r), fontdesc (0)
782: r(r)
783#endif
784{ 1004{
785 clear (); 1005 clear ();
786} 1006}
787 1007
788rxvt_fontset::~rxvt_fontset () 1008rxvt_fontset::~rxvt_fontset ()
… …
791} 1011}
792 1012
793void 1013void
794rxvt_fontset::clear () 1014rxvt_fontset::clear ()
795{ 1015{
796 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1016 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
797 FONT_UNREF (*i); 1017 FONT_UNREF (*i);
1018
1019 free (fontdesc); fontdesc = 0;
798 1020
799 fonts.clear (); 1021 fonts.clear ();
800 base_id = 0; 1022 base_id = 0;
801 height = 0x7fffffff; 1023 base_prop.height = 0x7fffffff;
1024 base_prop.weight = rxvt_fontprop::medium;
1025 base_prop.slant = rxvt_fontprop::roman;
802 1026
803 fallback = fallback_fonts; 1027 fallback = fallback_fonts;
804} 1028}
805 1029
806rxvt_font * 1030rxvt_font *
… …
826 f = new rxvt_font_x11; 1050 f = new rxvt_font_x11;
827 } 1051 }
828 else 1052 else
829 f = new rxvt_font_x11; 1053 f = new rxvt_font_x11;
830 1054
1055 f->fs = this;
831 f->set_term (r); 1056 f->set_term (r);
832 f->set_name (strdup (name)); 1057 f->set_name (strdup (name));
833 1058
834 f->cs = cs; 1059 f->cs = cs;
835 f->loaded = false; 1060 f->loaded = false;
… …
853 1078
854 if (*desc == '[') 1079 if (*desc == '[')
855 { 1080 {
856 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1081 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
857 1082
858 const char *extra = desc++; 1083 //const char *extra = desc++; // not yet used
859 1084
860 desc = strchr (desc, ']'); 1085 desc = strchr (desc, ']');
861 1086
862 if (!desc) 1087 if (!desc)
863 { 1088 {
… …
893 if (fonts[i]->loaded) 1118 if (fonts[i]->loaded)
894 return true; 1119 return true;
895 1120
896 fonts[i]->loaded = true; 1121 fonts[i]->loaded = true;
897 1122
898 if (!fonts[i]->load (height)) 1123 if (!fonts[i]->load (base_prop))
899 { 1124 {
900 fonts[i]->cs = CS_UNKNOWN; 1125 fonts[i]->cs = CS_UNKNOWN;
901 return false; 1126 return false;
902 } 1127 }
903 1128
904 return true; 1129 return true;
905} 1130}
906 1131
907void 1132bool
908rxvt_fontset::populate (const char *desc) 1133rxvt_fontset::populate (const char *desc)
909{ 1134{
910 clear (); 1135 clear ();
1136
1137 fontdesc = strdup (desc);
911 1138
912 fonts.push_back (new_font (0, CS_UNICODE)); 1139 fonts.push_back (new_font (0, CS_UNICODE));
913 realize_font (0); 1140 realize_font (0);
914 1141
915 add_fonts (desc); 1142 add_fonts (desc);
916 1143
917 if (!base_id) 1144 if (!base_id)
918 base_id = 1; 1145 base_id = 1;
919 1146
920 // we currently need a base-font, no matter what 1147 // we currently need a base-font, no matter what
921 if (fonts.size () <= base_id) 1148 if ((int)fonts.size () <= base_id || !realize_font (base_id))
922 { 1149 {
1150 puts ("unable to load specified font (s), falling back to 'fixed'\n");
923 add_fonts ("fixed"); 1151 add_fonts ("fixed");
924 base_id = 1; 1152 base_id = fonts.size () - 1;
925 } 1153 }
926 1154
927 if (fonts.size () <= base_id || !realize_font (base_id)) 1155 if ((int)fonts.size () <= base_id || !realize_font (base_id))
928 { 1156 return false;
929 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
930 exit (1);
931 }
932 1157
933 height = fonts[base_id]->height; 1158 base_prop = fonts[base_id]->properties ();
934 1159
935 /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/ 1160 return true;
936} 1161}
937 1162
938int 1163int
939rxvt_fontset::find_font (uint32_t unicode) 1164rxvt_fontset::find_font (unicode_t unicode)
940{ 1165{
941 for (int i = 0; i < fonts.size (); i++) 1166 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1167 i < fonts.size ();
1168 i++)
942 { 1169 {
943 rxvt_font *f = fonts[i]; 1170 rxvt_font *f = fonts[i];
944 1171
945 if (!f->loaded) 1172 if (!f->loaded)
946 { 1173 {

Diff Legend

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