--- rxvt-unicode/src/rxvt.C	2004/01/31 00:20:21	1.5
+++ rxvt-unicode/src/rxvt.C	2006/01/22 11:57:06	1.12
@@ -1,17 +1,59 @@
-#include "rxvtlib.h"
-#include "iom.h"
+/*--------------------------------*-C-*---------------------------------*
+ * File:	rxvt.C
+ *----------------------------------------------------------------------*
+ *
+ * All portions of code are copyright by their respective author/s.
+ * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *----------------------------------------------------------------------*/
+
+#include "../config.h"
+#include "rxvt.h"
+
+#include <cstdlib>
+#include <cstring>
 
-/*----------------------------------------------------------------------*/
-/* main() */
 int
-main(int argc, const char *const *argv)
-{
-  rxvt_init_signals ();
+main (int argc, const char *const *argv)
+try
+  {
+    rxvt_init ();
 
-  if (!rxvt_init(argc, argv))
-    return EXIT_FAILURE;
+#if ENABLE_PERL
+    stringvec *envv = new stringvec;
+
+    for (char **var = environ; *var; var++)
+      envv->push_back (strdup (*var));
+
+    envv->push_back (0);
+#else
+    stringvec *envv = 0;
+#endif
 
-  iom.loop ();
+    rxvt_term *t = new rxvt_term;
+
+    if (!t->init (argc, argv, envv))
+      return EXIT_FAILURE;
+
+    io_manager::loop ();
+
+    return EXIT_SUCCESS;
+  }
+catch (const class rxvt_failure_exception &e)
+  {
+    return EXIT_FAILURE;
+  }
 
-  return EXIT_SUCCESS;
-}