--- rxvt-unicode/src/rxvt.h	2006/01/19 09:47:15	1.222
+++ rxvt-unicode/src/rxvt.h	2006/01/19 20:30:36	1.225
@@ -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);
@@ -180,9 +177,13 @@
   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;
@@ -1328,7 +1329,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);
@@ -1431,8 +1431,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);
@@ -1469,7 +1471,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);