--- rxvt-unicode/src/rxvt.h	2006/01/17 12:29:40	1.219
+++ rxvt-unicode/src/rxvt.h	2006/01/19 19:51:08	1.224
@@ -96,8 +96,6 @@
 # define STDERR_FILENO  2
 #endif
 
-enum rxvt_privaction { IGNORE = 'i', SAVE = 's', RESTORE = 'r' };//TODO
-
 /*
  *****************************************************************************
  * PROTOTYPES                    
@@ -110,7 +108,6 @@
 void           * rxvt_malloc                      (size_t size);
 void           * rxvt_calloc                      (size_t number, size_t size);
 void           * rxvt_realloc                     (void *ptr, size_t size);
-void             rxvt_privileges                  (rxvt_privaction action);
 
 // util.C
 char *           rxvt_wcstombs                    (const wchar_t *str, int len = -1);
@@ -186,18 +183,17 @@
   }
 
   virtual bool get () = 0;
-
+#if UTMP_SUPPORT
   virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
-  virtual void logout () = 0;
+#endif
 
   void close_tty ();
-
   bool make_controlling_tty ();
   void set_utf8_mode (bool on);
 };
 
-// a "factory" *g*
-rxvt_ptytty *rxvt_new_ptytty ();
+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
@@ -1190,6 +1186,7 @@
   xevent_watcher scrollbar_ev;
 #endif
 
+  void child_cb (child_watcher &w, int status); child_watcher child_ev;
   void check_cb (check_watcher &w); check_watcher check_ev;
   void destroy_cb (time_watcher &w); time_watcher destroy_ev;
   void flush_cb (time_watcher &w); time_watcher flush_ev;
@@ -1229,7 +1226,6 @@
 
   rxvt_term ();
   ~rxvt_term ();
-  void child_exit (); // child has exited, usually destroys
   void destroy ();
   void emergency_cleanup ();
 
@@ -1329,7 +1325,6 @@
   void Get_Colours ();
   void get_ourmods ();
   // main.C
-  void privileged_utmp (rxvt_privaction action);
   bool set_fonts ();
   void set_string_property (Atom prop, const char *str, int len = -1);
   void set_utf8_property (Atom prop, const char *str, int len = -1);
@@ -1432,8 +1427,10 @@
   void scr_remap_chars ();
   void scr_remap_chars (line_t &l);
 
+  enum cursor_mode { SAVE, RESTORE };
+
   void scr_poweron ();
-  void scr_cursor (int mode);
+  void scr_cursor (cursor_mode mode);
   void scr_do_wrap ();
   int scr_change_screen (int scrn);
   void scr_color (unsigned int color, int fgbg);
@@ -1470,7 +1467,7 @@
   void selection_check (int check_more);
   void selection_paste (Window win, Atom prop, bool delete_prop);
   void selection_property (Window win, Atom prop);
-  void selection_request (Time tm, int x, int y);
+  void selection_request (Time tm);
   int selection_request_other (Atom target, int selnum);
   void selection_clear ();
   void selection_make (Time tm);