| … | |
… | |
| 307 | { |
307 | { |
| 308 | HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); |
308 | HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); |
| 309 | |
309 | |
| 310 | cmd_pid = 0; |
310 | cmd_pid = 0; |
| 311 | |
311 | |
| 312 | if (!OPTION (Opt_hold)) |
312 | if (!option (Opt_hold)) |
| 313 | destroy (); |
313 | destroy (); |
| 314 | } |
314 | } |
| 315 | |
315 | |
| 316 | void |
316 | void |
| 317 | rxvt_term::destroy () |
317 | rxvt_term::destroy () |
| … | |
… | |
| 481 | #ifdef KEYSYM_RESOURCE |
481 | #ifdef KEYSYM_RESOURCE |
| 482 | keyboard->register_done (); |
482 | keyboard->register_done (); |
| 483 | #endif |
483 | #endif |
| 484 | |
484 | |
| 485 | #ifdef HAVE_SCROLLBARS |
485 | #ifdef HAVE_SCROLLBARS |
| 486 | if (OPTION (Opt_scrollBar)) |
486 | if (option (Opt_scrollBar)) |
| 487 | scrollBar.setIdle (); /* set existence for size calculations */ |
487 | scrollBar.setIdle (); /* set existence for size calculations */ |
| 488 | #endif |
488 | #endif |
| 489 | |
489 | |
| 490 | pty = ptytty::create (); |
490 | pty = ptytty::create (); |
| 491 | |
491 | |
| … | |
… | |
| 498 | #if 0 |
498 | #if 0 |
| 499 | XSynchronize (dpy, True); |
499 | XSynchronize (dpy, True); |
| 500 | #endif |
500 | #endif |
| 501 | |
501 | |
| 502 | #ifdef HAVE_SCROLLBARS |
502 | #ifdef HAVE_SCROLLBARS |
| 503 | if (OPTION (Opt_scrollBar)) |
503 | if (option (Opt_scrollBar)) |
| 504 | resize_scrollbar (); /* create and map scrollbar */ |
504 | resize_scrollbar (); /* create and map scrollbar */ |
| 505 | #endif |
505 | #endif |
| 506 | #ifdef TRANSPARENT |
506 | #ifdef TRANSPARENT |
| 507 | if (OPTION (Opt_transparent)) |
507 | if (option (Opt_transparent)) |
| 508 | { |
508 | { |
| 509 | XSelectInput (dpy, display->root, PropertyChangeMask); |
509 | XSelectInput (dpy, display->root, PropertyChangeMask); |
| 510 | check_our_parents (); |
510 | check_our_parents (); |
| 511 | rootwin_ev.start (display, display->root); |
511 | rootwin_ev.start (display, display->root); |
| 512 | } |
512 | } |
| … | |
… | |
| 709 | if (scrollBar.state) |
709 | if (scrollBar.state) |
| 710 | { |
710 | { |
| 711 | sb_w = scrollbar_TotalWidth (); |
711 | sb_w = scrollbar_TotalWidth (); |
| 712 | szHint.base_width += sb_w; |
712 | szHint.base_width += sb_w; |
| 713 | |
713 | |
| 714 | if (!OPTION (Opt_scrollBar_right)) |
714 | if (!option (Opt_scrollBar_right)) |
| 715 | window_vt_x += sb_w; |
715 | window_vt_x += sb_w; |
| 716 | } |
716 | } |
| 717 | |
717 | |
| 718 | szHint.width_inc = fwidth; |
718 | szHint.width_inc = fwidth; |
| 719 | szHint.height_inc = fheight; |
719 | szHint.height_inc = fheight; |
| … | |
… | |
| 740 | { |
740 | { |
| 741 | min_it (height, max_height); |
741 | min_it (height, max_height); |
| 742 | szHint.height = szHint.base_height + height; |
742 | szHint.height = szHint.base_height + height; |
| 743 | } |
743 | } |
| 744 | |
744 | |
| 745 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
745 | if (scrollBar.state && option (Opt_scrollBar_right)) |
| 746 | window_sb_x = szHint.width - sb_w; |
746 | window_sb_x = szHint.width - sb_w; |
| 747 | |
747 | |
| 748 | if (recalc_x) |
748 | if (recalc_x) |
| 749 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
749 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
| 750 | |
750 | |
