--- rxvt-unicode/src/rxvtd.C 2009/05/08 23:52:55 1.48 +++ rxvt-unicode/src/rxvtd.C 2010/11/19 00:10:18 1.53 @@ -224,15 +224,15 @@ return err (); } -int opt_fork, opt_opendisplay, opt_quiet; -#if ENABLE_MLOCK -int opt_lock; -#endif - int main (int argc, const char *const *argv) { - rxvt_init (); + ptytty::init (); + + int opt_fork = 0, opt_opendisplay = 0, opt_quiet = 0; +#if ENABLE_MLOCK + int opt_lock = 0; +#endif for (int i = 1; i < argc; i++) { @@ -253,6 +253,8 @@ } } + rxvt_init (); + // optionally open display and never release it. if (opt_opendisplay) if (const char *dpy = getenv ("DISPLAY")) @@ -294,10 +296,10 @@ else if (pid > 0) _exit (EXIT_SUCCESS); - ev_default_fork (); + ev_loop_fork (EV_DEFAULT_UC); } - ev_loop (0); + ev_run (); return EXIT_SUCCESS; }