… | |
… | |
764 | |
764 | |
765 | delete fontset[0]; |
765 | delete fontset[0]; |
766 | fontset[0] = fs; |
766 | fontset[0] = fs; |
767 | |
767 | |
768 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
768 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
769 | prop.height += lineSpace; |
|
|
770 | prop.width += letterSpace; |
769 | prop.width += letterSpace; |
771 | |
770 | |
772 | fs->set_prop (prop, false); |
771 | fs->set_prop (prop, false); |
773 | |
772 | |
774 | fwidth = prop.width; |
773 | fwidth = prop.width; |
775 | fheight = prop.height; |
774 | fheight = prop.height + lineSpace; |
776 | fbase = prop.ascent; |
775 | fbase = prop.ascent; |
777 | |
776 | |
778 | for (int style = 1; style < 4; style++) |
777 | for (int style = 1; style < 4; style++) |
779 | { |
778 | { |
780 | #if ENABLE_STYLES |
779 | #if ENABLE_STYLES |
… | |
… | |
1564 | |
1563 | |
1565 | /* try with no modifiers base IF the user didn't specify an IM */ |
1564 | /* try with no modifiers base IF the user didn't specify an IM */ |
1566 | if (im_get_ic ("@im=none")) |
1565 | if (im_get_ic ("@im=none")) |
1567 | goto done; |
1566 | goto done; |
1568 | |
1567 | |
1569 | done: ; |
1568 | done: |
1570 | if (rs[Rs_imLocale]) |
1569 | if (rs[Rs_imLocale]) |
1571 | SET_LOCALE (locale); |
1570 | SET_LOCALE (locale); |
1572 | } |
1571 | } |
1573 | |
1572 | |
1574 | void |
1573 | void |