| … | |
… | |
| 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 | } |
| … | |
… | |
| 995 | } |
995 | } |
| 996 | |
996 | |
| 997 | if (fix_screen || old_height == 0) |
997 | if (fix_screen || old_height == 0) |
| 998 | scr_reset (); |
998 | scr_reset (); |
| 999 | |
999 | |
| 1000 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
|
|
| 1001 | //scr_touch (false); |
|
|
| 1002 | |
|
|
| 1003 | #ifdef HAVE_BG_PIXMAP |
1000 | #ifdef HAVE_BG_PIXMAP |
| 1004 | // TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? |
1001 | // TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? |
| 1005 | // if (bgPixmap.pixmap) |
1002 | // if (bgPixmap.pixmap) |
| 1006 | // scr_touch (false); |
1003 | // scr_touch (false); |
| 1007 | #endif |
1004 | #endif |
| … | |
… | |
| 1165 | |
1162 | |
| 1166 | term->make_current (); |
1163 | term->make_current (); |
| 1167 | |
1164 | |
| 1168 | if (text) |
1165 | if (text) |
| 1169 | { |
1166 | { |
| 1170 | void *str; |
1167 | wchar_t *str; |
| 1171 | |
1168 | |
| 1172 | if (!text->encoding_is_wchar && text->string.multi_byte) |
1169 | if (!text->encoding_is_wchar && text->string.multi_byte) |
| 1173 | { |
1170 | { |
| 1174 | // of course, X makes it ugly again |
1171 | // of course, X makes it ugly again |
| 1175 | if (term->rs[Rs_imLocale]) |
1172 | if (term->rs[Rs_imLocale]) |
| 1176 | SET_LOCALE (term->rs[Rs_imLocale]); |
1173 | SET_LOCALE (term->rs[Rs_imLocale]); |
| 1177 | |
1174 | |
| 1178 | str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); |
1175 | str = rxvt_temp_buf<wchar_t> (text->length + 1); |
| 1179 | mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); |
1176 | mbstowcs (str, text->string.multi_byte, text->length + 1); |
| 1180 | |
1177 | |
| 1181 | if (term->rs[Rs_imLocale]) |
1178 | if (term->rs[Rs_imLocale]) |
| 1182 | SET_LOCALE (term->locale); |
1179 | SET_LOCALE (term->locale); |
| 1183 | } |
1180 | } |
| 1184 | else |
1181 | else |
| 1185 | str = (void *)text->string.wide_char; |
1182 | str = text->string.wide_char; |
| 1186 | |
1183 | |
| 1187 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
1184 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
| 1188 | DT_INT, call_data->caret, |
1185 | DT_INT, call_data->caret, |
| 1189 | DT_INT, call_data->chg_first, |
1186 | DT_INT, call_data->chg_first, |
| 1190 | DT_INT, call_data->chg_length, |
1187 | DT_INT, call_data->chg_length, |
