--- rxvt-unicode/src/rxvt.h	2003/12/16 23:04:13	1.11
+++ rxvt-unicode/src/rxvt.h	2003/12/18 02:07:12	1.15
@@ -1,5 +1,5 @@
 /*
- * $Id: rxvt.h,v 1.11 2003/12/16 23:04:13 pcg Exp $
+ * $Id: rxvt.h,v 1.15 2003/12/18 02:07:12 pcg Exp $
  */
 
 #ifndef _RXVT_H_                /* include once only */
@@ -17,6 +17,7 @@
 #include "defaultfont.h"
 #include "rxvtcolor.h"
 #include "iom.h"
+#include "salloc.h"
 
 /*
  *****************************************************************************
@@ -482,9 +483,6 @@
 #if (MENUBAR_MAX)
   Rs_menu,
 #endif
-#ifndef NO_BOLDFONT
-  Rs_boldFont,
-#endif
 #ifdef GREEK_SUPPORT
   Rs_greek_keyboard,
   Rs_greektoggle_key,
@@ -553,6 +551,7 @@
   Rs_cursorBlink,
   Rs_pointerBlank,
   Rs_pointerBlankDelay,
+  Rs_imLocale,
   NUM_RESOURCES
 };
 
@@ -770,8 +769,8 @@
 # define rxvt_get_fontwidest(font)      ((font)->max_bounds.width)
 #endif
 
-#define rxvt_Gr_ButtonPress(x,y)        rxvt_Gr_ButtonReport (r, 'P',(x),(y))
-#define rxvt_Gr_ButtonRelease(x,y)      rxvt_Gr_ButtonReport (r, 'R',(x),(y))
+#define rxvt_Gr_ButtonPress(x,y)        rxvt_Gr_ButtonReport (R, 'P',(x),(y))
+#define rxvt_Gr_ButtonRelease(x,y)      rxvt_Gr_ButtonReport (R, 'R',(x),(y))
 
 #ifdef UTMP_SUPPORT
 # if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
@@ -1087,6 +1086,9 @@
   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 ();
@@ -1128,6 +1130,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__