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.34 by pcg, Thu Mar 4 04:28:50 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
62 // prefer xft for complex scripts 62 // prefer xft for complex scripts
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_1983_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
228 set_name (strdup ("built-in pseudofont"));
229
273 return true; 230 return true;
274 } 231 }
275 232
276 bool has_codepoint (uint32_t unicode) 233 bool has_codepoint (unicode_t unicode)
277 { 234 {
278 if (unicode <= 0x001f) 235 if (unicode <= 0x001f)
279 return true; 236 return true;
280 237
281 if (unicode >= 0x0080 && unicode <= 0x009f) 238 if (unicode <= 0x007f)
239 return false;
240
241 if (unicode <= 0x009f)
282 return true; 242 return true;
283 243
284 if (unicode >= 0x2500 && unicode <= 0x257f 244 if (unicode >= 0x2500 && unicode <= 0x259f)
285 && linedraw_cmds[unicode - 0x2500])
286 return true; 245 return true;
287 246
288 if (IS_PSEUDO (unicode)) 247 if (IS_COMPOSE (unicode))
289 return true; 248 return true;
290 249
291 switch (unicode) 250 switch (unicode)
292 { 251 {
293 case ZERO_WIDTH_CHAR: 252 case ZERO_WIDTH_CHAR:
… …
307 const text_t *text, int len, 266 const text_t *text, int len,
308 int fg, int bg) 267 int fg, int bg)
309{ 268{
310 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);
311 270
312 XSetForeground (d.display->display, GC, r->PixColors[fg]); 271 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
313 272
314 while (len--) 273 while (len--)
315 { 274 {
275#if ENABLE_COMBINING
276 compose_char *cc;
277#endif
316 text_t t = *text++; 278 text_t t = *text++;
317 279
318 // is it in our linedrawing table? 280 if (0x2500 <= t && t <= 0x259f)
319 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++)
320 { 293 {
321 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 }
322 297
323 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;
324 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;
325 300
326 XGCValues gcv; 301 XGCValues gcv;
327 302
303 gcv.cap_style = CapButt;
304 gcv.line_width = 0;
305 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
306
328 while (*p) 307 while (a < b)
329 { 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
330 switch (*p++) 319 switch (op)
331 { 320 {
332 case '1': 321 case 0: // line
333 gcv.line_width = 0; 322 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
334 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
335 break; 323 break;
336 324
337 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);
338 gcv.line_width = 2; 345 gcv.stipple = 0;
346 gcv.fill_style = FillSolid;
339 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
348 }
340 break; 349 break;
341 350 case 2: // arc
342 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 351 XDrawArc (d.display->display, d, TGC,
343 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 352 x1 - W/2, y1 - H/2, W-1, H-1,
344 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 353 (a - 1) * 90*64, (b - 1) * 90*64);
345 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 354 break;
346 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
347 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
348 } 355 }
349 } 356 }
350
351 gcv.line_width = 0;
352 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
353 }
354 else if (IS_PSEUDO (t))
355 { 357 }
356 const compose_char &cc = r->composite (t); 358#if ENABLE_COMBINING
357 (void)0; //D ADD pseudo handling here 359 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
358 } 360 {
361 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
362 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
363 if (cc->c2 != NOCHAR)
364 {
365 // prefer font of first character, for no good reasons
366 rxvt_font *f2 = f1->has_codepoint (cc->c2)
367 ? f1
368 : (*fs)[fs->find_font (cc->c2)];
369
370 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
371 }
372 }
373#endif
359 else 374 else
360 switch (t) 375 switch (t)
361 { 376 {
362 case ZERO_WIDTH_CHAR: 377 case ZERO_WIDTH_CHAR:
363 break; 378 break;
379
364 default: 380 default:
365 int w = 0; 381 int w = 0;
366 while (len > 0 && *text == NOCHAR) 382 while (len > 0 && *text == NOCHAR)
367 { 383 {
368 ++text; 384 ++text;
369 --len; 385 --len;
370 w += r->TermWin.fwidth; 386 w += r->TermWin.fwidth;
371 } 387 }
372 388
373 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 389 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
374 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 390 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
375 x += w; 391 x += w;
376 } 392 }
377 393
378 x += r->TermWin.fwidth; 394 x += r->TermWin.fwidth;
379 } 395 }
… …
388 404
389 rxvt_fontprop properties (); 405 rxvt_fontprop properties ();
390 406
391 bool load (const rxvt_fontprop &prop); 407 bool load (const rxvt_fontprop &prop);
392 408
393 bool has_codepoint (uint32_t unicode); 409 bool has_codepoint (unicode_t unicode);
394 410
395 void draw (rxvt_drawable &d, int x, int y, 411 void draw (rxvt_drawable &d, int x, int y,
396 const text_t *text, int len, 412 const text_t *text, int len,
397 int fg, int bg); 413 int fg, int bg);
398 414
399 XFontStruct *f; 415 XFontStruct *f;
400 codeset cs; 416 codeset cs;
401 bool enc2b, encm; 417 bool enc2b, encm;
402 418
403 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;
404 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);
405 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 421 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
406 bool set_properties (rxvt_fontprop &p, const char *name); 422 bool set_properties (rxvt_fontprop &p, const char *name);
407}; 423};
408 424
409const char * 425char *
410rxvt_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
411{ 427{
412 unsigned long value; 428 unsigned long value;
413 429
414 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 430 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
415 return XGetAtomName (DISPLAY, value); 431 return XGetAtomName (DISPLAY, value);
416 else 432 else
417 return repl; 433 return rxvt_strdup (repl);
418} 434}
419 435
420rxvt_fontprop 436rxvt_fontprop
421rxvt_font_x11::properties () 437rxvt_font_x11::properties ()
422{ 438{
… …
437} 453}
438 454
439bool 455bool
440rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 456rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
441{ 457{
442 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
443 const char *slant = get_property (f, "SLANT", "r");
444
445 unsigned long height; 458 unsigned long height;
446 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 459 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
447 return false; 460 return false;
448 461
449 unsigned long avgwidth; 462 unsigned long avgwidth;
450 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
451 avgwidth = 0; 464 avgwidth = 0;
452 465
466 char *weight = get_property (f, "WEIGHT_NAME", "medium");
467 char *slant = get_property (f, "SLANT", "r");
468
453 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;
454} 475}
455 476
456bool 477bool
457rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 478rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
458{ 479{
… …
521{ 542{
522 clear (); 543 clear ();
523 544
524 char **list; 545 char **list;
525 int count; 546 int count;
526 list = XListFonts (DISPLAY, name, 512, &count); 547 list = XListFonts (DISPLAY, name, 1024, &count);
527 set_name (0); 548 set_name (0);
528 549
529 if (!list) 550 if (!list)
530 return false; 551 return false;
531 552
… …
562 f = XLoadQueryFont (DISPLAY, name); 583 f = XLoadQueryFont (DISPLAY, name);
563 584
564 if (!f) 585 if (!f)
565 return false; 586 return false;
566 587
567 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 588 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
568 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 589 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
569 590
570 if (registry && encoding) 591 if (registry && encoding)
571 { 592 {
572 char charset[64]; 593 char charset[64];
573 snprintf (charset, 64, "%s-%s", registry, encoding); 594 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
586 if (*charset++ == '-' && !--count) 607 if (*charset++ == '-' && !--count)
587 break; 608 break;
588 609
589 cs = codeset_from_name (charset); 610 cs = codeset_from_name (charset);
590 } 611 }
612
613 free (registry);
614 free (encoding);
591 615
592 if (cs == CS_UNICODE) 616 if (cs == CS_UNICODE)
593 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
594 618
595 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 619 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
645 f = 0; 669 f = 0;
646 } 670 }
647} 671}
648 672
649bool 673bool
650rxvt_font_x11::has_codepoint (uint32_t unicode) 674rxvt_font_x11::has_codepoint (unicode_t unicode)
651{ 675{
652 uint32_t ch = FROM_UNICODE (cs, unicode); 676 uint32_t ch = FROM_UNICODE (cs, unicode);
653 677
654 if (ch == NOCHAR) 678 if (ch == NOCHAR)
655 return false; 679 return false;
… …
708 732
709 int base = r->TermWin.fbase; 733 int base = r->TermWin.fbase;
710 734
711 XGCValues v; 735 XGCValues v;
712 v.foreground = r->PixColors[fg]; 736 v.foreground = r->PixColors[fg];
713 v.background = r->PixColors[bg];
714 v.font = f->fid; 737 v.font = f->fid;
715 738
716 if (enc2b) 739 if (enc2b)
717 { 740 {
718 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 741 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
719 742
720 if (bg == Color_bg && !slow) 743 if (bg == Color_bg && !slow)
721 { 744 {
745 v.background = r->PixColors[bg];
722 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 746 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
723 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 747 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
724 } 748 }
725 else 749 else
726 { 750 {
727 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);
728 752
729 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 753 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
730 754
731 if (slow) 755 if (slow)
732 { 756 {
733 do 757 do
734 { 758 {
735 if (xc->byte1 || xc->byte2) 759 if (xc->byte1 || xc->byte2)
736 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 760 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
737 761
738 x += r->TermWin.fwidth; 762 x += r->TermWin.fwidth;
739 xc++; len--; 763 xc++; len--;
740 } 764 }
741 while (len); 765 while (len);
742 } 766 }
743 else 767 else
744 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 768 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
745 } 769 }
746 } 770 }
747 else 771 else
748 { 772 {
749 const char *xc = enc_char (text, len, cs, slow); 773 const char *xc = enc_char (text, len, cs, slow);
750 774
751 if (bg == Color_bg && !slow) 775 if (bg == Color_bg && !slow)
752 { 776 {
777 v.background = r->PixColors[bg];
753 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 778 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
754 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 779 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
755 } 780 }
756 else 781 else
757 { 782 {
758 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);
759 784
760 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 785 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
761 786
762 if (slow) 787 if (slow)
763 { 788 {
764 do 789 do
765 { 790 {
766 if (*xc) 791 if (*xc)
767 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 792 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
768 793
769 x += r->TermWin.fwidth; 794 x += r->TermWin.fwidth;
770 xc++; len--; 795 xc++; len--;
771 } 796 }
772 while (len); 797 while (len);
773 } 798 }
774 else 799 else
775 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 800 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
776 } 801 }
777 } 802 }
778} 803}
779 804
780///////////////////////////////////////////////////////////////////////////// 805/////////////////////////////////////////////////////////////////////////////
… …
797 822
798 void draw (rxvt_drawable &d, int x, int y, 823 void draw (rxvt_drawable &d, int x, int y,
799 const text_t *text, int len, 824 const text_t *text, int len,
800 int fg, int bg); 825 int fg, int bg);
801 826
802 bool has_codepoint (uint32_t unicode); 827 bool has_codepoint (unicode_t unicode);
803 828
804protected: 829protected:
805 XftFont *f; 830 XftFont *f;
806}; 831};
807 832
… …
820{ 845{
821 rxvt_fontprop p; 846 rxvt_fontprop p;
822 847
823 FT_Face face = XftLockFace (f); 848 FT_Face face = XftLockFace (f);
824 849
825 p.width = width; p.height = height; 850 p.width = width;
826 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 851 p.height = height;
827 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;
828 856
829 XftUnlockFace (f); 857 XftUnlockFace (f);
830 858
831 return p; 859 return p;
832} 860}
… …
846 if (!p) 874 if (!p)
847 return false; 875 return false;
848 876
849 FcValue v; 877 FcValue v;
850 878
879 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
880 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
881
851 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 882 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
852 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 883 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
853 884
854 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 885 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
855 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);
856 890
857#if 0 // clipping unfortunately destroys our precious double-width-characters 891#if 0 // clipping unfortunately destroys our precious double-width-characters
858 // clip width, we can't do better, or can we? 892 // clip width, we can't do better, or can we?
859 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 893 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
860 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); 894 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
861#endif 895#endif
862 896
863 //FcPatternAddBool (p, FC_MINSPACE, 1);
864
865 XftResult result; 897 XftResult result;
866 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 898 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
867 899
868 FcPatternDestroy (p); 900 FcPatternDestroy (p);
869 901
… …
920 952
921 return true; 953 return true;
922} 954}
923 955
924bool 956bool
925rxvt_font_xft::has_codepoint (uint32_t unicode) 957rxvt_font_xft::has_codepoint (unicode_t unicode)
926{ 958{
927 return XftCharExists (DISPLAY, f, unicode); 959 return XftCharExists (DISPLAY, f, unicode);
928} 960}
929 961
930void 962void
… …
976#endif 1008#endif
977 1009
978///////////////////////////////////////////////////////////////////////////// 1010/////////////////////////////////////////////////////////////////////////////
979 1011
980rxvt_fontset::rxvt_fontset (rxvt_t r) 1012rxvt_fontset::rxvt_fontset (rxvt_t r)
981: r (r) 1013: r (r), fontdesc (0)
982{ 1014{
983 clear (); 1015 clear ();
984} 1016}
985 1017
986rxvt_fontset::~rxvt_fontset () 1018rxvt_fontset::~rxvt_fontset ()
… …
991void 1023void
992rxvt_fontset::clear () 1024rxvt_fontset::clear ()
993{ 1025{
994 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1026 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
995 FONT_UNREF (*i); 1027 FONT_UNREF (*i);
1028
1029 free (fontdesc); fontdesc = 0;
996 1030
997 fonts.clear (); 1031 fonts.clear ();
998 base_id = 0; 1032 base_id = 0;
999 base_prop.height = 0x7fffffff; 1033 base_prop.height = 0x7fffffff;
1000 base_prop.weight = rxvt_fontprop::medium; 1034 base_prop.weight = rxvt_fontprop::medium;
… …
1026 f = new rxvt_font_x11; 1060 f = new rxvt_font_x11;
1027 } 1061 }
1028 else 1062 else
1029 f = new rxvt_font_x11; 1063 f = new rxvt_font_x11;
1030 1064
1065 f->fs = this;
1031 f->set_term (r); 1066 f->set_term (r);
1032 f->set_name (strdup (name)); 1067 f->set_name (strdup (name));
1033 1068
1034 f->cs = cs; 1069 f->cs = cs;
1035 f->loaded = false; 1070 f->loaded = false;
… …
1107bool 1142bool
1108rxvt_fontset::populate (const char *desc) 1143rxvt_fontset::populate (const char *desc)
1109{ 1144{
1110 clear (); 1145 clear ();
1111 1146
1147 fontdesc = strdup (desc);
1148
1112 fonts.push_back (new_font (0, CS_UNICODE)); 1149 fonts.push_back (new_font (0, CS_UNICODE));
1113 realize_font (0); 1150 realize_font (0);
1114 1151
1115 add_fonts (desc); 1152 add_fonts (desc);
1116 1153
… …
1132 1169
1133 return true; 1170 return true;
1134} 1171}
1135 1172
1136int 1173int
1137rxvt_fontset::find_font (uint32_t unicode) 1174rxvt_fontset::find_font (const char *name) const
1138{ 1175{
1139 for (unsigned int i = 0; i < fonts.size (); i++) 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
1184rxvt_fontset::find_font (unicode_t unicode, bool bold)
1185{
1186
1187 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1188 i < fonts.size ();
1189 i++)
1140 { 1190 {
1141 rxvt_font *f = fonts[i]; 1191 rxvt_font *f = fonts[i];
1142 1192
1143 if (!f->loaded) 1193 if (!f->loaded)
1144 { 1194 {
… …
1147 1197
1148 if (!realize_font (i)) 1198 if (!realize_font (i))
1149 goto next_font; 1199 goto next_font;
1150 } 1200 }
1151 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
1152 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1208 if (f->has_codepoint (unicode))
1153 return i; 1209 return i;
1154 1210
1155 next_font: 1211 next_font:
1156 if (i == fonts.size () - 1 && fallback->name) 1212 if (i == fonts.size () - 1)
1213 {
1214 if (fallback->name)
1157 { 1215 {
1216 // search through the fallback list
1158 fonts.push_back (new_font (fallback->name, fallback->cs)); 1217 fonts.push_back (new_font (fallback->name, fallback->cs));
1159 fallback++; 1218 fallback++;
1160 i = 0;
1161 } 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 }
1162 } 1266 }
1267
1268 // if no bold font found, use a regular one
1269 if (bold)
1270 return find_font (unicode);
1163 1271
1164 return 0; /* we must return SOME font */ 1272 return 0; /* we must return SOME font */
1165} 1273}
1166 1274
1167 1275

Diff Legend

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