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.43 by pcg, Mon Mar 15 07:10:47 2004 UTC vs.
Revision 1.44 by pcg, Tue Mar 16 04:52:20 2004 UTC

… …
200 XFillRectangle (d.display->display, d, TGC, 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 + 32] = {
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 // 2580
254 0, 0, 0, 0,
255 0, 0, 0, 0,
256 0, 0, 0, 0,
257 0, 0, 0, 0,
258
259 // 2590
260 0, 0, 0, 0,
261 0, 0, "k", "l",
262 "i", "ikl", "il", "ijk",
263 "ijl", "j", "jk", "jkl",
264
265 // to be done
266};
267
268struct rxvt_font_default : rxvt_font { 205struct rxvt_font_default : rxvt_font {
269 rxvt_fontprop properties () 206 rxvt_fontprop properties ()
270 { 207 {
271 rxvt_fontprop p; 208 rxvt_fontprop p;
272 209
… …
293 return true; 230 return true;
294 231
295 if (unicode >= 0x0080 && unicode <= 0x009f) 232 if (unicode >= 0x0080 && unicode <= 0x009f)
296 return true; 233 return true;
297 234
298 if (unicode >= 0x2500 && unicode <= 0x257f
299 && linedraw_cmds[unicode - 0x2500])
300 return true;
301
302 if (unicode >= 0x2580 && unicode <= 0x259f) 235 if (unicode >= 0x2500 && unicode <= 0x259f)
303 return true; 236 return true;
304 237
305 if (IS_COMPOSE (unicode)) 238 if (IS_COMPOSE (unicode))
306 return true; 239 return true;
307 240
… …
339 272
340 gcv.fill_style = FillSolid; 273 gcv.fill_style = FillSolid;
341 XChangeGC (display, gc, GCFillStyle, &gcv); 274 XChangeGC (display, gc, GCFillStyle, &gcv);
342} 275}
343 276
277#include "table/linedraw.h"
278
344void 279void
345rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 280rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
346 const text_t *text, int len, 281 const text_t *text, int len,
347 int fg, int bg) 282 int fg, int bg)
348{ 283{
… …
355#if ENABLE_COMBINING 290#if ENABLE_COMBINING
356 compose_char *cc; 291 compose_char *cc;
357#endif 292#endif
358 text_t t = *text++; 293 text_t t = *text++;
359 294
295 int x_[16];
296 int y_[16];
297
360 int W = r->TermWin.fwidth , w = (W - 1) / 2; 298 int W = r->TermWin.fwidth , w = (W - 1) / 2;
361 int H = r->TermWin.fheight, h = (H - 1) / 2; 299 int H = r->TermWin.fheight, h = (H - 1) / 2;
362 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ; 300 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
363 int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight; 301 int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
364 302
365 // is it in our linedrawing table? 303 for (int i = 0; i <= 8; i++)
366 if (t >= 0x2500 & t <= 0x259f && linedraw_cmds[t - 0x2500]) 304 {
305 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
306 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
367 { 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
368 const char *p = linedraw_cmds[t - 0x2500]; 312 int i1 = linedraw_offs[t - 0x2500];
313 int i2 = linedraw_offs[t - 0x2500 + 1];
369 314
370 XGCValues gcv; 315 XGCValues gcv;
371 316
372 gcv.cap_style = CapNotLast; 317 gcv.cap_style = CapButt;
318 gcv.line_width = 0;
373 XChangeGC (d.display->display, TGC, GCCapStyle, &gcv); 319 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
374 320
321 if (i1 != i2)
322 {
375 while (*p) 323 while (i1 < i2)
376 { 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
377 switch (*p++) 335 switch (op)
378 { 336 {
379 case '1': 337 case 0: // line
380 gcv.line_width = 0; 338 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
381 XChangeGC (d.display->display, TGC, GCLineWidth, &gcv);
382 break; 339 break;
383 340
384 case '2': 341 case 1: // rectangle, possibly stippled
385 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;
386 XChangeGC (d.display->display, TGC, GCLineWidth, &gcv); 363 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
364 }
365
387 break; 366 break;
367 case 2: // arc
368 break;
369 }
370 }
388 371
389 case 'h': XDrawLine (d.display->display, d, TGC, x0, y1, x1+1, y1 ); break; 372#if 0
390 case 'H': XDrawLine (d.display->display, d, TGC, x1, y1, x2 , y1 ); break;
391 case '-': XDrawLine (d.display->display, d, TGC, x0, y1, x2 , y1 ); break;
392 case 'v': XDrawLine (d.display->display, d, TGC, x1, y0, x1 , y1+1); break;
393 case 'V': XDrawLine (d.display->display, d, TGC, x1, y1, x1 , y2 ); break;
394 case '|': XDrawLine (d.display->display, d, TGC, x1, y0, x1 , y2 ); break;
395
396 case '/' : XDrawLine (d.display->display, d, TGC, x0, y2, x2 , y0 ); break;
397 case '\\': XDrawLine (d.display->display, d, TGC, x0, y0, x2 , y2 ); break;
398
399 case 'A': XDrawArc (d.display->display, d, TGC, x1 , y1 , W-1, H-1, 90*64, 90*64); break; 373 case 'A': XDrawArc (d.display->display, d, TGC, x1 , y1 , W-1, H-1, 90*64, 90*64); break;
400 case 'B': XDrawArc (d.display->display, d, TGC, x1-W+1, y1 , W-1, H-1, 0*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;
401 case 'C': XDrawArc (d.display->display, d, TGC, x1-W+1, y1-H+1, 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;
402 case 'D': XDrawArc (d.display->display, d, TGC, x1 , y1-H+1, W-1, H-1, -90*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;
403 377
… …
405 case 'j': XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, y1 - y0 + 1); break; 379 case 'j': XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, y1 - y0 + 1); break;
406 case 'k': XFillRectangle (d.display->display, d, TGC, x0, y1, x1 - x0 + 1, y2 - y1); break; 380 case 'k': XFillRectangle (d.display->display, d, TGC, x0, y1, x1 - x0 + 1, y2 - y1); break;
407 case 'l': XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1, y2 - y1); break; 381 case 'l': XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1, y2 - y1); break;
408 } 382 }
409 } 383 }
384#endif
410 385
411 gcv.line_width = 0;
412 XChangeGC (d.display->display, TGC, GCLineWidth, &gcv);
413 } 386 }
414
415#if ENABLE_COMBINING 387#if ENABLE_COMBINING
416 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 388 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
417 { 389 {
418 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 390 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
419 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 391 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
… …
432 switch (t) 404 switch (t)
433 { 405 {
434 case ZERO_WIDTH_CHAR: 406 case ZERO_WIDTH_CHAR:
435 break; 407 break;
436 408
409#if 0
437 case 0x2580: XFillRectangle (d.display->display, d, TGC, x0, y0, W, y1 - y0 + 1); break; 410 case 0x2580: XFillRectangle (d.display->display, d, TGC, x0, y0, W, y1 - y0 + 1); break;
438 case 0x2581: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 7 - 1) / 8, W, H - (H * 7 - 1) / 8); break; 411 case 0x2581: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 7 - 1) / 8, W, H - (H * 7 - 1) / 8); break;
439 case 0x2582: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 6 - 2) / 8, W, H - (H * 6 - 2) / 8); break; 412 case 0x2582: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 6 - 2) / 8, W, H - (H * 6 - 2) / 8); break;
440 case 0x2583: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 5 - 3) / 8, W, H - (H * 5 - 3) / 8); break; 413 case 0x2583: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 5 - 3) / 8, W, H - (H * 5 - 3) / 8); break;
441 case 0x2584: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 4 - 4) / 8, W, H - (H * 4 - 4) / 8); break; 414 case 0x2584: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 4 - 4) / 8, W, H - (H * 4 - 4) / 8); break;
… …
456 case 0x2592: rect_stipple (d.display->display, d, TGC, 0x02, 0x01, x0, y0, W, H); break; 429 case 0x2592: rect_stipple (d.display->display, d, TGC, 0x02, 0x01, x0, y0, W, H); break;
457 case 0x2593: rect_stipple (d.display->display, d, TGC, 0x01, 0x03, x0, y0, W, H); break; 430 case 0x2593: rect_stipple (d.display->display, d, TGC, 0x01, 0x03, x0, y0, W, H); break;
458 431
459 case 0x2594: XFillRectangle (d.display->display, d, TGC, x0, y0, W, (H * 1 - 7) / 8); break; 432 case 0x2594: XFillRectangle (d.display->display, d, TGC, x0, y0, W, (H * 1 - 7) / 8); break;
460 case 0x2595: XFillRectangle (d.display->display, d, TGC, x0 + (W * 7 - 1) / 8, y0, W - (W * 7 - 1) / 8, H); 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
461 435
462 default: 436 default:
463 int w = 0; 437 int w = 0;
464 while (len > 0 && *text == NOCHAR) 438 while (len > 0 && *text == NOCHAR)
465 { 439 {

Diff Legend

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