… | |
… | |
148 | } |
148 | } |
149 | #endif |
149 | #endif |
150 | |
150 | |
151 | rxvt_term::rxvt_term () |
151 | rxvt_term::rxvt_term () |
152 | : |
152 | : |
153 | #if TRANSPARENT || ENABLE_PERL |
153 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
154 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
154 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
|
|
155 | #endif |
|
|
156 | #if ENABLE_TRANSPARENCY |
|
|
157 | check_our_parents_ev(this, &rxvt_term::check_our_parents_cb), |
155 | #endif |
158 | #endif |
156 | #ifdef HAVE_SCROLLBARS |
159 | #ifdef HAVE_SCROLLBARS |
157 | scrollbar_ev (this, &rxvt_term::x_cb), |
160 | scrollbar_ev (this, &rxvt_term::x_cb), |
158 | #endif |
161 | #endif |
159 | #ifdef CURSOR_BLINK |
162 | #ifdef CURSOR_BLINK |
… | |
… | |
307 | { |
310 | { |
308 | HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); |
311 | HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); |
309 | |
312 | |
310 | cmd_pid = 0; |
313 | cmd_pid = 0; |
311 | |
314 | |
312 | if (!OPTION (Opt_hold)) |
315 | if (!option (Opt_hold)) |
313 | destroy (); |
316 | destroy (); |
314 | } |
317 | } |
315 | |
318 | |
316 | void |
319 | void |
317 | rxvt_term::destroy () |
320 | rxvt_term::destroy () |
… | |
… | |
331 | im_ev.stop (display); |
334 | im_ev.stop (display); |
332 | #endif |
335 | #endif |
333 | #if HAVE_SCROLLBARS |
336 | #if HAVE_SCROLLBARS |
334 | scrollbar_ev.stop (display); |
337 | scrollbar_ev.stop (display); |
335 | #endif |
338 | #endif |
336 | #if TRANSPARENT || ENABLE_PERL |
339 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
337 | rootwin_ev.stop (display); |
340 | rootwin_ev.stop (display); |
338 | #endif |
341 | #endif |
339 | incr_ev.stop (); |
342 | incr_ev.stop (); |
340 | termwin_ev.stop (display); |
343 | termwin_ev.stop (display); |
341 | vt_ev.stop (display); |
344 | vt_ev.stop (display); |
… | |
… | |
481 | #ifdef KEYSYM_RESOURCE |
484 | #ifdef KEYSYM_RESOURCE |
482 | keyboard->register_done (); |
485 | keyboard->register_done (); |
483 | #endif |
486 | #endif |
484 | |
487 | |
485 | #ifdef HAVE_SCROLLBARS |
488 | #ifdef HAVE_SCROLLBARS |
486 | if (OPTION (Opt_scrollBar)) |
489 | if (option (Opt_scrollBar)) |
487 | scrollBar.setIdle (); /* set existence for size calculations */ |
490 | scrollBar.setIdle (); /* set existence for size calculations */ |
488 | #endif |
491 | #endif |
489 | |
492 | |
490 | pty = ptytty::create (); |
493 | pty = ptytty::create (); |
491 | |
494 | |
… | |
… | |
498 | #if 0 |
501 | #if 0 |
499 | XSynchronize (dpy, True); |
502 | XSynchronize (dpy, True); |
500 | #endif |
503 | #endif |
501 | |
504 | |
502 | #ifdef HAVE_SCROLLBARS |
505 | #ifdef HAVE_SCROLLBARS |
503 | if (OPTION (Opt_scrollBar)) |
506 | if (option (Opt_scrollBar)) |
504 | resize_scrollbar (); /* create and map scrollbar */ |
507 | resize_scrollbar (); /* create and map scrollbar */ |
505 | #endif |
508 | #endif |
506 | #ifdef TRANSPARENT |
509 | #ifdef ENABLE_TRANSPARENCY |
507 | if (OPTION (Opt_transparent)) |
510 | if (option (Opt_transparent)) |
508 | { |
511 | { |
509 | XSelectInput (dpy, display->root, PropertyChangeMask); |
512 | XSelectInput (dpy, display->root, PropertyChangeMask); |
510 | check_our_parents (); |
513 | check_our_parents (); |
511 | rootwin_ev.start (display, display->root); |
514 | rootwin_ev.start (display, display->root); |
512 | } |
515 | } |
… | |
… | |
627 | return p; |
630 | return p; |
628 | } |
631 | } |
629 | |
632 | |
630 | /*----------------------------------------------------------------------*/ |
633 | /*----------------------------------------------------------------------*/ |
631 | /* |
634 | /* |
632 | * window size/position calculcations for XSizeHint and other storage. |
635 | * window size/position calculations for XSizeHint and other storage. |
633 | * if width/height are non-zero then override calculated width/height |
636 | * if width/height are non-zero then override calculated width/height |
634 | */ |
637 | */ |
635 | void |
638 | void |
636 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
639 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
637 | { |
640 | { |
… | |
… | |
709 | if (scrollBar.state) |
712 | if (scrollBar.state) |
710 | { |
713 | { |
711 | sb_w = scrollbar_TotalWidth (); |
714 | sb_w = scrollbar_TotalWidth (); |
712 | szHint.base_width += sb_w; |
715 | szHint.base_width += sb_w; |
713 | |
716 | |
714 | if (!OPTION (Opt_scrollBar_right)) |
717 | if (!option (Opt_scrollBar_right)) |
715 | window_vt_x += sb_w; |
718 | window_vt_x += sb_w; |
716 | } |
719 | } |
717 | |
720 | |
718 | szHint.width_inc = fwidth; |
721 | szHint.width_inc = fwidth; |
719 | szHint.height_inc = fheight; |
722 | szHint.height_inc = fheight; |
… | |
… | |
740 | { |
743 | { |
741 | min_it (height, max_height); |
744 | min_it (height, max_height); |
742 | szHint.height = szHint.base_height + height; |
745 | szHint.height = szHint.base_height + height; |
743 | } |
746 | } |
744 | |
747 | |
745 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
748 | if (scrollBar.state && option (Opt_scrollBar_right)) |
746 | window_sb_x = szHint.width - sb_w; |
749 | window_sb_x = szHint.width - sb_w; |
747 | |
750 | |
748 | if (recalc_x) |
751 | if (recalc_x) |
749 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
752 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
750 | |
753 | |
… | |
… | |
812 | delete fontset[0]; |
815 | delete fontset[0]; |
813 | fontset[0] = fs; |
816 | fontset[0] = fs; |
814 | |
817 | |
815 | prop = (*fs)[1]->properties (); |
818 | prop = (*fs)[1]->properties (); |
816 | prop.height += lineSpace; |
819 | prop.height += lineSpace; |
|
|
820 | |
817 | fs->set_prop (prop); |
821 | fs->set_prop (prop, false); |
818 | |
822 | |
819 | fwidth = prop.width; |
823 | fwidth = prop.width; |
820 | fheight = prop.height; |
824 | fheight = prop.height; |
821 | fbase = prop.ascent; |
825 | fbase = prop.ascent; |
822 | |
826 | |
… | |
… | |
831 | { |
835 | { |
832 | fontset[style] = fs = new rxvt_fontset (this); |
836 | fontset[style] = fs = new rxvt_fontset (this); |
833 | rxvt_fontprop prop2 = prop; |
837 | rxvt_fontprop prop2 = prop; |
834 | |
838 | |
835 | if (res) |
839 | if (res) |
836 | prop2.weight = prop2.slant = rxvt_fontprop::unset; |
840 | { |
|
|
841 | fs->populate (res); |
|
|
842 | fs->set_prop (prop2, false); |
|
|
843 | } |
837 | else |
844 | else |
838 | { |
845 | { |
839 | res = fontset[0]->fontdesc; |
846 | fs->populate (fontset[0]->fontdesc); |
840 | |
847 | |
841 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
848 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
842 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
849 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
|
|
850 | |
|
|
851 | fs->set_prop (prop2, true); |
843 | } |
852 | } |
844 | |
853 | |
845 | fs->populate (res); |
|
|
846 | fs->set_prop (prop2); |
|
|
847 | } |
854 | } |
848 | #else |
855 | #else |
849 | fontset[style] = fontset[0]; |
856 | fontset[style] = fontset[0]; |
850 | #endif |
857 | #endif |
851 | } |
858 | } |
… | |
… | |
1113 | scr_reset (); |
1120 | scr_reset (); |
1114 | |
1121 | |
1115 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
1122 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
1116 | //scr_touch (false); |
1123 | //scr_touch (false); |
1117 | |
1124 | |
1118 | #ifdef XPM_BACKGROUND |
1125 | #if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY) |
1119 | if (pixmap) |
1126 | if (bgPixmap.pixmap) |
1120 | scr_touch (false); |
1127 | scr_touch (false); |
1121 | #endif |
1128 | #endif |
1122 | |
1129 | |
1123 | #ifdef USE_XIM |
1130 | #ifdef USE_XIM |
1124 | IMSetPosition (); |
1131 | IMSetPosition (); |