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.56 by root, Mon Aug 2 04:42:11 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 104#if UNICODE_3 && XFT
… …
133{ 136{
134 if (len > enc_len) 137 if (len > enc_len)
135 { 138 {
136 free (enc_buf); 139 free (enc_buf);
137 enc_buf = malloc (len); 140 enc_buf = malloc (len);
141 enc_len = len;
138 } 142 }
139 143
140 return enc_buf; 144 return enc_buf;
141} 145}
142 146
… …
200 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 204 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif 205#endif
202 } 206 }
203} 207}
204 208
205static const char *linedraw_cmds[128 + 32] = { 209#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 210
268struct rxvt_font_default : rxvt_font { 211struct rxvt_font_default : rxvt_font {
212
269 rxvt_fontprop properties () 213 rxvt_fontprop properties ()
270 { 214 {
271 rxvt_fontprop p; 215 rxvt_fontprop p;
272 216
273 p.width = p.height = 1; 217 p.width = p.height = 1;
… …
280 bool load (const rxvt_fontprop &prop) 224 bool load (const rxvt_fontprop &prop)
281 { 225 {
282 width = 1; height = 1; 226 width = 1; height = 1;
283 ascent = 1; descent = 0; 227 ascent = 1; descent = 0;
284 228
285 set_name ("built-in pseudofont"); 229 set_name (strdup ("built-in pseudofont"));
286 230
287 return true; 231 return true;
288 } 232 }
289 233
290 bool has_codepoint (unicode_t unicode) 234 bool has_codepoint (unicode_t unicode)
291 { 235 {
292 if (unicode <= 0x001f) 236 if (unicode <= 0x001f)
293 return true; 237 return true;
294 238
295 if (unicode >= 0x0080 && unicode <= 0x009f) 239 if (unicode <= 0x007f)
240 return false;
241
242 if (unicode <= 0x009f)
296 return true; 243 return true;
297 244
298 if (unicode >= 0x2500 && unicode <= 0x257f
299 && linedraw_cmds[unicode - 0x2500])
300 return true;
301
302 if (unicode >= 0x2580 && unicode <= 0x259f) 245 if (unicode >= 0x2500 && unicode <= 0x259f)
303 return true; 246 return true;
304 247
305 if (IS_COMPOSE (unicode)) 248 if (IS_COMPOSE (unicode))
306 return true; 249 return true;
307 250
… …
317 void draw (rxvt_drawable &d, int x, int y, 260 void draw (rxvt_drawable &d, int x, int y,
318 const text_t *text, int len, 261 const text_t *text, int len,
319 int fg, int bg); 262 int fg, int bg);
320}; 263};
321 264
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 265void
345rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 266rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
346 const text_t *text, int len, 267 const text_t *text, int len,
347 int fg, int bg) 268 int fg, int bg)
348{ 269{
… …
355#if ENABLE_COMBINING 276#if ENABLE_COMBINING
356 compose_char *cc; 277 compose_char *cc;
357#endif 278#endif
358 text_t t = *text++; 279 text_t t = *text++;
359 280
360 int W = r->TermWin.fwidth , w = (W - 1) / 2; 281 if (0x2500 <= t && t <= 0x259f)
282 {
283 uint16_t offs = linedraw_offs[t - 0x2500];
284 uint32_t *a = linedraw_command + (offs >> 4);
285 uint32_t *b = a + (offs & 15);
286
287 int W = r->TermWin.fwidth;
361 int H = r->TermWin.fheight, h = (H - 1) / 2; 288 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 289
365 // is it in our linedrawing table? 290 int x_[16];
366 if (t >= 0x2500 & t <= 0x259f && linedraw_cmds[t - 0x2500]) 291 int y_[16];
292
293 for (int i = 0; i <= 8; i++)
367 { 294 {
368 const char *p = linedraw_cmds[t - 0x2500]; 295 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
296 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
297 }
298
299 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
300 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
369 301
370 XGCValues gcv; 302 XGCValues gcv;
371 303
372 gcv.cap_style = CapNotLast; 304 gcv.cap_style = CapButt;
305 gcv.line_width = 0;
373 XChangeGC (d.display->display, TGC, GCCapStyle, &gcv); 306 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
374 307
375 while (*p) 308 while (a < b)
376 { 309 {
310 uint32_t command = *a++;
311
312 int op = (command >> 24) & 255;
313 int a = (command >> 20) & 15;
314 int b = (command >> 16) & 15;
315 int x1 = x_[(command >> 12) & 15];
316 int y1 = y_[(command >> 8) & 15];
317 int x2 = x_[(command >> 4) & 15];
318 int y2 = y_[(command >> 0) & 15];
319
377 switch (*p++) 320 switch (op)
378 { 321 {
379 case '1': 322 case 0: // line
380 gcv.line_width = 0; 323 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
381 XChangeGC (d.display->display, TGC, GCLineWidth, &gcv);
382 break; 324 break;
383 325
384 case '2': 326 case 1: // rectangle, possibly stippled
327 if (a)
328 {
329 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
330
331 gcv.fill_style = FillStippled;
332 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
333 gcv.ts_x_origin = x;
334 gcv.ts_y_origin = y;
335
336 XChangeGC (d.display->display, TGC,
337 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
338 &gcv);
339 }
340
341 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
342
343 if (a)
344 {
345 XFreePixmap (d.display->display, gcv.stipple);
385 gcv.line_width = 3; 346 gcv.stipple = 0;
347 gcv.fill_style = FillSolid;
386 XChangeGC (d.display->display, TGC, GCLineWidth, &gcv); 348 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
349 }
387 break; 350 break;
388 351 case 2: // arc
389 case 'h': XDrawLine (d.display->display, d, TGC, x0, y1, x1+1, y1 ); break; 352 XDrawArc (d.display->display, d, TGC,
390 case 'H': XDrawLine (d.display->display, d, TGC, x1, y1, x2 , y1 ); break; 353 x1 - W/2, y1 - H/2, W-1, H-1,
391 case '-': XDrawLine (d.display->display, d, TGC, x0, y1, x2 , y1 ); break; 354 (a - 1) * 90*64, (b - 1) * 90*64);
392 case 'v': XDrawLine (d.display->display, d, TGC, x1, y0, x1 , y1+1); break; 355 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 } 356 }
409 } 357 }
410
411 gcv.line_width = 0;
412 XChangeGC (d.display->display, TGC, GCLineWidth, &gcv);
413 } 358 }
414
415#if ENABLE_COMBINING 359#if ENABLE_COMBINING
416 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 360 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
417 { 361 {
418 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 362 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
419 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 363 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
… …
432 switch (t) 376 switch (t)
433 { 377 {
434 case ZERO_WIDTH_CHAR: 378 case ZERO_WIDTH_CHAR:
435 break; 379 break;
436 380
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: 381 default:
463 int w = 0; 382 int w = 0;
464 while (len > 0 && *text == NOCHAR) 383 while (len > 0 && *text == NOCHAR)
465 { 384 {
466 ++text; 385 ++text;
… …
496 415
497 XFontStruct *f; 416 XFontStruct *f;
498 codeset cs; 417 codeset cs;
499 bool enc2b, encm; 418 bool enc2b, encm;
500 419
501 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 420 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); 421 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); 422 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
504 bool set_properties (rxvt_fontprop &p, const char *name); 423 bool set_properties (rxvt_fontprop &p, const char *name);
505}; 424};
506 425
507const char * 426char *
508rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 427rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
509{ 428{
510 unsigned long value; 429 unsigned long value;
511 430
512 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 431 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
513 return XGetAtomName (DISPLAY, value); 432 return XGetAtomName (DISPLAY, value);
514 else 433 else
515 return repl; 434 return rxvt_strdup (repl);
516} 435}
517 436
518rxvt_fontprop 437rxvt_fontprop
519rxvt_font_x11::properties () 438rxvt_font_x11::properties ()
520{ 439{
… …
535} 454}
536 455
537bool 456bool
538rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 457rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
539{ 458{
540 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
541 const char *slant = get_property (f, "SLANT", "r");
542
543 unsigned long height; 459 unsigned long height;
544 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
545 return false; 461 return false;
546 462
547 unsigned long avgwidth; 463 unsigned long avgwidth;
548 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 464 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
549 avgwidth = 0; 465 avgwidth = 0;
550 466
467 char *weight = get_property (f, "WEIGHT_NAME", "medium");
468 char *slant = get_property (f, "SLANT", "r");
469
551 return set_properties (p, height, weight, slant, avgwidth); 470 set_properties (p, height, weight, slant, avgwidth);
471
472 free (weight);
473 free (slant);
474
475 return true;
552} 476}
553 477
554bool 478bool
555rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 479rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
556{ 480{
… …
660 f = XLoadQueryFont (DISPLAY, name); 584 f = XLoadQueryFont (DISPLAY, name);
661 585
662 if (!f) 586 if (!f)
663 return false; 587 return false;
664 588
665 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 589 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
666 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 590 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
667 591
668 if (registry && encoding) 592 if (registry && encoding)
669 { 593 {
670 char charset[64]; 594 char charset[64];
671 snprintf (charset, 64, "%s-%s", registry, encoding); 595 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
684 if (*charset++ == '-' && !--count) 608 if (*charset++ == '-' && !--count)
685 break; 609 break;
686 610
687 cs = codeset_from_name (charset); 611 cs = codeset_from_name (charset);
688 } 612 }
613
614 free (registry);
615 free (encoding);
689 616
690 if (cs == CS_UNICODE) 617 if (cs == CS_UNICODE)
691 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 618 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
692 619
693 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 620 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
806 733
807 int base = r->TermWin.fbase; 734 int base = r->TermWin.fbase;
808 735
809 XGCValues v; 736 XGCValues v;
810 v.foreground = r->PixColors[fg]; 737 v.foreground = r->PixColors[fg];
811 v.background = r->PixColors[bg];
812 v.font = f->fid; 738 v.font = f->fid;
813 739
814 if (enc2b) 740 if (enc2b)
815 { 741 {
816 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 742 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
817 743
818 if (bg == Color_bg && !slow) 744 if (bg == Color_bg && !slow)
819 { 745 {
746 v.background = r->PixColors[bg];
820 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 747 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
821 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 748 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
822 } 749 }
823 else 750 else
824 { 751 {
… …
846 { 773 {
847 const char *xc = enc_char (text, len, cs, slow); 774 const char *xc = enc_char (text, len, cs, slow);
848 775
849 if (bg == Color_bg && !slow) 776 if (bg == Color_bg && !slow)
850 { 777 {
778 v.background = r->PixColors[bg];
851 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 779 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
852 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 780 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
853 } 781 }
854 else 782 else
855 { 783 {
… …
1074#endif 1002#endif
1075 1003
1076///////////////////////////////////////////////////////////////////////////// 1004/////////////////////////////////////////////////////////////////////////////
1077 1005
1078rxvt_fontset::rxvt_fontset (rxvt_t r) 1006rxvt_fontset::rxvt_fontset (rxvt_t r)
1079: r (r) 1007: r (r), fontdesc (0)
1080{ 1008{
1081 clear (); 1009 clear ();
1082} 1010}
1083 1011
1084rxvt_fontset::~rxvt_fontset () 1012rxvt_fontset::~rxvt_fontset ()
… …
1089void 1017void
1090rxvt_fontset::clear () 1018rxvt_fontset::clear ()
1091{ 1019{
1092 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1020 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1093 FONT_UNREF (*i); 1021 FONT_UNREF (*i);
1022
1023 free (fontdesc); fontdesc = 0;
1094 1024
1095 fonts.clear (); 1025 fonts.clear ();
1096 base_id = 0; 1026 base_id = 0;
1097 base_prop.height = 0x7fffffff; 1027 base_prop.height = 0x7fffffff;
1098 base_prop.weight = rxvt_fontprop::medium; 1028 base_prop.weight = rxvt_fontprop::medium;
… …
1206bool 1136bool
1207rxvt_fontset::populate (const char *desc) 1137rxvt_fontset::populate (const char *desc)
1208{ 1138{
1209 clear (); 1139 clear ();
1210 1140
1141 fontdesc = strdup (desc);
1142
1211 fonts.push_back (new_font (0, CS_UNICODE)); 1143 fonts.push_back (new_font (0, CS_UNICODE));
1212 realize_font (0); 1144 realize_font (0);
1213 1145
1214 add_fonts (desc); 1146 add_fonts (desc);
1215 1147
… …
1231 1163
1232 return true; 1164 return true;
1233} 1165}
1234 1166
1235int 1167int
1236rxvt_fontset::find_font (unicode_t unicode) 1168rxvt_fontset::find_font (unicode_t unicode, bool bold)
1237{ 1169{
1238 for (unsigned int i = 0; i < fonts.size (); i++) 1170 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1171 i < fonts.size ();
1172 i++)
1239 { 1173 {
1240 rxvt_font *f = fonts[i]; 1174 rxvt_font *f = fonts[i];
1241 1175
1242 if (!f->loaded) 1176 if (!f->loaded)
1243 { 1177 {
… …
1246 1180
1247 if (!realize_font (i)) 1181 if (!realize_font (i))
1248 goto next_font; 1182 goto next_font;
1249 } 1183 }
1250 1184
1185 if (f->cs == CS_UNKNOWN)
1186 goto next_font;
1187
1188 if (bold && f->properties ().weight < rxvt_fontprop::bold)
1189 goto next_font;
1190
1251 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1191 if (f->has_codepoint (unicode))
1252 return i; 1192 return i;
1253 1193
1254 next_font: 1194 next_font:
1255 if (i == fonts.size () - 1 && fallback->name) 1195 if (i == fonts.size () - 1 && fallback->name)
1256 { 1196 {
… …
1258 fallback++; 1198 fallback++;
1259 i = 0; 1199 i = 0;
1260 } 1200 }
1261 } 1201 }
1262 1202
1203 // if no bold font found, use a regular one
1204 if (bold)
1205 return find_font (unicode);
1206
1263 return 0; /* we must return SOME font */ 1207 return 0; /* we must return SOME font */
1264} 1208}
1265 1209
1266 1210
1267 1211

Diff Legend

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