--- rxvt-unicode/src/rxvt.h	2003/12/02 21:49:46	1.10
+++ rxvt-unicode/src/rxvt.h	2003/12/17 09:00:35	1.12
@@ -1,5 +1,5 @@
 /*
- * $Id: rxvt.h,v 1.10 2003/12/02 21:49:46 pcg Exp $
+ * $Id: rxvt.h,v 1.12 2003/12/17 09:00:35 pcg Exp $
  */
 
 #ifndef _RXVT_H_                /* include once only */
@@ -17,6 +17,7 @@
 #include "defaultfont.h"
 #include "rxvtcolor.h"
 #include "iom.h"
+#include "salloc.h"
 
 /*
  *****************************************************************************
@@ -557,11 +558,6 @@
 };
 
 enum {
-  TIMEOUT_INCR = 0,
-  NUM_TIMEOUTS
-};
-
-enum {
   XA_COMPOUND_TEXT = 0,
   XA_MULTIPLE,
   XA_TARGETS,
@@ -1071,7 +1067,6 @@
 #ifdef POINTER_BLANK
   struct timeval  lastmotion;
 #endif
-  struct timeval  timeout[NUM_TIMEOUTS];
 
 /* these three don't need to be kept but do so to placate some mem checkers */
   char           *env_windowid;       /* environmental variable WINDOWID */
@@ -1093,6 +1088,11 @@
   unsigned char   cmdbuf_base[BUFSIZ];
   unsigned char   kbuf[KBUFSZ];
 
+  rxvt_salloc *ralloc;
+  rxvt_salloc *talloc;
+
+  void paste (const unsigned char *data, unsigned int len);
+
   void flush ();
 
   void check_cb   (check_watcher &w); check_watcher check_ev;
@@ -1101,6 +1101,8 @@
   void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
   void x_cb   (io_watcher &w, short revents); io_watcher x_ev;
 
+  void incr_cb (time_watcher &w); time_watcher incr_ev;
+
 #ifdef CURSOR_BLINK
   void blink_cb (time_watcher &w); time_watcher blink_ev;
 #endif
@@ -1130,6 +1132,14 @@
 
   void *operator new (size_t s);
   void operator delete (void *p, size_t s);
+
+  /* screen(!) */
+  void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
+  void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
+  int scr_scroll_text (int row1, int row2, int count, int spec);
+  void scr_reset ();
+  void scr_reset_realloc ();
+  void scr_release ();
 };
 
 #ifndef __attribute__