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.42 by pcg, Mon Mar 15 06:13:35 2004 UTC vs.
Revision 1.44 by pcg, Tue Mar 16 04:52:20 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[] = {
… …
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
205static const char *linedraw_cmds[128] = {
206 "1-", "2-", "1|", "2|",
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 "1H|", "2H1|", "1HV2v", "1Hv2V",
216
217 // 2520
218 "1H2|", "2Hv1V", "2HV1v", "2H|",
219 "1h|", "2h1|", "1hV2v", "1hv2V",
220 "1h2|", "2hv1V", "1v2hV", "2h|",
221 "1-V", "2h1HV", "2H1hV", "2-1V",
222
223 // 2530
224 "1-2V", "2hV1H", "1h2HV", "2-V",
225 "1-v", "1vH2h", "1hv2H", "1v2-",
226 "1-2v", "1H2hv", "1h2Hv", "2-v",
227 "1-|", "1|H2h", "1h|2H", "1|2-",
228
229 // 2540
230 "1-V2v", "1-v2V", "1-2|", "1HV2hv",
231 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2-v",
232 "1v2-V", "1H2h|", "1h2H|", "2-|",
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, "A", "B", "C",
246
247 // 2570
248 "D", "1/", "1\\", "1/\\",
249 "1h", "1v", "1H", "1V",
250 "2h", "2v", "2H", "2V",
251 "1h2H", "1v2V", "1H2h", "1V2v"
252
253 // to be done
254};
255 204
256struct rxvt_font_default : rxvt_font { 205struct rxvt_font_default : rxvt_font {
257 rxvt_fontprop properties () 206 rxvt_fontprop properties ()
258 { 207 {
259 rxvt_fontprop p; 208 rxvt_fontprop p;
… …
281 return true; 230 return true;
282 231
283 if (unicode >= 0x0080 && unicode <= 0x009f) 232 if (unicode >= 0x0080 && unicode <= 0x009f)
284 return true; 233 return true;
285 234
286 if (unicode >= 0x2500 && unicode <= 0x257f 235 if (unicode >= 0x2500 && unicode <= 0x259f)
287 && linedraw_cmds[unicode - 0x2500])
288 return true; 236 return true;
289 237
290 if (IS_COMPOSE (unicode)) 238 if (IS_COMPOSE (unicode))
291 return true; 239 return true;
292 240
… …
302 void draw (rxvt_drawable &d, int x, int y, 250 void draw (rxvt_drawable &d, int x, int y,
303 const text_t *text, int len, 251 const text_t *text, int len,
304 int fg, int bg); 252 int fg, int bg);
305}; 253};
306 254
255static void rect_stipple (Display *display, Drawable d, GC gc, int s1, int s2, int x, int y, int w, int h)
256{
257 XGCValues gcv;
258 char bm[2] = { s1, s2 };
259
260 gcv.fill_style = FillStippled;
261 gcv.stipple = XCreateBitmapFromData (display, d, bm, 2, 2);
262 gcv.ts_x_origin = x;
263 gcv.ts_y_origin = y;
264
265 if (!gcv.stipple)
266 return;
267
268 XChangeGC (display, gc, GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
269 XFillRectangle (display, d, gc, x, y, w, h);
270
271 XFreePixmap (display, gcv.stipple);
272
273 gcv.fill_style = FillSolid;
274 XChangeGC (display, gc, GCFillStyle, &gcv);
275}
276
277#include "table/linedraw.h"
278
307void 279void
308rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 280rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
309 const text_t *text, int len, 281 const text_t *text, int len,
310 int fg, int bg) 282 int fg, int bg)
311{ 283{
312 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 284 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
313 285
314 XSetForeground (d.display->display, GC, r->PixColors[fg]); 286 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
315 287
316 while (len--) 288 while (len--)
317 { 289 {
318#if ENABLE_COMBINING 290#if ENABLE_COMBINING
319 compose_char *cc; 291 compose_char *cc;
320#endif 292#endif
321 text_t t = *text++; 293 text_t t = *text++;
322 294
323 // is it in our linedrawing table? 295 int x_[16];
324 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 296 int y_[16];
325 {
326 const char *p = linedraw_cmds[t - 0x2500];
327 297
328 int W = r->TermWin.fwidth , w = (W - 1) / 2; 298 int W = r->TermWin.fwidth , w = (W - 1) / 2;
329 int H = r->TermWin.fheight, h = (H - 1) / 2; 299 int H = r->TermWin.fheight, h = (H - 1) / 2;
330 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ; 300 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
331 int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight; 301 int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
332 302
303 for (int i = 0; i <= 8; i++)
304 {
305 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
306 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
307 }
308
309 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
310 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
311
312 int i1 = linedraw_offs[t - 0x2500];
313 int i2 = linedraw_offs[t - 0x2500 + 1];
314
333 XGCValues gcv; 315 XGCValues gcv;
334 316
335 gcv.cap_style = CapNotLast; 317 gcv.cap_style = CapButt;
318 gcv.line_width = 0;
336 XChangeGC (d.display->display, GC, GCCapStyle, &gcv); 319 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
337 320
321 if (i1 != i2)
322 {
338 while (*p) 323 while (i1 < i2)
339 { 324 {
325 uint32_t command = linedraw_command [i1++];
326
327 int op = (command >> 24) & 255;
328 int a = (command >> 20) & 15;
329 int b = (command >> 16) & 15;
330 int x1 = x_[(command >> 12) & 15];
331 int y1 = y_[(command >> 8) & 15];
332 int x2 = x_[(command >> 4) & 15];
333 int y2 = y_[(command >> 0) & 15];
334
340 switch (*p++) 335 switch (op)
341 { 336 {
342 case '1': 337 case 0: // line
343 gcv.line_width = 0; 338 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
345 break; 339 break;
346 340
347 case '2': 341 case 1: // rectangle, possibly stippled
348 gcv.line_width = 3; 342 if (a)
343 {
344 static char bm[] = { 0,0 , 1,3 , 2,1 , 0,1 };
345
346 gcv.fill_style = FillStippled;
347 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
348 gcv.ts_x_origin = x;
349 gcv.ts_y_origin = y;
350
351 XChangeGC (d.display->display, TGC,
352 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
353 &gcv);
354 }
355
356
357 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
358
359 if (a)
360 {
361 XFreePixmap (d.display->display, gcv.stipple);
362 gcv.fill_style = FillSolid;
349 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 363 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
364 }
365
350 break; 366 break;
351 367 case 2: // arc
352 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1+1, y1 ); break; 368 break;
353 case 'H': XDrawLine (d.display->display, d, GC, x2, y1, x1-1, y1 ); break;
354 case '-': XDrawLine (d.display->display, d, GC, x0, y1, x2 , y1 ); break;
355 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1 , y1+1); break;
356 case 'V': XDrawLine (d.display->display, d, GC, x1, y2, x1 , y1-1); break;
357 case '|': XDrawLine (d.display->display, d, GC, x1, y0, x1 , y2 ); break;
358
359 case '/' : XDrawLine (d.display->display, d, GC, x0, y2, x2 , y0 ); break;
360 case '\\': XDrawLine (d.display->display, d, GC, x0, y0, x2 , y2 ); break;
361
362 case 'A': XDrawArc (d.display->display, d, GC, x1 , y1 , W-1, H-1, 90*64, 90*64); break;
363 case 'B': XDrawArc (d.display->display, d, GC, x1-W+1, y1 , W-1, H-1, 0*64, 90*64); break;
364 case 'C': XDrawArc (d.display->display, d, GC, x1-W+1, y1-H+1, W-1, H-1, 0*64, -90*64); break;
365 case 'D': XDrawArc (d.display->display, d, GC, x1 , y1-H+1, W-1, H-1, -90*64, -90*64); break;
366 } 369 }
367 } 370 }
368 371
369 gcv.line_width = 0; 372#if 0
370 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 373 case 'A': XDrawArc (d.display->display, d, TGC, x1 , y1 , W-1, H-1, 90*64, 90*64); break;
374 case 'B': XDrawArc (d.display->display, d, TGC, x1-W+1, y1 , W-1, H-1, 0*64, 90*64); break;
375 case 'C': XDrawArc (d.display->display, d, TGC, x1-W+1, y1-H+1, W-1, H-1, 0*64, -90*64); break;
376 case 'D': XDrawArc (d.display->display, d, TGC, x1 , y1-H+1, W-1, H-1, -90*64, -90*64); break;
377
378 case 'i': XFillRectangle (d.display->display, d, TGC, x0, y0, x1 - x0 + 1, y1 - y0 + 1); break;
379 case 'j': XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, y1 - y0 + 1); break;
380 case 'k': XFillRectangle (d.display->display, d, TGC, x0, y1, x1 - x0 + 1, y2 - y1); break;
381 case 'l': XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1, y2 - y1); break;
382 }
371 } 383 }
384#endif
372 385
386 }
373#if ENABLE_COMBINING 387#if ENABLE_COMBINING
374 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 388 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
375 { 389 {
376 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 390 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
377 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 391 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
… …
389 else 403 else
390 switch (t) 404 switch (t)
391 { 405 {
392 case ZERO_WIDTH_CHAR: 406 case ZERO_WIDTH_CHAR:
393 break; 407 break;
408
409#if 0
410 case 0x2580: XFillRectangle (d.display->display, d, TGC, x0, y0, W, y1 - y0 + 1); break;
411 case 0x2581: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 7 - 1) / 8, W, H - (H * 7 - 1) / 8); break;
412 case 0x2582: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 6 - 2) / 8, W, H - (H * 6 - 2) / 8); break;
413 case 0x2583: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 5 - 3) / 8, W, H - (H * 5 - 3) / 8); break;
414 case 0x2584: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 4 - 4) / 8, W, H - (H * 4 - 4) / 8); break;
415 case 0x2585: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 3 - 5) / 8, W, H - (H * 3 - 5) / 8); break;
416 case 0x2586: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 2 - 6) / 8, W, H - (H * 2 - 6) / 8); break;
417 case 0x2587: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 1 - 7) / 8, W, H - (H * 1 - 7) / 8); break;
418 case 0x2588: XFillRectangle (d.display->display, d, TGC, x0, y0, W, H); break;
419 case 0x2589: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 7 - 1) / 8, H); break;
420 case 0x258a: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 6 - 2) / 8, H); break;
421 case 0x258b: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 5 - 3) / 8, H); break;
422 case 0x258c: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 4 - 4) / 8, H); break;
423 case 0x258d: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 3 - 5) / 8, H); break;
424 case 0x258e: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 2 - 6) / 8, H); break;
425 case 0x258f: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 1 - 7) / 8, H); break;
426 case 0x2590: XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, H); break;
427
428 case 0x2591: rect_stipple (d.display->display, d, TGC, 0x00, 0x01, x0, y0, W, H); break;
429 case 0x2592: rect_stipple (d.display->display, d, TGC, 0x02, 0x01, x0, y0, W, H); break;
430 case 0x2593: rect_stipple (d.display->display, d, TGC, 0x01, 0x03, x0, y0, W, H); break;
431
432 case 0x2594: XFillRectangle (d.display->display, d, TGC, x0, y0, W, (H * 1 - 7) / 8); break;
433 case 0x2595: XFillRectangle (d.display->display, d, TGC, x0 + (W * 7 - 1) / 8, y0, W - (W * 7 - 1) / 8, H); break;
434#endif
435
394 default: 436 default:
395 int w = 0; 437 int w = 0;
396 while (len > 0 && *text == NOCHAR) 438 while (len > 0 && *text == NOCHAR)
397 { 439 {
398 ++text; 440 ++text;
399 --len; 441 --len;
400 w += r->TermWin.fwidth; 442 w += r->TermWin.fwidth;
401 } 443 }
402 444
403 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 445 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
404 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 446 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
405 x += w; 447 x += w;
406 } 448 }
407 449
408 x += r->TermWin.fwidth; 450 x += r->TermWin.fwidth;
409 } 451 }
… …
747 { 789 {
748 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 790 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
749 791
750 if (bg == Color_bg && !slow) 792 if (bg == Color_bg && !slow)
751 { 793 {
752 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 794 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
753 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 795 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
754 } 796 }
755 else 797 else
756 { 798 {
757 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 799 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
758 800
759 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 801 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
760 802
761 if (slow) 803 if (slow)
762 { 804 {
763 do 805 do
764 { 806 {
765 if (xc->byte1 || xc->byte2) 807 if (xc->byte1 || xc->byte2)
766 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 808 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
767 809
768 x += r->TermWin.fwidth; 810 x += r->TermWin.fwidth;
769 xc++; len--; 811 xc++; len--;
770 } 812 }
771 while (len); 813 while (len);
772 } 814 }
773 else 815 else
774 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 816 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
775 } 817 }
776 } 818 }
777 else 819 else
778 { 820 {
779 const char *xc = enc_char (text, len, cs, slow); 821 const char *xc = enc_char (text, len, cs, slow);
780 822
781 if (bg == Color_bg && !slow) 823 if (bg == Color_bg && !slow)
782 { 824 {
783 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 825 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
784 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 826 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
785 } 827 }
786 else 828 else
787 { 829 {
788 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 830 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
789 831
790 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 832 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
791 833
792 if (slow) 834 if (slow)
793 { 835 {
794 do 836 do
795 { 837 {
796 if (*xc) 838 if (*xc)
797 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 839 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
798 840
799 x += r->TermWin.fwidth; 841 x += r->TermWin.fwidth;
800 xc++; len--; 842 xc++; len--;
801 } 843 }
802 while (len); 844 while (len);
803 } 845 }
804 else 846 else
805 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 847 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
806 } 848 }
807 } 849 }
808} 850}
809 851
810///////////////////////////////////////////////////////////////////////////// 852/////////////////////////////////////////////////////////////////////////////

Diff Legend

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