| … | |
… | |
| 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; |
