--- rxvt-unicode/src/rxvttoolkit.h	2007/12/14 05:25:26	1.38
+++ rxvt-unicode/src/rxvttoolkit.h	2011/02/11 01:24:46	1.50
@@ -31,7 +31,6 @@
 
 #include "ev_cpp.h"
 
-#include "rxvtlib.h"
 #include "rxvtutil.h"
 
 #include "callback.h"
@@ -62,6 +61,7 @@
   XA_NET_WM_NAME,
   XA_NET_WM_ICON_NAME,
   XA_NET_WM_PING,
+  XA_NET_WM_ICON,
 #endif
 #if USE_XIM
   XA_WM_LOCALE_NAME,
@@ -76,7 +76,7 @@
   XA_XEMBED_INFO,
 #endif
 #if !ENABLE_MINIMAL
-  // these are usually allocated by other subsystens, but we do it
+  // these are usually allocated by other subsystems, but we do it
   // here to avoid a server roundtrip.
   XA_SCREEN_RESOURCES,
   XA_XDCCC_LINEAR_RGB_CORRECTION,
@@ -237,6 +237,7 @@
   int       screen;
   Window    root;
   rxvt_term *selection_owner;
+  rxvt_term *clipboard_owner;
   Atom      xa[NUM_XA];
   bool      is_local;
 #ifdef POINTER_BLANK
@@ -249,9 +250,13 @@
   void ref_next ();
   ~rxvt_display ();
 
-  void flush ();
+  void flush ()
+  {
+    flush_ev.start ();
+  }
+
   Atom atom (const char *name);
-  void set_selection_owner (rxvt_term *owner);
+  void set_selection_owner (rxvt_term *owner, bool clipboard);
 
   void reg (xevent_watcher *w);
   void unreg (xevent_watcher *w);
@@ -266,7 +271,8 @@
 };
 
 #ifdef USE_XIM
-struct im_watcher : rxvt_watcher, callback<void (void)> {
+struct im_watcher : rxvt_watcher, callback<void (void)>
+{
   void start (rxvt_display *display)
   {
     display->reg (this);
@@ -328,6 +334,15 @@
   bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); }
   bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
 
+  bool is_opaque () const
+  {
+#if XFT
+    return c.color.alpha == rgba::MAX_CC;
+#else
+    return 1;
+#endif
+  }
+
   bool alloc (rxvt_screen *screen, const rgba &color);
   void free (rxvt_screen *screen);
 
@@ -340,13 +355,43 @@
   void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0));
 };
 
-#if TRACE_PIXMAPS
-Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d);
-void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p);
+#define Sel_normal              0x01    /* normal selection */
+#define Sel_incr                0x02    /* incremental selection */
+#define Sel_Primary             0x01
+#define Sel_Secondary           0x02
+#define Sel_Clipboard           0x03
+#define Sel_whereMask           0x0f
+#define Sel_CompoundText        0x10    /* last request was COMPOUND_TEXT */
+#define Sel_UTF8String          0x20    /* last request was UTF8_STRING */
 
-# define XCreatePixmap(dpy,r,w,h,d) trace_XCreatePixmap (__FILE__,__LINE__,dpy,r,w,h,d)
-# define XFreePixmap(dpy,p) trace_XFreePixmap (__FILE__,__LINE__,dpy,p)
-#endif
+typedef void (*sel_cb)(char *data, unsigned int len, struct rxvt_selection *rs, void *ptr);
+
+struct rxvt_selection
+{
+  rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, sel_cb cb, void *ptr);
+  ~rxvt_selection ();
+
+private:
+  rxvt_display *display;
+  Time request_time;
+  Window request_win;
+  Atom request_prop;
+  sel_cb request_cb;
+  void *user_data;
+
+  unsigned char selection_wait;
+  unsigned char selection_type;
+
+  char *incr_buf;
+  size_t incr_buf_size, incr_buf_fill;
+
+  void timer_cb (ev::timer &w, int revents); ev::timer timer_ev;
+  void x_cb (XEvent &xev); xevent_watcher x_ev;
+
+  void stop ();
+  bool request (Atom target, int selnum);
+  void handle_selection (Window win, Atom prop, bool delete_prop);
+};
 
 #endif