--- rxvt-unicode/src/rxvt.C 2006/02/20 22:42:00 1.15 +++ rxvt-unicode/src/rxvt.C 2021/06/26 14:44:30 1.27 @@ -3,11 +3,11 @@ *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. - * Copyright (c) 2003-2006 Marc Lehmann + * Copyright (c) 2003-2006 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -23,41 +23,25 @@ #include "../config.h" #include "rxvt.h" -#include -#include +#include +#include int -main (int argc, const char *const *argv) +main (int argc, char *argv[]) try { + ptytty::init (); rxvt_init (); rxvt_term *t = new rxvt_term; - -#if ENABLE_PERL - stringvec *args = new stringvec; - stringvec *envv = new stringvec; - - for (int i = 0; i < argc; i++) - args->push_back (strdup (argv [i])); - - for (char **var = environ; *var; var++) - envv->push_back (strdup (*var)); - - envv->push_back (0); - - if (!t->init (args, envv)) -#else - if (!t->init (argc, argv, 0)) -#endif - return EXIT_FAILURE; - - io_manager::loop (); + t->init (argc, argv, environ); + ev_run (); return EXIT_SUCCESS; } -catch (const class rxvt_failure_exception &e) +catch (const std::exception &e) { + fputs (e.what (), stderr); return EXIT_FAILURE; }