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.66 by root, Fri Feb 11 05:51:14 2005 UTC vs.
Revision 1.87 by root, Wed Jan 25 21:03:04 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
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[] = {
… …
130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 135 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
131 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 136 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
132 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 137 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 138 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
134#if XFT 139#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, 140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139 144
140 // FreeMono is usually uglier than x fonts, so try last only. 145 // FreeMono is usually uglier than x fonts, so try last only.
141 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 146 { CS_UNICODE, "xft:FreeMono:autohint=true" },
142#endif 147#endif
143 148
… …
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->display->display
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
… …
504char * 504char *
505rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 505rxvt_font_x11::get_property (XFontStruct *f, const char *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, XInternAtom (term->display->display, property, 0), &value))
510 return XGetAtomName (DISPLAY, value); 510 return XGetAtomName (term->display->display, 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->display->display, "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, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))
548 avgwidth = 0; 549 avgwidth = 0;
549 550
550 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 551 char *weight = get_property (f, "WEIGHT_NAME", "medium");
551 char *slant = get_property (f, "SLANT", "r"); 552 char *slant = get_property (f, "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
… …
716 720
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
725 else if (replace_field (fname, list[i], 11, '0', "0"))
726 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
721 727
722 if (!set_properties (p, fname)) 728 if (!set_properties (p, fname))
723 continue; 729 continue;
724 730
725 if (prop.height != rxvt_fontprop::unset 731 if (prop.height != rxvt_fontprop::unset
… …
741 for (;;) 747 for (;;)
742 { 748 {
743 font_weight *best = fonts + count - 1; 749 font_weight *best = fonts + count - 1;
744 750
745 for (font_weight *w = best; w-- > fonts; ) 751 for (font_weight *w = best; w-- > fonts; )
746 if (w->diff < best->diff) 752 if (w->diff <= best->diff)
747 best = w; 753 best = w;
748 754
749 if (!best->name 755 if (!best->name
750 || !(f = XLoadQueryFont (disp, best->name))) 756 || !(f = XLoadQueryFont (disp, best->name)))
751 break; 757 break;
… …
849 855
850 XCharStruct g; 856 XCharStruct g;
851 int dir_ret, asc_ret, des_ret; 857 int dir_ret, asc_ret, des_ret;
852 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 858 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
853 859
854 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 860 int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
855 861
856 if (width < g.width) width = g.width; 862 if (width < g.width) width = g.width;
857 } 863 }
858 864
859 if (cs == CS_UNKNOWN) 865 if (cs == CS_UNKNOWN)
… …
878void 884void
879rxvt_font_x11::clear () 885rxvt_font_x11::clear ()
880{ 886{
881 if (f) 887 if (f)
882 { 888 {
883 XFreeFont (DISPLAY, f); 889 XFreeFont (term->display->display, f);
884 f = 0; 890 f = 0;
885 } 891 }
886} 892}
887 893
888bool 894bool
889rxvt_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
890{ 896{
891 uint32_t ch = FROM_UNICODE (cs, unicode); 897 uint32_t ch = FROM_UNICODE (cs, unicode);
892 898
893 if (ch == NOCHAR) 899 if (ch == NOCHAR)
894 return false; 900 return false;
… …
932 938
933 if (!prop || prop->width == rxvt_fontprop::unset) 939 if (!prop || prop->width == rxvt_fontprop::unset)
934 return true; 940 return true;
935 941
936 // check character against base font bounding box 942 // check character against base font bounding box
937 int w = xcs->width; 943 int w = xcs->rbearing - xcs->lbearing;
938 int wcw = wcwidth (unicode); 944 int wcw = WCWIDTH (unicode);
939 if (wcw > 0) w /= wcw; 945 if (wcw > 0) w = (w + wcw - 1) / wcw;
940 946
941 careful = w > prop->width; 947 careful = w > prop->width;
942 if (careful && w > prop->width * MAX_OVERLAP >> 2) 948 if (careful && OVERLAP_OK (w, prop))
943 return false; 949 return false;
944 950
945 return true; 951 return true;
946} 952}
947 953
… …
953 // this looks like a mess /. 959 // this looks like a mess /.
954 // and it is a mess /. 960 // and it is a mess /.
955 // yet we are trying to be perfect /. 961 // yet we are trying to be perfect /.
956 // but the result still isn't perfect /. 962 // but the result still isn't perfect /.
957 963
964 dTermDisplay;
965 dTermGC;
966
958 bool slow = this->slow 967 bool slow = this->slow
959 || width != r->TermWin.fwidth 968 || width != term->fwidth
960 || height != r->TermWin.fheight; 969 || height != term->fheight;
961 970
962 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 971 int base = ascent; // sorry, incorrect: term->fbase;
963 972
964 XGCValues v; 973 XGCValues v;
965 v.foreground = r->pix_colors[fg]; 974 v.foreground = term->pix_colors[fg];
966 v.font = f->fid; 975 v.font = f->fid;
967 976
968 if (enc2b) 977 if (enc2b)
969 { 978 {
970 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 979 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
971 980
972 if (bg == Color_bg && !slow) 981 if (bg == Color_bg && !slow)
973 { 982 {
974 v.background = r->pix_colors[bg]; 983 v.background = term->pix_colors[bg];
975 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 984 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
976 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 985 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
977 } 986 }
978 else 987 else
979 { 988 {
980 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);
981 990
982 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 991 XChangeGC (disp, gc, GCForeground | GCFont, &v);
983 992
984 if (slow) 993 if (slow)
985 { 994 {
986 do 995 do
987 { 996 {
988 if (xc->byte1 || xc->byte2) 997 if (xc->byte1 || xc->byte2)
989 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 998 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
990 999
991 x += r->TermWin.fwidth; 1000 x += term->fwidth;
992 xc++; len--; 1001 xc++; len--;
993 } 1002 }
994 while (len); 1003 while (len);
995 } 1004 }
996 else 1005 else
997 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1006 XDrawString16 (disp, d, gc, x, y + base, xc, len);
998 } 1007 }
999 } 1008 }
1000 else 1009 else
1001 { 1010 {
1002 const char *xc = enc_char (text, len, cs, slow); 1011 const char *xc = enc_char (text, len, cs, slow);
1003 1012
1004 if (bg == Color_bg && !slow) 1013 if (bg == Color_bg && !slow)
1005 { 1014 {
1006 v.background = r->pix_colors[bg]; 1015 v.background = term->pix_colors[bg];
1007 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1016 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1008 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1017 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1009 } 1018 }
1010 else 1019 else
1011 { 1020 {
1012 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);
1013 1022
1014 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1023 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1015 1024
1016 if (slow) 1025 if (slow)
1017 { 1026 {
1018 do 1027 do
1019 { 1028 {
1020 if (*xc) 1029 if (*xc)
1021 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1030 XDrawString (disp, d, gc, x, y + base, xc, 1);
1022 1031
1023 x += r->TermWin.fwidth; 1032 x += term->fwidth;
1024 xc++; len--; 1033 xc++; len--;
1025 } 1034 }
1026 while (len); 1035 while (len);
1027 } 1036 }
1028 else 1037 else
1029 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1038 XDrawString (disp, d, gc, x, y + base, xc, len);
1030 } 1039 }
1031 } 1040 }
1032} 1041}
1033 1042
1034///////////////////////////////////////////////////////////////////////////// 1043/////////////////////////////////////////////////////////////////////////////
… …
1046 1055
1047 void draw (rxvt_drawable &d, int x, int y, 1056 void draw (rxvt_drawable &d, int x, int y,
1048 const text_t *text, int len, 1057 const text_t *text, int len,
1049 int fg, int bg); 1058 int fg, int bg);
1050 1059
1051 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;
1052 1061
1053protected: 1062protected:
1054 XftFont *f; 1063 XftFont *f;
1055}; 1064};
1056 1065
1057void 1066void
1058rxvt_font_xft::clear () 1067rxvt_font_xft::clear ()
1059{ 1068{
1060 if (f) 1069 if (f)
1061 { 1070 {
1062 XftFontClose (DISPLAY, f); 1071 XftFontClose (term->display->display, f);
1063 f = 0; 1072 f = 0;
1064 } 1073 }
1065} 1074}
1066 1075
1067rxvt_fontprop 1076rxvt_fontprop
… …
1071 1080
1072 FT_Face face = XftLockFace (f); 1081 FT_Face face = XftLockFace (f);
1073 1082
1074 p.width = width; 1083 p.width = width;
1075 p.height = height; 1084 p.height = height;
1085 p.ascent = ascent;
1076 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1086 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1077 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1087 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1078 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1088 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1079 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1089 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1080 1090
… …
1084} 1094}
1085 1095
1086bool 1096bool
1087rxvt_font_xft::load (const rxvt_fontprop &prop) 1097rxvt_font_xft::load (const rxvt_fontprop &prop)
1088{ 1098{
1089 Display *disp = DISPLAY; 1099 dTermDisplay;
1090 1100
1091 clear (); 1101 clear ();
1092 1102
1093 FcPattern *p = FcNameParse ((FcChar8 *) name); 1103 FcPattern *p = FcNameParse ((FcChar8 *) name);
1094 1104
… …
1096 return false; 1106 return false;
1097 1107
1098 FcValue v; 1108 FcValue v;
1099 1109
1100 if (prop.height != rxvt_fontprop::unset 1110 if (prop.height != rxvt_fontprop::unset
1101 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1111 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1112 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1113 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104 1114
1105 if (prop.weight != rxvt_fontprop::unset 1115 if (prop.weight != rxvt_fontprop::unset
1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1116 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
… …
1121 1131
1122 // store generated name so iso14755 view gives better results 1132 // store generated name so iso14755 view gives better results
1123 set_name ((char *)FcNameUnparse (p)); 1133 set_name ((char *)FcNameUnparse (p));
1124 1134
1125 XftResult result; 1135 XftResult result;
1126 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1136 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1127 1137
1128 FcPatternDestroy (p); 1138 FcPatternDestroy (p);
1129 1139
1130 if (!match) 1140 if (!match)
1131 return false; 1141 return false;
… …
1152 1162
1153 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1163 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1154 1164
1155 XftUnlockFace (f); 1165 XftUnlockFace (f);
1156 1166
1167 int glheight = height;
1168
1157 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1169 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1158 { 1170 {
1159 FcChar16 ch = *t; 1171 FcChar16 ch = *t;
1160 1172
1161 if (cs != CS_UNICODE 1173 if (cs != CS_UNICODE
… …
1169 continue; 1181 continue;
1170 1182
1171 XGlyphInfo g; 1183 XGlyphInfo g;
1172 XftTextExtents16 (disp, f, &ch, 1, &g); 1184 XftTextExtents16 (disp, f, &ch, 1, &g);
1173 1185
1186 g.width -= g.x;
1187
1174 int wcw = wcwidth (ch); 1188 int wcw = WCWIDTH (ch);
1175 if (wcw > 0) g.width = g.width / wcw; 1189 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1176 1190
1177 if (width < g.width) width = g.width; 1191 if (width < g.width ) width = g.width;
1178 if (height < g.height) height = g.height; 1192 if (height < g.height ) height = g.height;
1193 if (glheight < g.height - g.y) glheight = g.height - g.y;
1194 }
1195
1196 if (!width)
1197 {
1198 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1199
1200 XftFontClose (disp, f);
1201 f = 0;
1202
1203 success = false;
1204 break;
1179 } 1205 }
1180 1206
1181 if (prop.height == rxvt_fontprop::unset 1207 if (prop.height == rxvt_fontprop::unset
1182 || height <= prop.height 1208 || (height <= prop.height && glheight <= prop.height)
1183 || height <= 2 1209 || height <= 2
1184 || !scalable) 1210 || !scalable)
1185 break; 1211 break;
1186 1212
1187 if (ftheight) 1213 if (ftheight)
… …
1194 ftheight -= height - prop.height; 1220 ftheight -= height - prop.height;
1195 } 1221 }
1196 else 1222 else
1197 ftheight = prop.height - 1; 1223 ftheight = prop.height - 1;
1198 1224
1199 XftFontClose (disp, f); 1225 XftFontClose (disp, f);
1200 FcPatternDel (match, FC_PIXEL_SIZE); 1226 FcPatternDel (match, FC_PIXEL_SIZE);
1201 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1227 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1202 } 1228 }
1203 1229
1204 FcPatternDestroy (match); 1230 FcPatternDestroy (match);
1205 1231
1206#if 0 // do it per-character 1232#if 0 // do it per-character
… …
1213 1239
1214 return success; 1240 return success;
1215} 1241}
1216 1242
1217bool 1243bool
1218rxvt_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
1219{ 1245{
1220 careful = false; 1246 careful = false;
1221 1247
1222 if (!XftCharExists (DISPLAY, f, unicode)) 1248 if (!XftCharExists (term->display->display, f, unicode))
1223 return false; 1249 return false;
1224 1250
1225 if (!prop || prop->width == rxvt_fontprop::unset) 1251 if (!prop || prop->width == rxvt_fontprop::unset)
1226 return true; 1252 return true;
1227 1253
1228 // check character against base font bounding box 1254 // check character against base font bounding box
1229 FcChar32 ch = unicode; 1255 FcChar32 ch = unicode;
1230 XGlyphInfo g; 1256 XGlyphInfo g;
1231 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1257 XftTextExtents32 (term->display->display, f, &ch, 1, &g);
1232 1258
1233 int w = g.width; 1259 int w = g.width - g.x;
1234 int wcw = wcwidth (unicode); 1260 int wcw = WCWIDTH (unicode);
1235 if (wcw > 0) w /= wcw; 1261 if (wcw > 0) w = (w + wcw - 1) / wcw;
1236 1262
1237 careful = w > prop->width; 1263 careful = w > prop->width;
1238 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1264 if (careful && OVERLAP_OK (w, prop))
1239 return false; 1265 return false;
1240 1266
1241 return true; 1267 return true;
1242} 1268}
1243 1269
1244void 1270void
1245rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1271rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1246 const text_t *text, int len, 1272 const text_t *text, int len,
1247 int fg, int bg) 1273 int fg, int bg)
1248{ 1274{
1249 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);
1250
1251 int base = ascent; // should be fbase, but that is incorrect
1252 1276
1253 XGlyphInfo extents; 1277 XGlyphInfo extents;
1254 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1278 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1255 FcChar32 *ep = enc; 1279 XftGlyphSpec *ep = enc;
1256 int ewidth = 0; 1280
1257 int xoff = 0; 1281 dTermDisplay;
1282 dTermGC;
1283
1284 // cut trailing spaces
1285 while (len && text [len - 1] == ' ')
1286 len--;
1258 1287
1259 while (len) 1288 while (len)
1260 { 1289 {
1261 int cwidth = r->TermWin.fwidth; 1290 int cwidth = term->fwidth;
1262 FcChar32 fc = *text++; len--; 1291 FcChar32 fc = *text++; len--;
1263 FT_UInt gl;
1264 1292
1265 while (len && *text == NOCHAR) 1293 while (len && *text == NOCHAR)
1266 text++, len--, cwidth += r->TermWin.fwidth; 1294 text++, len--, cwidth += term->fwidth;
1267 1295
1268 gl = XftCharIndex (d.display->display, f, fc); 1296 if (fc != ' ') // skip spaces
1269 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1270
1271 if (extents.xOff != cwidth && ep != enc)
1272 {
1273 if (xoff > ewidth) xoff = ewidth;
1274 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1275 x + (ewidth - xoff >> 1),
1276 y + base, enc, ep - enc);
1277 x += ewidth;
1278
1279 ep = enc;
1280 ewidth = 0;
1281 xoff = 0;
1282 } 1297 {
1298 FT_UInt glyph = XftCharIndex (disp, f, fc);
1299 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1283 1300
1284 if (fc == ' ' && ep == enc) // skip leading spaces 1301 ep->glyph = glyph;
1302 ep->x = x + (cwidth - extents.xOff >> 1);
1303 ep->y = y + ascent;
1304 ep++;
1285 { 1305 }
1306
1286 x += cwidth; 1307 x += cwidth;
1287 continue;
1288 }
1289
1290 else
1291 {
1292 *ep++ = gl;
1293 ewidth += cwidth;
1294 xoff += extents.xOff;
1295 }
1296 } 1308 }
1297 1309
1298 if (ep != enc) 1310 if (ep != enc)
1299 {
1300 if (xoff > ewidth) xoff = ewidth;
1301 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1311 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1302 x + (ewidth - xoff >> 1),
1303 y + base, enc, ep - enc);
1304 }
1305} 1312}
1306#endif 1313#endif
1307 1314
1308///////////////////////////////////////////////////////////////////////////// 1315/////////////////////////////////////////////////////////////////////////////
1309 1316
1310rxvt_fontset::rxvt_fontset (rxvt_t r) 1317rxvt_fontset::rxvt_fontset (rxvt_term *term)
1311: r (r), fontdesc (0) 1318: fontdesc (0), term (term)
1312{ 1319{
1313 clear (); 1320 clear ();
1314} 1321}
1315 1322
1316rxvt_fontset::~rxvt_fontset () 1323rxvt_fontset::~rxvt_fontset ()
… …
1319} 1326}
1320 1327
1321void 1328void
1322rxvt_fontset::clear () 1329rxvt_fontset::clear ()
1323{ 1330{
1324 prop.width = prop.height = prop.weight = prop.slant 1331 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325 = rxvt_fontprop::unset; 1332 = rxvt_fontprop::unset;
1326 1333
1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1334 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328 FONT_UNREF (*i); 1335 FONT_UNREF (*i);
1329 1336
… …
1360 f = new rxvt_font_x11; 1367 f = new rxvt_font_x11;
1361 } 1368 }
1362 else 1369 else
1363 f = new rxvt_font_x11; 1370 f = new rxvt_font_x11;
1364 1371
1365 f->set_term (r); 1372 f->set_term (term);
1366 f->set_name (strdup (name)); 1373 f->set_name (strdup (name));
1367 1374
1368 f->cs = cs; 1375 f->cs = cs;
1369 f->loaded = false; 1376 f->loaded = false;
1370 1377
… …
1381 char buf[512]; 1388 char buf[512];
1382 const char *end; 1389 const char *end;
1383 1390
1384 do 1391 do
1385 { 1392 {
1386 while (*desc <= ' ') desc++; 1393 while (*desc && *desc <= ' ')
1394 desc++;
1387 1395
1388 codeset cs = CS_UNICODE; 1396 codeset cs = CS_UNICODE;
1389 1397
1390 if (*desc == '[') 1398 if (*desc == '[')
1391 { 1399 {
… …
1501 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1509 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1502 goto next_font; 1510 goto next_font;
1503 1511
1504 if (!realize_font (i)) 1512 if (!realize_font (i))
1505 goto next_font; 1513 goto next_font;
1514
1515 if (prop.ascent != rxvt_fontprop::unset)
1516 max_it (f->ascent, prop.ascent);
1506 } 1517 }
1507 1518
1508 if (f->cs == CS_UNKNOWN) 1519 if (f->cs == CS_UNKNOWN)
1509 goto next_font; 1520 goto next_font;
1510 1521
… …
1549 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1560 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1550 FcPatternAddBool (p, FC_MINSPACE, 1); 1561 FcPatternAddBool (p, FC_MINSPACE, 1);
1551 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1562 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1552 1563
1553 XftResult result; 1564 XftResult result;
1554 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1565 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);
1555 1566
1556 FcPatternDestroy (p); 1567 FcPatternDestroy (p);
1557 1568
1558 if (match) 1569 if (match)
1559 { 1570 {

Diff Legend

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