--- rxvt-unicode/src/rxvt.h	2006/01/21 14:25:05	1.231
+++ rxvt-unicode/src/rxvt.h	2006/01/22 20:39:47	1.237
@@ -37,6 +37,7 @@
 #include "rxvttoolkit.h"
 #include "iom.h"
 #include "salloc.h"
+#include "libptytty.h"
 
 #include "rxvtperl.h"
 
@@ -143,6 +144,7 @@
 wchar_t *        rxvt_mbstowcs                    (const char *str, int len = -1);
 char *           rxvt_wcstoutf8                   (const wchar_t *str, int len = -1);
 wchar_t *        rxvt_utf8towcs                   (const char *str, int len = -1);
+char *           rxvt_strdup_cpp                  (const char *str);
 
 #define rxvt_strdup(s) ((s) ? strdup(s) : 0)
 
@@ -160,7 +162,6 @@
 char          ** rxvt_splitcommastring            (const char *cs) NOTHROW;
 void             rxvt_freecommastring             (char **cs) NOTHROW;
 char           * rxvt_File_find                   (const char *file, const char *ext, const char *path) NOTHROW;
-void             rxvt_usleep                      (int usecs) NOTHROW;
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -170,13 +171,21 @@
 
 inline void set_environ (stringvec *envv)
 {
+#if ENABLE_PERL
+  assert (envv);
+#else
   if (envv)
+#endif
     environ = (char **)envv->begin ();
 }
 
 inline void set_environ (char **envv)
 {
+#if ENABLE_PERL
+  assert (envv);
+#else
   if (envv)
+#endif
     environ = envv;
 }
 
@@ -203,32 +212,6 @@
 } bgPixmap_t;
 #endif
 
-struct rxvt_ptytty {
-  int pty; // pty file descriptor; connected to rxvt
-  int tty; // tty file descriptor; connected to child
-
-  rxvt_ptytty ()
-  : pty(-1), tty(-1)
-  {
-  }
-
-  virtual ~rxvt_ptytty ()
-  {
-  }
-
-  virtual bool get () = 0;
-#if UTMP_SUPPORT
-  virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
-#endif
-
-  void close_tty ();
-  bool make_controlling_tty ();
-  void set_utf8_mode (bool on);
-};
-
-rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
-void rxvt_ptytty_server (); // start the ptytty server process
-
 /*
  * the 'essential' information for reporting Mouse Events
  * pared down from XButtonEvent
@@ -1155,7 +1138,7 @@
   char           *cmdbuf_ptr, *cmdbuf_endp;
   char            cmdbuf_base[CBUFSIZ];
 
-  rxvt_ptytty    *pty;
+  ptytty         *pty;
 
   rxvt_salloc    *talloc;             // text line allocator
   rxvt_salloc    *ralloc;             // rend line allocator
@@ -1240,7 +1223,14 @@
   void destroy ();
   void emergency_cleanup ();
 
-  bool init (int argc, const char *const *argv);
+  bool init (int argc, const char *const *argv, stringvec *envv);
+
+  bool init (stringvec *argv, stringvec *envv)
+  {
+    this->argv = argv;
+    return init (argv->size (), argv->begin (), envv);
+  }
+  
   bool init_vars ();
 
   bool pty_fill ();
@@ -1269,10 +1259,10 @@
   void window_calc (unsigned int newwidth, unsigned int newheight);
 
 #if USE_XIM
-  rxvt_xim       *input_method;
-  XIC             Input_Context;
-  XIMStyle        input_style;
-  XPoint          spot; // most recently sent spot position
+  rxvt_xim *input_method;
+  XIC      Input_Context;
+  XIMStyle input_style;
+  XPoint   spot; // most recently sent spot position
 
   void im_destroy ();
   void im_cb (); im_watcher im_ev;
@@ -1340,7 +1330,7 @@
 
   // screen.C
 
-  void lalloc (line_t &l) const NOTHROW
+  void lalloc (line_t &l) const
   {
     l.t = (text_t *)talloc->alloc ();
     l.r = (rend_t *)ralloc->alloc ();
@@ -1354,7 +1344,7 @@
   }
 #endif
 
-  void lresize (line_t &l) const NOTHROW
+  void lresize (line_t &l) const
   {
     if (!l.t)
       return;
@@ -1432,10 +1422,11 @@
 
   enum cursor_mode { SAVE, RESTORE };
 
-  void scr_poweron () NOTHROW;
+  void scr_poweron ();
   void scr_cursor (cursor_mode mode) NOTHROW;
   void scr_do_wrap () NOTHROW;
-  int scr_change_screen (int scrn) NOTHROW;
+  void scr_swap_screen () NOTHROW;
+  void scr_change_screen (int scrn);
   void scr_color (unsigned int color, int fgbg) NOTHROW;
   void scr_rendition (int set, int style) NOTHROW;
   void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;