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.45 by pcg, Tue Mar 16 05:51:36 2004 UTC vs.
Revision 1.47 by pcg, Tue Mar 16 06:04:28 2004 UTC

… …
233 return true; 233 return true;
234 234
235 if (unicode >= 0x0080 && unicode <= 0x009f) 235 if (unicode >= 0x0080 && unicode <= 0x009f)
236 return true; 236 return true;
237 237
238 if (unicode >= 0x2500 && unicode <= 0x259f 238 if (unicode >= 0x2500 && unicode <= 0x259f)
239 && linedraw_offs[unicode - 0x2500] & 15)
240 return true; 239 return true;
241 240
242 if (IS_COMPOSE (unicode)) 241 if (IS_COMPOSE (unicode))
243 return true; 242 return true;
244 243
… …
259void 258void
260rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 259rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
261 const text_t *text, int len, 260 const text_t *text, int len,
262 int fg, int bg) 261 int fg, int bg)
263{ 262{
264return;
265 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);
266 264
267 XSetForeground (d.display->display, TGC, r->PixColors[fg]); 265 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
268 266
269 while (len--) 267 while (len--)
… …
271#if ENABLE_COMBINING 269#if ENABLE_COMBINING
272 compose_char *cc; 270 compose_char *cc;
273#endif 271#endif
274 text_t t = *text++; 272 text_t t = *text++;
275 273
276 int W = r->TermWin.fwidth , w = (W - 1) / 2;
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 274 if (0x2500 <= t && t <= 0x259f)
282 && linedraw_offs[t - 0x2500] & 15)
283 { 275 {
284 uint16_t offs = linedraw_offs[t - 0x2500]; 276 uint16_t offs = linedraw_offs[t - 0x2500];
285 uint32_t *a = linedraw_command + (offs >> 4); 277 uint32_t *a = linedraw_command + (offs >> 4);
286 uint32_t *b = a + (offs & 15); 278 uint32_t *b = a + (offs & 15);
279
280 int W = r->TermWin.fwidth;
281 int H = r->TermWin.fheight;
287 282
288 int x_[16]; 283 int x_[16];
289 int y_[16]; 284 int y_[16];
290 285
291 for (int i = 0; i <= 8; i++) 286 for (int i = 0; i <= 8; i++)
… …
334 XChangeGC (d.display->display, TGC, 329 XChangeGC (d.display->display, TGC,
335 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 330 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
336 &gcv); 331 &gcv);
337 } 332 }
338 333
339
340 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 334 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
341 335
342 if (a) 336 if (a)
343 { 337 {
344 XFreePixmap (d.display->display, gcv.stipple); 338 XFreePixmap (d.display->display, gcv.stipple);
345 gcv.stipple = 0; 339 gcv.stipple = 0;
346 gcv.fill_style = FillSolid; 340 gcv.fill_style = FillSolid;
347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 341 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
348 } 342 }
349
350 break; 343 break;
351 case 2: // arc 344 case 2: // arc
352 XDrawArc (d.display->display, d, TGC, 345 XDrawArc (d.display->display, d, TGC,
353 x1 - W/2, y1 - H/2, W-1, H-1, 346 x1 - W/2, y1 - H/2, W-1, H-1,
354 (a - 1) * 90*64, (b - 1) * 90*64); 347 (a - 1) * 90*64, (b - 1) * 90*64);

Diff Legend

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