| … | |
… | |
| 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 () |
| … | |
… | |
| 308 | return false; |
306 | return false; |
| 309 | |
307 | |
| 310 | if (unicode <= 0x009f) |
308 | if (unicode <= 0x009f) |
| 311 | return true; |
309 | return true; |
| 312 | |
310 | |
|
|
311 | #ifdef BUILTIN_GLYPHS |
| 313 | if (unicode >= 0x2500 && unicode <= 0x259f && |
312 | if (unicode >= 0x2500 && unicode <= 0x259f && |
| 314 | !term->option (Opt_skipBuiltinGlyphs)) |
313 | !term->option (Opt_skipBuiltinGlyphs)) |
| 315 | return true; |
314 | return true; |
|
|
315 | #endif |
| 316 | |
316 | |
| 317 | if (IS_COMPOSE (unicode)) |
317 | if (IS_COMPOSE (unicode)) |
| 318 | return true; |
318 | return true; |
| 319 | |
319 | |
| 320 | switch (unicode) |
320 | switch (unicode) |
| … | |
… | |
| 356 | ; |
356 | ; |
| 357 | |
357 | |
| 358 | int width = text - tp; |
358 | int width = text - tp; |
| 359 | int fwidth = term->fwidth * width; |
359 | int fwidth = term->fwidth * width; |
| 360 | |
360 | |
|
|
361 | #ifdef BUILTIN_GLYPHS |
| 361 | if (0x2500 <= t && t <= 0x259f) |
362 | if (0x2500 <= t && t <= 0x259f) |
| 362 | { |
363 | { |
|
|
364 | # include "table/linedraw.h" |
| 363 | uint16_t offs = linedraw_offs[t - 0x2500]; |
365 | uint16_t offs = linedraw_offs[t - 0x2500]; |
| 364 | uint32_t *a = linedraw_command + (offs >> 4); |
366 | uint32_t *a = linedraw_command + (offs >> 4); |
| 365 | uint32_t *b = a + (offs & 15); |
367 | uint32_t *b = a + (offs & 15); |
| 366 | |
368 | |
| 367 | int W = fwidth; |
369 | int W = fwidth; |
| … | |
… | |
| 434 | (a - 1) * 90*64, (b - 1) * 90*64); |
436 | (a - 1) * 90*64, (b - 1) * 90*64); |
| 435 | break; |
437 | break; |
| 436 | } |
438 | } |
| 437 | } |
439 | } |
| 438 | } |
440 | } |
|
|
441 | #else |
|
|
442 | if (0) |
|
|
443 | ; |
|
|
444 | #endif |
| 439 | #if ENABLE_COMBINING |
445 | #if ENABLE_COMBINING |
| 440 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
446 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
| 441 | { |
447 | { |
| 442 | min_it (width, 2); // we only support wcwidth up to 2 |
448 | min_it (width, 2); // we only support wcwidth up to 2 |
| 443 | |
449 | |
