| … | |
… | |
| 237 | #endif |
237 | #endif |
| 238 | |
238 | |
| 239 | if (display) |
239 | if (display) |
| 240 | { |
240 | { |
| 241 | selection_clear (); |
241 | selection_clear (); |
|
|
242 | selection_clear (true); |
| 242 | |
243 | |
| 243 | #ifdef USE_XIM |
244 | #ifdef USE_XIM |
| 244 | im_destroy (); |
245 | im_destroy (); |
| 245 | #endif |
246 | #endif |
| 246 | scrollBar.destroy (); |
247 | scrollBar.destroy (); |
| … | |
… | |
| 271 | /* clear all resources */ |
272 | /* clear all resources */ |
| 272 | for (int i = 0; i < allocated.size (); i++) |
273 | for (int i = 0; i < allocated.size (); i++) |
| 273 | free (allocated [i]); |
274 | free (allocated [i]); |
| 274 | |
275 | |
| 275 | free (selection.text); |
276 | free (selection.text); |
|
|
277 | free (selection.clip_text); |
| 276 | // TODO: manage env vars in child only(!) |
278 | // TODO: manage env vars in child only(!) |
| 277 | free (env_display); |
279 | free (env_display); |
| 278 | free (env_term); |
280 | free (env_term); |
| 279 | free (locale); |
281 | free (locale); |
| 280 | free (v_buffer); |
282 | free (v_buffer); |
| … | |
… | |
| 646 | |
648 | |
| 647 | ws.ws_col = ncol; |
649 | ws.ws_col = ncol; |
| 648 | ws.ws_row = nrow; |
650 | ws.ws_row = nrow; |
| 649 | ws.ws_xpixel = width; |
651 | ws.ws_xpixel = width; |
| 650 | ws.ws_ypixel = height; |
652 | ws.ws_ypixel = height; |
| 651 | (void)ioctl (pty->pty, TIOCSWINSZ, &ws); |
653 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
| 652 | |
654 | |
| 653 | #if 0 |
655 | #if 0 |
| 654 | // TIOCSWINSZ is supposed to do this automatically and correctly |
656 | // TIOCSWINSZ is supposed to do this automatically and correctly |
| 655 | if (cmd_pid) /* force through to the command */ |
657 | if (cmd_pid) /* force through to the command */ |
| 656 | kill (-cmd_pid, SIGWINCH); |
658 | kill (-cmd_pid, SIGWINCH); |
| … | |
… | |
| 688 | delete fontset[0]; |
690 | delete fontset[0]; |
| 689 | fontset[0] = fs; |
691 | fontset[0] = fs; |
| 690 | |
692 | |
| 691 | prop = (*fs)[1]->properties (); |
693 | prop = (*fs)[1]->properties (); |
| 692 | prop.height += lineSpace; |
694 | prop.height += lineSpace; |
|
|
695 | prop.width += letterSpace; |
| 693 | |
696 | |
| 694 | fs->set_prop (prop, false); |
697 | fs->set_prop (prop, false); |
| 695 | |
698 | |
| 696 | fwidth = prop.width; |
699 | fwidth = prop.width; |
| 697 | fheight = prop.height; |
700 | fheight = prop.height; |
| … | |
… | |
| 1162 | |
1165 | |
| 1163 | term->make_current (); |
1166 | term->make_current (); |
| 1164 | |
1167 | |
| 1165 | if (text) |
1168 | if (text) |
| 1166 | { |
1169 | { |
| 1167 | void *str; |
1170 | wchar_t *str; |
| 1168 | |
1171 | |
| 1169 | if (!text->encoding_is_wchar && text->string.multi_byte) |
1172 | if (!text->encoding_is_wchar && text->string.multi_byte) |
| 1170 | { |
1173 | { |
| 1171 | // of course, X makes it ugly again |
1174 | // of course, X makes it ugly again |
| 1172 | if (term->rs[Rs_imLocale]) |
1175 | if (term->rs[Rs_imLocale]) |
| 1173 | SET_LOCALE (term->rs[Rs_imLocale]); |
1176 | SET_LOCALE (term->rs[Rs_imLocale]); |
| 1174 | |
1177 | |
| 1175 | str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); |
1178 | str = rxvt_temp_buf<wchar_t> (text->length + 1); |
| 1176 | mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); |
1179 | mbstowcs (str, text->string.multi_byte, text->length + 1); |
| 1177 | |
1180 | |
| 1178 | if (term->rs[Rs_imLocale]) |
1181 | if (term->rs[Rs_imLocale]) |
| 1179 | SET_LOCALE (term->locale); |
1182 | SET_LOCALE (term->locale); |
| 1180 | } |
1183 | } |
| 1181 | else |
1184 | else |
| 1182 | str = (void *)text->string.wide_char; |
1185 | str = text->string.wide_char; |
| 1183 | |
1186 | |
| 1184 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
1187 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
| 1185 | DT_INT, call_data->caret, |
1188 | DT_INT, call_data->caret, |
| 1186 | DT_INT, call_data->chg_first, |
1189 | DT_INT, call_data->chg_first, |
| 1187 | DT_INT, call_data->chg_length, |
1190 | DT_INT, call_data->chg_length, |
