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.69 by root, Sun Apr 17 22:36:13 2005 UTC vs.
Revision 1.85 by root, Wed Jan 25 00:42:21 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
… …
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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#define DISPLAY r->display->display
32#define TGC r->TermWin.gc
33 31
34#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width 32#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width
35 33
36const struct rxvt_fallback_font { 34const struct rxvt_fallback_font {
37 codeset cs; 35 codeset cs;
… …
152 0x304c, 0x672c, // が本 150 0x304c, 0x672c, // が本
153}; 151};
154 152
155#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 153#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
156 154
155#define dTermDisplay Display *disp = term->display->display
156#define dTermGC GC gc = term->gc
157
157///////////////////////////////////////////////////////////////////////////// 158/////////////////////////////////////////////////////////////////////////////
158 159
159#if XFT 160#if XFT
160rxvt_drawable::~rxvt_drawable () 161rxvt_drawable::~rxvt_drawable ()
161{ 162{
… …
172} 173}
173#endif 174#endif
174 175
175///////////////////////////////////////////////////////////////////////////// 176/////////////////////////////////////////////////////////////////////////////
176 177
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
193static const char * 178static const char *
194enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 179enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
195{ 180{
196 uint8_t *buf = (uint8_t *)get_enc_buf (len); 181 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
182 uint8_t *res = buf;
197 183
198 while (len--) 184 while (len--)
199 { 185 {
200 uint32_t c = FROM_UNICODE (cs, *text++); 186 uint32_t c = FROM_UNICODE (cs, *text++);
201 187
… …
206 } 192 }
207 193
208 *buf++ = c; 194 *buf++ = c;
209 } 195 }
210 196
211 return (const char *)enc_buf; 197 return (const char *)res;
212} 198}
213 199
214static const XChar2b * 200static const XChar2b *
215enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 201enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
216{ 202{
217 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 203 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
204 XChar2b *res = buf;
218 205
219 while (len--) 206 while (len--)
220 { 207 {
221 uint32_t c = FROM_UNICODE (cs, *text++); 208 uint32_t c = FROM_UNICODE (cs, *text++);
222 209
… …
229 buf->byte1 = c >> 8; 216 buf->byte1 = c >> 8;
230 buf->byte2 = c; 217 buf->byte2 = c;
231 buf++; 218 buf++;
232 } 219 }
233 220
234 return (XChar2b *)enc_buf; 221 return res;
235} 222}
236 223
237///////////////////////////////////////////////////////////////////////////// 224/////////////////////////////////////////////////////////////////////////////
238 225
239void 226void
… …
245 if (this->name) free (this->name); // let the compiler optimize 232 if (this->name) free (this->name); // let the compiler optimize
246 this->name = name; 233 this->name = name;
247} 234}
248 235
249void 236void
250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 237rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251{ 238{
239 dTermDisplay;
240 dTermGC;
241
252 if (color == Color_bg) 242 if (color == Color_bg)
253 XClearArea (d.display->display, d, x, y, w, h, FALSE); 243 XClearArea (disp, d, x, y, w, h, FALSE);
254 else if (color >= 0) 244 else if (color >= 0)
255 { 245 {
256#if XFT 246#if XFT
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 247 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258#else 248#else
259 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 249 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 250 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 251#endif
262 } 252 }
263} 253}
264 254
265#include "table/linedraw.h" 255#include "table/linedraw.h"
… …
276 rxvt_fontprop properties () 266 rxvt_fontprop properties ()
277 { 267 {
278 rxvt_fontprop p; 268 rxvt_fontprop p;
279 269
280 p.width = p.height = 1; 270 p.width = p.height = 1;
271 p.ascent = rxvt_fontprop::unset;
281 p.weight = rxvt_fontprop::medium; 272 p.weight = rxvt_fontprop::medium;
282 p.slant = rxvt_fontprop::roman; 273 p.slant = rxvt_fontprop::roman;
283 274
284 return p; 275 return p;
285 } 276 }
… …
292 set_name (strdup ("built-in support font")); 283 set_name (strdup ("built-in support font"));
293 284
294 return true; 285 return true;
295 } 286 }
296 287
297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 288 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
298 { 289 {
299 careful = false; 290 careful = false;
300 291
301 if (unicode <= 0x001f) 292 if (unicode <= 0x001f)
302 return true; 293 return true;
… …
305 return false; 296 return false;
306 297
307 if (unicode <= 0x009f) 298 if (unicode <= 0x009f)
308 return true; 299 return true;
309 300
310 if (unicode >= 0x2500 && unicode <= 0x259f) 301 if (unicode >= 0x2500 && unicode <= 0x259f &&
302 !term->option (Opt_skipBuiltinGlyphs))
311 return true; 303 return true;
312 304
313 if (IS_COMPOSE (unicode)) 305 if (IS_COMPOSE (unicode))
314 return true; 306 return true;
315 307
… …
331void 323void
332rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 324rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
333 const text_t *text, int len, 325 const text_t *text, int len,
334 int fg, int bg) 326 int fg, int bg)
335{ 327{
336 Display *disp = d.display->display; 328 dTermDisplay;
329 dTermGC;
337 330
338 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 331 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
339 332
340 XSetForeground (disp, TGC, r->pix_colors[fg]); 333 XSetForeground (disp, gc, term->pix_colors[fg]);
341 334
342 while (len) 335 while (len)
343 { 336 {
344#if ENABLE_COMBINING 337#if ENABLE_COMBINING
345 compose_char *cc; 338 compose_char *cc;
… …
349 342
350 while (++text, --len && *text == NOCHAR) 343 while (++text, --len && *text == NOCHAR)
351 ; 344 ;
352 345
353 int width = text - tp; 346 int width = text - tp;
354 int fwidth = r->TermWin.fwidth * width; 347 int fwidth = term->fwidth * width;
355 348
356 if (0x2500 <= t && t <= 0x259f) 349 if (0x2500 <= t && t <= 0x259f)
357 { 350 {
358 uint16_t offs = linedraw_offs[t - 0x2500]; 351 uint16_t offs = linedraw_offs[t - 0x2500];
359 uint32_t *a = linedraw_command + (offs >> 4); 352 uint32_t *a = linedraw_command + (offs >> 4);
360 uint32_t *b = a + (offs & 15); 353 uint32_t *b = a + (offs & 15);
361 354
362 int W = fwidth; 355 int W = fwidth;
363 int H = r->TermWin.fheight; 356 int H = term->fheight;
364 357
365 int x_[16]; 358 int x_[16];
366 int y_[16]; 359 int y_[16];
367 360
368 for (int i = 0; i <= 8; i++) 361 for (int i = 0; i <= 8; i++)
… …
376 369
377 XGCValues gcv; 370 XGCValues gcv;
378 371
379 gcv.cap_style = CapButt; 372 gcv.cap_style = CapButt;
380 gcv.line_width = 0; 373 gcv.line_width = 0;
381 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 374 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
382 375
383 while (a < b) 376 while (a < b)
384 { 377 {
385 uint32_t command = *a++; 378 uint32_t command = *a++;
386 379
… …
393 int y2 = y_[(command >> 0) & 15]; 386 int y2 = y_[(command >> 0) & 15];
394 387
395 switch (op) 388 switch (op)
396 { 389 {
397 case 0: // line 390 case 0: // line
398 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 391 XDrawLine (disp, d, gc, x1, y1, x2, y2);
399 break; 392 break;
400 393
401 case 1: // rectangle, possibly stippled 394 case 1: // rectangle, possibly stippled
402 if (a) 395 if (a)
403 { 396 {
… …
406 gcv.fill_style = FillStippled; 399 gcv.fill_style = FillStippled;
407 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 400 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408 gcv.ts_x_origin = x; 401 gcv.ts_x_origin = x;
409 gcv.ts_y_origin = y; 402 gcv.ts_y_origin = y;
410 403
411 XChangeGC (disp, TGC, 404 XChangeGC (disp, gc,
412 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 405 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
413 &gcv); 406 &gcv);
414 } 407 }
415 408
416 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 409 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
417 410
418 if (a) 411 if (a)
419 { 412 {
420 XFreePixmap (disp, gcv.stipple); 413 XFreePixmap (disp, gcv.stipple);
421 gcv.stipple = 0; 414 gcv.stipple = 0;
422 gcv.fill_style = FillSolid; 415 gcv.fill_style = FillSolid;
423 XChangeGC (disp, TGC, GCFillStyle, &gcv); 416 XChangeGC (disp, gc, GCFillStyle, &gcv);
424 } 417 }
425 break; 418 break;
426 case 2: // arc 419 case 2: // arc
427 XDrawArc (disp, d, TGC, 420 XDrawArc (disp, d, gc,
428 x1 - W/2, y1 - H/2, W-1, H-1, 421 x1 - W/2, y1 - H/2, W-1, H-1,
429 (a - 1) * 90*64, (b - 1) * 90*64); 422 (a - 1) * 90*64, (b - 1) * 90*64);
430 break; 423 break;
431 } 424 }
432 } 425 }
… …
463 case ZERO_WIDTH_CHAR: 456 case ZERO_WIDTH_CHAR:
464 case NOCHAR: 457 case NOCHAR:
465 break; 458 break;
466 459
467 default: 460 default:
468 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 461 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 fwidth - 4, r->TermWin.fheight - 4); 462 fwidth - 4, term->fheight - 4);
470 } 463 }
471 464
472 x += fwidth; 465 x += fwidth;
473 } 466 }
474} 467}
… …
482 475
483 rxvt_fontprop properties (); 476 rxvt_fontprop properties ();
484 477
485 bool load (const rxvt_fontprop &prop); 478 bool load (const rxvt_fontprop &prop);
486 479
487 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 480 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
488 481
489 void draw (rxvt_drawable &d, int x, int y, 482 void draw (rxvt_drawable &d, int x, int y,
490 const text_t *text, int len, 483 const text_t *text, int len,
491 int fg, int bg); 484 int fg, int bg);
492 485
… …
504char * 497char *
505rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 498rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
506{ 499{
507 unsigned long value; 500 unsigned long value;
508 501
509 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 502 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))
510 return XGetAtomName (DISPLAY, value); 503 return XGetAtomName (term->display->display, value);
511 else 504 else
512 return rxvt_strdup (repl); 505 return rxvt_strdup (repl);
513} 506}
514 507
515rxvt_fontprop 508rxvt_fontprop
… …
523bool 516bool
524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 517rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
525{ 518{
526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 519 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
527 p.height = height; 520 p.height = height;
521 p.ascent = rxvt_fontprop::unset;
528 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 522 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; 523 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
530 524
531 return true; 525 return true;
532} 526}
… …
535rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 529rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
536{ 530{
537 unsigned long height; 531 unsigned long height;
538 532
539#if 0 533#if 0
540 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 534 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))
541 return false; 535 return false;
542#else 536#else
543 height = f->ascent + f->descent; 537 height = f->ascent + f->descent;
544#endif 538#endif
545 539
546 unsigned long avgwidth; 540 unsigned long avgwidth;
547 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 541 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))
548 avgwidth = 0; 542 avgwidth = 0;
549 543
550 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 544 char *weight = get_property (f, "WEIGHT_NAME", "medium");
551 char *slant = get_property (f, "SLANT", "r"); 545 char *slant = get_property (f, "SLANT", "r");
552 546
553 set_properties (p, height, weight, slant, avgwidth); 547 set_properties (p, height, weight, slant, avgwidth);
554 548
555 free (weight); 549 free (weight);
556 free (slant); 550 free (slant);
557 551
552 p.ascent = f->ascent;
553
558 return true; 554 return true;
559} 555}
560 556
561bool 557bool
562rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 558rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
563{ 559{
560 dTermDisplay;
564 int slashes = 0; 561 int slashes = 0;
565 const char *comp[13]; 562 const char *comp[13];
566 563
567 for (const char *c = name; *c; c++) 564 for (const char *c = name; *c; c++)
568 if (*c == '-') 565 if (*c == '-')
… …
576 if (slashes >= 13 573 if (slashes >= 13
577 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 574 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
578 && (*comp[11] >= '0' && *comp[11] <= '9')) 575 && (*comp[11] >= '0' && *comp[11] <= '9'))
579 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 576 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
580 577
581 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 578 XFontStruct *f = XLoadQueryFont (disp, name);
582 579
583 if (f) 580 if (f)
584 { 581 {
585 // the font should really exist now. if not, we have a problem 582 // 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). 583 // (e.g. if the user did xset fp rehash just when we were searching fonts).
587 // in that case, just return garbage. 584 // in that case, just return garbage.
588 bool ret = set_properties (p, f); 585 bool ret = set_properties (p, f);
589 XFreeFont (DISPLAY, f); 586 XFreeFont (disp, f);
590 return ret; 587 return ret;
591 } 588 }
592 else 589 else
593 return false; 590 return false;
594} 591}
… …
632} 629}
633 630
634bool 631bool
635rxvt_font_x11::load (const rxvt_fontprop &prop) 632rxvt_font_x11::load (const rxvt_fontprop &prop)
636{ 633{
637 Display *disp = DISPLAY; 634 dTermDisplay;
638 635
639 clear (); 636 clear ();
640 637
641 char field_str[64]; // enough for 128 bits 638 char field_str[64]; // enough for 128 bits
642 639
… …
717 int diff = 0; 714 int diff = 0;
718 715
719 if (replace_field (fname, list[i], 6, '0', field_str)) 716 if (replace_field (fname, list[i], 6, '0', field_str))
720 diff += 10; // slightly penalize scalable fonts 717 diff += 10; // slightly penalize scalable fonts
721 else if (replace_field (fname, list[i], 11, '0', "0")) 718 else if (replace_field (fname, list[i], 11, '0', "0"))
722 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 719 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
723 720
724 if (!set_properties (p, fname)) 721 if (!set_properties (p, fname))
725 continue; 722 continue;
726 723
727 if (prop.height != rxvt_fontprop::unset 724 if (prop.height != rxvt_fontprop::unset
… …
851 848
852 XCharStruct g; 849 XCharStruct g;
853 int dir_ret, asc_ret, des_ret; 850 int dir_ret, asc_ret, des_ret;
854 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 851 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
855 852
856 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 853 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
857 854
858 if (width < g.width) width = g.width; 855 if (width < g.width) width = g.width;
859 } 856 }
860 857
861 if (cs == CS_UNKNOWN) 858 if (cs == CS_UNKNOWN)
… …
880void 877void
881rxvt_font_x11::clear () 878rxvt_font_x11::clear ()
882{ 879{
883 if (f) 880 if (f)
884 { 881 {
885 XFreeFont (DISPLAY, f); 882 XFreeFont (term->display->display, f);
886 f = 0; 883 f = 0;
887 } 884 }
888} 885}
889 886
890bool 887bool
891rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 888rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
892{ 889{
893 uint32_t ch = FROM_UNICODE (cs, unicode); 890 uint32_t ch = FROM_UNICODE (cs, unicode);
894 891
895 if (ch == NOCHAR) 892 if (ch == NOCHAR)
896 return false; 893 return false;
… …
936 return true; 933 return true;
937 934
938 // check character against base font bounding box 935 // check character against base font bounding box
939 int w = xcs->width; 936 int w = xcs->width;
940 int wcw = wcwidth (unicode); 937 int wcw = wcwidth (unicode);
941 if (wcw > 0) w /= wcw; 938 if (wcw > 0) w = (w + wcw - 1) / wcw;
942 939
943 careful = w > prop->width; 940 careful = w > prop->width;
944 if (careful && w > prop->width * MAX_OVERLAP >> 2) 941 if (careful && w > prop->width * MAX_OVERLAP >> 2)
945 return false; 942 return false;
946 943
… …
955 // this looks like a mess /. 952 // this looks like a mess /.
956 // and it is a mess /. 953 // and it is a mess /.
957 // yet we are trying to be perfect /. 954 // yet we are trying to be perfect /.
958 // but the result still isn't perfect /. 955 // but the result still isn't perfect /.
959 956
957 dTermDisplay;
958 dTermGC;
959
960 bool slow = this->slow 960 bool slow = this->slow
961 || width != r->TermWin.fwidth 961 || width != term->fwidth
962 || height != r->TermWin.fheight; 962 || height != term->fheight;
963 963
964 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 964 int base = ascent; // sorry, incorrect: term->fbase;
965 965
966 XGCValues v; 966 XGCValues v;
967 v.foreground = r->pix_colors[fg]; 967 v.foreground = term->pix_colors[fg];
968 v.font = f->fid; 968 v.font = f->fid;
969 969
970 if (enc2b) 970 if (enc2b)
971 { 971 {
972 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 972 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
973 973
974 if (bg == Color_bg && !slow) 974 if (bg == Color_bg && !slow)
975 { 975 {
976 v.background = r->pix_colors[bg]; 976 v.background = term->pix_colors[bg];
977 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 977 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
978 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 978 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
979 } 979 }
980 else 980 else
981 { 981 {
982 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 982 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
983 983
984 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 984 XChangeGC (disp, gc, GCForeground | GCFont, &v);
985 985
986 if (slow) 986 if (slow)
987 { 987 {
988 do 988 do
989 { 989 {
990 if (xc->byte1 || xc->byte2) 990 if (xc->byte1 || xc->byte2)
991 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 991 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
992 992
993 x += r->TermWin.fwidth; 993 x += term->fwidth;
994 xc++; len--; 994 xc++; len--;
995 } 995 }
996 while (len); 996 while (len);
997 } 997 }
998 else 998 else
999 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 999 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1000 } 1000 }
1001 } 1001 }
1002 else 1002 else
1003 { 1003 {
1004 const char *xc = enc_char (text, len, cs, slow); 1004 const char *xc = enc_char (text, len, cs, slow);
1005 1005
1006 if (bg == Color_bg && !slow) 1006 if (bg == Color_bg && !slow)
1007 { 1007 {
1008 v.background = r->pix_colors[bg]; 1008 v.background = term->pix_colors[bg];
1009 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1009 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1010 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1010 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1011 } 1011 }
1012 else 1012 else
1013 { 1013 {
1014 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1014 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1015 1015
1016 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1016 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1017 1017
1018 if (slow) 1018 if (slow)
1019 { 1019 {
1020 do 1020 do
1021 { 1021 {
1022 if (*xc) 1022 if (*xc)
1023 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1023 XDrawString (disp, d, gc, x, y + base, xc, 1);
1024 1024
1025 x += r->TermWin.fwidth; 1025 x += term->fwidth;
1026 xc++; len--; 1026 xc++; len--;
1027 } 1027 }
1028 while (len); 1028 while (len);
1029 } 1029 }
1030 else 1030 else
1031 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1031 XDrawString (disp, d, gc, x, y + base, xc, len);
1032 } 1032 }
1033 } 1033 }
1034} 1034}
1035 1035
1036///////////////////////////////////////////////////////////////////////////// 1036/////////////////////////////////////////////////////////////////////////////
… …
1048 1048
1049 void draw (rxvt_drawable &d, int x, int y, 1049 void draw (rxvt_drawable &d, int x, int y,
1050 const text_t *text, int len, 1050 const text_t *text, int len,
1051 int fg, int bg); 1051 int fg, int bg);
1052 1052
1053 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1053 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1054 1054
1055protected: 1055protected:
1056 XftFont *f; 1056 XftFont *f;
1057}; 1057};
1058 1058
1059void 1059void
1060rxvt_font_xft::clear () 1060rxvt_font_xft::clear ()
1061{ 1061{
1062 if (f) 1062 if (f)
1063 { 1063 {
1064 XftFontClose (DISPLAY, f); 1064 XftFontClose (term->display->display, f);
1065 f = 0; 1065 f = 0;
1066 } 1066 }
1067} 1067}
1068 1068
1069rxvt_fontprop 1069rxvt_fontprop
… …
1073 1073
1074 FT_Face face = XftLockFace (f); 1074 FT_Face face = XftLockFace (f);
1075 1075
1076 p.width = width; 1076 p.width = width;
1077 p.height = height; 1077 p.height = height;
1078 p.ascent = ascent;
1078 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1079 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1079 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1080 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1080 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1081 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1081 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1082 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1082 1083
… …
1086} 1087}
1087 1088
1088bool 1089bool
1089rxvt_font_xft::load (const rxvt_fontprop &prop) 1090rxvt_font_xft::load (const rxvt_fontprop &prop)
1090{ 1091{
1091 Display *disp = DISPLAY; 1092 dTermDisplay;
1092 1093
1093 clear (); 1094 clear ();
1094 1095
1095 FcPattern *p = FcNameParse ((FcChar8 *) name); 1096 FcPattern *p = FcNameParse ((FcChar8 *) name);
1096 1097
… …
1123 1124
1124 // store generated name so iso14755 view gives better results 1125 // store generated name so iso14755 view gives better results
1125 set_name ((char *)FcNameUnparse (p)); 1126 set_name ((char *)FcNameUnparse (p));
1126 1127
1127 XftResult result; 1128 XftResult result;
1128 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1129 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1129 1130
1130 FcPatternDestroy (p); 1131 FcPatternDestroy (p);
1131 1132
1132 if (!match) 1133 if (!match)
1133 return false; 1134 return false;
… …
1154 1155
1155 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1156 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1156 1157
1157 XftUnlockFace (f); 1158 XftUnlockFace (f);
1158 1159
1160 int glheight = height;
1161
1159 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1162 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1160 { 1163 {
1161 FcChar16 ch = *t; 1164 FcChar16 ch = *t;
1162 1165
1163 if (cs != CS_UNICODE 1166 if (cs != CS_UNICODE
… …
1171 continue; 1174 continue;
1172 1175
1173 XGlyphInfo g; 1176 XGlyphInfo g;
1174 XftTextExtents16 (disp, f, &ch, 1, &g); 1177 XftTextExtents16 (disp, f, &ch, 1, &g);
1175 1178
1179 g.width -= g.x;
1180
1176 int wcw = wcwidth (ch); 1181 int wcw = wcwidth (ch);
1177 if (wcw > 0) g.width = g.width / wcw; 1182 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1178 1183
1179 if (width < g.width) width = g.width; 1184 if (width < g.width ) width = g.width;
1180 if (height < g.height) height = g.height; 1185 if (height < g.height ) height = g.height;
1186 if (glheight < g.height - g.y) glheight = g.height - g.y;
1187 }
1188
1189 if (!width)
1190 {
1191 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1192
1193 XftFontClose (disp, f);
1194 f = 0;
1195
1196 success = false;
1197 break;
1181 } 1198 }
1182 1199
1183 if (prop.height == rxvt_fontprop::unset 1200 if (prop.height == rxvt_fontprop::unset
1184 || height <= prop.height 1201 || (height <= prop.height && glheight <= prop.height)
1185 || height <= 2 1202 || height <= 2
1186 || !scalable) 1203 || !scalable)
1187 break; 1204 break;
1188 1205
1189 if (ftheight) 1206 if (ftheight)
… …
1196 ftheight -= height - prop.height; 1213 ftheight -= height - prop.height;
1197 } 1214 }
1198 else 1215 else
1199 ftheight = prop.height - 1; 1216 ftheight = prop.height - 1;
1200 1217
1201 XftFontClose (disp, f); 1218 XftFontClose (disp, f);
1202 FcPatternDel (match, FC_PIXEL_SIZE); 1219 FcPatternDel (match, FC_PIXEL_SIZE);
1203 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1220 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1204 } 1221 }
1205 1222
1206 FcPatternDestroy (match); 1223 FcPatternDestroy (match);
1207 1224
1208#if 0 // do it per-character 1225#if 0 // do it per-character
… …
1215 1232
1216 return success; 1233 return success;
1217} 1234}
1218 1235
1219bool 1236bool
1220rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1237rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1221{ 1238{
1222 careful = false; 1239 careful = false;
1223 1240
1224 if (!XftCharExists (DISPLAY, f, unicode)) 1241 if (!XftCharExists (term->display->display, f, unicode))
1225 return false; 1242 return false;
1226 1243
1227 if (!prop || prop->width == rxvt_fontprop::unset) 1244 if (!prop || prop->width == rxvt_fontprop::unset)
1228 return true; 1245 return true;
1229 1246
1230 // check character against base font bounding box 1247 // check character against base font bounding box
1231 FcChar32 ch = unicode; 1248 FcChar32 ch = unicode;
1232 XGlyphInfo g; 1249 XGlyphInfo g;
1233 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1250 XftTextExtents32 (term->display->display, f, &ch, 1, &g);
1234 1251
1235 int w = g.width; 1252 int w = g.width - g.x;
1236 int wcw = wcwidth (unicode); 1253 int wcw = wcwidth (unicode);
1237 if (wcw > 0) w /= wcw; 1254 if (wcw > 0) w = (w + wcw - 1) / wcw;
1238 1255
1239 careful = w > prop->width; 1256 careful = w > prop->width;
1240 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1257 if (careful && w > prop->width * MAX_OVERLAP >> 2)
1241 return false; 1258 return false;
1242 1259
… …
1246void 1263void
1247rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1264rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1248 const text_t *text, int len, 1265 const text_t *text, int len,
1249 int fg, int bg) 1266 int fg, int bg)
1250{ 1267{
1251 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1268 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1252
1253 int base = ascent; // should be fbase, but that is incorrect
1254 1269
1255 XGlyphInfo extents; 1270 XGlyphInfo extents;
1256 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1271 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1257 FcChar32 *ep = enc; 1272 XftGlyphSpec *ep = enc;
1258 int ewidth = 0; 1273
1259 int xoff = 0; 1274 dTermDisplay;
1275 dTermGC;
1276
1277 // cut trailing spaces
1278 while (len && text [len - 1] == ' ')
1279 len--;
1260 1280
1261 while (len) 1281 while (len)
1262 { 1282 {
1263 int cwidth = r->TermWin.fwidth; 1283 int cwidth = term->fwidth;
1264 FcChar32 fc = *text++; len--; 1284 FcChar32 fc = *text++; len--;
1265 FT_UInt gl;
1266 1285
1267 while (len && *text == NOCHAR) 1286 while (len && *text == NOCHAR)
1268 text++, len--, cwidth += r->TermWin.fwidth; 1287 text++, len--, cwidth += term->fwidth;
1269 1288
1270 gl = XftCharIndex (d.display->display, f, fc); 1289 if (fc != ' ') // skip spaces
1271 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1272
1273 if (extents.xOff != cwidth && ep != enc)
1274 {
1275 if (xoff > ewidth) xoff = ewidth;
1276 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1277 x + (ewidth - xoff >> 1),
1278 y + base, enc, ep - enc);
1279 x += ewidth;
1280
1281 ep = enc;
1282 ewidth = 0;
1283 xoff = 0;
1284 } 1290 {
1291 FT_UInt glyph = XftCharIndex (disp, f, fc);
1292 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1285 1293
1286 if (fc == ' ' && ep == enc) // skip leading spaces 1294 ep->glyph = glyph;
1295 ep->x = x + (cwidth - extents.xOff >> 1);
1296 ep->y = y + ascent;
1297 ep++;
1287 { 1298 }
1299
1288 x += cwidth; 1300 x += cwidth;
1289 continue;
1290 }
1291
1292 else
1293 {
1294 *ep++ = gl;
1295 ewidth += cwidth;
1296 xoff += extents.xOff;
1297 }
1298 } 1301 }
1299 1302
1300 if (ep != enc) 1303 if (ep != enc)
1301 {
1302 if (xoff > ewidth) xoff = ewidth;
1303 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1304 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1304 x + (ewidth - xoff >> 1),
1305 y + base, enc, ep - enc);
1306 }
1307} 1305}
1308#endif 1306#endif
1309 1307
1310///////////////////////////////////////////////////////////////////////////// 1308/////////////////////////////////////////////////////////////////////////////
1311 1309
1312rxvt_fontset::rxvt_fontset (rxvt_t r) 1310rxvt_fontset::rxvt_fontset (rxvt_term *term)
1313: r (r), fontdesc (0) 1311: fontdesc (0), term (term)
1314{ 1312{
1315 clear (); 1313 clear ();
1316} 1314}
1317 1315
1318rxvt_fontset::~rxvt_fontset () 1316rxvt_fontset::~rxvt_fontset ()
… …
1321} 1319}
1322 1320
1323void 1321void
1324rxvt_fontset::clear () 1322rxvt_fontset::clear ()
1325{ 1323{
1326 prop.width = prop.height = prop.weight = prop.slant 1324 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1327 = rxvt_fontprop::unset; 1325 = rxvt_fontprop::unset;
1328 1326
1329 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1330 FONT_UNREF (*i); 1328 FONT_UNREF (*i);
1331 1329
… …
1362 f = new rxvt_font_x11; 1360 f = new rxvt_font_x11;
1363 } 1361 }
1364 else 1362 else
1365 f = new rxvt_font_x11; 1363 f = new rxvt_font_x11;
1366 1364
1367 f->set_term (r); 1365 f->set_term (term);
1368 f->set_name (strdup (name)); 1366 f->set_name (strdup (name));
1369 1367
1370 f->cs = cs; 1368 f->cs = cs;
1371 f->loaded = false; 1369 f->loaded = false;
1372 1370
… …
1504 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1502 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1505 goto next_font; 1503 goto next_font;
1506 1504
1507 if (!realize_font (i)) 1505 if (!realize_font (i))
1508 goto next_font; 1506 goto next_font;
1507
1508 if (prop.ascent != rxvt_fontprop::unset)
1509 max_it (f->ascent, prop.ascent);
1509 } 1510 }
1510 1511
1511 if (f->cs == CS_UNKNOWN) 1512 if (f->cs == CS_UNKNOWN)
1512 goto next_font; 1513 goto next_font;
1513 1514
… …
1552 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1553 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1553 FcPatternAddBool (p, FC_MINSPACE, 1); 1554 FcPatternAddBool (p, FC_MINSPACE, 1);
1554 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1555 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1555 1556
1556 XftResult result; 1557 XftResult result;
1557 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1558 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);
1558 1559
1559 FcPatternDestroy (p); 1560 FcPatternDestroy (p);
1560 1561
1561 if (match) 1562 if (match)
1562 { 1563 {

Diff Legend

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