Move rxvt_term::init to init.C.

diff --git a/src/init.C b/src/init.C
index b470ce1cb095d2e28038b0f52896f3ec328396dd..e3337052c4429e308f67eb14d5694016c6ab5e49 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -36,6 +36,7 @@
 #include "rxvt.h"               /* NECESSARY */
 #include "rxvtutil.h"
 #include "init.h"
+#include "keyboard.h"
 
 #include <limits>
 
@@ -549,6 +550,125 @@ rxvt_term::init_resources (int argc, const char *const *argv)
   return cmd_argv;
 }
 
+/*----------------------------------------------------------------------*/
+void
+rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
+{
+  this->envv = envv;
+
+  SET_R (this);
+  set_locale ("");
+  set_environ (envv); // few things in X do not call setlocale :(
+
+  init_vars ();
+
+  init_secondary ();
+
+  const char **cmd_argv = init_resources (argc, argv);
+
+#ifdef KEYSYM_RESOURCE
+  keyboard->register_done ();
+#endif
+
+#ifdef HAVE_SCROLLBARS
+  if (option (Opt_scrollBar))
+    scrollBar.setIdle ();    /* set existence for size calculations */
+#endif
+
+  pty = ptytty::create ();
+
+  create_windows (argc, argv);
+
+  init_xlocale ();
+
+  scr_reset (); // initialize screen
+
+#if 0
+  XSynchronize (dpy, True);
+#endif
+
+#ifdef HAVE_SCROLLBARS
+  if (option (Opt_scrollBar))
+    resize_scrollbar ();      /* create and map scrollbar */
+#endif
+#ifdef HAVE_BG_PIXMAP
+  {
+    bgPixmap.set_target (this);
+    bgPixmap.invalidate ();
+
+#ifdef ENABLE_TRANSPARENCY
+    if (option (Opt_transparent))
+      {
+        bgPixmap.set_transparent ();
+
+#ifdef HAVE_AFTERIMAGE
+        if (rs [Rs_blurradius])
+          bgPixmap.set_blur_radius (rs [Rs_blurradius]);
+#endif
+        if (ISSET_PIXCOLOR (Color_tint))
+          bgPixmap.set_tint (pix_colors_focused [Color_tint]);
+
+        if (rs [Rs_shade])
+          bgPixmap.set_shade (rs [Rs_shade]);
+
+        bgPixmap.set_root_pixmap ();
+        XSelectInput (dpy, display->root, PropertyChangeMask);
+        rootwin_ev.start (display, display->root);
+      }
+#endif
+
+#ifdef BG_IMAGE_FROM_FILE
+    if (rs[Rs_backgroundPixmap])
+      {
+        const char *p = rs[Rs_backgroundPixmap];
+
+        if ((p = strchr (p, ';')) != 0)
+          {
+            p++;
+            bgPixmap.set_geometry (p);
+          }
+        else
+          bgPixmap.set_defaultGeometry ();
+
+        if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
+          if (!bgPixmap.window_position_sensitive ())
+            update_background ();
+      }
+#endif
+  }
+#endif
+
+#if ENABLE_PERL
+  rootwin_ev.start (display, display->root);
+#endif
+
+  set_colorfgbg ();
+
+  init_command (cmd_argv);
+
+  free (cmd_argv);
+
+  if (pty->pty >= 0)
+    pty_ev.start (pty->pty, ev::READ);
+
+  HOOK_INVOKE ((this, HOOK_START, DT_END));
+
+#if ENABLE_XEMBED
+  if (rs[Rs_embed])
+    {
+      long info[2] = { 0, XEMBED_MAPPED };
+
+      XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
+                       32, PropModeReplace, (unsigned char *)&info, 2);
+    }
+#endif
+
+  XMapWindow (dpy, vt);
+  XMapWindow (dpy, parent[0]);
+
+  refresh_check ();
+}
+
 /*----------------------------------------------------------------------*/
 void
 rxvt_term::init_env ()

diff --git a/src/main.C b/src/main.C
index 272d1eb9d14002932c25e95d75b39aa5c160e715..873da2b627add9e61aeaa2ea6d2f1d359d5bfdd5 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -470,125 +470,6 @@ rxvt_xioerror_handler (Display *display)
   _exit (EXIT_FAILURE);
 }
 
-/*----------------------------------------------------------------------*/
-void
-rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
-{
-  this->envv = envv;
-
-  SET_R (this);
-  set_locale ("");
-  set_environ (envv); // few things in X do not call setlocale :(
-
-  init_vars ();
-
-  init_secondary ();
-
-  const char **cmd_argv = init_resources (argc, argv);
-
-#ifdef KEYSYM_RESOURCE
-  keyboard->register_done ();
-#endif
-
-#ifdef HAVE_SCROLLBARS
-  if (option (Opt_scrollBar))
-    scrollBar.setIdle ();    /* set existence for size calculations */
-#endif
-
-  pty = ptytty::create ();
-
-  create_windows (argc, argv);
-
-  init_xlocale ();
-
-  scr_reset (); // initialize screen
-
-#if 0
-  XSynchronize (dpy, True);
-#endif
-
-#ifdef HAVE_SCROLLBARS
-  if (option (Opt_scrollBar))
-    resize_scrollbar ();      /* create and map scrollbar */
-#endif
-#ifdef HAVE_BG_PIXMAP
-  {
-    bgPixmap.set_target (this);
-    bgPixmap.invalidate ();
-
-#ifdef ENABLE_TRANSPARENCY
-    if (option (Opt_transparent))
-      {
-        bgPixmap.set_transparent ();
-
-#ifdef HAVE_AFTERIMAGE
-        if (rs [Rs_blurradius])
-          bgPixmap.set_blur_radius (rs [Rs_blurradius]);
-#endif
-        if (ISSET_PIXCOLOR (Color_tint))
-          bgPixmap.set_tint (pix_colors_focused [Color_tint]);
-
-        if (rs [Rs_shade])
-          bgPixmap.set_shade (rs [Rs_shade]);
-
-        bgPixmap.set_root_pixmap ();
-        XSelectInput (dpy, display->root, PropertyChangeMask);
-        rootwin_ev.start (display, display->root);
-      }
-#endif
-
-#ifdef BG_IMAGE_FROM_FILE
-    if (rs[Rs_backgroundPixmap])
-      {
-        const char *p = rs[Rs_backgroundPixmap];
-
-        if ((p = strchr (p, ';')) != 0)
-          {
-            p++;
-            bgPixmap.set_geometry (p);
-          }
-        else
-          bgPixmap.set_defaultGeometry ();
-
-        if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
-          if (!bgPixmap.window_position_sensitive ())
-            update_background ();
-      }
-#endif
-  }
-#endif
-
-#if ENABLE_PERL
-  rootwin_ev.start (display, display->root);
-#endif
-
-  set_colorfgbg ();
-
-  init_command (cmd_argv);
-
-  free (cmd_argv);
-
-  if (pty->pty >= 0)
-    pty_ev.start (pty->pty, ev::READ);
-
-  HOOK_INVOKE ((this, HOOK_START, DT_END));
-
-#if ENABLE_XEMBED
-  if (rs[Rs_embed])
-    {
-      long info[2] = { 0, XEMBED_MAPPED };
-
-      XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
-                       32, PropModeReplace, (unsigned char *)&info, 2);
-    }
-#endif
-
-  XMapWindow (dpy, vt);
-  XMapWindow (dpy, parent[0]);
-
-  refresh_check ();
-}
-
 static struct sig_handlers
 {
   ev::sig sw_term, sw_int;

diff --git a/src/rxvt.h b/src/rxvt.h
index 4b7c263294a90933780fb1c78414413669691ede..f1875257e82de7f45b6d935bcd2ab5e6b6dc5bac 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1265,6 +1265,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
   void init_vars ();
   void init_secondary ();
   const char **init_resources (int argc, const char *const *argv);
+  void init (int argc, const char *const *argv, stringvec *envv);
   void init_env ();
   void set_locale (const char *locale);
   void init_xlocale ();
@@ -1281,7 +1282,6 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
   ~rxvt_term ();
   void destroy ();
   void emergency_cleanup ();
-  void init (int argc, const char *const *argv, stringvec *envv);
   void recolour_cursor ();
   void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
   void window_calc (unsigned int newwidth, unsigned int newheight);