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.43 by pcg, Mon Mar 15 07:10:47 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 *
… …
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" },
… …
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#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
104
105 { CS_UNKNOWN, 0 } 104 { CS_UNKNOWN, 0 }
106}; 105};
107 106
108///////////////////////////////////////////////////////////////////////////// 107/////////////////////////////////////////////////////////////////////////////
109 108
… …
133{ 132{
134 if (len > enc_len) 133 if (len > enc_len)
135 { 134 {
136 free (enc_buf); 135 free (enc_buf);
137 enc_buf = malloc (len); 136 enc_buf = malloc (len);
137 enc_len = len;
138 } 138 }
139 139
140 return enc_buf; 140 return enc_buf;
141} 141}
142 142
… …
200 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif 201#endif
202 } 202 }
203} 203}
204 204
205static const char *linedraw_cmds[128 + 32] = { 205#include "table/linedraw.h"
206 "1-", "2-", "1|", "2|",
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 "1H|", "2H1|", "1HV2v", "1Hv2V",
216
217 // 2520
218 "1H2|", "2Hv1V", "2HV1v", "2H|",
219 "1h|", "2h1|", "1hV2v", "1hv2V",
220 "1h2|", "2hv1V", "1v2hV", "2h|",
221 "1-V", "2h1HV", "2H1hV", "2-1V",
222
223 // 2530
224 "1-2V", "2hV1H", "1h2HV", "2-V",
225 "1-v", "1vH2h", "1hv2H", "1v2-",
226 "1-2v", "1H2hv", "1h2Hv", "2-v",
227 "1-|", "1|H2h", "1h|2H", "1|2-",
228
229 // 2540
230 "1-V2v", "1-v2V", "1-2|", "1HV2hv",
231 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2-v",
232 "1v2-V", "1H2h|", "1h2H|", "2-|",
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, "A", "B", "C",
246
247 // 2570
248 "D", "1/", "1\\", "1/\\",
249 "1h", "1v", "1H", "1V",
250 "2h", "2v", "2H", "2V",
251 "1h2H", "1v2V", "1H2h", "1V2v",
252
253 // 2580
254 0, 0, 0, 0,
255 0, 0, 0, 0,
256 0, 0, 0, 0,
257 0, 0, 0, 0,
258
259 // 2590
260 0, 0, 0, 0,
261 0, 0, "k", "l",
262 "i", "ikl", "il", "ijk",
263 "ijl", "j", "jk", "jkl",
264
265 // to be done
266};
267 206
268struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
269 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
270 { 210 {
271 rxvt_fontprop p; 211 rxvt_fontprop p;
272 212
273 p.width = p.height = 1; 213 p.width = p.height = 1;
… …
280 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
281 { 221 {
282 width = 1; height = 1; 222 width = 1; height = 1;
283 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
284 224
285 set_name ("built-in pseudofont"); 225 set_name (strdup ("built-in pseudofont"));
286 226
287 return true; 227 return true;
288 } 228 }
289 229
290 bool has_codepoint (unicode_t unicode) 230 bool has_codepoint (unicode_t unicode)
291 { 231 {
292 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
293 return true; 233 return true;
294 234
295 if (unicode >= 0x0080 && unicode <= 0x009f) 235 if (unicode <= 0x007f)
236 return false;
237
238 if (unicode <= 0x009f)
296 return true; 239 return true;
297 240
298 if (unicode >= 0x2500 && unicode <= 0x257f
299 && linedraw_cmds[unicode - 0x2500])
300 return true;
301
302 if (unicode >= 0x2580 && unicode <= 0x259f) 241 if (unicode >= 0x2500 && unicode <= 0x259f)
303 return true; 242 return true;
304 243
305 if (IS_COMPOSE (unicode)) 244 if (IS_COMPOSE (unicode))
306 return true; 245 return true;
307 246
… …
317 void draw (rxvt_drawable &d, int x, int y, 256 void draw (rxvt_drawable &d, int x, int y,
318 const text_t *text, int len, 257 const text_t *text, int len,
319 int fg, int bg); 258 int fg, int bg);
320}; 259};
321 260
322static void rect_stipple (Display *display, Drawable d, GC gc, int s1, int s2, int x, int y, int w, int h)
323{
324 XGCValues gcv;
325 char bm[2] = { s1, s2 };
326
327 gcv.fill_style = FillStippled;
328 gcv.stipple = XCreateBitmapFromData (display, d, bm, 2, 2);
329 gcv.ts_x_origin = x;
330 gcv.ts_y_origin = y;
331
332 if (!gcv.stipple)
333 return;
334
335 XChangeGC (display, gc, GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
336 XFillRectangle (display, d, gc, x, y, w, h);
337
338 XFreePixmap (display, gcv.stipple);
339
340 gcv.fill_style = FillSolid;
341 XChangeGC (display, gc, GCFillStyle, &gcv);
342}
343
344void 261void
345rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 262rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
346 const text_t *text, int len, 263 const text_t *text, int len,
347 int fg, int bg) 264 int fg, int bg)
348{ 265{
… …
355#if ENABLE_COMBINING 272#if ENABLE_COMBINING
356 compose_char *cc; 273 compose_char *cc;
357#endif 274#endif
358 text_t t = *text++; 275 text_t t = *text++;
359 276
360 int W = r->TermWin.fwidth , w = (W - 1) / 2; 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;
361 int H = r->TermWin.fheight, h = (H - 1) / 2; 284 int H = r->TermWin.fheight;
362 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
363 int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
364 285
365 // is it in our linedrawing table? 286 int x_[16];
366 if (t >= 0x2500 & t <= 0x259f && linedraw_cmds[t - 0x2500]) 287 int y_[16];
288
289 for (int i = 0; i <= 8; i++)
367 { 290 {
368 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 }
294
295 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
296 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
369 297
370 XGCValues gcv; 298 XGCValues gcv;
371 299
372 gcv.cap_style = CapNotLast; 300 gcv.cap_style = CapButt;
301 gcv.line_width = 0;
373 XChangeGC (d.display->display, TGC, GCCapStyle, &gcv); 302 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
374 303
375 while (*p) 304 while (a < b)
376 { 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
377 switch (*p++) 316 switch (op)
378 { 317 {
379 case '1': 318 case 0: // line
380 gcv.line_width = 0; 319 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
381 XChangeGC (d.display->display, TGC, GCLineWidth, &gcv);
382 break; 320 break;
383 321
384 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);
385 gcv.line_width = 3; 342 gcv.stipple = 0;
343 gcv.fill_style = FillSolid;
386 XChangeGC (d.display->display, TGC, GCLineWidth, &gcv); 344 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
345 }
387 break; 346 break;
388 347 case 2: // arc
389 case 'h': XDrawLine (d.display->display, d, TGC, x0, y1, x1+1, y1 ); break; 348 XDrawArc (d.display->display, d, TGC,
390 case 'H': XDrawLine (d.display->display, d, TGC, x1, y1, x2 , y1 ); break; 349 x1 - W/2, y1 - H/2, W-1, H-1,
391 case '-': XDrawLine (d.display->display, d, TGC, x0, y1, x2 , y1 ); break; 350 (a - 1) * 90*64, (b - 1) * 90*64);
392 case 'v': XDrawLine (d.display->display, d, TGC, x1, y0, x1 , y1+1); break; 351 break;
393 case 'V': XDrawLine (d.display->display, d, TGC, x1, y1, x1 , y2 ); break;
394 case '|': XDrawLine (d.display->display, d, TGC, x1, y0, x1 , y2 ); break;
395
396 case '/' : XDrawLine (d.display->display, d, TGC, x0, y2, x2 , y0 ); break;
397 case '\\': XDrawLine (d.display->display, d, TGC, x0, y0, x2 , y2 ); break;
398
399 case 'A': XDrawArc (d.display->display, d, TGC, x1 , y1 , W-1, H-1, 90*64, 90*64); break;
400 case 'B': XDrawArc (d.display->display, d, TGC, x1-W+1, y1 , W-1, H-1, 0*64, 90*64); break;
401 case 'C': XDrawArc (d.display->display, d, TGC, x1-W+1, y1-H+1, W-1, H-1, 0*64, -90*64); break;
402 case 'D': XDrawArc (d.display->display, d, TGC, x1 , y1-H+1, W-1, H-1, -90*64, -90*64); break;
403
404 case 'i': XFillRectangle (d.display->display, d, TGC, x0, y0, x1 - x0 + 1, y1 - y0 + 1); break;
405 case 'j': XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, y1 - y0 + 1); break;
406 case 'k': XFillRectangle (d.display->display, d, TGC, x0, y1, x1 - x0 + 1, y2 - y1); break;
407 case 'l': XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1, y2 - y1); break;
408 } 352 }
409 } 353 }
410
411 gcv.line_width = 0;
412 XChangeGC (d.display->display, TGC, GCLineWidth, &gcv);
413 } 354 }
414
415#if ENABLE_COMBINING 355#if ENABLE_COMBINING
416 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 356 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
417 { 357 {
418 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 358 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
419 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 359 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
… …
432 switch (t) 372 switch (t)
433 { 373 {
434 case ZERO_WIDTH_CHAR: 374 case ZERO_WIDTH_CHAR:
435 break; 375 break;
436 376
437 case 0x2580: XFillRectangle (d.display->display, d, TGC, x0, y0, W, y1 - y0 + 1); break;
438 case 0x2581: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 7 - 1) / 8, W, H - (H * 7 - 1) / 8); break;
439 case 0x2582: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 6 - 2) / 8, W, H - (H * 6 - 2) / 8); break;
440 case 0x2583: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 5 - 3) / 8, W, H - (H * 5 - 3) / 8); break;
441 case 0x2584: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 4 - 4) / 8, W, H - (H * 4 - 4) / 8); break;
442 case 0x2585: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 3 - 5) / 8, W, H - (H * 3 - 5) / 8); break;
443 case 0x2586: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 2 - 6) / 8, W, H - (H * 2 - 6) / 8); break;
444 case 0x2587: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 1 - 7) / 8, W, H - (H * 1 - 7) / 8); break;
445 case 0x2588: XFillRectangle (d.display->display, d, TGC, x0, y0, W, H); break;
446 case 0x2589: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 7 - 1) / 8, H); break;
447 case 0x258a: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 6 - 2) / 8, H); break;
448 case 0x258b: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 5 - 3) / 8, H); break;
449 case 0x258c: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 4 - 4) / 8, H); break;
450 case 0x258d: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 3 - 5) / 8, H); break;
451 case 0x258e: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 2 - 6) / 8, H); break;
452 case 0x258f: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 1 - 7) / 8, H); break;
453 case 0x2590: XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, H); break;
454
455 case 0x2591: rect_stipple (d.display->display, d, TGC, 0x00, 0x01, x0, y0, W, H); break;
456 case 0x2592: rect_stipple (d.display->display, d, TGC, 0x02, 0x01, x0, y0, W, H); break;
457 case 0x2593: rect_stipple (d.display->display, d, TGC, 0x01, 0x03, x0, y0, W, H); break;
458
459 case 0x2594: XFillRectangle (d.display->display, d, TGC, x0, y0, W, (H * 1 - 7) / 8); break;
460 case 0x2595: XFillRectangle (d.display->display, d, TGC, x0 + (W * 7 - 1) / 8, y0, W - (W * 7 - 1) / 8, H); break;
461
462 default: 377 default:
463 int w = 0; 378 int w = 0;
464 while (len > 0 && *text == NOCHAR) 379 while (len > 0 && *text == NOCHAR)
465 { 380 {
466 ++text; 381 ++text;
… …
496 411
497 XFontStruct *f; 412 XFontStruct *f;
498 codeset cs; 413 codeset cs;
499 bool enc2b, encm; 414 bool enc2b, encm;
500 415
501 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;
502 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);
503 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 418 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
504 bool set_properties (rxvt_fontprop &p, const char *name); 419 bool set_properties (rxvt_fontprop &p, const char *name);
505}; 420};
506 421
507const char * 422char *
508rxvt_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
509{ 424{
510 unsigned long value; 425 unsigned long value;
511 426
512 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
513 return XGetAtomName (DISPLAY, value); 428 return XGetAtomName (DISPLAY, value);
514 else 429 else
515 return repl; 430 return rxvt_strdup (repl);
516} 431}
517 432
518rxvt_fontprop 433rxvt_fontprop
519rxvt_font_x11::properties () 434rxvt_font_x11::properties ()
520{ 435{
… …
535} 450}
536 451
537bool 452bool
538rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
539{ 454{
540 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
541 const char *slant = get_property (f, "SLANT", "r");
542
543 unsigned long height; 455 unsigned long height;
544 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
545 return false; 457 return false;
546 458
547 unsigned long avgwidth; 459 unsigned long avgwidth;
548 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
549 avgwidth = 0; 461 avgwidth = 0;
550 462
463 char *weight = get_property (f, "WEIGHT_NAME", "medium");
464 char *slant = get_property (f, "SLANT", "r");
465
551 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;
552} 472}
553 473
554bool 474bool
555rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 475rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
556{ 476{
… …
619{ 539{
620 clear (); 540 clear ();
621 541
622 char **list; 542 char **list;
623 int count; 543 int count;
624 list = XListFonts (DISPLAY, name, 512, &count); 544 list = XListFonts (DISPLAY, name, 1024, &count);
625 set_name (0); 545 set_name (0);
626 546
627 if (!list) 547 if (!list)
628 return false; 548 return false;
629 549
… …
660 f = XLoadQueryFont (DISPLAY, name); 580 f = XLoadQueryFont (DISPLAY, name);
661 581
662 if (!f) 582 if (!f)
663 return false; 583 return false;
664 584
665 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 585 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
666 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 586 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
667 587
668 if (registry && encoding) 588 if (registry && encoding)
669 { 589 {
670 char charset[64]; 590 char charset[64];
671 snprintf (charset, 64, "%s-%s", registry, encoding); 591 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
684 if (*charset++ == '-' && !--count) 604 if (*charset++ == '-' && !--count)
685 break; 605 break;
686 606
687 cs = codeset_from_name (charset); 607 cs = codeset_from_name (charset);
688 } 608 }
609
610 free (registry);
611 free (encoding);
689 612
690 if (cs == CS_UNICODE) 613 if (cs == CS_UNICODE)
691 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
692 615
693 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 616 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
806 729
807 int base = r->TermWin.fbase; 730 int base = r->TermWin.fbase;
808 731
809 XGCValues v; 732 XGCValues v;
810 v.foreground = r->PixColors[fg]; 733 v.foreground = r->PixColors[fg];
811 v.background = r->PixColors[bg];
812 v.font = f->fid; 734 v.font = f->fid;
813 735
814 if (enc2b) 736 if (enc2b)
815 { 737 {
816 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 738 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
817 739
818 if (bg == Color_bg && !slow) 740 if (bg == Color_bg && !slow)
819 { 741 {
742 v.background = r->PixColors[bg];
820 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 743 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
821 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 744 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
822 } 745 }
823 else 746 else
824 { 747 {
… …
846 { 769 {
847 const char *xc = enc_char (text, len, cs, slow); 770 const char *xc = enc_char (text, len, cs, slow);
848 771
849 if (bg == Color_bg && !slow) 772 if (bg == Color_bg && !slow)
850 { 773 {
774 v.background = r->PixColors[bg];
851 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 775 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
852 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 776 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
853 } 777 }
854 else 778 else
855 { 779 {
… …
918{ 842{
919 rxvt_fontprop p; 843 rxvt_fontprop p;
920 844
921 FT_Face face = XftLockFace (f); 845 FT_Face face = XftLockFace (f);
922 846
923 p.width = width; p.height = height; 847 p.width = width;
924 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 848 p.height = height;
925 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;
926 853
927 XftUnlockFace (f); 854 XftUnlockFace (f);
928 855
929 return p; 856 return p;
930} 857}
… …
943 870
944 if (!p) 871 if (!p)
945 return false; 872 return false;
946 873
947 FcValue v; 874 FcValue v;
875
876 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
877 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
948 878
949 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 879 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
950 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 880 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
951 881
952 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 882 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
… …
1074#endif 1004#endif
1075 1005
1076///////////////////////////////////////////////////////////////////////////// 1006/////////////////////////////////////////////////////////////////////////////
1077 1007
1078rxvt_fontset::rxvt_fontset (rxvt_t r) 1008rxvt_fontset::rxvt_fontset (rxvt_t r)
1079: r (r) 1009: r (r), fontdesc (0)
1080{ 1010{
1081 clear (); 1011 clear ();
1082} 1012}
1083 1013
1084rxvt_fontset::~rxvt_fontset () 1014rxvt_fontset::~rxvt_fontset ()
… …
1089void 1019void
1090rxvt_fontset::clear () 1020rxvt_fontset::clear ()
1091{ 1021{
1092 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1022 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1093 FONT_UNREF (*i); 1023 FONT_UNREF (*i);
1024
1025 free (fontdesc); fontdesc = 0;
1094 1026
1095 fonts.clear (); 1027 fonts.clear ();
1096 base_id = 0; 1028 base_id = 0;
1097 base_prop.height = 0x7fffffff; 1029 base_prop.height = 0x7fffffff;
1098 base_prop.weight = rxvt_fontprop::medium; 1030 base_prop.weight = rxvt_fontprop::medium;
… …
1206bool 1138bool
1207rxvt_fontset::populate (const char *desc) 1139rxvt_fontset::populate (const char *desc)
1208{ 1140{
1209 clear (); 1141 clear ();
1210 1142
1143 fontdesc = strdup (desc);
1144
1211 fonts.push_back (new_font (0, CS_UNICODE)); 1145 fonts.push_back (new_font (0, CS_UNICODE));
1212 realize_font (0); 1146 realize_font (0);
1213 1147
1214 add_fonts (desc); 1148 add_fonts (desc);
1215 1149
… …
1231 1165
1232 return true; 1166 return true;
1233} 1167}
1234 1168
1235int 1169int
1170rxvt_fontset::find_font (const char *name) const
1171{
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
1236rxvt_fontset::find_font (unicode_t unicode) 1180rxvt_fontset::find_font (unicode_t unicode, bool bold)
1237{ 1181{
1238 for (unsigned int i = 0; i < fonts.size (); i++) 1182
1183 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1184 i < fonts.size ();
1185 i++)
1239 { 1186 {
1240 rxvt_font *f = fonts[i]; 1187 rxvt_font *f = fonts[i];
1241 1188
1242 if (!f->loaded) 1189 if (!f->loaded)
1243 { 1190 {
… …
1246 1193
1247 if (!realize_font (i)) 1194 if (!realize_font (i))
1248 goto next_font; 1195 goto next_font;
1249 } 1196 }
1250 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
1251 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1204 if (f->has_codepoint (unicode))
1252 return i; 1205 return i;
1253 1206
1254 next_font: 1207 next_font:
1255 if (i == fonts.size () - 1 && fallback->name) 1208 if (i == fonts.size () - 1)
1209 {
1210 if (fallback->name)
1256 { 1211 {
1212 // search through the fallback list
1257 fonts.push_back (new_font (fallback->name, fallback->cs)); 1213 fonts.push_back (new_font (fallback->name, fallback->cs));
1258 fallback++; 1214 fallback++;
1259 i = 0;
1260 } 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 }
1261 } 1260 }
1261
1262 // if no bold font found, use a regular one
1263 if (bold)
1264 return find_font (unicode);
1262 1265
1263 return 0; /* we must return SOME font */ 1266 return 0; /* we must return SOME font */
1264} 1267}
1265 1268
1266 1269

Diff Legend

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