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.41 by pcg, Mon Mar 15 01:27:46 2004 UTC vs.
Revision 1.59 by root, Wed Aug 11 15:55:35 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: defaultfont.C 2 * File: defaultfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
… …
24#include "defaultfont.h" 24#include "defaultfont.h"
25 25
26#include <cstdlib> 26#include <cstdlib>
27 27
28#define DISPLAY r->display->display 28#define DISPLAY r->display->display
29#define GC r->TermWin.gc 29#define TGC r->TermWin.gc
30 30
31const struct rxvt_fallback_font { 31const struct rxvt_fallback_font {
32 codeset cs; 32 codeset cs;
33 const char *name; 33 const char *name;
34} fallback_fonts[] = { 34} fallback_fonts[] = {
35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
38 38
39#if ENCODING_EU 39#if ENCODING_EU
40 // cyrillic 40 // cyrillic
41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
43 43
44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
49 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, 49 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" },
50 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, 50 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" },
51 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, 51 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" },
52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, 52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },
53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, 53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },
54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
57#endif 57#endif
58 58
59 // japanese 59 // japanese
60#if ENCODING_JP || ENCODING_JP_EXT 60#if ENCODING_JP || ENCODING_JP_EXT
61# if XFT 61# if XFT
… …
63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, 63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
64# endif 64# endif
65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
69 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
70 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68#endif 71#endif
69 72
70#if ENCODING_CN || ENCODING_CN_EXT 73#if ENCODING_CN || ENCODING_CN_EXT
71# if XFT 74# if XFT
72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 75 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
… …
91#if XFT 94#if XFT
92 { CS_UNICODE, "xft:Andale Mono" }, 95 { CS_UNICODE, "xft:Andale Mono" },
93 { CS_UNICODE, "xft:Arial Unicode MS" }, 96 { CS_UNICODE, "xft:Arial Unicode MS" },
94#endif 97#endif
95 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 98 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
96 { CS_UNICODE, "xft:FreeMono" },
97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 99 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 100 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 101 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
100 102#if XFT
101#if UNICODE_3 && XFT 103 // FreeMono is usually uglier than x fonts, so try last only.
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters 104 //{ CS_UNICODE, "xft:FreeMono" },
103#endif 105#endif
104 106
105 { CS_UNKNOWN, 0 } 107 { CS_UNKNOWN, 0 }
106}; 108};
107 109
… …
133{ 135{
134 if (len > enc_len) 136 if (len > enc_len)
135 { 137 {
136 free (enc_buf); 138 free (enc_buf);
137 enc_buf = malloc (len); 139 enc_buf = malloc (len);
140 enc_len = len;
138 } 141 }
139 142
140 return enc_buf; 143 return enc_buf;
141} 144}
142 145
… …
194 else if (color >= 0) 197 else if (color >= 0)
195 { 198 {
196#if XFT 199#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 200 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else 201#else
199 XSetForeground (d.display->display, GC, r->PixColors[color]); 202 XSetForeground (d.display->display, TGC, r->PixColors[color]);
200 XFillRectangle (d.display->display, d, GC, x, y, w, h); 203 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif 204#endif
202 } 205 }
203} 206}
204 207
205static const char *linedraw_cmds[128] = { 208#include "table/linedraw.h"
206 "1hH", "2hH", "1vV", "2vV",
207 0, 0, 0, 0,
208 0, 0, 0, 0,
209 "1HV", "2H1V", "1H2V", "2HV",
210
211 // 2510
212 "1hV", "2h1V", "1h2V", "2hV",
213 "1Hv", "2H1v", "1H2v", "2Hv",
214 "1hv", "2h1v", "1h2v", "2hv",
215 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
216
217 // 2520
218 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
219 "1hvV", "2h1vV", "1hV2v", "1hv2V",
220 "1h2vV", "2hv1V", "1v2hV", "2hvV",
221 "1hHV", "2h1HV", "2H1hV", "2hH1V",
222
223 // 2530
224 "1hH2V", "2hV1H", "1h2HV", "2hHV",
225 "1hHv", "1vH2h", "1hv2H", "1v2hH",
226 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
227 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
228
229 // 2540
230 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
231 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
232 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
233 0, 0, 0, 0,
234
235 // 2550
236 0, 0, 0, 0,
237 0, 0, 0, 0,
238 0, 0, 0, 0,
239 0, 0, 0, 0,
240
241 // 2560
242 0, 0, 0, 0,
243 0, 0, 0, 0,
244 0, 0, 0, 0,
245 0, 0, 0, 0,
246
247 // 2570
248 0, "1a", "1b", "1ab",
249 "1h", "1v", "1H", "1V",
250 "2h", "2v", "2H", "2V",
251 "1h2H", "1v2V", "1H2h", "1V2v"
252
253 // to be done
254};
255 209
256struct rxvt_font_default : rxvt_font { 210struct rxvt_font_default : rxvt_font {
211
257 rxvt_fontprop properties () 212 rxvt_fontprop properties ()
258 { 213 {
259 rxvt_fontprop p; 214 rxvt_fontprop p;
260 215
261 p.width = p.height = 1; 216 p.width = p.height = 1;
… …
268 bool load (const rxvt_fontprop &prop) 223 bool load (const rxvt_fontprop &prop)
269 { 224 {
270 width = 1; height = 1; 225 width = 1; height = 1;
271 ascent = 1; descent = 0; 226 ascent = 1; descent = 0;
272 227
273 set_name ("built-in pseudofont"); 228 set_name (strdup ("built-in pseudofont"));
274 229
275 return true; 230 return true;
276 } 231 }
277 232
278 bool has_codepoint (unicode_t unicode) 233 bool has_codepoint (unicode_t unicode)
279 { 234 {
280 if (unicode <= 0x001f) 235 if (unicode <= 0x001f)
281 return true; 236 return true;
282 237
283 if (unicode >= 0x0080 && unicode <= 0x009f) 238 if (unicode <= 0x007f)
239 return false;
240
241 if (unicode <= 0x009f)
284 return true; 242 return true;
285 243
286 if (unicode >= 0x2500 && unicode <= 0x257f 244 if (unicode >= 0x2500 && unicode <= 0x259f)
287 && linedraw_cmds[unicode - 0x2500])
288 return true; 245 return true;
289 246
290 if (IS_COMPOSE (unicode)) 247 if (IS_COMPOSE (unicode))
291 return true; 248 return true;
292 249
… …
309 const text_t *text, int len, 266 const text_t *text, int len,
310 int fg, int bg) 267 int fg, int bg)
311{ 268{
312 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 269 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
313 270
314 XSetForeground (d.display->display, GC, r->PixColors[fg]); 271 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
315 272
316 while (len--) 273 while (len--)
317 { 274 {
318#if ENABLE_COMBINING 275#if ENABLE_COMBINING
319 compose_char *cc; 276 compose_char *cc;
320#endif 277#endif
321 text_t t = *text++; 278 text_t t = *text++;
322 279
323 // is it in our linedrawing table? 280 if (0x2500 <= t && t <= 0x259f)
324 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 281 {
282 uint16_t offs = linedraw_offs[t - 0x2500];
283 uint32_t *a = linedraw_command + (offs >> 4);
284 uint32_t *b = a + (offs & 15);
285
286 int W = r->TermWin.fwidth;
287 int H = r->TermWin.fheight;
288
289 int x_[16];
290 int y_[16];
291
292 for (int i = 0; i <= 8; i++)
325 { 293 {
326 const char *p = linedraw_cmds[t - 0x2500]; 294 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
295 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
296 }
327 297
328 int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; 298 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
329 int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; 299 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
330 300
331 XGCValues gcv; 301 XGCValues gcv;
332 302
303 gcv.cap_style = CapButt;
304 gcv.line_width = 0;
305 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
306
333 while (*p) 307 while (a < b)
334 { 308 {
309 uint32_t command = *a++;
310
311 int op = (command >> 24) & 255;
312 int a = (command >> 20) & 15;
313 int b = (command >> 16) & 15;
314 int x1 = x_[(command >> 12) & 15];
315 int y1 = y_[(command >> 8) & 15];
316 int x2 = x_[(command >> 4) & 15];
317 int y2 = y_[(command >> 0) & 15];
318
335 switch (*p++) 319 switch (op)
336 { 320 {
337 case '1': 321 case 0: // line
338 gcv.line_width = 0; 322 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
339 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
340 break; 323 break;
341 324
342 case '2': 325 case 1: // rectangle, possibly stippled
326 if (a)
327 {
328 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
329
330 gcv.fill_style = FillStippled;
331 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
332 gcv.ts_x_origin = x;
333 gcv.ts_y_origin = y;
334
335 XChangeGC (d.display->display, TGC,
336 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
337 &gcv);
338 }
339
340 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
341
342 if (a)
343 {
344 XFreePixmap (d.display->display, gcv.stipple);
343 gcv.line_width = 2; 345 gcv.stipple = 0;
346 gcv.fill_style = FillSolid;
344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
348 }
345 break; 349 break;
346 350 case 2: // arc
347 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 351 XDrawArc (d.display->display, d, TGC,
348 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 352 x1 - W/2, y1 - H/2, W-1, H-1,
349 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 353 (a - 1) * 90*64, (b - 1) * 90*64);
350 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 354 break;
351 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
352 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
353 } 355 }
354 } 356 }
355
356 gcv.line_width = 0;
357 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
358 } 357 }
359#if ENABLE_COMBINING 358#if ENABLE_COMBINING
360 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 359 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
361 { 360 {
362 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 361 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
… …
375 else 374 else
376 switch (t) 375 switch (t)
377 { 376 {
378 case ZERO_WIDTH_CHAR: 377 case ZERO_WIDTH_CHAR:
379 break; 378 break;
379
380 default: 380 default:
381 int w = 0; 381 int w = 0;
382 while (len > 0 && *text == NOCHAR) 382 while (len > 0 && *text == NOCHAR)
383 { 383 {
384 ++text; 384 ++text;
385 --len; 385 --len;
386 w += r->TermWin.fwidth; 386 w += r->TermWin.fwidth;
387 } 387 }
388 388
389 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 389 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
390 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 390 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
391 x += w; 391 x += w;
392 } 392 }
393 393
394 x += r->TermWin.fwidth; 394 x += r->TermWin.fwidth;
395 } 395 }
… …
414 414
415 XFontStruct *f; 415 XFontStruct *f;
416 codeset cs; 416 codeset cs;
417 bool enc2b, encm; 417 bool enc2b, encm;
418 418
419 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 419 char *get_property (XFontStruct *f, const char *property, const char *repl) const;
420 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 420 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
421 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 421 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
422 bool set_properties (rxvt_fontprop &p, const char *name); 422 bool set_properties (rxvt_fontprop &p, const char *name);
423}; 423};
424 424
425const char * 425char *
426rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 426rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
427{ 427{
428 unsigned long value; 428 unsigned long value;
429 429
430 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 430 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
431 return XGetAtomName (DISPLAY, value); 431 return XGetAtomName (DISPLAY, value);
432 else 432 else
433 return repl; 433 return rxvt_strdup (repl);
434} 434}
435 435
436rxvt_fontprop 436rxvt_fontprop
437rxvt_font_x11::properties () 437rxvt_font_x11::properties ()
438{ 438{
… …
453} 453}
454 454
455bool 455bool
456rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 456rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
457{ 457{
458 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
459 const char *slant = get_property (f, "SLANT", "r");
460
461 unsigned long height; 458 unsigned long height;
462 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 459 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
463 return false; 460 return false;
464 461
465 unsigned long avgwidth; 462 unsigned long avgwidth;
466 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
467 avgwidth = 0; 464 avgwidth = 0;
468 465
466 char *weight = get_property (f, "WEIGHT_NAME", "medium");
467 char *slant = get_property (f, "SLANT", "r");
468
469 return set_properties (p, height, weight, slant, avgwidth); 469 set_properties (p, height, weight, slant, avgwidth);
470
471 free (weight);
472 free (slant);
473
474 return true;
470} 475}
471 476
472bool 477bool
473rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 478rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
474{ 479{
… …
537{ 542{
538 clear (); 543 clear ();
539 544
540 char **list; 545 char **list;
541 int count; 546 int count;
542 list = XListFonts (DISPLAY, name, 512, &count); 547 list = XListFonts (DISPLAY, name, 1024, &count);
543 set_name (0); 548 set_name (0);
544 549
545 if (!list) 550 if (!list)
546 return false; 551 return false;
547 552
… …
578 f = XLoadQueryFont (DISPLAY, name); 583 f = XLoadQueryFont (DISPLAY, name);
579 584
580 if (!f) 585 if (!f)
581 return false; 586 return false;
582 587
583 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 588 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
584 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 589 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
585 590
586 if (registry && encoding) 591 if (registry && encoding)
587 { 592 {
588 char charset[64]; 593 char charset[64];
589 snprintf (charset, 64, "%s-%s", registry, encoding); 594 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
602 if (*charset++ == '-' && !--count) 607 if (*charset++ == '-' && !--count)
603 break; 608 break;
604 609
605 cs = codeset_from_name (charset); 610 cs = codeset_from_name (charset);
606 } 611 }
612
613 free (registry);
614 free (encoding);
607 615
608 if (cs == CS_UNICODE) 616 if (cs == CS_UNICODE)
609 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 617 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
610 618
611 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 619 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
724 732
725 int base = r->TermWin.fbase; 733 int base = r->TermWin.fbase;
726 734
727 XGCValues v; 735 XGCValues v;
728 v.foreground = r->PixColors[fg]; 736 v.foreground = r->PixColors[fg];
729 v.background = r->PixColors[bg];
730 v.font = f->fid; 737 v.font = f->fid;
731 738
732 if (enc2b) 739 if (enc2b)
733 { 740 {
734 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 741 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
735 742
736 if (bg == Color_bg && !slow) 743 if (bg == Color_bg && !slow)
737 { 744 {
745 v.background = r->PixColors[bg];
738 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 746 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
739 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 747 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
740 } 748 }
741 else 749 else
742 { 750 {
743 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 751 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
744 752
745 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 753 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
746 754
747 if (slow) 755 if (slow)
748 { 756 {
749 do 757 do
750 { 758 {
751 if (xc->byte1 || xc->byte2) 759 if (xc->byte1 || xc->byte2)
752 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 760 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
753 761
754 x += r->TermWin.fwidth; 762 x += r->TermWin.fwidth;
755 xc++; len--; 763 xc++; len--;
756 } 764 }
757 while (len); 765 while (len);
758 } 766 }
759 else 767 else
760 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 768 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
761 } 769 }
762 } 770 }
763 else 771 else
764 { 772 {
765 const char *xc = enc_char (text, len, cs, slow); 773 const char *xc = enc_char (text, len, cs, slow);
766 774
767 if (bg == Color_bg && !slow) 775 if (bg == Color_bg && !slow)
768 { 776 {
777 v.background = r->PixColors[bg];
769 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 778 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
770 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 779 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
771 } 780 }
772 else 781 else
773 { 782 {
774 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 783 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
775 784
776 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 785 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
777 786
778 if (slow) 787 if (slow)
779 { 788 {
780 do 789 do
781 { 790 {
782 if (*xc) 791 if (*xc)
783 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 792 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
784 793
785 x += r->TermWin.fwidth; 794 x += r->TermWin.fwidth;
786 xc++; len--; 795 xc++; len--;
787 } 796 }
788 while (len); 797 while (len);
789 } 798 }
790 else 799 else
791 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 800 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
792 } 801 }
793 } 802 }
794} 803}
795 804
796///////////////////////////////////////////////////////////////////////////// 805/////////////////////////////////////////////////////////////////////////////
… …
836{ 845{
837 rxvt_fontprop p; 846 rxvt_fontprop p;
838 847
839 FT_Face face = XftLockFace (f); 848 FT_Face face = XftLockFace (f);
840 849
841 p.width = width; p.height = height; 850 p.width = width;
842 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 851 p.height = height;
843 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman; 852 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
853 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
854 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
855 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
844 856
845 XftUnlockFace (f); 857 XftUnlockFace (f);
846 858
847 return p; 859 return p;
848} 860}
… …
862 if (!p) 874 if (!p)
863 return false; 875 return false;
864 876
865 FcValue v; 877 FcValue v;
866 878
879 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
880 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
881
867 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 882 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
868 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 883 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
869 884
870 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 885 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
871 FcPatternAddInteger (p, FC_SLANT, prop.slant); 886 FcPatternAddInteger (p, FC_SLANT, prop.slant);
887
888 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
889 FcPatternAddBool (p, FC_MINSPACE, 1);
872 890
873#if 0 // clipping unfortunately destroys our precious double-width-characters 891#if 0 // clipping unfortunately destroys our precious double-width-characters
874 // clip width, we can't do better, or can we? 892 // clip width, we can't do better, or can we?
875 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 893 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
876 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); 894 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
877#endif 895#endif
878
879 //FcPatternAddBool (p, FC_MINSPACE, 1);
880 896
881 XftResult result; 897 XftResult result;
882 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 898 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
883 899
884 FcPatternDestroy (p); 900 FcPatternDestroy (p);
… …
992#endif 1008#endif
993 1009
994///////////////////////////////////////////////////////////////////////////// 1010/////////////////////////////////////////////////////////////////////////////
995 1011
996rxvt_fontset::rxvt_fontset (rxvt_t r) 1012rxvt_fontset::rxvt_fontset (rxvt_t r)
997: r (r) 1013: r (r), fontdesc (0)
998{ 1014{
999 clear (); 1015 clear ();
1000} 1016}
1001 1017
1002rxvt_fontset::~rxvt_fontset () 1018rxvt_fontset::~rxvt_fontset ()
… …
1007void 1023void
1008rxvt_fontset::clear () 1024rxvt_fontset::clear ()
1009{ 1025{
1010 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1026 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1011 FONT_UNREF (*i); 1027 FONT_UNREF (*i);
1028
1029 free (fontdesc); fontdesc = 0;
1012 1030
1013 fonts.clear (); 1031 fonts.clear ();
1014 base_id = 0; 1032 base_id = 0;
1015 base_prop.height = 0x7fffffff; 1033 base_prop.height = 0x7fffffff;
1016 base_prop.weight = rxvt_fontprop::medium; 1034 base_prop.weight = rxvt_fontprop::medium;
… …
1124bool 1142bool
1125rxvt_fontset::populate (const char *desc) 1143rxvt_fontset::populate (const char *desc)
1126{ 1144{
1127 clear (); 1145 clear ();
1128 1146
1147 fontdesc = strdup (desc);
1148
1129 fonts.push_back (new_font (0, CS_UNICODE)); 1149 fonts.push_back (new_font (0, CS_UNICODE));
1130 realize_font (0); 1150 realize_font (0);
1131 1151
1132 add_fonts (desc); 1152 add_fonts (desc);
1133 1153
… …
1149 1169
1150 return true; 1170 return true;
1151} 1171}
1152 1172
1153int 1173int
1174rxvt_fontset::find_font (const char *name) const
1175{
1176 for (rxvt_font *const *f = fonts.begin (); f < fonts.end (); f++)
1177 if ((*f)->name && !strcmp ((*f)->name, name))
1178 return f - fonts.begin ();
1179
1180 return -1;
1181}
1182
1183int
1154rxvt_fontset::find_font (unicode_t unicode) 1184rxvt_fontset::find_font (unicode_t unicode, bool bold)
1155{ 1185{
1156 for (unsigned int i = 0; i < fonts.size (); i++) 1186
1187 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1188 i < fonts.size ();
1189 i++)
1157 { 1190 {
1158 rxvt_font *f = fonts[i]; 1191 rxvt_font *f = fonts[i];
1159 1192
1160 if (!f->loaded) 1193 if (!f->loaded)
1161 { 1194 {
… …
1164 1197
1165 if (!realize_font (i)) 1198 if (!realize_font (i))
1166 goto next_font; 1199 goto next_font;
1167 } 1200 }
1168 1201
1202 if (f->cs == CS_UNKNOWN)
1203 goto next_font;
1204
1205 if (bold && f->properties ().weight < rxvt_fontprop::bold)
1206 goto next_font;
1207
1169 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1208 if (f->has_codepoint (unicode))
1170 return i; 1209 return i;
1171 1210
1172 next_font: 1211 next_font:
1173 if (i == fonts.size () - 1 && fallback->name) 1212 if (i == fonts.size () - 1)
1213 {
1214 if (fallback->name)
1174 { 1215 {
1216 // search through the fallback list
1175 fonts.push_back (new_font (fallback->name, fallback->cs)); 1217 fonts.push_back (new_font (fallback->name, fallback->cs));
1176 fallback++; 1218 fallback++;
1177 i = 0;
1178 } 1219 }
1220 else
1221 {
1222 // try to find a new font.
1223 // only xft currently supported, as there is no
1224 // way to configure this and xft is easier to hack in,
1225 // while x11 has more framework in place already.
1226#if XFT
1227 // grab the first xft font that seems suitable
1228 FcPattern *p = FcPatternCreate ();
1229
1230 FcCharSet *s = FcCharSetCreate ();
1231 FcCharSetAddChar (s, unicode);
1232 FcPatternAddCharSet (p, FC_CHARSET, s);
1233 // charsets don't help that much, as xft might return
1234 // a non-matching font even if a better font is available :/
1235
1236 FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height);
1237 FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight);
1238 FcPatternAddInteger (p, FC_SLANT, base_prop.slant);
1239 FcPatternAddBool (p, FC_MINSPACE, 1);
1240 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1241
1242 XftResult result;
1243 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
1244
1245 FcPatternDestroy (p);
1246
1247 if (match)
1248 {
1249 FcPatternDel (match, FC_CHARSET);
1250 char *font = (char *)FcNameUnparse (match);
1251 FcPatternDestroy (match);
1252
1253 if (find_font (font) < 0)
1254 {
1255 char fontname[4096];
1256 sprintf (fontname, "xft:%-.4090s", font);
1257
1258 fonts.push_back (new_font (fontname, CS_UNICODE));
1259 }
1260
1261 free (font);
1262 }
1263#endif
1264 }
1265 }
1179 } 1266 }
1267
1268 // if no bold font found, use a regular one
1269 if (bold)
1270 return find_font (unicode);
1180 1271
1181 return 0; /* we must return SOME font */ 1272 return 0; /* we must return SOME font */
1182} 1273}
1183 1274
1184 1275

Diff Legend

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