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.34 by pcg, Thu Mar 4 04:28:50 2004 UTC vs.
Revision 1.47 by pcg, Tue Mar 16 06:04:28 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
… …
194 else if (color >= 0) 194 else if (color >= 0)
195 { 195 {
196#if XFT 196#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else 198#else
199 XSetForeground (d.display->display, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
200 XFillRectangle (d.display->display, d, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif 201#endif
202 } 202 }
203} 203}
204 204
205static const char *linedraw_cmds[128] = { 205#include "table/linedraw.h"
206 "1hH", "2hH", "1vV", "2vV",
207 0, 0, 0, 0,
208 0, 0, 0, 0,
209 "1HV", "2H1V", "1H2V", "2HV",
210
211 // 2510
212 "1hV", "2h1V", "1h2V", "2hV",
213 "1Hv", "2H1v", "1H2v", "2Hv",
214 "1hv", "2h1v", "1h2v", "2hv",
215 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
216
217 // 2520
218 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
219 "1hvV", "2h1vV", "1hV2v", "1hv2V",
220 "1h2vV", "2hv1V", "1v2hV", "2hvV",
221 "1hHV", "2h1HV", "2H1hV", "2hH1V",
222
223 // 2530
224 "1hH2V", "2hV1H", "1h2HV", "2hHV",
225 "1hHv", "1vH2h", "1hv2H", "1v2hH",
226 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
227 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
228
229 // 2540
230 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
231 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
232 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
233 0, 0, 0, 0,
234
235 // 2550
236 0, 0, 0, 0,
237 0, 0, 0, 0,
238 0, 0, 0, 0,
239 0, 0, 0, 0,
240
241 // 2560
242 0, 0, 0, 0,
243 0, 0, 0, 0,
244 0, 0, 0, 0,
245 0, 0, 0, 0,
246
247 // 2570
248 0, "1a", "1b", "1ab",
249 "1h", "1v", "1H", "1V",
250 "2h", "2v", "2H", "2V",
251 "1h2H", "1v2V", "1H2h", "1V2v"
252
253 // to be done
254};
255 206
256struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
257 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
258 { 210 {
259 rxvt_fontprop p; 211 rxvt_fontprop p;
260 212
261 p.width = p.height = 1; 213 p.width = p.height = 1;
… …
268 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
269 { 221 {
270 width = 1; height = 1; 222 width = 1; height = 1;
271 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
272 224
225 set_name (strdup ("built-in pseudofont"));
226
273 return true; 227 return true;
274 } 228 }
275 229
276 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
277 { 231 {
278 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
279 return true; 233 return true;
280 234
281 if (unicode >= 0x0080 && unicode <= 0x009f) 235 if (unicode >= 0x0080 && unicode <= 0x009f)
282 return true; 236 return true;
283 237
284 if (unicode >= 0x2500 && unicode <= 0x257f 238 if (unicode >= 0x2500 && unicode <= 0x259f)
285 && linedraw_cmds[unicode - 0x2500])
286 return true; 239 return true;
287 240
288 if (IS_PSEUDO (unicode)) 241 if (IS_COMPOSE (unicode))
289 return true; 242 return true;
290 243
291 switch (unicode) 244 switch (unicode)
292 { 245 {
293 case ZERO_WIDTH_CHAR: 246 case ZERO_WIDTH_CHAR:
… …
307 const text_t *text, int len, 260 const text_t *text, int len,
308 int fg, int bg) 261 int fg, int bg)
309{ 262{
310 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 263 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
311 264
312 XSetForeground (d.display->display, GC, r->PixColors[fg]); 265 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
313 266
314 while (len--) 267 while (len--)
315 { 268 {
269#if ENABLE_COMBINING
270 compose_char *cc;
271#endif
316 text_t t = *text++; 272 text_t t = *text++;
317 273
318 // is it in our linedrawing table? 274 if (0x2500 <= t && t <= 0x259f)
319 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 275 {
276 uint16_t offs = linedraw_offs[t - 0x2500];
277 uint32_t *a = linedraw_command + (offs >> 4);
278 uint32_t *b = a + (offs & 15);
279
280 int W = r->TermWin.fwidth;
281 int H = r->TermWin.fheight;
282
283 int x_[16];
284 int y_[16];
285
286 for (int i = 0; i <= 8; i++)
320 { 287 {
321 const char *p = linedraw_cmds[t - 0x2500]; 288 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
289 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
290 }
322 291
323 int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; 292 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
324 int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; 293 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
325 294
326 XGCValues gcv; 295 XGCValues gcv;
327 296
297 gcv.cap_style = CapButt;
298 gcv.line_width = 0;
299 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
300
328 while (*p) 301 while (a < b)
329 { 302 {
303 uint32_t command = *a++;
304
305 int op = (command >> 24) & 255;
306 int a = (command >> 20) & 15;
307 int b = (command >> 16) & 15;
308 int x1 = x_[(command >> 12) & 15];
309 int y1 = y_[(command >> 8) & 15];
310 int x2 = x_[(command >> 4) & 15];
311 int y2 = y_[(command >> 0) & 15];
312
330 switch (*p++) 313 switch (op)
331 { 314 {
332 case '1': 315 case 0: // line
333 gcv.line_width = 0; 316 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
334 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
335 break; 317 break;
336 318
337 case '2': 319 case 1: // rectangle, possibly stippled
320 if (a)
321 {
322 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
323
324 gcv.fill_style = FillStippled;
325 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
326 gcv.ts_x_origin = x;
327 gcv.ts_y_origin = y;
328
329 XChangeGC (d.display->display, TGC,
330 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
331 &gcv);
332 }
333
334 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
335
336 if (a)
337 {
338 XFreePixmap (d.display->display, gcv.stipple);
338 gcv.line_width = 2; 339 gcv.stipple = 0;
340 gcv.fill_style = FillSolid;
339 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 341 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
342 }
340 break; 343 break;
341 344 case 2: // arc
342 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 345 XDrawArc (d.display->display, d, TGC,
343 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 346 x1 - W/2, y1 - H/2, W-1, H-1,
344 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 347 (a - 1) * 90*64, (b - 1) * 90*64);
345 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 348 break;
346 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
347 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
348 } 349 }
349 } 350 }
350
351 gcv.line_width = 0;
352 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
353 }
354 else if (IS_PSEUDO (t))
355 { 351 }
356 const compose_char &cc = r->composite (t); 352#if ENABLE_COMBINING
357 (void)0; //D ADD pseudo handling here 353 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
358 } 354 {
355 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
356 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
357 if (cc->c2 != NOCHAR)
358 {
359 // prefer font of first character, for no good reasons
360 rxvt_font *f2 = f1->has_codepoint (cc->c2)
361 ? f1
362 : (*fs)[fs->find_font (cc->c2)];
363
364 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
365 }
366 }
367#endif
359 else 368 else
360 switch (t) 369 switch (t)
361 { 370 {
362 case ZERO_WIDTH_CHAR: 371 case ZERO_WIDTH_CHAR:
363 break; 372 break;
373
364 default: 374 default:
365 int w = 0; 375 int w = 0;
366 while (len > 0 && *text == NOCHAR) 376 while (len > 0 && *text == NOCHAR)
367 { 377 {
368 ++text; 378 ++text;
369 --len; 379 --len;
370 w += r->TermWin.fwidth; 380 w += r->TermWin.fwidth;
371 } 381 }
372 382
373 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 383 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
374 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 384 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
375 x += w; 385 x += w;
376 } 386 }
377 387
378 x += r->TermWin.fwidth; 388 x += r->TermWin.fwidth;
379 } 389 }
… …
388 398
389 rxvt_fontprop properties (); 399 rxvt_fontprop properties ();
390 400
391 bool load (const rxvt_fontprop &prop); 401 bool load (const rxvt_fontprop &prop);
392 402
393 bool has_codepoint (uint32_t unicode); 403 bool has_codepoint (unicode_t unicode);
394 404
395 void draw (rxvt_drawable &d, int x, int y, 405 void draw (rxvt_drawable &d, int x, int y,
396 const text_t *text, int len, 406 const text_t *text, int len,
397 int fg, int bg); 407 int fg, int bg);
398 408
… …
645 f = 0; 655 f = 0;
646 } 656 }
647} 657}
648 658
649bool 659bool
650rxvt_font_x11::has_codepoint (uint32_t unicode) 660rxvt_font_x11::has_codepoint (unicode_t unicode)
651{ 661{
652 uint32_t ch = FROM_UNICODE (cs, unicode); 662 uint32_t ch = FROM_UNICODE (cs, unicode);
653 663
654 if (ch == NOCHAR) 664 if (ch == NOCHAR)
655 return false; 665 return false;
… …
717 { 727 {
718 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 728 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
719 729
720 if (bg == Color_bg && !slow) 730 if (bg == Color_bg && !slow)
721 { 731 {
722 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 732 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
723 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 733 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
724 } 734 }
725 else 735 else
726 { 736 {
727 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 737 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
728 738
729 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 739 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
730 740
731 if (slow) 741 if (slow)
732 { 742 {
733 do 743 do
734 { 744 {
735 if (xc->byte1 || xc->byte2) 745 if (xc->byte1 || xc->byte2)
736 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 746 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
737 747
738 x += r->TermWin.fwidth; 748 x += r->TermWin.fwidth;
739 xc++; len--; 749 xc++; len--;
740 } 750 }
741 while (len); 751 while (len);
742 } 752 }
743 else 753 else
744 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 754 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
745 } 755 }
746 } 756 }
747 else 757 else
748 { 758 {
749 const char *xc = enc_char (text, len, cs, slow); 759 const char *xc = enc_char (text, len, cs, slow);
750 760
751 if (bg == Color_bg && !slow) 761 if (bg == Color_bg && !slow)
752 { 762 {
753 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 763 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
754 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 764 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
755 } 765 }
756 else 766 else
757 { 767 {
758 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 768 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
759 769
760 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 770 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
761 771
762 if (slow) 772 if (slow)
763 { 773 {
764 do 774 do
765 { 775 {
766 if (*xc) 776 if (*xc)
767 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 777 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
768 778
769 x += r->TermWin.fwidth; 779 x += r->TermWin.fwidth;
770 xc++; len--; 780 xc++; len--;
771 } 781 }
772 while (len); 782 while (len);
773 } 783 }
774 else 784 else
775 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 785 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
776 } 786 }
777 } 787 }
778} 788}
779 789
780///////////////////////////////////////////////////////////////////////////// 790/////////////////////////////////////////////////////////////////////////////
… …
797 807
798 void draw (rxvt_drawable &d, int x, int y, 808 void draw (rxvt_drawable &d, int x, int y,
799 const text_t *text, int len, 809 const text_t *text, int len,
800 int fg, int bg); 810 int fg, int bg);
801 811
802 bool has_codepoint (uint32_t unicode); 812 bool has_codepoint (unicode_t unicode);
803 813
804protected: 814protected:
805 XftFont *f; 815 XftFont *f;
806}; 816};
807 817
… …
920 930
921 return true; 931 return true;
922} 932}
923 933
924bool 934bool
925rxvt_font_xft::has_codepoint (uint32_t unicode) 935rxvt_font_xft::has_codepoint (unicode_t unicode)
926{ 936{
927 return XftCharExists (DISPLAY, f, unicode); 937 return XftCharExists (DISPLAY, f, unicode);
928} 938}
929 939
930void 940void
… …
1026 f = new rxvt_font_x11; 1036 f = new rxvt_font_x11;
1027 } 1037 }
1028 else 1038 else
1029 f = new rxvt_font_x11; 1039 f = new rxvt_font_x11;
1030 1040
1041 f->fs = this;
1031 f->set_term (r); 1042 f->set_term (r);
1032 f->set_name (strdup (name)); 1043 f->set_name (strdup (name));
1033 1044
1034 f->cs = cs; 1045 f->cs = cs;
1035 f->loaded = false; 1046 f->loaded = false;
… …
1132 1143
1133 return true; 1144 return true;
1134} 1145}
1135 1146
1136int 1147int
1137rxvt_fontset::find_font (uint32_t unicode) 1148rxvt_fontset::find_font (unicode_t unicode)
1138{ 1149{
1139 for (unsigned int i = 0; i < fonts.size (); i++) 1150 for (unsigned int i = 0; i < fonts.size (); i++)
1140 { 1151 {
1141 rxvt_font *f = fonts[i]; 1152 rxvt_font *f = fonts[i];
1142 1153

Diff Legend

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