--- rxvt-unicode/src/rxvttoolkit.h	2007/11/14 22:25:42	1.35
+++ rxvt-unicode/src/rxvttoolkit.h	2012/06/04 15:18:52	1.61
@@ -3,7 +3,8 @@
  *----------------------------------------------------------------------*
  *
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +32,6 @@
 
 #include "ev_cpp.h"
 
-#include "rxvtlib.h"
 #include "rxvtutil.h"
 
 #include "callback.h"
@@ -62,6 +62,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 +77,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,
@@ -103,7 +104,8 @@
 struct xevent_watcher;
 
 template<class watcher>
-struct event_vec : vector<watcher *> {
+struct event_vec : vector<watcher *>
+{
   void erase_unordered (unsigned int pos)
   {
     watcher *w = (*this)[this->size () - 1];
@@ -115,7 +117,8 @@
   }
 };
 
-struct rxvt_watcher {
+struct rxvt_watcher
+{
   int active; /* 0 == inactive, else index into respective vector */
 
   bool is_active () { return active; }
@@ -123,7 +126,8 @@
   rxvt_watcher () : active (0) { }
 };
 
-struct refcounted {
+struct refcounted
+{
   int referenced;
   char *id;
 
@@ -134,7 +138,8 @@
 };
 
 template<class T>
-struct refcache : vector<T *> {
+struct refcache : vector<T *>
+{
   T *get (const char *id);
   void put (T *obj);
   void clear ();
@@ -149,7 +154,8 @@
 
 struct rxvt_screen;
 
-struct rxvt_drawable {
+struct rxvt_drawable
+{
   rxvt_screen *screen;
   Drawable drawable;
   operator Drawable() { return drawable; }
@@ -174,8 +180,9 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef USE_XIM
-struct rxvt_xim : refcounted {
+#if USE_XIM
+struct rxvt_xim : refcounted
+{
   void destroy ();
   rxvt_display *display;
 
@@ -188,7 +195,8 @@
 };
 #endif
 
-struct rxvt_screen {
+struct rxvt_screen
+{
   rxvt_display *display;
   Display *dpy;
   int depth;
@@ -210,12 +218,20 @@
   void clear ();
 };
 
-struct rxvt_display : refcounted {
+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;
 
-  ev::io x_ev; void x_cb (ev::io &w, int revents);
+  ev::prepare flush_ev; void flush_cb (ev::prepare &w, int revents);
+  ev::io      x_ev    ; void x_cb     (ev::io      &w, int revents);
 
-#ifdef USE_XIM
+#if USE_XIM
   refcache<rxvt_xim> xims;
   vector<im_watcher *> imw;
 
@@ -228,11 +244,13 @@
   int       screen;
   Window    root;
   rxvt_term *selection_owner;
+  rxvt_term *clipboard_owner;
   Atom      xa[NUM_XA];
   bool      is_local;
 #ifdef POINTER_BLANK
   Cursor    blank_cursor;
 #endif
+  uint8_t   flags;
 
   rxvt_display (const char *id);
   XrmDatabase get_resources (bool refresh);
@@ -240,14 +258,19 @@
   void ref_next ();
   ~rxvt_display ();
 
-  void flush ();
+  void flush ()
+  {
+    flush_ev.start ();
+  }
+
   Atom atom (const char *name);
-  void set_selection_owner (rxvt_term *owner);
+  Pixmap get_pixmap_property (Atom property);
+  void set_selection_owner (rxvt_term *owner, bool clipboard);
 
   void reg (xevent_watcher *w);
   void unreg (xevent_watcher *w);
 
-#ifdef USE_XIM
+#if USE_XIM
   void reg (im_watcher *w);
   void unreg (im_watcher *w);
 
@@ -256,13 +279,9 @@
 #endif
 };
 
-#ifdef USE_XIM
-struct im_watcher : rxvt_watcher, callback<void (void)> {
-  template<class O, class M>
-  im_watcher (O object, M method)
-  : callback<void (void)> (object, method)
-  { }
-
+#if USE_XIM
+struct im_watcher : rxvt_watcher, callback<void (void)>
+{
   void start (rxvt_display *display)
   {
     display->reg (this);
@@ -275,14 +294,10 @@
 };
 #endif
 
-struct xevent_watcher : rxvt_watcher, callback<void (XEvent &)> {
+struct xevent_watcher : rxvt_watcher, callback<void (XEvent &)>
+{
   Window window;
 
-  template<class O, class M>
-  xevent_watcher (O object, M method)
-  : callback<void (XEvent &)> (object, method)
-  { }
-
   void start (rxvt_display *display, Window window)
   {
     this->window = window;
@@ -301,7 +316,8 @@
 
 typedef unsigned long Pixel;
 
-struct rgba {
+struct rgba
+{
   unsigned short r, g, b, a;
 
   enum { MIN_CC = 0x0000, MAX_CC  = 0xffff };
@@ -314,7 +330,8 @@
   { }
 };
 
-struct rxvt_color {
+struct rxvt_color
+{
 #if XFT
   XftColor c;
 #else
@@ -326,6 +343,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);
 
@@ -338,13 +364,44 @@
   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 */
+
+struct rxvt_selection
+{
+  rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, rxvt_term *term);
+  void run ();
+  ~rxvt_selection ();
 
-# 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
+  rxvt_term *term; // terminal to paste to, 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;
+
+  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 finish (char *data = 0, unsigned int len = 0);
+  void stop ();
+  bool request (Atom target, int selnum);
+  void handle_selection (Window win, Atom prop, bool delete_prop);
+};
 
 #endif