--- rxvt-unicode/src/rxvttoolkit.h	2006/01/29 20:51:28	1.13
+++ rxvt-unicode/src/rxvttoolkit.h	2007/11/11 04:08:00	1.34
@@ -1,6 +1,25 @@
-/*
- * rxvttoolkit.h - provide toolkit-functionality for rxvt.
- */
+/*----------------------------------------------------------------------*
+ * File:	rxvttoolkit.h - provide toolkit-functionality for rxvt.
+ *----------------------------------------------------------------------*
+ *
+ * All portions of code are copyright by their respective author/s.
+ * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *----------------------------------------------------------------------*/
+
 #ifndef RXVT_TOOLKIT_H
 #define RXVT_TOOLKIT_H
 
@@ -10,7 +29,7 @@
 # include <X11/Xft/Xft.h>
 #endif
 
-#include "iom.h"
+#include "ev_cpp.h"
 
 #include "rxvtlib.h"
 #include "rxvtutil.h"
@@ -30,6 +49,11 @@
   XA_WM_PROTOCOLS,
   XA_WM_DELETE_WINDOW,
   XA_CLIPBOARD,
+  XA_AVERAGE_WIDTH,
+  XA_WEIGHT_NAME,
+  XA_SLANT,
+  XA_CHARSET_REGISTRY,
+  XA_CHARSET_ENCODING,
 #if ENABLE_FRILLS
   XA_MOTIF_WM_HINTS,
 #endif
@@ -43,7 +67,7 @@
   XA_WM_LOCALE_NAME,
   XA_XIM_SERVERS,
 #endif
-#if TRANSPARENT
+#if ENABLE_TRANSPARENCY
   XA_XROOTPMAP_ID,
   XA_ESETROOT_PMAP_ID,
 #endif
@@ -51,6 +75,24 @@
   XA_XEMBED,
   XA_XEMBED_INFO,
 #endif
+#if !ENABLE_MINIMAL
+  // these are usually allocated by other subsystens, but we do it
+  // here to avoid a server roundtrip.
+  XA_SCREEN_RESOURCES,
+  XA_XDCCC_LINEAR_RGB_CORRECTION,
+  XA_XDCCC_LINEAR_RGB_MATRICES,
+  XA_WM_COLORMAP_WINDOWS,
+  XA_WM_STATE,
+  XA_cursor,
+# if USE_XIM
+  // various selection targets used by XIM
+  XA_TRANSPORT,
+  XA_LOCALES,
+  XA__XIM_PROTOCOL,
+  XA__XIM_XCONNECT,
+  XA__XIM_MOREDATA,
+# endif
+#endif
   NUM_XA
 };
 
@@ -60,6 +102,27 @@
 struct im_watcher;
 struct xevent_watcher;
 
+template<class watcher>
+struct event_vec : vector<watcher *> {
+  void erase_unordered (unsigned int pos)
+  {
+    watcher *w = (*this)[this->size () - 1];
+    this->pop_back ();
+
+    if (!this->empty ())
+      if (((*this)[pos] = w)) // '=' is correct!
+        w->active = pos + 1;
+  }
+};
+
+struct rxvt_watcher {
+  int active; /* 0 == inactive, else index into respective vector */
+
+  bool is_active () { return active; }
+
+  rxvt_watcher () : active (0) { }
+};
+
 struct refcounted {
   int referenced;
   char *id;
@@ -84,6 +147,33 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
+struct rxvt_screen;
+
+struct rxvt_drawable {
+  rxvt_screen *screen;
+  Drawable drawable;
+  operator Drawable() { return drawable; }
+
+#if XFT
+  XftDraw *xftdrawable;
+  operator XftDraw *();
+#endif
+
+  rxvt_drawable (rxvt_screen *screen, Drawable drawable)
+  : screen(screen),
+#if XFT
+    xftdrawable(0),
+#endif
+    drawable(drawable)
+  { }
+
+#if XFT
+  ~rxvt_drawable ();
+#endif
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
 #ifdef USE_XIM
 struct rxvt_xim : refcounted {
   void destroy ();
@@ -100,20 +190,30 @@
 
 struct rxvt_screen {
   rxvt_display *display;
-  Display *xdisp;
+  Display *dpy;
   int depth;
   Visual *visual;
   Colormap cmap;
 
+#if XFT
+  // scratch pixmap
+  rxvt_drawable *scratch_area;
+  int scratch_w, scratch_h;
+
+  rxvt_drawable &scratch_drawable (int w, int h);
+
+  rxvt_screen ();
+#endif
+
   void set (rxvt_display *disp);
-  void set (rxvt_display *disp, int bitdepth);
+  void select_visual (int bitdepth);
   void clear ();
 };
 
 struct rxvt_display : refcounted {
-  io_manager_vec<xevent_watcher> xw;
+  event_vec<xevent_watcher> xw;
 
-  io_watcher x_ev; void x_cb (io_watcher &w, short revents);
+  ev::io x_ev; void x_cb (ev::io &w, int revents);
 
 #ifdef USE_XIM
   refcache<rxvt_xim> xims;
@@ -124,20 +224,18 @@
 #endif
 
 //public
-  Display   *display;
+  Display   *dpy;
   int       screen;
   Window    root;
   rxvt_term *selection_owner;
   Atom      xa[NUM_XA];
-#ifndef NO_SLOW_LINK_SUPPORT
   bool      is_local;
-#endif
 #ifdef POINTER_BLANK
   Cursor    blank_cursor;
 #endif
 
   rxvt_display (const char *id);
-  XrmDatabase get_resources ();
+  XrmDatabase get_resources (bool refresh);
   bool ref_init ();
   void ref_next ();
   ~rxvt_display ();
@@ -159,16 +257,17 @@
 };
 
 #ifdef USE_XIM
-struct im_watcher : watcher, callback0<void> {
-  template<class O1, class O2>
-  im_watcher (O1 *object, void (O2::*method) ())
-  : callback0<void> (object,method)
+struct im_watcher : rxvt_watcher, callback<void (void)> {
+  template<class O, class M>
+  im_watcher (O object, M method)
+  : callback<void (void)> (object, method)
   { }
 
   void start (rxvt_display *display)
   {
     display->reg (this);
   }
+
   void stop (rxvt_display *display)
   {
     display->unreg (this);
@@ -176,12 +275,12 @@
 };
 #endif
 
-struct xevent_watcher : watcher, callback1<void, XEvent &> {
+struct xevent_watcher : rxvt_watcher, callback<void (XEvent &)> {
   Window window;
 
-  template<class O1, class O2>
-  xevent_watcher (O1 *object, void (O2::*method) (XEvent &))
-  : callback1<void, XEvent &> (object,method)
+  template<class O, class M>
+  xevent_watcher (O object, M method)
+  : callback<void (XEvent &)> (object, method)
   { }
 
   void start (rxvt_display *display, Window window)
@@ -189,6 +288,7 @@
     this->window = window;
     display->reg (this);
   }
+
   void stop (rxvt_display *display)
   {
     display->unreg (this);
@@ -201,15 +301,15 @@
 
 typedef unsigned long Pixel;
 
-struct rxvt_rgba {
+struct rgba {
   unsigned short r, g, b, a;
 
   enum { MIN_CC = 0x0000, MAX_CC  = 0xffff };
 
-  rxvt_rgba ()
+  rgba ()
   { }
 
-  rxvt_rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
+  rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
   : r(r), g(g), b(b), a(a)
   { }
 };
@@ -217,24 +317,25 @@
 struct rxvt_color {
 #if XFT
   XftColor c;
-  operator Pixel () const { return c.pixel; }
 #else
-  Pixel p;
-  operator Pixel () const { return p; }
+  XColor c;
 #endif
 
+  operator Pixel () const { return c.pixel; }
+
   bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); }
   bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
 
-  void get (rxvt_screen *screen, rxvt_rgba &rgba);
- 
-  bool set (rxvt_screen *screen, const char *name);
-  bool set (rxvt_screen *screen, rxvt_rgba rgba);
+  bool alloc (rxvt_screen *screen, const rgba &color);
+  void free (rxvt_screen *screen);
 
-  rxvt_color fade (rxvt_screen *screen, int percent); // fades to black
-  rxvt_color fade (rxvt_screen *screen, int percent, rxvt_color &fadeto);
+  void get (rgba &color);
+  void get (XColor &color);
 
-  void free (rxvt_screen *screen);
+  bool set (rxvt_screen *screen, const char *name);
+  bool set (rxvt_screen *screen, const rgba &color);
+
+  void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0));
 };
 
 #endif