| … | |
… | |
| 1317 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1317 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
| 1318 | } |
1318 | } |
| 1319 | |
1319 | |
| 1320 | if (!width) |
1320 | if (!width) |
| 1321 | { |
1321 | { |
| 1322 | rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); |
1322 | rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name); |
| 1323 | |
1323 | width = f->max_advance_width; |
| 1324 | XftFontClose (disp, f); |
|
|
| 1325 | f = 0; |
|
|
| 1326 | |
|
|
| 1327 | success = false; |
|
|
| 1328 | break; |
1324 | break; |
| 1329 | } |
1325 | } |
| 1330 | |
1326 | |
| 1331 | if (prop.height == rxvt_fontprop::unset |
1327 | if (prop.height == rxvt_fontprop::unset |
| 1332 | || (height <= prop.height && glheight <= prop.height) |
1328 | || (height <= prop.height && glheight <= prop.height) |
