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.261 by root, Mon Nov 19 15:33:34 2007 UTC vs.
Revision 1.264 by root, Sat Nov 24 11:06:13 2007 UTC

… …
284 delete [] pix_colors_focused; 284 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
287#endif 287#endif
288 288
289#ifdef HAVE_BG_PIXMAP
289 bgPixmap.destroy (); 290 bgPixmap.destroy ();
291#endif
290 displays.put (display); 292 displays.put (display);
291 293
292 scr_release (); 294 scr_release ();
293 295
294 /* clear all resources */ 296 /* clear all resources */
… …
306 delete envv; 308 delete envv;
307 delete argv; 309 delete argv;
308 310
309#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
310 delete keyboard; 312 delete keyboard;
313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
311#endif 316#endif
312} 317}
313 318
314// child has exited, usually destroys 319// child has exited, usually destroys
315void 320void
… …
617void 622void
618rxvt_init () 623rxvt_init ()
619{ 624{
620 ptytty::init (); 625 ptytty::init ();
621 626
622 if (!ev::ev_default_loop (0)) 627 if (!ev_default_loop (0))
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624 629
625 rxvt_environ = environ; 630 rxvt_environ = environ;
626 631
627 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
628 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
629 634
630 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
631 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
632 637
633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
634 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
635 640
636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);

Diff Legend

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