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.28 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.58 by root, Wed Aug 11 03:51:32 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" },
… …
89#endif 92#endif
90 93
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" },
97 { CS_UNICODE, "xft:FreeMono" },
94#endif 98#endif
95 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
96 { CS_UNICODE, "xft:FreeMono" },
97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 100 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 101 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 102 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
100 103
101 { CS_UNKNOWN, 0 } 104 { CS_UNKNOWN, 0 }
… …
129{ 132{
130 if (len > enc_len) 133 if (len > enc_len)
131 { 134 {
132 free (enc_buf); 135 free (enc_buf);
133 enc_buf = malloc (len); 136 enc_buf = malloc (len);
137 enc_len = len;
134 } 138 }
135 139
136 return enc_buf; 140 return enc_buf;
137} 141}
138 142
… …
190 else if (color >= 0) 194 else if (color >= 0)
191 { 195 {
192#if XFT 196#if XFT
193 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
194#else 198#else
195 XSetForeground (d.display->display, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
196 XFillRectangle (d.display->display, d, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
197#endif 201#endif
198 } 202 }
199} 203}
200 204
201static const char *linedraw_cmds[128] = { 205#include "table/linedraw.h"
202 "1hH", "2hH", "1vV", "2vV",
203 0, 0, 0, 0,
204 0, 0, 0, 0,
205 "1HV", "2H1V", "1H2V", "2HV",
206
207 // 2510
208 "1hV", "2h1V", "1h2V", "2hV",
209 "1Hv", "2H1v", "1H2v", "2Hv",
210 "1hv", "2h1v", "1h2v", "2hv",
211 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
212
213 // 2520
214 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
215 "1hvV", "2h1vV", "1hV2v", "1hv2V",
216 "1h2vV", "2hv1V", "1v2hV", "2hvV",
217 "1hHV", "2h1HV", "2H1hV", "2hH1V",
218
219 // 2530
220 "1hH2V", "2hV1H", "1h2HV", "2hHV",
221 "1hHv", "1vH2h", "1hv2H", "1v2hH",
222 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
223 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
224
225 // 2540
226 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
227 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
228 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
229 0, 0, 0, 0,
230
231 // 2550
232 0, 0, 0, 0,
233 0, 0, 0, 0,
234 0, 0, 0, 0,
235 0, 0, 0, 0,
236
237 // 2560
238 0, 0, 0, 0,
239 0, 0, 0, 0,
240 0, 0, 0, 0,
241 0, 0, 0, 0,
242
243 // 2570
244 0, "1a", "1b", "1ab",
245 "1h", "1v", "1H", "1V",
246 "2h", "2v", "2H", "2V",
247 "1h2H", "1v2V", "1H2h", "1V2v"
248
249 // to be done
250};
251 206
252struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
253 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
254 { 210 {
255 rxvt_fontprop p; 211 rxvt_fontprop p;
256 212
257 p.width = p.height = 1; 213 p.width = p.height = 1;
… …
264 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
265 { 221 {
266 width = 1; height = 1; 222 width = 1; height = 1;
267 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
268 224
225 set_name (strdup ("built-in pseudofont"));
226
269 return true; 227 return true;
270 } 228 }
271 229
272 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
273 { 231 {
274 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
275 return true; 233 return true;
276 if (unicode >= 0x0080 && unicode <= 0x009f) 234
235 if (unicode <= 0x007f)
236 return false;
237
238 if (unicode <= 0x009f)
277 return true; 239 return true;
278 240
279 if (unicode >= 0x2500 && unicode <= 0x257f 241 if (unicode >= 0x2500 && unicode <= 0x259f)
280 && linedraw_cmds[unicode - 0x2500]) 242 return true;
243
244 if (IS_COMPOSE (unicode))
281 return true; 245 return true;
282 246
283 switch (unicode) 247 switch (unicode)
284 { 248 {
285 case ZERO_WIDTH_CHAR: 249 case ZERO_WIDTH_CHAR:
… …
299 const text_t *text, int len, 263 const text_t *text, int len,
300 int fg, int bg) 264 int fg, int bg)
301{ 265{
302 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 266 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
303 267
304 XSetForeground (d.display->display, GC, r->PixColors[fg]); 268 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
305 269
306 while (len--) 270 while (len--)
307 { 271 {
272#if ENABLE_COMBINING
273 compose_char *cc;
274#endif
308 text_t t = *text++; 275 text_t t = *text++;
309 276
310 // is it in our linedrawing table? 277 if (0x2500 <= t && t <= 0x259f)
311 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 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++)
312 { 290 {
313 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 }
314 294
315 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1; 295 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
316 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1; 296 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
317 297
318 XGCValues gcv; 298 XGCValues gcv;
319 299
300 gcv.cap_style = CapButt;
301 gcv.line_width = 0;
302 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
303
320 while (*p) 304 while (a < b)
321 { 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
322 switch (*p++) 316 switch (op)
323 { 317 {
324 case '1': 318 case 0: // line
325 gcv.line_width = 0; 319 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
326 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
327 break; 320 break;
328 321
329 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);
330 gcv.line_width = 2; 342 gcv.stipple = 0;
343 gcv.fill_style = FillSolid;
331 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 344 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
345 }
332 break; 346 break;
333 347 case 2: // arc
334 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 348 XDrawArc (d.display->display, d, TGC,
335 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 349 x1 - W/2, y1 - H/2, W-1, H-1,
336 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 350 (a - 1) * 90*64, (b - 1) * 90*64);
337 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 351 break;
338 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
339 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
340 } 352 }
341 } 353 }
342 354 }
343 gcv.line_width = 0; 355#if ENABLE_COMBINING
344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 356 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
345 } 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
346 else 371 else
347 switch (t) 372 switch (t)
348 { 373 {
349 case ZERO_WIDTH_CHAR: 374 case ZERO_WIDTH_CHAR:
350 break; 375 break;
376
351 default: 377 default:
352 int w = 0; 378 int w = 0;
353 while (len > 0 && *text == NOCHAR) 379 while (len > 0 && *text == NOCHAR)
354 { 380 {
355 ++text; 381 ++text;
356 --len; 382 --len;
357 w += r->TermWin.fwidth; 383 w += r->TermWin.fwidth;
358 } 384 }
359 385
360 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 386 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
361 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 387 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
362 x += w; 388 x += w;
363 } 389 }
364 390
365 x += r->TermWin.fwidth; 391 x += r->TermWin.fwidth;
366 } 392 }
… …
375 401
376 rxvt_fontprop properties (); 402 rxvt_fontprop properties ();
377 403
378 bool load (const rxvt_fontprop &prop); 404 bool load (const rxvt_fontprop &prop);
379 405
380 bool has_codepoint (uint32_t unicode); 406 bool has_codepoint (unicode_t unicode);
381 407
382 void draw (rxvt_drawable &d, int x, int y, 408 void draw (rxvt_drawable &d, int x, int y,
383 const text_t *text, int len, 409 const text_t *text, int len,
384 int fg, int bg); 410 int fg, int bg);
385 411
386 XFontStruct *f; 412 XFontStruct *f;
387 codeset cs; 413 codeset cs;
388 bool enc2b, encm; 414 bool enc2b, encm;
389 415
390 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 416 char *get_property (XFontStruct *f, const char *property, const char *repl) const;
391 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 417 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
392 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 418 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
393 bool set_properties (rxvt_fontprop &p, const char *name); 419 bool set_properties (rxvt_fontprop &p, const char *name);
394}; 420};
395 421
396const char * 422char *
397rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 423rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
398{ 424{
399 unsigned long value; 425 unsigned long value;
400 426
401 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
402 return XGetAtomName (DISPLAY, value); 428 return XGetAtomName (DISPLAY, value);
403 else 429 else
404 return repl; 430 return rxvt_strdup (repl);
405} 431}
406 432
407rxvt_fontprop 433rxvt_fontprop
408rxvt_font_x11::properties () 434rxvt_font_x11::properties ()
409{ 435{
… …
424} 450}
425 451
426bool 452bool
427rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
428{ 454{
429 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
430 const char *slant = get_property (f, "SLANT", "r");
431
432 unsigned long height; 455 unsigned long height;
433 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
434 return false; 457 return false;
435 458
436 unsigned long avgwidth; 459 unsigned long avgwidth;
437 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
438 avgwidth = 0; 461 avgwidth = 0;
439 462
463 char *weight = get_property (f, "WEIGHT_NAME", "medium");
464 char *slant = get_property (f, "SLANT", "r");
465
440 return set_properties (p, height, weight, slant, avgwidth); 466 set_properties (p, height, weight, slant, avgwidth);
467
468 free (weight);
469 free (slant);
470
471 return true;
441} 472}
442 473
443bool 474bool
444rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 475rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
445{ 476{
446 int slashes = 0; 477 int slashes = 0;
447 const char *comp[12]; 478 const char *comp[13];
448 479
449 for (const char *c = name; *c; c++) 480 for (const char *c = name; *c; c++)
450 if (*c == '-') 481 if (*c == '-')
451 { 482 {
452 comp[slashes++] = c + 1; 483 comp[slashes++] = c + 1;
… …
508{ 539{
509 clear (); 540 clear ();
510 541
511 char **list; 542 char **list;
512 int count; 543 int count;
513 list = XListFonts (DISPLAY, name, 512, &count); 544 list = XListFonts (DISPLAY, name, 1024, &count);
514 set_name (0); 545 set_name (0);
515 546
516 if (!list) 547 if (!list)
517 return false; 548 return false;
518 549
… …
549 f = XLoadQueryFont (DISPLAY, name); 580 f = XLoadQueryFont (DISPLAY, name);
550 581
551 if (!f) 582 if (!f)
552 return false; 583 return false;
553 584
554 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 585 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
555 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 586 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
556 587
557 if (registry && encoding) 588 if (registry && encoding)
558 { 589 {
559 char charset[64]; 590 char charset[64];
560 snprintf (charset, 64, "%s-%s", registry, encoding); 591 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
573 if (*charset++ == '-' && !--count) 604 if (*charset++ == '-' && !--count)
574 break; 605 break;
575 606
576 cs = codeset_from_name (charset); 607 cs = codeset_from_name (charset);
577 } 608 }
609
610 free (registry);
611 free (encoding);
578 612
579 if (cs == CS_UNICODE) 613 if (cs == CS_UNICODE)
580 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
581 615
582 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 616 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
632 f = 0; 666 f = 0;
633 } 667 }
634} 668}
635 669
636bool 670bool
637rxvt_font_x11::has_codepoint (uint32_t unicode) 671rxvt_font_x11::has_codepoint (unicode_t unicode)
638{ 672{
639 uint32_t ch = FROM_UNICODE (cs, unicode); 673 uint32_t ch = FROM_UNICODE (cs, unicode);
640 674
641 if (ch == NOCHAR) 675 if (ch == NOCHAR)
642 return false; 676 return false;
… …
695 729
696 int base = r->TermWin.fbase; 730 int base = r->TermWin.fbase;
697 731
698 XGCValues v; 732 XGCValues v;
699 v.foreground = r->PixColors[fg]; 733 v.foreground = r->PixColors[fg];
700 v.background = r->PixColors[bg];
701 v.font = f->fid; 734 v.font = f->fid;
702 735
703 if (enc2b) 736 if (enc2b)
704 { 737 {
705 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 738 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
706 739
707 if (bg == Color_bg && !slow) 740 if (bg == Color_bg && !slow)
708 { 741 {
742 v.background = r->PixColors[bg];
709 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 743 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
710 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 744 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
711 } 745 }
712 else 746 else
713 { 747 {
714 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 748 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
715 749
716 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 750 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
717 751
718 if (slow) 752 if (slow)
719 { 753 {
720 do 754 do
721 { 755 {
722 if (xc->byte1 || xc->byte2) 756 if (xc->byte1 || xc->byte2)
723 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 757 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
724 758
725 x += r->TermWin.fwidth; 759 x += r->TermWin.fwidth;
726 xc++; len--; 760 xc++; len--;
727 } 761 }
728 while (len); 762 while (len);
729 } 763 }
730 else 764 else
731 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 765 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
732 } 766 }
733 } 767 }
734 else 768 else
735 { 769 {
736 const char *xc = enc_char (text, len, cs, slow); 770 const char *xc = enc_char (text, len, cs, slow);
737 771
738 if (bg == Color_bg && !slow) 772 if (bg == Color_bg && !slow)
739 { 773 {
774 v.background = r->PixColors[bg];
740 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 775 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
741 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 776 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
742 } 777 }
743 else 778 else
744 { 779 {
745 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 780 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
746 781
747 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 782 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
748 783
749 if (slow) 784 if (slow)
750 { 785 {
751 do 786 do
752 { 787 {
753 if (*xc) 788 if (*xc)
754 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 789 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
755 790
756 x += r->TermWin.fwidth; 791 x += r->TermWin.fwidth;
757 xc++; len--; 792 xc++; len--;
758 } 793 }
759 while (len); 794 while (len);
760 } 795 }
761 else 796 else
762 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 797 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
763 } 798 }
764 } 799 }
765} 800}
766 801
767///////////////////////////////////////////////////////////////////////////// 802/////////////////////////////////////////////////////////////////////////////
… …
784 819
785 void draw (rxvt_drawable &d, int x, int y, 820 void draw (rxvt_drawable &d, int x, int y,
786 const text_t *text, int len, 821 const text_t *text, int len,
787 int fg, int bg); 822 int fg, int bg);
788 823
789 bool has_codepoint (uint32_t unicode); 824 bool has_codepoint (unicode_t unicode);
790 825
791protected: 826protected:
792 XftFont *f; 827 XftFont *f;
793}; 828};
794 829
… …
807{ 842{
808 rxvt_fontprop p; 843 rxvt_fontprop p;
809 844
810 FT_Face face = XftLockFace (f); 845 FT_Face face = XftLockFace (f);
811 846
812 p.width = width; p.height = height; 847 p.width = width;
813 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 848 p.height = height;
814 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman; 849 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
850 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
851 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
852 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
815 853
816 XftUnlockFace (f); 854 XftUnlockFace (f);
817 855
818 return p; 856 return p;
819} 857}
… …
832 870
833 if (!p) 871 if (!p)
834 return false; 872 return false;
835 873
836 FcValue v; 874 FcValue v;
875
876 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
877 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
837 878
838 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 879 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
839 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 880 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
840 881
841 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 882 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
… …
907 948
908 return true; 949 return true;
909} 950}
910 951
911bool 952bool
912rxvt_font_xft::has_codepoint (uint32_t unicode) 953rxvt_font_xft::has_codepoint (unicode_t unicode)
913{ 954{
914 return XftCharExists (DISPLAY, f, unicode); 955 return XftCharExists (DISPLAY, f, unicode);
915} 956}
916 957
917void 958void
… …
963#endif 1004#endif
964 1005
965///////////////////////////////////////////////////////////////////////////// 1006/////////////////////////////////////////////////////////////////////////////
966 1007
967rxvt_fontset::rxvt_fontset (rxvt_t r) 1008rxvt_fontset::rxvt_fontset (rxvt_t r)
968: r (r) 1009: r (r), fontdesc (0)
969{ 1010{
970 clear (); 1011 clear ();
971} 1012}
972 1013
973rxvt_fontset::~rxvt_fontset () 1014rxvt_fontset::~rxvt_fontset ()
… …
978void 1019void
979rxvt_fontset::clear () 1020rxvt_fontset::clear ()
980{ 1021{
981 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1022 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
982 FONT_UNREF (*i); 1023 FONT_UNREF (*i);
1024
1025 free (fontdesc); fontdesc = 0;
983 1026
984 fonts.clear (); 1027 fonts.clear ();
985 base_id = 0; 1028 base_id = 0;
986 base_prop.height = 0x7fffffff; 1029 base_prop.height = 0x7fffffff;
987 base_prop.weight = rxvt_fontprop::medium; 1030 base_prop.weight = rxvt_fontprop::medium;
… …
1013 f = new rxvt_font_x11; 1056 f = new rxvt_font_x11;
1014 } 1057 }
1015 else 1058 else
1016 f = new rxvt_font_x11; 1059 f = new rxvt_font_x11;
1017 1060
1061 f->fs = this;
1018 f->set_term (r); 1062 f->set_term (r);
1019 f->set_name (strdup (name)); 1063 f->set_name (strdup (name));
1020 1064
1021 f->cs = cs; 1065 f->cs = cs;
1022 f->loaded = false; 1066 f->loaded = false;
… …
1094bool 1138bool
1095rxvt_fontset::populate (const char *desc) 1139rxvt_fontset::populate (const char *desc)
1096{ 1140{
1097 clear (); 1141 clear ();
1098 1142
1143 fontdesc = strdup (desc);
1144
1099 fonts.push_back (new_font (0, CS_UNICODE)); 1145 fonts.push_back (new_font (0, CS_UNICODE));
1100 realize_font (0); 1146 realize_font (0);
1101 1147
1102 add_fonts (desc); 1148 add_fonts (desc);
1103 1149
… …
1119 1165
1120 return true; 1166 return true;
1121} 1167}
1122 1168
1123int 1169int
1124rxvt_fontset::find_font (uint32_t unicode) 1170rxvt_fontset::find_font (const char *name) const
1125{ 1171{
1126 for (unsigned int i = 0; i < fonts.size (); i++) 1172 for (rxvt_font *const *f = fonts.begin (); f < fonts.end (); f++)
1173 if ((*f)->name && !strcmp ((*f)->name, name))
1174 return f - fonts.begin ();
1175
1176 return -1;
1177}
1178
1179int
1180rxvt_fontset::find_font (unicode_t unicode, bool bold)
1181{
1182
1183 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1184 i < fonts.size ();
1185 i++)
1127 { 1186 {
1128 rxvt_font *f = fonts[i]; 1187 rxvt_font *f = fonts[i];
1129 1188
1130 if (!f->loaded) 1189 if (!f->loaded)
1131 { 1190 {
… …
1134 1193
1135 if (!realize_font (i)) 1194 if (!realize_font (i))
1136 goto next_font; 1195 goto next_font;
1137 } 1196 }
1138 1197
1198 if (f->cs == CS_UNKNOWN)
1199 goto next_font;
1200
1201 if (bold && f->properties ().weight < rxvt_fontprop::bold)
1202 goto next_font;
1203
1139 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1204 if (f->has_codepoint (unicode))
1140 return i; 1205 return i;
1141 1206
1142 next_font: 1207 next_font:
1143 if (i == fonts.size () - 1 && fallback->name) 1208 if (i == fonts.size () - 1)
1209 {
1210 if (fallback->name)
1144 { 1211 {
1212 // search through the fallback list
1145 fonts.push_back (new_font (fallback->name, fallback->cs)); 1213 fonts.push_back (new_font (fallback->name, fallback->cs));
1146 fallback++; 1214 fallback++;
1147 i = 0;
1148 } 1215 }
1216 else
1217 {
1218 // try to find a new font.
1219 // only xft currently supported, as there is no
1220 // way to configure this and xft is easier to hack in,
1221 // while x11 has more framework in place already.
1222#if XFT
1223 // grab the first xft font that seems suitable
1224 FcPattern *p = FcPatternCreate ();
1225
1226 FcCharSet *s = FcCharSetCreate ();
1227 FcCharSetAddChar (s, unicode);
1228 FcPatternAddCharSet (p, FC_CHARSET, s);
1229 // charsets don't help that much, as xft might return
1230 // a non-matching font even if a better font is available :/
1231
1232 FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height);
1233 FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight);
1234 FcPatternAddInteger (p, FC_SLANT, base_prop.slant);
1235
1236 XftResult result;
1237 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
1238
1239 FcPatternDestroy (p);
1240
1241 if (match)
1242 {
1243 FcPatternDel (match, FC_CHARSET);
1244 char *font = (char *)FcNameUnparse (match);
1245 FcPatternDestroy (match);
1246
1247 if (find_font (font) < 0)
1248 {
1249 char fontname[4096];
1250 sprintf (fontname, "xft:%-.4090s", font);
1251
1252 fonts.push_back (new_font (fontname, CS_UNICODE));
1253 }
1254
1255 free (font);
1256 }
1257#endif
1258 }
1259 }
1149 } 1260 }
1261
1262 // if no bold font found, use a regular one
1263 if (bold)
1264 return find_font (unicode);
1150 1265
1151 return 0; /* we must return SOME font */ 1266 return 0; /* we must return SOME font */
1152} 1267}
1153 1268
1154 1269

Diff Legend

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