--- rxvt-unicode/src/rxvt.h	2006/01/20 10:27:08	1.227
+++ rxvt-unicode/src/rxvt.h	2006/01/21 23:50:33	1.232
@@ -160,7 +160,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;
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -666,10 +665,6 @@
   XA_XROOTPMAP_ID,
   XA_ESETROOT_PMAP_ID,
 #endif
-#if OFFIX_DND                /* OffiX Dnd (drag 'n' drop) support */
-  XA_DNDPROTOCOL,
-  XA_DNDSELECTION,
-#endif
 #if ENABLE_XEMBED
   XA_XEMBED,
   XA_XEMBED_INFO,
@@ -1002,7 +997,6 @@
                   am_pixmap_trans:1, 	/* transparency w/known root pixmap  */
 #endif
                   current_screen:1,	/* primary or secondary              */
-                  hate_those_clicks:1,	/* a.k.a. keep mark position         */
                   num_scr_allow:1,
                   bypass_keystate:1,
 #ifdef CURSOR_BLINK
@@ -1027,7 +1021,10 @@
                   selection_wait,
                   selection_type;
 /* ---------- */
-  short           rvideo;
+  bool            rvideo_state, rvideo_mode;
+#ifndef NO_BELL
+  bool            rvideo_bell;
+#endif
   int             num_scr;              /* screen: number lines scrolled */
   int             prev_ncol,            /* screen: previous number of columns */
                   prev_nrow;            /* screen: previous number of rows */
@@ -1202,9 +1199,7 @@
   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;
-
   void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
-
   void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
 
 #ifdef CURSOR_BLINK
@@ -1213,6 +1208,9 @@
 #ifdef TEXT_BLINK
   void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
 #endif
+#ifndef NO_BELL     
+  void bell_cb (time_watcher &w); time_watcher bell_ev;
+#endif
 
 #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
   void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
@@ -1454,7 +1452,7 @@
   void scr_relative_origin (int mode) NOTHROW;
   void scr_insert_mode (int mode) NOTHROW;
   void scr_set_tab (int mode) NOTHROW;
-  void scr_rvideo_mode (int mode) NOTHROW;
+  void scr_rvideo_mode (bool on) NOTHROW;
   void scr_report_position () NOTHROW;
   void set_font_style () NOTHROW;
   void scr_charset_choose (int set) NOTHROW;
@@ -1472,7 +1470,7 @@
   void selection_check (int check_more) NOTHROW;
   void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
   void selection_property (Window win, Atom prop) NOTHROW;
-  void selection_request (Time tm, int selnum) NOTHROW;
+  void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
   int selection_request_other (Atom target, int selnum) NOTHROW;
   void selection_clear () NOTHROW;
   void selection_make (Time tm);