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.41 by pcg, Mon Mar 15 01:27:46 2004 UTC vs.
Revision 1.45 by pcg, Tue Mar 16 05:51:36 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 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
273 set_name ("built-in pseudofont"); 225 set_name (strdup ("built-in pseudofont"));
274 226
275 return true; 227 return true;
276 } 228 }
277 229
278 bool has_codepoint (unicode_t unicode) 230 bool has_codepoint (unicode_t unicode)
… …
281 return true; 233 return true;
282 234
283 if (unicode >= 0x0080 && unicode <= 0x009f) 235 if (unicode >= 0x0080 && unicode <= 0x009f)
284 return true; 236 return true;
285 237
286 if (unicode >= 0x2500 && unicode <= 0x257f 238 if (unicode >= 0x2500 && unicode <= 0x259f
287 && linedraw_cmds[unicode - 0x2500]) 239 && linedraw_offs[unicode - 0x2500] & 15)
288 return true; 240 return true;
289 241
290 if (IS_COMPOSE (unicode)) 242 if (IS_COMPOSE (unicode))
291 return true; 243 return true;
292 244
… …
307void 259void
308rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 260rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
309 const text_t *text, int len, 261 const text_t *text, int len,
310 int fg, int bg) 262 int fg, int bg)
311{ 263{
264return;
312 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 265 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
313 266
314 XSetForeground (d.display->display, GC, r->PixColors[fg]); 267 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
315 268
316 while (len--) 269 while (len--)
317 { 270 {
318#if ENABLE_COMBINING 271#if ENABLE_COMBINING
319 compose_char *cc; 272 compose_char *cc;
320#endif 273#endif
321 text_t t = *text++; 274 text_t t = *text++;
322 275
323 // is it in our linedrawing table? 276 int W = r->TermWin.fwidth , w = (W - 1) / 2;
324 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 277 int H = r->TermWin.fheight, h = (H - 1) / 2;
278 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
279 int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
280
281 if (0x2500 <= t && t <= 0x259f
282 && linedraw_offs[t - 0x2500] & 15)
283 {
284 uint16_t offs = linedraw_offs[t - 0x2500];
285 uint32_t *a = linedraw_command + (offs >> 4);
286 uint32_t *b = a + (offs & 15);
287
288 int x_[16];
289 int y_[16];
290
291 for (int i = 0; i <= 8; i++)
325 { 292 {
326 const char *p = linedraw_cmds[t - 0x2500]; 293 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
294 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
295 }
327 296
328 int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; 297 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
329 int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; 298 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
330 299
331 XGCValues gcv; 300 XGCValues gcv;
332 301
302 gcv.cap_style = CapButt;
303 gcv.line_width = 0;
304 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
305
333 while (*p) 306 while (a < b)
334 { 307 {
308 uint32_t command = *a++;
309
310 int op = (command >> 24) & 255;
311 int a = (command >> 20) & 15;
312 int b = (command >> 16) & 15;
313 int x1 = x_[(command >> 12) & 15];
314 int y1 = y_[(command >> 8) & 15];
315 int x2 = x_[(command >> 4) & 15];
316 int y2 = y_[(command >> 0) & 15];
317
335 switch (*p++) 318 switch (op)
336 { 319 {
337 case '1': 320 case 0: // line
338 gcv.line_width = 0; 321 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
339 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
340 break; 322 break;
341 323
342 case '2': 324 case 1: // rectangle, possibly stippled
325 if (a)
326 {
327 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
328
329 gcv.fill_style = FillStippled;
330 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
331 gcv.ts_x_origin = x;
332 gcv.ts_y_origin = y;
333
334 XChangeGC (d.display->display, TGC,
335 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
336 &gcv);
337 }
338
339
340 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
341
342 if (a)
343 {
344 XFreePixmap (d.display->display, gcv.stipple);
343 gcv.line_width = 2; 345 gcv.stipple = 0;
346 gcv.fill_style = FillSolid;
344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
348 }
349
345 break; 350 break;
346 351 case 2: // arc
347 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 352 XDrawArc (d.display->display, d, TGC,
348 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 353 x1 - W/2, y1 - H/2, W-1, H-1,
349 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 354 (a - 1) * 90*64, (b - 1) * 90*64);
350 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 355 break;
351 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
352 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
353 } 356 }
354 } 357 }
355
356 gcv.line_width = 0;
357 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
358 } 358 }
359#if ENABLE_COMBINING 359#if ENABLE_COMBINING
360 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 360 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
361 { 361 {
362 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 362 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
… …
375 else 375 else
376 switch (t) 376 switch (t)
377 { 377 {
378 case ZERO_WIDTH_CHAR: 378 case ZERO_WIDTH_CHAR:
379 break; 379 break;
380
380 default: 381 default:
381 int w = 0; 382 int w = 0;
382 while (len > 0 && *text == NOCHAR) 383 while (len > 0 && *text == NOCHAR)
383 { 384 {
384 ++text; 385 ++text;
385 --len; 386 --len;
386 w += r->TermWin.fwidth; 387 w += r->TermWin.fwidth;
387 } 388 }
388 389
389 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 390 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
390 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 391 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
391 x += w; 392 x += w;
392 } 393 }
393 394
394 x += r->TermWin.fwidth; 395 x += r->TermWin.fwidth;
395 } 396 }
… …
733 { 734 {
734 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 735 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
735 736
736 if (bg == Color_bg && !slow) 737 if (bg == Color_bg && !slow)
737 { 738 {
738 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 739 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
739 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 740 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
740 } 741 }
741 else 742 else
742 { 743 {
743 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 744 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
744 745
745 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 746 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
746 747
747 if (slow) 748 if (slow)
748 { 749 {
749 do 750 do
750 { 751 {
751 if (xc->byte1 || xc->byte2) 752 if (xc->byte1 || xc->byte2)
752 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 753 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
753 754
754 x += r->TermWin.fwidth; 755 x += r->TermWin.fwidth;
755 xc++; len--; 756 xc++; len--;
756 } 757 }
757 while (len); 758 while (len);
758 } 759 }
759 else 760 else
760 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 761 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
761 } 762 }
762 } 763 }
763 else 764 else
764 { 765 {
765 const char *xc = enc_char (text, len, cs, slow); 766 const char *xc = enc_char (text, len, cs, slow);
766 767
767 if (bg == Color_bg && !slow) 768 if (bg == Color_bg && !slow)
768 { 769 {
769 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 770 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
770 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 771 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
771 } 772 }
772 else 773 else
773 { 774 {
774 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 775 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
775 776
776 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 777 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
777 778
778 if (slow) 779 if (slow)
779 { 780 {
780 do 781 do
781 { 782 {
782 if (*xc) 783 if (*xc)
783 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 784 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
784 785
785 x += r->TermWin.fwidth; 786 x += r->TermWin.fwidth;
786 xc++; len--; 787 xc++; len--;
787 } 788 }
788 while (len); 789 while (len);
789 } 790 }
790 else 791 else
791 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 792 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
792 } 793 }
793 } 794 }
794} 795}
795 796
796///////////////////////////////////////////////////////////////////////////// 797/////////////////////////////////////////////////////////////////////////////

Diff Legend

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