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.37 by pcg, Fri Mar 5 05:52:02 2004 UTC vs.
Revision 1.46 by pcg, Tue Mar 16 05:55:51 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]) 239 && linedraw_offs[unicode - 0x2500] & 15)
286 return true; 240 return true;
287 241
288 if (IS_COMPOSE (unicode)) 242 if (IS_COMPOSE (unicode))
289 return true; 243 return true;
290 244
… …
307 const text_t *text, int len, 261 const text_t *text, int len,
308 int fg, int bg) 262 int fg, int bg)
309{ 263{
310 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 264 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
311 265
312 XSetForeground (d.display->display, GC, r->PixColors[fg]); 266 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
313 267
314 while (len--) 268 while (len--)
315 { 269 {
270#if ENABLE_COMBINING
316 compose_char *cc; 271 compose_char *cc;
272#endif
317 text_t t = *text++; 273 text_t t = *text++;
318 274
319 // is it in our linedrawing table? 275 int W = r->TermWin.fwidth , w = (W - 1) / 2;
320 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 276 int H = r->TermWin.fheight, h = (H - 1) / 2;
277 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
278 int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
279
280 if (0x2500 <= t && t <= 0x259f
281 && linedraw_offs[t - 0x2500] & 15)
282 {
283 uint16_t offs = linedraw_offs[t - 0x2500];
284 uint32_t *a = linedraw_command + (offs >> 4);
285 uint32_t *b = a + (offs & 15);
286
287 int x_[16];
288 int y_[16];
289
290 for (int i = 0; i <= 8; i++)
321 { 291 {
322 const char *p = linedraw_cmds[t - 0x2500]; 292 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
293 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
294 }
323 295
324 int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; 296 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
325 int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; 297 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
326 298
327 XGCValues gcv; 299 XGCValues gcv;
328 300
301 gcv.cap_style = CapButt;
302 gcv.line_width = 0;
303 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
304
329 while (*p) 305 while (a < b)
330 { 306 {
307 uint32_t command = *a++;
308
309 int op = (command >> 24) & 255;
310 int a = (command >> 20) & 15;
311 int b = (command >> 16) & 15;
312 int x1 = x_[(command >> 12) & 15];
313 int y1 = y_[(command >> 8) & 15];
314 int x2 = x_[(command >> 4) & 15];
315 int y2 = y_[(command >> 0) & 15];
316
331 switch (*p++) 317 switch (op)
332 { 318 {
333 case '1': 319 case 0: // line
334 gcv.line_width = 0; 320 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
335 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
336 break; 321 break;
337 322
338 case '2': 323 case 1: // rectangle, possibly stippled
324 if (a)
325 {
326 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
327
328 gcv.fill_style = FillStippled;
329 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
330 gcv.ts_x_origin = x;
331 gcv.ts_y_origin = y;
332
333 XChangeGC (d.display->display, TGC,
334 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
335 &gcv);
336 }
337
338
339 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
340
341 if (a)
342 {
343 XFreePixmap (d.display->display, gcv.stipple);
339 gcv.line_width = 2; 344 gcv.stipple = 0;
345 gcv.fill_style = FillSolid;
340 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 346 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
347 }
348
341 break; 349 break;
342 350 case 2: // arc
343 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 351 XDrawArc (d.display->display, d, TGC,
344 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 352 x1 - W/2, y1 - H/2, W-1, H-1,
345 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 353 (a - 1) * 90*64, (b - 1) * 90*64);
346 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 354 break;
347 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
348 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
349 } 355 }
350 } 356 }
351
352 gcv.line_width = 0;
353 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
354 } 357 }
358#if ENABLE_COMBINING
355 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 359 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
356 { 360 {
357 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 361 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
358 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 362 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
359 if (cc->c2 != NOCHAR) 363 if (cc->c2 != NOCHAR)
… …
364 : (*fs)[fs->find_font (cc->c2)]; 368 : (*fs)[fs->find_font (cc->c2)];
365 369
366 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); 370 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
367 } 371 }
368 } 372 }
373#endif
369 else 374 else
370 switch (t) 375 switch (t)
371 { 376 {
372 case ZERO_WIDTH_CHAR: 377 case ZERO_WIDTH_CHAR:
373 break; 378 break;
379
374 default: 380 default:
375 int w = 0; 381 int w = 0;
376 while (len > 0 && *text == NOCHAR) 382 while (len > 0 && *text == NOCHAR)
377 { 383 {
378 ++text; 384 ++text;
379 --len; 385 --len;
380 w += r->TermWin.fwidth; 386 w += r->TermWin.fwidth;
381 } 387 }
382 388
383 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 389 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
384 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 390 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
385 x += w; 391 x += w;
386 } 392 }
387 393
388 x += r->TermWin.fwidth; 394 x += r->TermWin.fwidth;
389 } 395 }
… …
398 404
399 rxvt_fontprop properties (); 405 rxvt_fontprop properties ();
400 406
401 bool load (const rxvt_fontprop &prop); 407 bool load (const rxvt_fontprop &prop);
402 408
403 bool has_codepoint (uint32_t unicode); 409 bool has_codepoint (unicode_t unicode);
404 410
405 void draw (rxvt_drawable &d, int x, int y, 411 void draw (rxvt_drawable &d, int x, int y,
406 const text_t *text, int len, 412 const text_t *text, int len,
407 int fg, int bg); 413 int fg, int bg);
408 414
… …
655 f = 0; 661 f = 0;
656 } 662 }
657} 663}
658 664
659bool 665bool
660rxvt_font_x11::has_codepoint (uint32_t unicode) 666rxvt_font_x11::has_codepoint (unicode_t unicode)
661{ 667{
662 uint32_t ch = FROM_UNICODE (cs, unicode); 668 uint32_t ch = FROM_UNICODE (cs, unicode);
663 669
664 if (ch == NOCHAR) 670 if (ch == NOCHAR)
665 return false; 671 return false;
… …
727 { 733 {
728 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 734 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
729 735
730 if (bg == Color_bg && !slow) 736 if (bg == Color_bg && !slow)
731 { 737 {
732 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 738 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
733 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 739 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
734 } 740 }
735 else 741 else
736 { 742 {
737 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 743 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
738 744
739 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 745 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
740 746
741 if (slow) 747 if (slow)
742 { 748 {
743 do 749 do
744 { 750 {
745 if (xc->byte1 || xc->byte2) 751 if (xc->byte1 || xc->byte2)
746 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 752 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
747 753
748 x += r->TermWin.fwidth; 754 x += r->TermWin.fwidth;
749 xc++; len--; 755 xc++; len--;
750 } 756 }
751 while (len); 757 while (len);
752 } 758 }
753 else 759 else
754 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 760 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
755 } 761 }
756 } 762 }
757 else 763 else
758 { 764 {
759 const char *xc = enc_char (text, len, cs, slow); 765 const char *xc = enc_char (text, len, cs, slow);
760 766
761 if (bg == Color_bg && !slow) 767 if (bg == Color_bg && !slow)
762 { 768 {
763 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 769 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
764 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 770 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
765 } 771 }
766 else 772 else
767 { 773 {
768 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 774 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
769 775
770 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 776 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
771 777
772 if (slow) 778 if (slow)
773 { 779 {
774 do 780 do
775 { 781 {
776 if (*xc) 782 if (*xc)
777 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 783 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
778 784
779 x += r->TermWin.fwidth; 785 x += r->TermWin.fwidth;
780 xc++; len--; 786 xc++; len--;
781 } 787 }
782 while (len); 788 while (len);
783 } 789 }
784 else 790 else
785 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 791 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
786 } 792 }
787 } 793 }
788} 794}
789 795
790///////////////////////////////////////////////////////////////////////////// 796/////////////////////////////////////////////////////////////////////////////
… …
807 813
808 void draw (rxvt_drawable &d, int x, int y, 814 void draw (rxvt_drawable &d, int x, int y,
809 const text_t *text, int len, 815 const text_t *text, int len,
810 int fg, int bg); 816 int fg, int bg);
811 817
812 bool has_codepoint (uint32_t unicode); 818 bool has_codepoint (unicode_t unicode);
813 819
814protected: 820protected:
815 XftFont *f; 821 XftFont *f;
816}; 822};
817 823
… …
930 936
931 return true; 937 return true;
932} 938}
933 939
934bool 940bool
935rxvt_font_xft::has_codepoint (uint32_t unicode) 941rxvt_font_xft::has_codepoint (unicode_t unicode)
936{ 942{
937 return XftCharExists (DISPLAY, f, unicode); 943 return XftCharExists (DISPLAY, f, unicode);
938} 944}
939 945
940void 946void
… …
1143 1149
1144 return true; 1150 return true;
1145} 1151}
1146 1152
1147int 1153int
1148rxvt_fontset::find_font (uint32_t unicode) 1154rxvt_fontset::find_font (unicode_t unicode)
1149{ 1155{
1150 for (unsigned int i = 0; i < fonts.size (); i++) 1156 for (unsigned int i = 0; i < fonts.size (); i++)
1151 { 1157 {
1152 rxvt_font *f = fonts[i]; 1158 rxvt_font *f = fonts[i];
1153 1159

Diff Legend

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