| … | |
… | |
| 101 | { |
101 | { |
| 102 | if (cc->c2 == c2) return c1; |
102 | if (cc->c2 == c2) return c1; |
| 103 | cc = (*this)[cc->c1]; |
103 | cc = (*this)[cc->c1]; |
| 104 | } |
104 | } |
| 105 | |
105 | |
| 106 | // check to see wether this combination already exists otherwise |
106 | // check to see whether this combination already exists otherwise |
| 107 | for (cc = v.end (); cc-- > v.begin (); ) |
107 | for (cc = v.end (); cc-- > v.begin (); ) |
| 108 | { |
108 | { |
| 109 | if (cc->c1 == c1 && cc->c2 == c2) |
109 | if (cc->c1 == c1 && cc->c2 == c2) |
| 110 | return COMPOSE_LO + (cc - v.begin ()); |
110 | return COMPOSE_LO + (cc - v.begin ()); |
| 111 | } |
111 | } |
| … | |
… | |
| 688 | #endif |
688 | #endif |
| 689 | |
689 | |
| 690 | delete fontset[0]; |
690 | delete fontset[0]; |
| 691 | fontset[0] = fs; |
691 | fontset[0] = fs; |
| 692 | |
692 | |
| 693 | prop = (*fs)[1]->properties (); |
693 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
| 694 | prop.height += lineSpace; |
694 | prop.height += lineSpace; |
| 695 | prop.width += letterSpace; |
695 | prop.width += letterSpace; |
| 696 | |
696 | |
| 697 | fs->set_prop (prop, false); |
697 | fs->set_prop (prop, false); |
| 698 | |
698 | |
