… | |
… | |
206 | pty.put (); |
206 | pty.put (); |
207 | } |
207 | } |
208 | |
208 | |
209 | rxvt_term::~rxvt_term () |
209 | rxvt_term::~rxvt_term () |
210 | { |
210 | { |
211 | PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); |
211 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
212 | |
212 | |
213 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
213 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
214 | |
214 | |
215 | emergency_cleanup (); |
215 | emergency_cleanup (); |
216 | |
216 | |
… | |
… | |
487 | if (OPTION (Opt_scrollBar)) |
487 | if (OPTION (Opt_scrollBar)) |
488 | scrollBar.setIdle (); /* set existence for size calculations */ |
488 | scrollBar.setIdle (); /* set existence for size calculations */ |
489 | #endif |
489 | #endif |
490 | |
490 | |
491 | #if ENABLE_PERL |
491 | #if ENABLE_PERL |
492 | if (rs[Rs_perl_ext] && *rs[Rs_perl_ext]) |
492 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
|
|
493 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
|
|
494 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
493 | { |
495 | { |
494 | rxvt_perl.init (); |
496 | rxvt_perl.init (); |
495 | PERL_INVOKE ((this, HOOK_INIT, DT_END)); |
497 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
496 | } |
498 | } |
497 | #endif |
499 | #endif |
498 | |
500 | |
499 | create_windows (argc, argv); |
501 | create_windows (argc, argv); |
500 | |
502 | |
… | |
… | |
532 | |
534 | |
533 | init_command (cmd_argv); |
535 | init_command (cmd_argv); |
534 | |
536 | |
535 | free (cmd_argv); |
537 | free (cmd_argv); |
536 | |
538 | |
|
|
539 | if (pty.pty >= 0) |
537 | pty_ev.start (pty.pty, EVENT_READ); |
540 | pty_ev.start (pty.pty, EVENT_READ); |
538 | |
541 | |
539 | check_ev.start (); |
542 | check_ev.start (); |
540 | |
543 | |
541 | PERL_INVOKE ((this, HOOK_START, DT_END)); |
544 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
542 | |
545 | |
543 | return true; |
546 | return true; |
544 | } |
547 | } |
545 | |
548 | |
546 | static struct sig_handlers |
549 | static struct sig_handlers |
… | |
… | |
923 | prop.height += lineSpace; |
926 | prop.height += lineSpace; |
924 | fs->set_prop (prop); |
927 | fs->set_prop (prop); |
925 | |
928 | |
926 | fwidth = prop.width; |
929 | fwidth = prop.width; |
927 | fheight = prop.height; |
930 | fheight = prop.height; |
928 | fbase = (*fs)[1]->ascent; |
931 | fbase = prop.ascent; |
929 | |
932 | |
930 | for (int style = 1; style < 4; style++) |
933 | for (int style = 1; style < 4; style++) |
931 | { |
934 | { |
932 | #if ENABLE_STYLES |
935 | #if ENABLE_STYLES |
933 | const char *res = rs[Rs_font + style]; |
936 | const char *res = rs[Rs_font + style]; |
… | |
… | |
1024 | i = atoi (color); |
1027 | i = atoi (color); |
1025 | |
1028 | |
1026 | if (i >= 8 && i <= 15) |
1029 | if (i >= 8 && i <= 15) |
1027 | { /* bright colors */ |
1030 | { /* bright colors */ |
1028 | i -= 8; |
1031 | i -= 8; |
1029 | # ifndef NO_BRIGHTCOLOR |
|
|
1030 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
1032 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
1031 | SET_PIXCOLOR (idx); |
1033 | SET_PIXCOLOR (idx); |
1032 | goto done; |
1034 | goto done; |
1033 | # endif |
|
|
1034 | } |
1035 | } |
1035 | |
1036 | |
1036 | if (i >= 0 && i <= 7) |
1037 | if (i >= 0 && i <= 7) |
1037 | { /* normal colors */ |
1038 | { /* normal colors */ |
1038 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
1039 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
… | |
… | |
1222 | } |
1223 | } |
1223 | |
1224 | |
1224 | if (menubar_visible ()) |
1225 | if (menubar_visible ()) |
1225 | XMoveResizeWindow (disp, menuBar.win, |
1226 | XMoveResizeWindow (disp, menuBar.win, |
1226 | window_vt_x, 0, |
1227 | window_vt_x, 0, |
1227 | TermWin_TotalWidth (), menuBar_TotalHeight ()); |
1228 | width, menuBar_TotalHeight ()); |
1228 | |
1229 | |
1229 | XMoveResizeWindow (disp, vt, |
1230 | XMoveResizeWindow (disp, vt, |
1230 | window_vt_x, window_vt_y, |
1231 | window_vt_x, window_vt_y, |
1231 | TermWin_TotalWidth (), TermWin_TotalHeight ()); |
1232 | width, height); |
1232 | |
1233 | |
1233 | scr_clear (); |
1234 | scr_clear (); |
1234 | #ifdef XPM_BACKGROUND |
1235 | #ifdef XPM_BACKGROUND |
1235 | resize_pixmap (); |
1236 | resize_pixmap (); |
1236 | #endif |
1237 | #endif |