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.160 by root, Wed Jan 4 05:35:34 2006 UTC vs.
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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])
493 rs[Rs_perl_ext_1] = "default";
494
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 495 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 496 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 { 498 {
496 rxvt_perl.init (); 499 rxvt_perl.init ();
497 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 500 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
498 } 501 }
499#endif 502#endif
500 503
501 create_windows (argc, argv); 504 create_windows (argc, argv);
502 505
… …
534 537
535 init_command (cmd_argv); 538 init_command (cmd_argv);
536 539
537 free (cmd_argv); 540 free (cmd_argv);
538 541
542 if (pty.pty >= 0)
539 pty_ev.start (pty.pty, EVENT_READ); 543 pty_ev.start (pty.pty, EVENT_READ);
540 544
541 check_ev.start (); 545 check_ev.start ();
542 546
543 PERL_INVOKE ((this, HOOK_START, DT_END)); 547 HOOK_INVOKE ((this, HOOK_START, DT_END));
544 548
545 return true; 549 return true;
546} 550}
547 551
548static struct sig_handlers 552static struct sig_handlers
… …
1026 i = atoi (color); 1030 i = atoi (color);
1027 1031
1028 if (i >= 8 && i <= 15) 1032 if (i >= 8 && i <= 15)
1029 { /* bright colors */ 1033 { /* bright colors */
1030 i -= 8; 1034 i -= 8;
1031# ifndef NO_BRIGHTCOLOR
1032 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1035 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1033 SET_PIXCOLOR (idx); 1036 SET_PIXCOLOR (idx);
1034 goto done; 1037 goto done;
1035# endif
1036 } 1038 }
1037 1039
1038 if (i >= 0 && i <= 7) 1040 if (i >= 0 && i <= 7)
1039 { /* normal colors */ 1041 { /* normal colors */
1040 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1042 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];

Diff Legend

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