--- rxvt-unicode/src/rxvt.h	2006/01/25 13:24:45	1.244
+++ rxvt-unicode/src/rxvt.h	2006/01/28 20:33:31	1.246
@@ -512,6 +512,7 @@
   Rxvt_dumpscreen        = 55,      // dump scrollback and all of screen
 
   URxvt_locale           = 701,     // change locale
+  URxvt_version          = 702,     // request version
 
   URxvt_Color_IT         = 704,     // change actual 'Italic' colour
   URxvt_Color_tint       = 705,     // change actual tint colour
@@ -701,7 +702,6 @@
  *****************************************************************************
  */
 #define dLocal(type,name)       type const name = this->name
-#define dDisp			Display *disp = this->display->display
 
 // for speed reasons, we assume that all latin1 characters
 // are single-width (the first unicode combining character
@@ -913,7 +913,7 @@
   class keyboard_manager;
 #endif
 
-struct rxvt_term : zero_initialized, rxvt_vars {
+struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
   log_callback   *log_hook;               // log error messages through this hook, if != 0
   getfd_callback *getfd_hook;           // convert remote to local fd, if != 0
 #if ENABLE_PERL
@@ -1113,7 +1113,7 @@
 
   void vt_select_input () const NOTHROW
   {
-    XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim);
+    XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
   }
 
 #if TRANSPARENT