| … | |
… | |
| 343 | { |
343 | { |
| 344 | uint16_t offs = linedraw_offs[t - 0x2500]; |
344 | uint16_t offs = linedraw_offs[t - 0x2500]; |
| 345 | uint32_t *a = linedraw_command + (offs >> 4); |
345 | uint32_t *a = linedraw_command + (offs >> 4); |
| 346 | uint32_t *b = a + (offs & 15); |
346 | uint32_t *b = a + (offs & 15); |
| 347 | |
347 | |
| 348 | int W = r->TermWin.fwidth; |
348 | int W = r->TermWin.fwidth * wcwidth (t); |
| 349 | int H = r->TermWin.fheight; |
349 | int H = r->TermWin.fheight; |
| 350 | |
350 | |
| 351 | int x_[16]; |
351 | int x_[16]; |
| 352 | int y_[16]; |
352 | int y_[16]; |
| 353 | |
353 | |
| … | |
… | |
| 1056 | return false; |
1056 | return false; |
| 1057 | |
1057 | |
| 1058 | FcValue v; |
1058 | FcValue v; |
| 1059 | |
1059 | |
| 1060 | if (prop.height != rxvt_fontprop::unset |
1060 | if (prop.height != rxvt_fontprop::unset |
| 1061 | || FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) |
1061 | || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
|
|
1062 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
| 1062 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1063 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
| 1063 | |
1064 | |
| 1064 | if (prop.weight != rxvt_fontprop::unset |
1065 | if (prop.weight != rxvt_fontprop::unset |
| 1065 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1066 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
| 1066 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1067 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
