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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.28 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.48 by pcg, Tue Mar 16 11:07:44 2004 UTC

… …
24#include "defaultfont.h" 24#include "defaultfont.h"
25 25
26#include <cstdlib> 26#include <cstdlib>
27 27
28#define DISPLAY r->display->display 28#define DISPLAY r->display->display
29#define GC r->TermWin.gc 29#define TGC r->TermWin.gc
30 30
31const struct rxvt_fallback_font { 31const struct rxvt_fallback_font {
32 codeset cs; 32 codeset cs;
33 const char *name; 33 const char *name;
34} fallback_fonts[] = { 34} fallback_fonts[] = {
… …
61# if XFT 61# if XFT
62 // prefer xft for complex scripts 62 // prefer xft for complex scripts
63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, 63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
64# endif 64# endif
65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
66 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68#endif 68#endif
69 69
70#if ENCODING_CN || ENCODING_CN_EXT 70#if ENCODING_CN || ENCODING_CN_EXT
71# if XFT 71# if XFT
… …
96 { CS_UNICODE, "xft:FreeMono" }, 96 { CS_UNICODE, "xft:FreeMono" },
97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
100 100
101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
104
101 { CS_UNKNOWN, 0 } 105 { CS_UNKNOWN, 0 }
102}; 106};
103 107
104///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
105 109
… …
190 else if (color >= 0) 194 else if (color >= 0)
191 { 195 {
192#if XFT 196#if XFT
193 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
194#else 198#else
195 XSetForeground (d.display->display, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
196 XFillRectangle (d.display->display, d, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
197#endif 201#endif
198 } 202 }
199} 203}
200 204
201static const char *linedraw_cmds[128] = { 205#include "table/linedraw.h"
202 "1hH", "2hH", "1vV", "2vV",
203 0, 0, 0, 0,
204 0, 0, 0, 0,
205 "1HV", "2H1V", "1H2V", "2HV",
206
207 // 2510
208 "1hV", "2h1V", "1h2V", "2hV",
209 "1Hv", "2H1v", "1H2v", "2Hv",
210 "1hv", "2h1v", "1h2v", "2hv",
211 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
212
213 // 2520
214 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
215 "1hvV", "2h1vV", "1hV2v", "1hv2V",
216 "1h2vV", "2hv1V", "1v2hV", "2hvV",
217 "1hHV", "2h1HV", "2H1hV", "2hH1V",
218
219 // 2530
220 "1hH2V", "2hV1H", "1h2HV", "2hHV",
221 "1hHv", "1vH2h", "1hv2H", "1v2hH",
222 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
223 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
224
225 // 2540
226 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
227 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
228 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
229 0, 0, 0, 0,
230
231 // 2550
232 0, 0, 0, 0,
233 0, 0, 0, 0,
234 0, 0, 0, 0,
235 0, 0, 0, 0,
236
237 // 2560
238 0, 0, 0, 0,
239 0, 0, 0, 0,
240 0, 0, 0, 0,
241 0, 0, 0, 0,
242
243 // 2570
244 0, "1a", "1b", "1ab",
245 "1h", "1v", "1H", "1V",
246 "2h", "2v", "2H", "2V",
247 "1h2H", "1v2V", "1H2h", "1V2v"
248
249 // to be done
250};
251 206
252struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
253 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
254 { 210 {
255 rxvt_fontprop p; 211 rxvt_fontprop p;
256 212
257 p.width = p.height = 1; 213 p.width = p.height = 1;
… …
264 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
265 { 221 {
266 width = 1; height = 1; 222 width = 1; height = 1;
267 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
268 224
225 set_name (strdup ("built-in pseudofont"));
226
269 return true; 227 return true;
270 } 228 }
271 229
272 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
273 { 231 {
274 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
275 return true; 233 return true;
276 if (unicode >= 0x0080 && unicode <= 0x009f) 234
235 if (unicode <= 0x007f)
236 return false;
237
238 if (unicode <= 0x009f)
277 return true; 239 return true;
278 240
279 if (unicode >= 0x2500 && unicode <= 0x257f 241 if (unicode >= 0x2500 && unicode <= 0x259f)
280 && linedraw_cmds[unicode - 0x2500]) 242 return true;
243
244 if (IS_COMPOSE (unicode))
281 return true; 245 return true;
282 246
283 switch (unicode) 247 switch (unicode)
284 { 248 {
285 case ZERO_WIDTH_CHAR: 249 case ZERO_WIDTH_CHAR:
… …
299 const text_t *text, int len, 263 const text_t *text, int len,
300 int fg, int bg) 264 int fg, int bg)
301{ 265{
302 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 266 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
303 267
304 XSetForeground (d.display->display, GC, r->PixColors[fg]); 268 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
305 269
306 while (len--) 270 while (len--)
307 { 271 {
272#if ENABLE_COMBINING
273 compose_char *cc;
274#endif
308 text_t t = *text++; 275 text_t t = *text++;
309 276
310 // is it in our linedrawing table? 277 if (0x2500 <= t && t <= 0x259f)
311 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 278 {
279 uint16_t offs = linedraw_offs[t - 0x2500];
280 uint32_t *a = linedraw_command + (offs >> 4);
281 uint32_t *b = a + (offs & 15);
282
283 int W = r->TermWin.fwidth;
284 int H = r->TermWin.fheight;
285
286 int x_[16];
287 int y_[16];
288
289 for (int i = 0; i <= 8; i++)
312 { 290 {
313 const char *p = linedraw_cmds[t - 0x2500]; 291 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
292 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
293 }
314 294
315 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1; 295 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
316 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1; 296 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
317 297
318 XGCValues gcv; 298 XGCValues gcv;
319 299
300 gcv.cap_style = CapButt;
301 gcv.line_width = 0;
302 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
303
320 while (*p) 304 while (a < b)
321 { 305 {
306 uint32_t command = *a++;
307
308 int op = (command >> 24) & 255;
309 int a = (command >> 20) & 15;
310 int b = (command >> 16) & 15;
311 int x1 = x_[(command >> 12) & 15];
312 int y1 = y_[(command >> 8) & 15];
313 int x2 = x_[(command >> 4) & 15];
314 int y2 = y_[(command >> 0) & 15];
315
322 switch (*p++) 316 switch (op)
323 { 317 {
324 case '1': 318 case 0: // line
325 gcv.line_width = 0; 319 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
326 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
327 break; 320 break;
328 321
329 case '2': 322 case 1: // rectangle, possibly stippled
323 if (a)
324 {
325 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
326
327 gcv.fill_style = FillStippled;
328 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
329 gcv.ts_x_origin = x;
330 gcv.ts_y_origin = y;
331
332 XChangeGC (d.display->display, TGC,
333 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
334 &gcv);
335 }
336
337 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
338
339 if (a)
340 {
341 XFreePixmap (d.display->display, gcv.stipple);
330 gcv.line_width = 2; 342 gcv.stipple = 0;
343 gcv.fill_style = FillSolid;
331 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 344 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
345 }
332 break; 346 break;
333 347 case 2: // arc
334 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 348 XDrawArc (d.display->display, d, TGC,
335 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 349 x1 - W/2, y1 - H/2, W-1, H-1,
336 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 350 (a - 1) * 90*64, (b - 1) * 90*64);
337 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 351 break;
338 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
339 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
340 } 352 }
341 } 353 }
342 354 }
343 gcv.line_width = 0; 355#if ENABLE_COMBINING
344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 356 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
345 } 357 {
358 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
359 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
360 if (cc->c2 != NOCHAR)
361 {
362 // prefer font of first character, for no good reasons
363 rxvt_font *f2 = f1->has_codepoint (cc->c2)
364 ? f1
365 : (*fs)[fs->find_font (cc->c2)];
366
367 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
368 }
369 }
370#endif
346 else 371 else
347 switch (t) 372 switch (t)
348 { 373 {
349 case ZERO_WIDTH_CHAR: 374 case ZERO_WIDTH_CHAR:
350 break; 375 break;
376
351 default: 377 default:
352 int w = 0; 378 int w = 0;
353 while (len > 0 && *text == NOCHAR) 379 while (len > 0 && *text == NOCHAR)
354 { 380 {
355 ++text; 381 ++text;
356 --len; 382 --len;
357 w += r->TermWin.fwidth; 383 w += r->TermWin.fwidth;
358 } 384 }
359 385
360 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 386 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
361 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 387 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
362 x += w; 388 x += w;
363 } 389 }
364 390
365 x += r->TermWin.fwidth; 391 x += r->TermWin.fwidth;
366 } 392 }
… …
375 401
376 rxvt_fontprop properties (); 402 rxvt_fontprop properties ();
377 403
378 bool load (const rxvt_fontprop &prop); 404 bool load (const rxvt_fontprop &prop);
379 405
380 bool has_codepoint (uint32_t unicode); 406 bool has_codepoint (unicode_t unicode);
381 407
382 void draw (rxvt_drawable &d, int x, int y, 408 void draw (rxvt_drawable &d, int x, int y,
383 const text_t *text, int len, 409 const text_t *text, int len,
384 int fg, int bg); 410 int fg, int bg);
385 411
… …
442 468
443bool 469bool
444rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 470rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
445{ 471{
446 int slashes = 0; 472 int slashes = 0;
447 const char *comp[12]; 473 const char *comp[13];
448 474
449 for (const char *c = name; *c; c++) 475 for (const char *c = name; *c; c++)
450 if (*c == '-') 476 if (*c == '-')
451 { 477 {
452 comp[slashes++] = c + 1; 478 comp[slashes++] = c + 1;
… …
632 f = 0; 658 f = 0;
633 } 659 }
634} 660}
635 661
636bool 662bool
637rxvt_font_x11::has_codepoint (uint32_t unicode) 663rxvt_font_x11::has_codepoint (unicode_t unicode)
638{ 664{
639 uint32_t ch = FROM_UNICODE (cs, unicode); 665 uint32_t ch = FROM_UNICODE (cs, unicode);
640 666
641 if (ch == NOCHAR) 667 if (ch == NOCHAR)
642 return false; 668 return false;
… …
704 { 730 {
705 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 731 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
706 732
707 if (bg == Color_bg && !slow) 733 if (bg == Color_bg && !slow)
708 { 734 {
709 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 735 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
710 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 736 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
711 } 737 }
712 else 738 else
713 { 739 {
714 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 740 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
715 741
716 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 742 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
717 743
718 if (slow) 744 if (slow)
719 { 745 {
720 do 746 do
721 { 747 {
722 if (xc->byte1 || xc->byte2) 748 if (xc->byte1 || xc->byte2)
723 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 749 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
724 750
725 x += r->TermWin.fwidth; 751 x += r->TermWin.fwidth;
726 xc++; len--; 752 xc++; len--;
727 } 753 }
728 while (len); 754 while (len);
729 } 755 }
730 else 756 else
731 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 757 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
732 } 758 }
733 } 759 }
734 else 760 else
735 { 761 {
736 const char *xc = enc_char (text, len, cs, slow); 762 const char *xc = enc_char (text, len, cs, slow);
737 763
738 if (bg == Color_bg && !slow) 764 if (bg == Color_bg && !slow)
739 { 765 {
740 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 766 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
741 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 767 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
742 } 768 }
743 else 769 else
744 { 770 {
745 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 771 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
746 772
747 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 773 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
748 774
749 if (slow) 775 if (slow)
750 { 776 {
751 do 777 do
752 { 778 {
753 if (*xc) 779 if (*xc)
754 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 780 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
755 781
756 x += r->TermWin.fwidth; 782 x += r->TermWin.fwidth;
757 xc++; len--; 783 xc++; len--;
758 } 784 }
759 while (len); 785 while (len);
760 } 786 }
761 else 787 else
762 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 788 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
763 } 789 }
764 } 790 }
765} 791}
766 792
767///////////////////////////////////////////////////////////////////////////// 793/////////////////////////////////////////////////////////////////////////////
… …
784 810
785 void draw (rxvt_drawable &d, int x, int y, 811 void draw (rxvt_drawable &d, int x, int y,
786 const text_t *text, int len, 812 const text_t *text, int len,
787 int fg, int bg); 813 int fg, int bg);
788 814
789 bool has_codepoint (uint32_t unicode); 815 bool has_codepoint (unicode_t unicode);
790 816
791protected: 817protected:
792 XftFont *f; 818 XftFont *f;
793}; 819};
794 820
… …
907 933
908 return true; 934 return true;
909} 935}
910 936
911bool 937bool
912rxvt_font_xft::has_codepoint (uint32_t unicode) 938rxvt_font_xft::has_codepoint (unicode_t unicode)
913{ 939{
914 return XftCharExists (DISPLAY, f, unicode); 940 return XftCharExists (DISPLAY, f, unicode);
915} 941}
916 942
917void 943void
… …
1013 f = new rxvt_font_x11; 1039 f = new rxvt_font_x11;
1014 } 1040 }
1015 else 1041 else
1016 f = new rxvt_font_x11; 1042 f = new rxvt_font_x11;
1017 1043
1044 f->fs = this;
1018 f->set_term (r); 1045 f->set_term (r);
1019 f->set_name (strdup (name)); 1046 f->set_name (strdup (name));
1020 1047
1021 f->cs = cs; 1048 f->cs = cs;
1022 f->loaded = false; 1049 f->loaded = false;
… …
1119 1146
1120 return true; 1147 return true;
1121} 1148}
1122 1149
1123int 1150int
1124rxvt_fontset::find_font (uint32_t unicode) 1151rxvt_fontset::find_font (unicode_t unicode)
1125{ 1152{
1126 for (unsigned int i = 0; i < fonts.size (); i++) 1153 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1154 i < fonts.size ();
1155 i++)
1127 { 1156 {
1128 rxvt_font *f = fonts[i]; 1157 rxvt_font *f = fonts[i];
1129 1158
1130 if (!f->loaded) 1159 if (!f->loaded)
1131 { 1160 {

Diff Legend

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