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