--- rxvt-unicode/src/rxvttoolkit.h	2011/02/21 07:12:03	1.54
+++ rxvt-unicode/src/rxvttoolkit.h	2012/06/03 15:50:22	1.59
@@ -3,7 +3,7 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
  * Copyright (c) 2011      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -218,6 +218,12 @@
   void clear ();
 };
 
+enum {
+  DISPLAY_HAS_RENDER      = 1 << 0,
+  DISPLAY_HAS_RENDER_MUL  = 1 << 1,
+  DISPLAY_HAS_RENDER_CONV = 1 << 2,
+};
+
 struct rxvt_display : refcounted
 {
   event_vec<xevent_watcher> xw;
@@ -244,6 +250,7 @@
 #ifdef POINTER_BLANK
   Cursor    blank_cursor;
 #endif
+  uint8_t   flags;
 
   rxvt_display (const char *id);
   XrmDatabase get_resources (bool refresh);
@@ -367,22 +374,22 @@
 
 struct rxvt_selection
 {
-  rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, rxvt_term *term, void *cb_sv = 0);
+  rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, rxvt_term *term);
   void run ();
   ~rxvt_selection ();
 
   rxvt_term *term; // terminal to paste to, may be 0
-  void *cb_sv;     // perl callback, may be 0
-  
+  void *cb_sv;     // managed by perl
+
   rxvt_display *display;
   Time request_time;
   Window request_win;
   Atom request_prop;
 
+private:
   unsigned char selection_wait;
   unsigned char selection_type;
 
-private:
   char *incr_buf;
   size_t incr_buf_size, incr_buf_fill;