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.164 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.166 by root, Sun Jan 8 07:55:36 2006 UTC

274 274
275 delete pix_colors_focused; 275 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 277 delete pix_colors_unfocused;
278#endif 278#endif
279#if USE_XGETDEFAULT
280 XrmDestroyDatabase (xrmdatabase);
281#endif
279 282
280 displays.put (display); 283 displays.put (display);
281 284
282 scr_release (); 285 scr_release ();
283 286
487 if (OPTION (Opt_scrollBar)) 490 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 491 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 492#endif
490 493
491#if ENABLE_PERL 494#if ENABLE_PERL
495 if (!rs[Rs_perl_ext_1])
496 rs[Rs_perl_ext_1] = "default";
497
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 498 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 499 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 500 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 { 501 {
496 rxvt_perl.init (); 502 rxvt_perl.init ();
610 /* signal (SIGURG, SIG_DFL); */ 616 /* signal (SIGURG, SIG_DFL); */
611 617
612 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
613 // TODO: handle this with exceptions and tolerate the memory loss 619 // TODO: handle this with exceptions and tolerate the memory loss
614 XSetIOErrorHandler (rxvt_xioerror_handler); 620 XSetIOErrorHandler (rxvt_xioerror_handler);
621
622#ifdef USE_XGETDEFAULT
623 XrmInitialize ();
624#endif
615} 625}
616 626
617/* ------------------------------------------------------------------------- * 627/* ------------------------------------------------------------------------- *
618 * MEMORY ALLOCATION WRAPPERS * 628 * MEMORY ALLOCATION WRAPPERS *
619 * ------------------------------------------------------------------------- */ 629 * ------------------------------------------------------------------------- */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines