| … | |
… | |
| 262 | } |
262 | } |
| 263 | } |
263 | } |
| 264 | |
264 | |
| 265 | ///////////////////////////////////////////////////////////////////////////// |
265 | ///////////////////////////////////////////////////////////////////////////// |
| 266 | |
266 | |
| 267 | #include "table/linedraw.h" |
|
|
| 268 | |
|
|
| 269 | struct rxvt_font_default : rxvt_font { |
267 | struct rxvt_font_default : rxvt_font { |
| 270 | struct rxvt_fontset *fs; |
268 | struct rxvt_fontset *fs; |
| 271 | |
269 | |
| 272 | rxvt_font_default (rxvt_fontset *fs) |
270 | rxvt_font_default (rxvt_fontset *fs) |
| 273 | : rxvt_font () |
271 | : rxvt_font () |
| … | |
… | |
| 356 | ; |
354 | ; |
| 357 | |
355 | |
| 358 | int width = text - tp; |
356 | int width = text - tp; |
| 359 | int fwidth = term->fwidth * width; |
357 | int fwidth = term->fwidth * width; |
| 360 | |
358 | |
|
|
359 | #ifdef BUILTIN_GLYPHS |
| 361 | if (0x2500 <= t && t <= 0x259f) |
360 | if (0x2500 <= t && t <= 0x259f) |
| 362 | { |
361 | { |
|
|
362 | # include "table/linedraw.h" |
| 363 | uint16_t offs = linedraw_offs[t - 0x2500]; |
363 | uint16_t offs = linedraw_offs[t - 0x2500]; |
| 364 | uint32_t *a = linedraw_command + (offs >> 4); |
364 | uint32_t *a = linedraw_command + (offs >> 4); |
| 365 | uint32_t *b = a + (offs & 15); |
365 | uint32_t *b = a + (offs & 15); |
| 366 | |
366 | |
| 367 | int W = fwidth; |
367 | int W = fwidth; |
| … | |
… | |
| 434 | (a - 1) * 90*64, (b - 1) * 90*64); |
434 | (a - 1) * 90*64, (b - 1) * 90*64); |
| 435 | break; |
435 | break; |
| 436 | } |
436 | } |
| 437 | } |
437 | } |
| 438 | } |
438 | } |
|
|
439 | #else |
|
|
440 | if (0) |
|
|
441 | ; |
|
|
442 | #endif |
| 439 | #if ENABLE_COMBINING |
443 | #if ENABLE_COMBINING |
| 440 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
444 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
| 441 | { |
445 | { |
| 442 | min_it (width, 2); // we only support wcwidth up to 2 |
446 | min_it (width, 2); // we only support wcwidth up to 2 |
| 443 | |
447 | |
