--- rxvt-unicode/src/rxvt.C	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/rxvt.C	2011/12/17 23:17:33	1.23
@@ -1,15 +1,46 @@
-#include "rxvtlib.h"
+/*----------------------------------------------------------------------*
+ * File:	rxvt.C
+ *----------------------------------------------------------------------*
+ *
+ * All portions of code are copyright by their respective author/s.
+ * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
+ *
+ * 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() */
-/* INTPROTO */
 int
-main(int argc, const char *const *argv)
-{
-    if (rxvt_init(argc, argv) == NULL)
-	return EXIT_FAILURE;
+main (int argc, char *argv[])
+try
+  {
+    ptytty::init ();
+    rxvt_init ();
+
+    rxvt_term *t = new rxvt_term;
+    t->init (argc, argv, environ);
+    ev_run ();
 
-    dR;
-    rxvt_main_loop(aR);	/* main processing loop */
     return EXIT_SUCCESS;
-}
+  }
+catch (const class rxvt_failure_exception &e)
+  {
+    return EXIT_FAILURE;
+  }
+