| … | |
… | |
| 293 | void |
293 | void |
| 294 | rxvt_term::child_exit () |
294 | rxvt_term::child_exit () |
| 295 | { |
295 | { |
| 296 | cmd_pid = 0; |
296 | cmd_pid = 0; |
| 297 | |
297 | |
| 298 | if (!(options & Opt_hold)) |
298 | if (!OPTION (Opt_hold)) |
| 299 | destroy (); |
299 | destroy (); |
| 300 | } |
300 | } |
| 301 | |
301 | |
| 302 | void |
302 | void |
| 303 | rxvt_term::destroy () |
303 | rxvt_term::destroy () |
| … | |
… | |
| 469 | |
469 | |
| 470 | #if MENUBAR_MAX |
470 | #if MENUBAR_MAX |
| 471 | menubar_read (rs[Rs_menu]); |
471 | menubar_read (rs[Rs_menu]); |
| 472 | #endif |
472 | #endif |
| 473 | #ifdef HAVE_SCROLLBARS |
473 | #ifdef HAVE_SCROLLBARS |
| 474 | if (options & Opt_scrollBar) |
474 | if (OPTION (Opt_scrollBar)) |
| 475 | scrollBar.setIdle (); /* set existence for size calculations */ |
475 | scrollBar.setIdle (); /* set existence for size calculations */ |
| 476 | #endif |
476 | #endif |
| 477 | |
477 | |
| 478 | create_windows (argc, argv); |
478 | create_windows (argc, argv); |
| 479 | |
479 | |
| … | |
… | |
| 486 | #if 0 |
486 | #if 0 |
| 487 | XSynchronize (disp, True); |
487 | XSynchronize (disp, True); |
| 488 | #endif |
488 | #endif |
| 489 | |
489 | |
| 490 | #ifdef HAVE_SCROLLBARS |
490 | #ifdef HAVE_SCROLLBARS |
| 491 | if (options & Opt_scrollBar) |
491 | if (OPTION (Opt_scrollBar)) |
| 492 | resize_scrollbar (); /* create and map scrollbar */ |
492 | resize_scrollbar (); /* create and map scrollbar */ |
| 493 | #endif |
493 | #endif |
| 494 | #if (MENUBAR_MAX) |
494 | #if (MENUBAR_MAX) |
| 495 | if (menubar_visible ()) |
495 | if (menubar_visible ()) |
| 496 | XMapWindow (disp, menuBar.win); |
496 | XMapWindow (disp, menuBar.win); |
| 497 | #endif |
497 | #endif |
| 498 | #ifdef TRANSPARENT |
498 | #ifdef TRANSPARENT |
| 499 | if (options & Opt_transparent) |
499 | if (OPTION (Opt_transparent)) |
| 500 | { |
500 | { |
| 501 | XSelectInput (disp, display->root, PropertyChangeMask); |
501 | XSelectInput (disp, display->root, PropertyChangeMask); |
| 502 | check_our_parents (); |
502 | check_our_parents (); |
| 503 | rootwin_ev.start (display, display->root); |
503 | rootwin_ev.start (display, display->root); |
| 504 | } |
504 | } |
| … | |
… | |
| 681 | |
681 | |
| 682 | #ifdef UTMP_SUPPORT |
682 | #ifdef UTMP_SUPPORT |
| 683 | void |
683 | void |
| 684 | rxvt_term::privileged_utmp (rxvt_privaction action) |
684 | rxvt_term::privileged_utmp (rxvt_privaction action) |
| 685 | { |
685 | { |
| 686 | if ((options & Opt_utmpInhibit) |
686 | if (OPTION (Opt_utmpInhibit) |
| 687 | || !pty.name || !*pty.name) |
687 | || !pty.name || !*pty.name) |
| 688 | return; |
688 | return; |
| 689 | |
689 | |
| 690 | rxvt_privileges (RESTORE); |
690 | rxvt_privileges (RESTORE); |
| 691 | |
691 | |
| … | |
… | |
| 783 | |
783 | |
| 784 | if (scrollbar_visible ()) |
784 | if (scrollbar_visible ()) |
| 785 | { |
785 | { |
| 786 | sb_w = scrollbar_TotalWidth (); |
786 | sb_w = scrollbar_TotalWidth (); |
| 787 | szHint.base_width += sb_w; |
787 | szHint.base_width += sb_w; |
| 788 | if (!(options & Opt_scrollBar_right)) |
788 | if (!OPTION (Opt_scrollBar_right)) |
| 789 | window_vt_x += sb_w; |
789 | window_vt_x += sb_w; |
| 790 | } |
790 | } |
| 791 | |
791 | |
| 792 | if (menubar_visible ()) |
792 | if (menubar_visible ()) |
| 793 | { |
793 | { |
| … | |
… | |
| 821 | { |
821 | { |
| 822 | min_it (height, max_height); |
822 | min_it (height, max_height); |
| 823 | szHint.height = szHint.base_height + height; |
823 | szHint.height = szHint.base_height + height; |
| 824 | } |
824 | } |
| 825 | |
825 | |
| 826 | if (scrollbar_visible () && (options & Opt_scrollBar_right)) |
826 | if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) |
| 827 | window_sb_x = szHint.width - sb_w; |
827 | window_sb_x = szHint.width - sb_w; |
| 828 | |
828 | |
| 829 | if (recalc_x) |
829 | if (recalc_x) |
| 830 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
830 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
| 831 | if (recalc_y) |
831 | if (recalc_y) |
