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.9 by pcg, Wed Dec 24 06:26:52 2003 UTC vs.
Revision 1.26 by pcg, Fri Feb 27 02:52:51 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*;
2 * File: defaultfont.C 2 * File: defaultfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003 Marc Lehmann rxvt@plan9.de> 4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
23#include "rxvt.h" 23#include "rxvt.h"
24#include "defaultfont.h" 24#include "defaultfont.h"
25 25
26#include <cstdlib> 26#include <cstdlib>
27 27
28#define DISPLAY r->Xdisplay 28#define DISPLAY r->display->display
29#define DRAWABLE r->TermWin.vt
30#define GC r->TermWin.gc 29#define GC r->TermWin.gc
31 30
32const struct rxvt_fallback_font { 31const struct rxvt_fallback_font {
33 codeset cs; 32 codeset cs;
34 const char *name; 33 const char *name;
… …
73 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
74 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 73 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
75 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 74 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
76 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 75 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
77# endif 76# endif
77 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
86#endif 86#endif
87 87
88#if XFT 88#if XFT
89 { CS_UNICODE, "xft:Andale Mono" }, 89 { CS_UNICODE, "xft:Andale Mono" },
90 { CS_UNICODE, "xft:Arial Unicode MS" }, 90 { CS_UNICODE, "xft:Arial Unicode MS" },
… …
98 { CS_UNKNOWN, 0 } 98 { CS_UNKNOWN, 0 }
99}; 99};
100 100
101///////////////////////////////////////////////////////////////////////////// 101/////////////////////////////////////////////////////////////////////////////
102 102
103#if XFT
104rxvt_drawable::~rxvt_drawable ()
105{
106 if (xftdrawable)
107 XftDrawDestroy (xftdrawable);
108}
109
110rxvt_drawable::operator XftDraw *()
111{
112 if (!xftdrawable)
113 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
114
115 return xftdrawable;
116}
117#endif
118
119/////////////////////////////////////////////////////////////////////////////
120
103static void *enc_buf; 121static void *enc_buf;
104static uint32_t enc_len; 122static uint32_t enc_len;
105 123
106static inline void * 124static inline void *
107get_enc_buf (int len) 125get_enc_buf (uint32_t len)
108{ 126{
109 if (len > enc_len) 127 if (len > enc_len)
110 { 128 {
111 free (enc_buf); 129 free (enc_buf);
112 enc_buf = malloc (len); 130 enc_buf = malloc (len);
… …
114 132
115 return enc_buf; 133 return enc_buf;
116} 134}
117 135
118static const char * 136static const char *
119enc_char (const text_t *text, int len, codeset cs, bool &zero) 137enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
120{ 138{
121 uint8_t *buf = (uint8_t *)get_enc_buf (len); 139 uint8_t *buf = (uint8_t *)get_enc_buf (len);
122 140
123 while (len--) 141 while (len--)
124 { 142 {
… …
135 153
136 return (const char *)enc_buf; 154 return (const char *)enc_buf;
137} 155}
138 156
139static const XChar2b * 157static const XChar2b *
140enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 158enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
141{ 159{
142 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 160 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
143 161
144 while (len--) 162 while (len--)
145 { 163 {
… …
160} 178}
161 179
162///////////////////////////////////////////////////////////////////////////// 180/////////////////////////////////////////////////////////////////////////////
163 181
164void 182void
165rxvt_font::clear_rect (int x, int y, int w, int h, int color) 183rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
166{ 184{
167 if (color == Color_bg) 185 if (color == Color_bg)
168 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 186 XClearArea (d.display->display, d, x, y, w, h, FALSE);
169 else if (color >= 0) 187 else if (color >= 0)
170 { 188 {
189#if XFT
190 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
191#else
171 XSetForeground (DISPLAY, GC, r->PixColors[color]); 192 XSetForeground (d.display->display, GC, r->PixColors[color]);
172 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 193 XFillRectangle (d.display->display, d, GC, x, y, w, h);
194#endif
173 } 195 }
174} 196}
175 197
176static const char *linedraw_cmds[128] = { 198static const char *linedraw_cmds[128] = {
177 "1hH", "2hH", "1vV", "2vV", 199 "1hH", "2hH", "1vV", "2vV",
… …
227struct rxvt_font_default : rxvt_font { 249struct rxvt_font_default : rxvt_font {
228 rxvt_fontprop properties () 250 rxvt_fontprop properties ()
229 { 251 {
230 rxvt_fontprop p; 252 rxvt_fontprop p;
231 253
232 p.height = 1; 254 p.width = p.height = 1;
233 p.weight = rxvt_fontprop::medium; 255 p.weight = rxvt_fontprop::medium;
234 p.slant = rxvt_fontprop::roman; 256 p.slant = rxvt_fontprop::roman;
235 257
236 return p; 258 return p;
237 } 259 }
… …
262 } 284 }
263 285
264 return false; 286 return false;
265 } 287 }
266 288
267 void draw (int x, int y, 289 void draw (rxvt_drawable &d, int x, int y,
268 const text_t *text, int len, 290 const text_t *text, int len,
269 int fg, int bg); 291 int fg, int bg);
270}; 292};
271 293
272void 294void
273rxvt_font_default::draw (int x, int y, 295rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274 const text_t *text, int len, 296 const text_t *text, int len,
275 int fg, int bg) 297 int fg, int bg)
276{ 298{
277 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 299 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278 300
279 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 301 XSetForeground (d.display->display, GC, r->PixColors[fg]);
280 302
281 while (len--) 303 while (len--)
282 { 304 {
283 text_t t = *text++; 305 text_t t = *text++;
284 306
285 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 307 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
286 { 308 {
287 const char *p = linedraw_cmds[t - 0x2500]; 309 const char *p = linedraw_cmds[t - 0x2500];
288 310
289 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 311 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1;
290 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 312 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;
291 313
292 XGCValues gcv; 314 XGCValues gcv;
293 315
294 while (*p) 316 while (*p)
295 { 317 {
296 switch (*p++) 318 switch (*p++)
297 { 319 {
298 case '1': 320 case '1':
299 gcv.line_width = 0; 321 gcv.line_width = 0;
300 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 322 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
301 break; 323 break;
302 324
303 case '2': 325 case '2':
304 gcv.line_width = 2; 326 gcv.line_width = 2;
305 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 327 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
306 break; 328 break;
307 329
308 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 330 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;
309 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 331 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
310 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 332 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
311 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 333 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;
312 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; 334 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
313 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break; 335 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
314 } 336 }
315 } 337 }
316 338
317 gcv.line_width = 0; 339 gcv.line_width = 0;
318 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 340 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
319 } 341 }
320 else 342 else
321 switch (*text++) 343 switch (*text++)
322 { 344 {
323 case NOCHAR: 345 case NOCHAR:
324 case ZERO_WIDTH_CHAR: 346 case ZERO_WIDTH_CHAR:
325 break; 347 break;
326 default: 348 default:
327 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 349 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
328 } 350 }
329 351
330 x += r->TermWin.fwidth; 352 x += r->TermWin.fwidth;
331 } 353 }
332} 354}
… …
337 rxvt_font_x11 () { f = 0; } 359 rxvt_font_x11 () { f = 0; }
338 360
339 void clear (); 361 void clear ();
340 362
341 rxvt_fontprop properties (); 363 rxvt_fontprop properties ();
342 rxvt_fontprop properties (XFontStruct *f);
343 364
344 bool load (const rxvt_fontprop &prop); 365 bool load (const rxvt_fontprop &prop);
345 366
346 bool has_codepoint (uint32_t unicode); 367 bool has_codepoint (uint32_t unicode);
347 368
348 void draw (int x, int y, 369 void draw (rxvt_drawable &d, int x, int y,
349 const text_t *text, int len, 370 const text_t *text, int len,
350 int fg, int bg); 371 int fg, int bg);
351 372
352 XFontStruct *f; 373 XFontStruct *f;
353 codeset cs; 374 codeset cs;
354 bool enc2b, encm; 375 bool enc2b, encm;
355 376
356 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 377 const char *get_property (XFontStruct *f, const char *property, const char *repl) const;
378 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
379 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
380 bool set_properties (rxvt_fontprop &p, const char *name);
357}; 381};
358 382
359const char * 383const char *
360rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 384rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
361{ 385{
… …
368} 392}
369 393
370rxvt_fontprop 394rxvt_fontprop
371rxvt_font_x11::properties () 395rxvt_font_x11::properties ()
372{ 396{
373 return properties (f);
374}
375
376rxvt_fontprop
377rxvt_font_x11::properties (XFontStruct *f)
378{
379 rxvt_fontprop p; 397 rxvt_fontprop p;
398 set_properties (p, f);
399 return p;
400}
380 401
402bool
403rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
404{
405 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
406 p.height = height;
407 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
408 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
409
410 return true;
411}
412
413bool
414rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
415{
381 const char *weight = get_property (f, "WEIGHT_NAME", "medium"); 416 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
382 const char *slant = get_property (f, "SLANT", "r"); 417 const char *slant = get_property (f, "SLANT", "r");
383 418
384 p.height = height; 419 unsigned long height;
385 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 420 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
386 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 421 return false;
387 422
388 return p; 423 unsigned long avgwidth;
424 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
425 avgwidth = 0;
426
427 return set_properties (p, height, weight, slant, avgwidth);
428}
429
430bool
431rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
432{
433 int slashes = 0;
434 const char *comp[12];
435
436 for (const char *c = name; *c; c++)
437 if (*c == '-')
438 {
439 comp[slashes++] = c + 1;
440 if (slashes >= 13)
441 break;
442 }
443
444 /* can we short-circuit the costly XLoadQueryFont? */
445 if (slashes >= 13
446 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
447 && (*comp[11] >= '0' && *comp[11] <= '9'))
448 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
449
450 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
451
452 if (f)
453 {
454 // the font should really exist now. if not, we have a problem
455 // (e.g. if the user did xset fp rehash just when we were searching fonts).
456 // in that case, just return garbage.
457 bool ret = set_properties (p, f);
458 XFreeFont (DISPLAY, f);
459 return ret;
460 }
461 else
462 return false;
463}
464
465// fix the size of scalable fonts
466static void
467fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop)
468{
469 int slashes = 0;
470 const char *size;
471
472 for (const char *c = name; *c; c++)
473 if (*c == '-')
474 {
475 if (slashes == 6)
476 size = c + 1;
477
478 if (++slashes >= 13)
479 break;
480 }
481
482 if (slashes >= 13 && size[0] == '0')
483 {
484 strncpy (buf, name, size - name);
485 buf += size - name;
486 buf += sprintf (buf, "%d", prop.height);
487 strcpy (buf, size + 1);
488 }
489 else
490 strcpy (buf, name);
389} 491}
390 492
391bool 493bool
392rxvt_font_x11::load (const rxvt_fontprop &prop) 494rxvt_font_x11::load (const rxvt_fontprop &prop)
393{ 495{
394 clear (); 496 clear ();
395 497
396 char **list; 498 char **list;
397 int count; 499 int count;
398 XFontStruct *info;
399 list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); 500 list = XListFonts (DISPLAY, name, 512, &count);
501 set_name (0);
400 502
401 if (!list) 503 if (!list)
402 return false; 504 return false;
403 505
404 int bestdiff = 0x7fffffff; 506 int bestdiff = 0x7fffffff;
405 XFontStruct *best = 0;
406 for (int i = 0; i < count; i++) 507 for (int i = 0; i < count; i++)
407 { 508 {
408 XFontStruct *f = info + i; 509 rxvt_fontprop p;
510 char fname[1024];
511 fix_scalable (fname, list[i], prop);
409 512
513 if (!set_properties (p, fname))
514 continue;
515
410 if (f->ascent + f->descent <= prop.height) // weed out too large fonts 516 if (p.height > prop.height) // weed out too large fonts
411 { 517 continue;
412 rxvt_fontprop p = properties (f); 518
413 int diff = (prop.height - f->ascent + f->descent) * 32 519 int diff = (prop.height - p.height) * 32
414 + abs (prop.weight - p.weight) 520 + abs (prop.weight - p.weight)
415 + abs (prop.slant - p.slant ); 521 + abs (prop.slant - p.slant );
416 522
417 if (!best // compare against best found so far 523 if (!name // compare against best found so far
418 || diff < bestdiff) 524 || diff < bestdiff)
419 { 525 {
420 best = f; 526 set_name (strdup (fname));
421 bestdiff = diff; 527 bestdiff = diff;
422 } 528 }
423 }
424 } 529 }
425 530
531 XFreeFontNames (list);
532
426 if (!best) 533 if (!name)
427 return false; 534 return false;
428
429 set_name (strdup (list[best - info]));
430
431 XFreeFontInfo (list, info, count);
432 535
433 f = XLoadQueryFont (DISPLAY, name); 536 f = XLoadQueryFont (DISPLAY, name);
434 537
435 if (!f) 538 if (!f)
436 return false; 539 return false;
437
438 unsigned long value;
439 540
440 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 541 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
441 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 542 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
442 543
443 if (registry && encoding) 544 if (registry && encoding)
… …
530 /* check wether the character exists in _this_ font. horrible. */ 631 /* check wether the character exists in _this_ font. horrible. */
531 XCharStruct *xcs; 632 XCharStruct *xcs;
532 633
533 if (encm) 634 if (encm)
534 { 635 {
535 int byte1 = ch >> 8; 636 unsigned char byte1 = ch >> 8;
536 int byte2 = ch & 255; 637 unsigned char byte2 = ch & 255;
537 638
538 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 639 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
539 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 640 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
540 return false; 641 return false;
541 642
… …
564 665
565 return true; 666 return true;
566} 667}
567 668
568void 669void
569rxvt_font_x11::draw (int x, int y, 670rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
570 const text_t *text, int len, 671 const text_t *text, int len,
571 int fg, int bg) 672 int fg, int bg)
572{ 673{
573 // this looks like a mess /. 674 // this looks like a mess /.
574 // and it is a mess /. 675 // and it is a mess /.
… …
590 { 691 {
591 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 692 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
592 693
593 if (bg == Color_bg && !slow) 694 if (bg == Color_bg && !slow)
594 { 695 {
595 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 696 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
596 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 697 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
597 } 698 }
598 else 699 else
599 { 700 {
600 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 701 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
601 702
602 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 703 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
603 704
604 if (slow) 705 if (slow)
605 { 706 {
606 do 707 do
607 { 708 {
608 if (xc->byte1 || xc->byte2) 709 if (xc->byte1 || xc->byte2)
609 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 710 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
610 711
611 x += r->TermWin.fwidth; 712 x += r->TermWin.fwidth;
612 xc++; len--; 713 xc++; len--;
613 } 714 }
614 while (len); 715 while (len);
615 } 716 }
616 else 717 else
617 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 718 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
618 } 719 }
619 } 720 }
620 else 721 else
621 { 722 {
622 const char *xc = enc_char (text, len, cs, slow); 723 const char *xc = enc_char (text, len, cs, slow);
623 724
624 if (bg == Color_bg && !slow) 725 if (bg == Color_bg && !slow)
625 { 726 {
626 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 727 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
627 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 728 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
628 } 729 }
629 else 730 else
630 { 731 {
631 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 732 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
632 733
633 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 734 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
634 735
635 if (slow) 736 if (slow)
636 { 737 {
637 do 738 do
638 { 739 {
639 if (*xc) 740 if (*xc)
640 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 741 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
641 742
642 x += r->TermWin.fwidth; 743 x += r->TermWin.fwidth;
643 xc++; len--; 744 xc++; len--;
644 } 745 }
645 while (len); 746 while (len);
646 } 747 }
647 else 748 else
648 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 749 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
649 } 750 }
650 } 751 }
651} 752}
652 753
653///////////////////////////////////////////////////////////////////////////// 754/////////////////////////////////////////////////////////////////////////////
… …
658//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 759//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
659#define SWATHBITS 8 760#define SWATHBITS 8
660#endif 761#endif
661 762
662struct rxvt_font_xft : rxvt_font { 763struct rxvt_font_xft : rxvt_font {
663#if 0
664 enum {
665 SWATHCOUNT = 1 << (21 - UNIBITS),
666 SWATHSIZE = 1 << (SWATHBITS - 5)
667 };
668 typedef uint32_t swath[SWATHSIZE];
669
670 swath *cvr[SWATHCOUNT];
671#endif
672
673#if 0
674 void gen_coverage_swath (unsigned int page);
675
676 bool has_char (uint32_t ch)
677 {
678 unsigned int page = ch >> SWATHBITS;
679 unsigned int idx = ch & ((1 << SWATHBITS) - 1);
680
681 if (page >= SWATHCOUNT)
682 return false;
683
684 if (!cvr[page]) gen_coverage_swath (page);
685
686 return cvr[page][idx >> 5] & (1 << (idx & 31));
687 }
688#endif
689 rxvt_font_xft () { f = 0; d = 0; } 764 rxvt_font_xft () { f = 0; }
690 765
691 void clear (); 766 void clear ();
692 767
693 rxvt_fontprop properties (); 768 rxvt_fontprop properties ();
694 769
695 bool load (const rxvt_fontprop &prop); 770 bool load (const rxvt_fontprop &prop);
696 771
697 void draw (int x, int y, 772 void draw (rxvt_drawable &d, int x, int y,
698 const text_t *text, int len, 773 const text_t *text, int len,
699 int fg, int bg); 774 int fg, int bg);
700 775
701 bool has_codepoint (uint32_t unicode); 776 bool has_codepoint (uint32_t unicode);
702 777
703protected: 778protected:
704 XftFont *f; 779 XftFont *f;
705 XftDraw *d;
706
707#if 0
708 virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
709 void set_swath (uint32_t ch)
710 {
711 cvr[ch >> SWATHBITS] |= 1 << (ch & ((1 << SWATHBITS) - 1));
712 }
713#endif
714}; 780};
715 781
716void 782void
717rxvt_font_xft::clear () 783rxvt_font_xft::clear ()
718{ 784{
719 if (f) 785 if (f)
720 { 786 {
721 XftFontClose (DISPLAY, f); 787 XftFontClose (DISPLAY, f);
722 f = 0; 788 f = 0;
723 } 789 }
724
725 if (d)
726 {
727 XftDrawDestroy (d);
728 d = 0;
729 }
730
731#if 0
732 for (int i = 0; i < SWATHCOUNT; i++)
733 delete cvr[i];
734#endif
735} 790}
736 791
737rxvt_fontprop 792rxvt_fontprop
738rxvt_font_xft::properties () 793rxvt_font_xft::properties ()
739{ 794{
740 rxvt_fontprop p; 795 rxvt_fontprop p;
741 796
742 FT_Face face = XftLockFace (f); 797 FT_Face face = XftLockFace (f);
743 798
744 p.height = height; 799 p.width = width; p.height = height;
745 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 800 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
746 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman; 801 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
747 802
748 XftUnlockFace (f); 803 XftUnlockFace (f);
749 804
… …
771 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 826 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
772 827
773 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 828 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
774 FcPatternAddInteger (p, FC_SLANT, prop.slant); 829 FcPatternAddInteger (p, FC_SLANT, prop.slant);
775 830
831#if 0 // clipping unfortunately destroys our precious double-width-characters
832 // clip width, we can't do better, or can we?
833 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
834 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
835#endif
836
776 //FcPatternAddBool (p, FC_MINSPACE, 1); 837 //FcPatternAddBool (p, FC_MINSPACE, 1);
777 838
778 XftResult result; 839 XftResult result;
779 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 840 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
780 841
… …
832 XftUnlockFace (f); 893 XftUnlockFace (f);
833 894
834 return true; 895 return true;
835} 896}
836 897
837#if 0
838void rxvt_font::gen_coverage_swath (unsigned int page)
839{
840 cvr[page] = new swath;
841
842 for (int i = 0; i < SWATHSIZE; i++)
843 cvr[page][i] = 0;
844
845 populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
846}
847#endif
848
849bool 898bool
850rxvt_font_xft::has_codepoint (uint32_t unicode) 899rxvt_font_xft::has_codepoint (uint32_t unicode)
851{ 900{
852 return XftCharExists (DISPLAY, f, unicode); 901 return XftCharExists (DISPLAY, f, unicode);
853} 902}
854 903
855void 904void
856rxvt_font_xft::draw (int x, int y, 905rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
857 const text_t *text, int len, 906 const text_t *text, int len,
858 int fg, int bg) 907 int fg, int bg)
859{ 908{
860 if (!d)
861 {
862 dR;
863 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
864 }
865
866 if (bg >= 0 && bg != Color_bg)
867 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
868 else
869 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 909 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
870 910
871 if (!slow && width == r->TermWin.fwidth) 911 if (!slow && width == r->TermWin.fwidth && 0)
872 { 912 {
873 if (sizeof (text_t) == sizeof (FcChar16)) 913 if (sizeof (text_t) == sizeof (FcChar16))
874 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 914 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
875 else 915 else
876 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 916 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
… …
879 { 919 {
880 while (len) 920 while (len)
881 { 921 {
882 if (*text != NOCHAR && *text != ' ') 922 if (*text != NOCHAR && *text != ' ')
883 { 923 {
924 int fwidth = r->TermWin.fwidth;
925 if (len >= 2 && text[1] == NOCHAR)
926 fwidth *= 2;
927
928 XGlyphInfo extents;
884 if (sizeof (text_t) == sizeof (FcChar16)) 929 if (sizeof (text_t) == sizeof (FcChar16))
885 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); 930 {
931 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
932 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
933 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
934 }
886 else 935 else
887 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); 936 {
937 XGlyphInfo extents;
938 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
939 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
940 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
941 }
888 } 942 }
889 943
890 x += r->TermWin.fwidth; 944 x += r->TermWin.fwidth;
891 text++; 945 text++;
892 len--; 946 len--;
… …
896#endif 950#endif
897 951
898///////////////////////////////////////////////////////////////////////////// 952/////////////////////////////////////////////////////////////////////////////
899 953
900rxvt_fontset::rxvt_fontset (rxvt_t r) 954rxvt_fontset::rxvt_fontset (rxvt_t r)
901#ifdef EXPLICIT_CONTEXT
902: r(r) 955: r (r)
903#endif
904{ 956{
905 clear (); 957 clear ();
906} 958}
907 959
908rxvt_fontset::~rxvt_fontset () 960rxvt_fontset::~rxvt_fontset ()
… …
911} 963}
912 964
913void 965void
914rxvt_fontset::clear () 966rxvt_fontset::clear ()
915{ 967{
916 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 968 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
917 FONT_UNREF (*i); 969 FONT_UNREF (*i);
918 970
919 fonts.clear (); 971 fonts.clear ();
920 base_id = 0; 972 base_id = 0;
921 base_prop.height = 0x7fffffff; 973 base_prop.height = 0x7fffffff;
… …
975 1027
976 if (*desc == '[') 1028 if (*desc == '[')
977 { 1029 {
978 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1030 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
979 1031
980 const char *extra = desc++; 1032 //const char *extra = desc++; // not yet used
981 1033
982 desc = strchr (desc, ']'); 1034 desc = strchr (desc, ']');
983 1035
984 if (!desc) 1036 if (!desc)
985 { 1037 {
… …
1024 } 1076 }
1025 1077
1026 return true; 1078 return true;
1027} 1079}
1028 1080
1029void 1081bool
1030rxvt_fontset::populate (const char *desc) 1082rxvt_fontset::populate (const char *desc)
1031{ 1083{
1032 clear (); 1084 clear ();
1033 1085
1034 fonts.push_back (new_font (0, CS_UNICODE)); 1086 fonts.push_back (new_font (0, CS_UNICODE));
… …
1038 1090
1039 if (!base_id) 1091 if (!base_id)
1040 base_id = 1; 1092 base_id = 1;
1041 1093
1042 // we currently need a base-font, no matter what 1094 // we currently need a base-font, no matter what
1043 if (fonts.size () <= base_id || !realize_font (base_id)) 1095 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1044 { 1096 {
1097 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1045 add_fonts ("fixed"); 1098 add_fonts ("fixed");
1046 base_id = fonts.size () - 1; 1099 base_id = fonts.size () - 1;
1047 } 1100 }
1048 1101
1049 if (fonts.size () <= base_id || !realize_font (base_id)) 1102 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1050 { 1103 return false;
1051 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1052 exit (1);
1053 }
1054 1104
1055 base_prop = fonts[base_id]->properties (); 1105 base_prop = fonts[base_id]->properties ();
1106
1107 return true;
1056} 1108}
1057 1109
1058int 1110int
1059rxvt_fontset::find_font (uint32_t unicode) 1111rxvt_fontset::find_font (uint32_t unicode)
1060{ 1112{
1061 for (int i = 0; i < fonts.size (); i++) 1113 for (unsigned int i = 0; i < fonts.size (); i++)
1062 { 1114 {
1063 rxvt_font *f = fonts[i]; 1115 rxvt_font *f = fonts[i];
1064 1116
1065 if (!f->loaded) 1117 if (!f->loaded)
1066 { 1118 {

Diff Legend

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