ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.156 by root, Mon Jan 2 18:20:23 2006 UTC vs.
Revision 1.163 by root, Fri Jan 6 02:11:15 2006 UTC

… …
206 pty.put (); 206 pty.put ();
207} 207}
208 208
209rxvt_term::~rxvt_term () 209rxvt_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_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]))
495 {
492 rxvt_perl.init (); 496 rxvt_perl.init ();
493#endif
494
495 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 497 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
498 }
499#endif
496 500
497 create_windows (argc, argv); 501 create_windows (argc, argv);
498 502
499 dDisp; 503 dDisp;
500 504
… …
530 534
531 init_command (cmd_argv); 535 init_command (cmd_argv);
532 536
533 free (cmd_argv); 537 free (cmd_argv);
534 538
539 if (pty.pty >= 0)
535 pty_ev.start (pty.pty, EVENT_READ); 540 pty_ev.start (pty.pty, EVENT_READ);
536 541
537 check_ev.start (); 542 check_ev.start ();
538 543
539 PERL_INVOKE ((this, HOOK_START, DT_END)); 544 HOOK_INVOKE ((this, HOOK_START, DT_END));
540 545
541 return true; 546 return true;
542} 547}
543 548
544static struct sig_handlers 549static struct sig_handlers
… …
921 prop.height += lineSpace; 926 prop.height += lineSpace;
922 fs->set_prop (prop); 927 fs->set_prop (prop);
923 928
924 fwidth = prop.width; 929 fwidth = prop.width;
925 fheight = prop.height; 930 fheight = prop.height;
926 fbase = (*fs)[1]->ascent; 931 fbase = prop.ascent;
927 932
928 for (int style = 1; style < 4; style++) 933 for (int style = 1; style < 4; style++)
929 { 934 {
930#if ENABLE_STYLES 935#if ENABLE_STYLES
931 const char *res = rs[Rs_font + style]; 936 const char *res = rs[Rs_font + style];
… …
1022 i = atoi (color); 1027 i = atoi (color);
1023 1028
1024 if (i >= 8 && i <= 15) 1029 if (i >= 8 && i <= 15)
1025 { /* bright colors */ 1030 { /* bright colors */
1026 i -= 8; 1031 i -= 8;
1027# ifndef NO_BRIGHTCOLOR
1028 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1032 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1029 SET_PIXCOLOR (idx); 1033 SET_PIXCOLOR (idx);
1030 goto done; 1034 goto done;
1031# endif
1032 } 1035 }
1033 1036
1034 if (i >= 0 && i <= 7) 1037 if (i >= 0 && i <= 7)
1035 { /* normal colors */ 1038 { /* normal colors */
1036 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1039 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1220 } 1223 }
1221 1224
1222 if (menubar_visible ()) 1225 if (menubar_visible ())
1223 XMoveResizeWindow (disp, menuBar.win, 1226 XMoveResizeWindow (disp, menuBar.win,
1224 window_vt_x, 0, 1227 window_vt_x, 0,
1225 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1228 width, menuBar_TotalHeight ());
1226 1229
1227 XMoveResizeWindow (disp, vt, 1230 XMoveResizeWindow (disp, vt,
1228 window_vt_x, window_vt_y, 1231 window_vt_x, window_vt_y,
1229 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1232 width, height);
1230 1233
1231 scr_clear (); 1234 scr_clear ();
1232#ifdef XPM_BACKGROUND 1235#ifdef XPM_BACKGROUND
1233 resize_pixmap (); 1236 resize_pixmap ();
1234#endif 1237#endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines