ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.74 by root, Tue Dec 6 15:41:26 2005 UTC vs.
Revision 1.90 by root, Mon Jan 30 02:21:20 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2006 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
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
24#include "rxvtutil.h" 25#include "rxvtutil.h"
25#include "rxvtfont.h" 26#include "rxvtfont.h"
26 27
27#include <cstdlib> 28#include <cstdlib>
28#include <wchar.h> 29#include <wchar.h>
29#include <inttypes.h> 30#include <inttypes.h>
30 31
31#define DISPLAY r->display->display
32#define TGC r->TermWin.gc
33
34#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width 32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34
35#define OVERLAP_OK(w,prop) (w) > ( \
36 prop->slant >= rxvt_fontprop::italic \
37 ? (prop->width * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : (prop->width * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 )
35 40
36const struct rxvt_fallback_font { 41const struct rxvt_fallback_font {
37 codeset cs; 42 codeset cs;
38 const char *name; 43 const char *name;
39} fallback_fonts[] = { 44} fallback_fonts[] = {
… …
152 0x304c, 0x672c, // が本 157 0x304c, 0x672c, // が本
153}; 158};
154 159
155#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
156 161
162#define dTermDisplay Display *disp = term->xdisp
163#define dTermGC GC gc = term->gc
164
157///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
158 166
159#if XFT 167#if XFT
160rxvt_drawable::~rxvt_drawable () 168rxvt_drawable::~rxvt_drawable ()
161{ 169{
… …
164} 172}
165 173
166rxvt_drawable::operator XftDraw *() 174rxvt_drawable::operator XftDraw *()
167{ 175{
168 if (!xftdrawable) 176 if (!xftdrawable)
169 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); 177 xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
170 178
171 return xftdrawable; 179 return xftdrawable;
172} 180}
173#endif 181#endif
174 182
175///////////////////////////////////////////////////////////////////////////// 183/////////////////////////////////////////////////////////////////////////////
176
177static void *enc_buf;
178static uint32_t enc_len;
179
180static inline void *
181get_enc_buf (uint32_t len)
182{
183 if (len > enc_len)
184 {
185 free (enc_buf);
186 enc_buf = malloc (len);
187 enc_len = len;
188 }
189
190 return enc_buf;
191}
192 184
193static const char * 185static const char *
194enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 186enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
195{ 187{
196 uint8_t *buf = (uint8_t *)get_enc_buf (len); 188 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
189 uint8_t *res = buf;
197 190
198 while (len--) 191 while (len--)
199 { 192 {
200 uint32_t c = FROM_UNICODE (cs, *text++); 193 uint32_t c = FROM_UNICODE (cs, *text++);
201 194
… …
206 } 199 }
207 200
208 *buf++ = c; 201 *buf++ = c;
209 } 202 }
210 203
211 return (const char *)enc_buf; 204 return (const char *)res;
212} 205}
213 206
214static const XChar2b * 207static const XChar2b *
215enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 208enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
216{ 209{
217 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 210 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
211 XChar2b *res = buf;
218 212
219 while (len--) 213 while (len--)
220 { 214 {
221 uint32_t c = FROM_UNICODE (cs, *text++); 215 uint32_t c = FROM_UNICODE (cs, *text++);
222 216
… …
229 buf->byte1 = c >> 8; 223 buf->byte1 = c >> 8;
230 buf->byte2 = c; 224 buf->byte2 = c;
231 buf++; 225 buf++;
232 } 226 }
233 227
234 return (XChar2b *)enc_buf; 228 return res;
235} 229}
236 230
237///////////////////////////////////////////////////////////////////////////// 231/////////////////////////////////////////////////////////////////////////////
238 232
239void 233void
… …
245 if (this->name) free (this->name); // let the compiler optimize 239 if (this->name) free (this->name); // let the compiler optimize
246 this->name = name; 240 this->name = name;
247} 241}
248 242
249void 243void
250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 244rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251{ 245{
246 dTermDisplay;
247 dTermGC;
248
252 if (color == Color_bg) 249 if (color == Color_bg)
253 XClearArea (d.display->display, d, x, y, w, h, FALSE); 250 XClearArea (disp, d, x, y, w, h, false);
254 else if (color >= 0) 251 else if (color >= 0)
255 { 252 {
256#if XFT 253#if XFT
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 254 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258#else 255#else
259 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 256 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 257 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 258#endif
262 } 259 }
263} 260}
264 261
265#include "table/linedraw.h" 262#include "table/linedraw.h"
… …
276 rxvt_fontprop properties () 273 rxvt_fontprop properties ()
277 { 274 {
278 rxvt_fontprop p; 275 rxvt_fontprop p;
279 276
280 p.width = p.height = 1; 277 p.width = p.height = 1;
278 p.ascent = rxvt_fontprop::unset;
281 p.weight = rxvt_fontprop::medium; 279 p.weight = rxvt_fontprop::medium;
282 p.slant = rxvt_fontprop::roman; 280 p.slant = rxvt_fontprop::roman;
283 281
284 return p; 282 return p;
285 } 283 }
… …
292 set_name (strdup ("built-in support font")); 290 set_name (strdup ("built-in support font"));
293 291
294 return true; 292 return true;
295 } 293 }
296 294
297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 295 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
298 { 296 {
299 careful = false; 297 careful = false;
300 298
301 if (unicode <= 0x001f) 299 if (unicode <= 0x001f)
302 return true; 300 return true;
… …
305 return false; 303 return false;
306 304
307 if (unicode <= 0x009f) 305 if (unicode <= 0x009f)
308 return true; 306 return true;
309 307
310 if (unicode >= 0x2500 && unicode <= 0x259f) 308 if (unicode >= 0x2500 && unicode <= 0x259f &&
309 !term->option (Opt_skipBuiltinGlyphs))
311 return true; 310 return true;
312 311
313 if (IS_COMPOSE (unicode)) 312 if (IS_COMPOSE (unicode))
314 return true; 313 return true;
315 314
… …
331void 330void
332rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 331rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
333 const text_t *text, int len, 332 const text_t *text, int len,
334 int fg, int bg) 333 int fg, int bg)
335{ 334{
336 Display *disp = d.display->display; 335 dTermDisplay;
336 dTermGC;
337 337
338 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 338 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
339 339
340 XSetForeground (disp, TGC, r->pix_colors[fg]); 340 XSetForeground (disp, gc, term->pix_colors[fg]);
341 341
342 while (len) 342 while (len)
343 { 343 {
344#if ENABLE_COMBINING 344#if ENABLE_COMBINING
345 compose_char *cc; 345 compose_char *cc;
… …
349 349
350 while (++text, --len && *text == NOCHAR) 350 while (++text, --len && *text == NOCHAR)
351 ; 351 ;
352 352
353 int width = text - tp; 353 int width = text - tp;
354 int fwidth = r->TermWin.fwidth * width; 354 int fwidth = term->fwidth * width;
355 355
356 if (0x2500 <= t && t <= 0x259f) 356 if (0x2500 <= t && t <= 0x259f)
357 { 357 {
358 uint16_t offs = linedraw_offs[t - 0x2500]; 358 uint16_t offs = linedraw_offs[t - 0x2500];
359 uint32_t *a = linedraw_command + (offs >> 4); 359 uint32_t *a = linedraw_command + (offs >> 4);
360 uint32_t *b = a + (offs & 15); 360 uint32_t *b = a + (offs & 15);
361 361
362 int W = fwidth; 362 int W = fwidth;
363 int H = r->TermWin.fheight; 363 int H = term->fheight;
364 364
365 int x_[16]; 365 int x_[16];
366 int y_[16]; 366 int y_[16];
367 367
368 for (int i = 0; i <= 8; i++) 368 for (int i = 0; i <= 8; i++)
… …
376 376
377 XGCValues gcv; 377 XGCValues gcv;
378 378
379 gcv.cap_style = CapButt; 379 gcv.cap_style = CapButt;
380 gcv.line_width = 0; 380 gcv.line_width = 0;
381 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 381 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
382 382
383 while (a < b) 383 while (a < b)
384 { 384 {
385 uint32_t command = *a++; 385 uint32_t command = *a++;
386 386
… …
393 int y2 = y_[(command >> 0) & 15]; 393 int y2 = y_[(command >> 0) & 15];
394 394
395 switch (op) 395 switch (op)
396 { 396 {
397 case 0: // line 397 case 0: // line
398 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 398 XDrawLine (disp, d, gc, x1, y1, x2, y2);
399 break; 399 break;
400 400
401 case 1: // rectangle, possibly stippled 401 case 1: // rectangle, possibly stippled
402 if (a) 402 if (a)
403 { 403 {
… …
406 gcv.fill_style = FillStippled; 406 gcv.fill_style = FillStippled;
407 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 407 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408 gcv.ts_x_origin = x; 408 gcv.ts_x_origin = x;
409 gcv.ts_y_origin = y; 409 gcv.ts_y_origin = y;
410 410
411 XChangeGC (disp, TGC, 411 XChangeGC (disp, gc,
412 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 412 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
413 &gcv); 413 &gcv);
414 } 414 }
415 415
416 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 416 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
417 417
418 if (a) 418 if (a)
419 { 419 {
420 XFreePixmap (disp, gcv.stipple); 420 XFreePixmap (disp, gcv.stipple);
421 gcv.stipple = 0; 421 gcv.stipple = 0;
422 gcv.fill_style = FillSolid; 422 gcv.fill_style = FillSolid;
423 XChangeGC (disp, TGC, GCFillStyle, &gcv); 423 XChangeGC (disp, gc, GCFillStyle, &gcv);
424 } 424 }
425 break; 425 break;
426 case 2: // arc 426 case 2: // arc
427 XDrawArc (disp, d, TGC, 427 XDrawArc (disp, d, gc,
428 x1 - W/2, y1 - H/2, W-1, H-1, 428 x1 - W/2, y1 - H/2, W-1, H-1,
429 (a - 1) * 90*64, (b - 1) * 90*64); 429 (a - 1) * 90*64, (b - 1) * 90*64);
430 break; 430 break;
431 } 431 }
432 } 432 }
… …
463 case ZERO_WIDTH_CHAR: 463 case ZERO_WIDTH_CHAR:
464 case NOCHAR: 464 case NOCHAR:
465 break; 465 break;
466 466
467 default: 467 default:
468 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 468 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 fwidth - 4, r->TermWin.fheight - 4); 469 fwidth - 4, term->fheight - 4);
470 } 470 }
471 471
472 x += fwidth; 472 x += fwidth;
473 } 473 }
474} 474}
… …
482 482
483 rxvt_fontprop properties (); 483 rxvt_fontprop properties ();
484 484
485 bool load (const rxvt_fontprop &prop); 485 bool load (const rxvt_fontprop &prop);
486 486
487 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 487 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
488 488
489 void draw (rxvt_drawable &d, int x, int y, 489 void draw (rxvt_drawable &d, int x, int y,
490 const text_t *text, int len, 490 const text_t *text, int len,
491 int fg, int bg); 491 int fg, int bg);
492 492
493 bool slow; // wether this is a proportional font or has other funny characteristics 493 bool slow; // wether this is a proportional font or has other funny characteristics
494 XFontStruct *f; 494 XFontStruct *f;
495 codeset cs; 495 codeset cs;
496 bool enc2b, encm; 496 bool enc2b, encm;
497 497
498 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 498 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
499 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 499 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
500 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 500 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501 bool set_properties (rxvt_fontprop &p, const char *name); 501 bool set_properties (rxvt_fontprop &p, const char *name);
502}; 502};
503 503
504char * 504char *
505rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 505rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
506{ 506{
507 unsigned long value; 507 unsigned long value;
508 508
509 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 509 if (XGetFontProperty (f, property, &value))
510 return XGetAtomName (DISPLAY, value); 510 return XGetAtomName (term->xdisp, value);
511 else 511 else
512 return rxvt_strdup (repl); 512 return rxvt_strdup (repl);
513} 513}
514 514
515rxvt_fontprop 515rxvt_fontprop
… …
523bool 523bool
524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
525{ 525{
526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
527 p.height = height; 527 p.height = height;
528 p.ascent = rxvt_fontprop::unset;
528 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 529 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
529 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 530 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
530 531
531 return true; 532 return true;
532} 533}
… …
535rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 536rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
536{ 537{
537 unsigned long height; 538 unsigned long height;
538 539
539#if 0 540#if 0
540 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 541 if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))
541 return false; 542 return false;
542#else 543#else
543 height = f->ascent + f->descent; 544 height = f->ascent + f->descent;
544#endif 545#endif
545 546
546 unsigned long avgwidth; 547 unsigned long avgwidth;
547 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 548 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
548 avgwidth = 0; 549 avgwidth = 0;
549 550
550 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 551 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
551 char *slant = get_property (f, "SLANT", "r"); 552 char *slant = get_property (f, term->xa [XA_SLANT], "r");
552 553
553 set_properties (p, height, weight, slant, avgwidth); 554 set_properties (p, height, weight, slant, avgwidth);
554 555
555 free (weight); 556 free (weight);
556 free (slant); 557 free (slant);
557 558
559 p.ascent = f->ascent;
560
558 return true; 561 return true;
559} 562}
560 563
561bool 564bool
562rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 565rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
563{ 566{
567 dTermDisplay;
564 int slashes = 0; 568 int slashes = 0;
565 const char *comp[13]; 569 const char *comp[13];
566 570
567 for (const char *c = name; *c; c++) 571 for (const char *c = name; *c; c++)
568 if (*c == '-') 572 if (*c == '-')
… …
576 if (slashes >= 13 580 if (slashes >= 13
577 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 581 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
578 && (*comp[11] >= '0' && *comp[11] <= '9')) 582 && (*comp[11] >= '0' && *comp[11] <= '9'))
579 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 583 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
580 584
581 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 585 XFontStruct *f = XLoadQueryFont (disp, name);
582 586
583 if (f) 587 if (f)
584 { 588 {
585 // the font should really exist now. if not, we have a problem 589 // the font should really exist now. if not, we have a problem
586 // (e.g. if the user did xset fp rehash just when we were searching fonts). 590 // (e.g. if the user did xset fp rehash just when we were searching fonts).
587 // in that case, just return garbage. 591 // in that case, just return garbage.
588 bool ret = set_properties (p, f); 592 bool ret = set_properties (p, f);
589 XFreeFont (DISPLAY, f); 593 XFreeFont (disp, f);
590 return ret; 594 return ret;
591 } 595 }
592 else 596 else
593 return false; 597 return false;
594} 598}
… …
632} 636}
633 637
634bool 638bool
635rxvt_font_x11::load (const rxvt_fontprop &prop) 639rxvt_font_x11::load (const rxvt_fontprop &prop)
636{ 640{
637 Display *disp = DISPLAY; 641 dTermDisplay;
638 642
639 clear (); 643 clear ();
640 644
641 char field_str[64]; // enough for 128 bits 645 char field_str[64]; // enough for 128 bits
642 646
… …
651 f = XLoadQueryFont (disp, name); 655 f = XLoadQueryFont (disp, name);
652 656
653 if (!f) 657 if (!f)
654 return false; 658 return false;
655 659
656 char *new_name = get_property (f, "FONT", name); 660 char *new_name = get_property (f, XA_FONT, name);
657 661
658 if (new_name) 662 if (new_name)
659 set_name (new_name); 663 set_name (new_name);
660 else 664 else
661 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 665 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
717 int diff = 0; 721 int diff = 0;
718 722
719 if (replace_field (fname, list[i], 6, '0', field_str)) 723 if (replace_field (fname, list[i], 6, '0', field_str))
720 diff += 10; // slightly penalize scalable fonts 724 diff += 10; // slightly penalize scalable fonts
721 else if (replace_field (fname, list[i], 11, '0', "0")) 725 else if (replace_field (fname, list[i], 11, '0', "0"))
722 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 726 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
723 727
724 if (!set_properties (p, fname)) 728 if (!set_properties (p, fname))
725 continue; 729 continue;
726 730
727 if (prop.height != rxvt_fontprop::unset 731 if (prop.height != rxvt_fontprop::unset
… …
770 delete [] fonts; 774 delete [] fonts;
771 775
772 if (!f) 776 if (!f)
773 return false; 777 return false;
774 778
775 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 779 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
776 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 780 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
777 781
778 if (registry && encoding) 782 if (registry && encoding)
779 { 783 {
780 char charset[64]; 784 char charset[64];
781 snprintf (charset, 64, "%s-%s", registry, encoding); 785 snprintf (charset, 64, "%s-%s", registry, encoding);
782 786
783 cs = codeset_from_name (charset); 787 cs = codeset_from_name (charset);
784 } 788 }
785 else 789 else
786 { 790 {
787 const char *charset = get_property (f, "FONT", 0); 791 const char *charset = get_property (f, XA_FONT, 0);
788 792
789 if (!charset) 793 if (!charset)
790 charset = name; 794 charset = name;
791 795
792 int count = 13; 796 int count = 13;
… …
851 855
852 XCharStruct g; 856 XCharStruct g;
853 int dir_ret, asc_ret, des_ret; 857 int dir_ret, asc_ret, des_ret;
854 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 858 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
855 859
856 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 860 int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
857 861
858 if (width < g.width) width = g.width; 862 if (width < g.width) width = g.width;
859 } 863 }
860 864
861 if (cs == CS_UNKNOWN) 865 if (cs == CS_UNKNOWN)
… …
880void 884void
881rxvt_font_x11::clear () 885rxvt_font_x11::clear ()
882{ 886{
883 if (f) 887 if (f)
884 { 888 {
885 XFreeFont (DISPLAY, f); 889 XFreeFont (term->xdisp, f);
886 f = 0; 890 f = 0;
887 } 891 }
888} 892}
889 893
890bool 894bool
891rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 895rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
892{ 896{
893 uint32_t ch = FROM_UNICODE (cs, unicode); 897 uint32_t ch = FROM_UNICODE (cs, unicode);
894 898
895 if (ch == NOCHAR) 899 if (ch == NOCHAR)
896 return false; 900 return false;
… …
934 938
935 if (!prop || prop->width == rxvt_fontprop::unset) 939 if (!prop || prop->width == rxvt_fontprop::unset)
936 return true; 940 return true;
937 941
938 // check character against base font bounding box 942 // check character against base font bounding box
939 int w = xcs->width; 943 int w = xcs->rbearing - xcs->lbearing;
940 int wcw = wcwidth (unicode); 944 int wcw = WCWIDTH (unicode);
941 if (wcw > 0) w = (w + wcw - 1) / wcw; 945 if (wcw > 0) w = (w + wcw - 1) / wcw;
942 946
943 careful = w > prop->width; 947 careful = w > prop->width;
944 if (careful && w > prop->width * MAX_OVERLAP >> 2) 948 if (careful && OVERLAP_OK (w, prop))
945 return false; 949 return false;
946 950
947 return true; 951 return true;
948} 952}
949 953
… …
955 // this looks like a mess /. 959 // this looks like a mess /.
956 // and it is a mess /. 960 // and it is a mess /.
957 // yet we are trying to be perfect /. 961 // yet we are trying to be perfect /.
958 // but the result still isn't perfect /. 962 // but the result still isn't perfect /.
959 963
964 dTermDisplay;
965 dTermGC;
966
960 bool slow = this->slow 967 bool slow = this->slow
961 || width != r->TermWin.fwidth 968 || width != term->fwidth
962 || height != r->TermWin.fheight; 969 || height != term->fheight;
963 970
964 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 971 int base = ascent; // sorry, incorrect: term->fbase;
965 972
966 XGCValues v; 973 XGCValues v;
967 v.foreground = r->pix_colors[fg]; 974 v.foreground = term->pix_colors[fg];
968 v.font = f->fid; 975 v.font = f->fid;
969 976
970 if (enc2b) 977 if (enc2b)
971 { 978 {
972 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 979 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
973 980
974 if (bg == Color_bg && !slow) 981 if (bg == Color_bg && !slow)
975 { 982 {
976 v.background = r->pix_colors[bg]; 983 v.background = term->pix_colors[bg];
977 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 984 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
978 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 985 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
979 } 986 }
980 else 987 else
981 { 988 {
982 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 989 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
983 990
984 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 991 XChangeGC (disp, gc, GCForeground | GCFont, &v);
985 992
986 if (slow) 993 if (slow)
987 { 994 {
988 do 995 do
989 { 996 {
990 if (xc->byte1 || xc->byte2) 997 if (xc->byte1 || xc->byte2)
991 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 998 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
992 999
993 x += r->TermWin.fwidth; 1000 x += term->fwidth;
994 xc++; len--; 1001 xc++; len--;
995 } 1002 }
996 while (len); 1003 while (len);
997 } 1004 }
998 else 1005 else
999 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1006 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1000 } 1007 }
1001 } 1008 }
1002 else 1009 else
1003 { 1010 {
1004 const char *xc = enc_char (text, len, cs, slow); 1011 const char *xc = enc_char (text, len, cs, slow);
1005 1012
1006 if (bg == Color_bg && !slow) 1013 if (bg == Color_bg && !slow)
1007 { 1014 {
1008 v.background = r->pix_colors[bg]; 1015 v.background = term->pix_colors[bg];
1009 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1016 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1010 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1017 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1011 } 1018 }
1012 else 1019 else
1013 { 1020 {
1014 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1021 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1015 1022
1016 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1023 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1017 1024
1018 if (slow) 1025 if (slow)
1019 { 1026 {
1020 do 1027 do
1021 { 1028 {
1022 if (*xc) 1029 if (*xc)
1023 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1030 XDrawString (disp, d, gc, x, y + base, xc, 1);
1024 1031
1025 x += r->TermWin.fwidth; 1032 x += term->fwidth;
1026 xc++; len--; 1033 xc++; len--;
1027 } 1034 }
1028 while (len); 1035 while (len);
1029 } 1036 }
1030 else 1037 else
1031 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1038 XDrawString (disp, d, gc, x, y + base, xc, len);
1032 } 1039 }
1033 } 1040 }
1034} 1041}
1035 1042
1036///////////////////////////////////////////////////////////////////////////// 1043/////////////////////////////////////////////////////////////////////////////
… …
1048 1055
1049 void draw (rxvt_drawable &d, int x, int y, 1056 void draw (rxvt_drawable &d, int x, int y,
1050 const text_t *text, int len, 1057 const text_t *text, int len,
1051 int fg, int bg); 1058 int fg, int bg);
1052 1059
1053 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1060 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1054 1061
1055protected: 1062protected:
1056 XftFont *f; 1063 XftFont *f;
1057}; 1064};
1058 1065
1059void 1066void
1060rxvt_font_xft::clear () 1067rxvt_font_xft::clear ()
1061{ 1068{
1062 if (f) 1069 if (f)
1063 { 1070 {
1064 XftFontClose (DISPLAY, f); 1071 XftFontClose (term->xdisp, f);
1065 f = 0; 1072 f = 0;
1066 } 1073 }
1067} 1074}
1068 1075
1069rxvt_fontprop 1076rxvt_fontprop
… …
1073 1080
1074 FT_Face face = XftLockFace (f); 1081 FT_Face face = XftLockFace (f);
1075 1082
1076 p.width = width; 1083 p.width = width;
1077 p.height = height; 1084 p.height = height;
1085 p.ascent = ascent;
1078 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1086 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1079 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1087 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1080 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1088 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1081 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1089 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1082 1090
… …
1086} 1094}
1087 1095
1088bool 1096bool
1089rxvt_font_xft::load (const rxvt_fontprop &prop) 1097rxvt_font_xft::load (const rxvt_fontprop &prop)
1090{ 1098{
1091 Display *disp = DISPLAY; 1099 dTermDisplay;
1092 1100
1093 clear (); 1101 clear ();
1094 1102
1095 FcPattern *p = FcNameParse ((FcChar8 *) name); 1103 FcPattern *p = FcNameParse ((FcChar8 *) name);
1096 1104
… …
1123 1131
1124 // store generated name so iso14755 view gives better results 1132 // store generated name so iso14755 view gives better results
1125 set_name ((char *)FcNameUnparse (p)); 1133 set_name ((char *)FcNameUnparse (p));
1126 1134
1127 XftResult result; 1135 XftResult result;
1128 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1136 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1129 1137
1130 FcPatternDestroy (p); 1138 FcPatternDestroy (p);
1131 1139
1132 if (!match) 1140 if (!match)
1133 return false; 1141 return false;
… …
1175 XGlyphInfo g; 1183 XGlyphInfo g;
1176 XftTextExtents16 (disp, f, &ch, 1, &g); 1184 XftTextExtents16 (disp, f, &ch, 1, &g);
1177 1185
1178 g.width -= g.x; 1186 g.width -= g.x;
1179 1187
1180 int wcw = wcwidth (ch); 1188 int wcw = WCWIDTH (ch);
1181 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1189 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1182 1190
1183 if (width < g.width ) width = g.width; 1191 if (width < g.width ) width = g.width;
1184 if (height < g.height ) height = g.height; 1192 if (height < g.height ) height = g.height;
1185 if (glheight < g.height - g.y) glheight = g.height - g.y; 1193 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1231 1239
1232 return success; 1240 return success;
1233} 1241}
1234 1242
1235bool 1243bool
1236rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1244rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1237{ 1245{
1238 careful = false; 1246 careful = false;
1239 1247
1240 if (!XftCharExists (DISPLAY, f, unicode)) 1248 if (!XftCharExists (term->xdisp, f, unicode))
1241 return false; 1249 return false;
1242 1250
1243 if (!prop || prop->width == rxvt_fontprop::unset) 1251 if (!prop || prop->width == rxvt_fontprop::unset)
1244 return true; 1252 return true;
1245 1253
1246 // check character against base font bounding box 1254 // check character against base font bounding box
1247 FcChar32 ch = unicode; 1255 FcChar32 ch = unicode;
1248 XGlyphInfo g; 1256 XGlyphInfo g;
1249 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1257 XftTextExtents32 (term->xdisp, f, &ch, 1, &g);
1250 1258
1251 int w = g.width - g.x; 1259 int w = g.width - g.x;
1252 int wcw = wcwidth (unicode); 1260 int wcw = WCWIDTH (unicode);
1253 if (wcw > 0) w = (w + wcw - 1) / wcw; 1261 if (wcw > 0) w = (w + wcw - 1) / wcw;
1254 1262
1255 careful = w > prop->width; 1263 careful = w > prop->width;
1256 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1264 if (careful && OVERLAP_OK (w, prop))
1257 return false; 1265 return false;
1258 1266
1259 return true; 1267 return true;
1260} 1268}
1261 1269
1262void 1270void
1263rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1271rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1264 const text_t *text, int len, 1272 const text_t *text, int len,
1265 int fg, int bg) 1273 int fg, int bg)
1266{ 1274{
1267 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1275 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1268
1269 int base = ascent; // should be fbase, but that is incorrect
1270 1276
1271 XGlyphInfo extents; 1277 XGlyphInfo extents;
1272 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1278 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1273 FcChar32 *ep = enc; 1279 XftGlyphSpec *ep = enc;
1274 int ewidth = 0; 1280
1281 dTermDisplay;
1282 dTermGC;
1283
1284 // cut trailing spaces
1285 while (len && text [len - 1] == ' ')
1286 len--;
1275 1287
1276 while (len) 1288 while (len)
1277 { 1289 {
1278 int cwidth = r->TermWin.fwidth; 1290 int cwidth = term->fwidth;
1279 FcChar32 fc = *text++; len--; 1291 FcChar32 fc = *text++; len--;
1280 1292
1281 while (len && *text == NOCHAR) 1293 while (len && *text == NOCHAR)
1282 text++, len--, cwidth += r->TermWin.fwidth; 1294 text++, len--, cwidth += term->fwidth;
1283 1295
1284 if (fc == ' ' && ep == enc) // skip leading spaces 1296 if (fc != ' ') // skip spaces
1297 {
1298 FT_UInt glyph = XftCharIndex (disp, f, fc);
1299 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1300
1301 ep->glyph = glyph;
1302 ep->x = x + (cwidth - extents.xOff >> 1);
1303 ep->y = y + ascent;
1304 ep++;
1305 }
1306
1285 x += cwidth; 1307 x += cwidth;
1286 else
1287 {
1288 FT_UInt gl = XftCharIndex (d.display->display, f, fc);
1289 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1290
1291 if (extents.xOff != cwidth)
1292 {
1293 if (ewidth)
1294 {
1295 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1296 x, y + base, enc, ep - enc);
1297 x += ewidth;
1298
1299 ep = enc;
1300 ewidth = 0;
1301 }
1302
1303 if (extents.xOff > cwidth)
1304 extents.xOff = cwidth;
1305
1306 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1307 x + (cwidth - extents.xOff >> 1),
1308 y + base, &gl, 1);
1309 x += cwidth;
1310 }
1311 else
1312 {
1313 *ep++ = gl;
1314 ewidth += cwidth;
1315 }
1316 }
1317 } 1308 }
1318 1309
1319 if (ep != enc) 1310 if (ep != enc)
1320 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1311 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1321 x, y + base, enc, ep - enc);
1322} 1312}
1323#endif 1313#endif
1324 1314
1325///////////////////////////////////////////////////////////////////////////// 1315/////////////////////////////////////////////////////////////////////////////
1326 1316
1327rxvt_fontset::rxvt_fontset (rxvt_t r) 1317rxvt_fontset::rxvt_fontset (rxvt_term *term)
1328: fontdesc (0), r (r) 1318: fontdesc (0), term (term)
1329{ 1319{
1330 clear (); 1320 clear ();
1331} 1321}
1332 1322
1333rxvt_fontset::~rxvt_fontset () 1323rxvt_fontset::~rxvt_fontset ()
… …
1336} 1326}
1337 1327
1338void 1328void
1339rxvt_fontset::clear () 1329rxvt_fontset::clear ()
1340{ 1330{
1341 prop.width = prop.height = prop.weight = prop.slant 1331 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1342 = rxvt_fontprop::unset; 1332 = rxvt_fontprop::unset;
1343 1333
1344 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1334 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1345 FONT_UNREF (*i); 1335 FONT_UNREF (*i);
1346 1336
… …
1377 f = new rxvt_font_x11; 1367 f = new rxvt_font_x11;
1378 } 1368 }
1379 else 1369 else
1380 f = new rxvt_font_x11; 1370 f = new rxvt_font_x11;
1381 1371
1382 f->set_term (r); 1372 f->set_term (term);
1383 f->set_name (strdup (name)); 1373 f->set_name (strdup (name));
1384 1374
1385 f->cs = cs; 1375 f->cs = cs;
1386 f->loaded = false; 1376 f->loaded = false;
1387 1377
… …
1519 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1509 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1520 goto next_font; 1510 goto next_font;
1521 1511
1522 if (!realize_font (i)) 1512 if (!realize_font (i))
1523 goto next_font; 1513 goto next_font;
1514
1515 if (prop.ascent != rxvt_fontprop::unset)
1516 max_it (f->ascent, prop.ascent);
1524 } 1517 }
1525 1518
1526 if (f->cs == CS_UNKNOWN) 1519 if (f->cs == CS_UNKNOWN)
1527 goto next_font; 1520 goto next_font;
1528 1521
… …
1567 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1560 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1568 FcPatternAddBool (p, FC_MINSPACE, 1); 1561 FcPatternAddBool (p, FC_MINSPACE, 1);
1569 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1562 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1570 1563
1571 XftResult result; 1564 XftResult result;
1572 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1565 FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);
1573 1566
1574 FcPatternDestroy (p); 1567 FcPatternDestroy (p);
1575 1568
1576 if (match) 1569 if (match)
1577 { 1570 {

Diff Legend

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