--- rxvt-unicode/src/rxvt.h	2006/01/12 01:30:53	1.199
+++ rxvt-unicode/src/rxvt.h	2006/01/15 06:02:40	1.204
@@ -5,6 +5,21 @@
 
 #include "feature.h"
 
+#if defined (ISO_14755) || defined (ENABLE_PERL)
+# define ENABLE_OVERLAY 1
+#endif
+
+#if ENABLE_PERL
+# define ENABLE_FRILLS 1
+# define ENABLE_COMBINING 1
+#endif
+
+#if ENABLE_FRILLS
+# define ENABLE_XEMBED 1
+# define ENABLE_EWMH   1
+# define CURSOR_BLINK  1
+#endif
+
 #include <limits.h>
 
 #include <X11/cursorfont.h>
@@ -23,12 +38,6 @@
 
 #include "rxvtperl.h"
 
-#if ENABLE_FRILLS
-# define ENABLE_XEMBED 1
-# define ENABLE_EWMH   1
-# define CURSOR_BLINK  1
-#endif
-
 /*
  *****************************************************************************
  * SYSTEM HACKS
@@ -45,7 +54,7 @@
 #endif
 
 #ifndef HAVE_XPOINTER
-typedef char   *XPointer;
+typedef char *XPointer;
 #endif
 
 #ifdef HAVE_TERMIOS_H
@@ -231,10 +240,6 @@
 # define NO_MOUSE_REPORT_SCROLLBAR 1
 #endif
 
-#if defined (ISO_14755) || defined (ENABLE_PERL)
-# define ENABLE_OVERLAY 1
-#endif
-
 /* now look for other badly set stuff */
 
 #if !defined (EACCESS) && defined(EAGAIN)
@@ -1210,7 +1215,12 @@
   // modifies first argument(!)
   void paste (char *data, unsigned int len);
 
-  void flush ();
+  long vt_emask, vt_emask_perl;
+
+  void vt_select_input ()
+  {
+    XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
+  }
 
 #if TRANSPARENT
   void rootwin_cb (XEvent &xev);
@@ -1218,6 +1228,7 @@
 #endif
 
   void x_cb (XEvent &xev);
+  void flush ();
   xevent_watcher termwin_ev;
   xevent_watcher vt_ev;
 #ifdef HAVE_SCROLLBARS
@@ -1524,9 +1535,9 @@
   void set_font_style ();
   void scr_charset_choose (int set);
   void scr_charset_set (int set, unsigned int ch);
-  int scr_move_to (int y, int len);
-  int scr_page (enum page_dirn direction, int nlines);
-  int scr_changeview (unsigned int oldviewstart);
+  void scr_move_to (int y, int len);
+  bool scr_page (enum page_dirn direction, int nlines);
+  bool scr_changeview (int new_view_start);
   void scr_bell ();
   void scr_printscreen (int fullhist);
   void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);