set _NET_WM_USER_TIME on the window

[dana/urxvt.git] / src / rxvttoolkit.h

diff --git a/src/rxvttoolkit.h b/src/rxvttoolkit.h
index d6893f5..d0ef9d6 100644 (file)
--- a/src/rxvttoolkit.h
+++ b/src/rxvttoolkit.h
@@ -29,9 +29,8 @@
 # include <X11/Xft/Xft.h>
 #endif
 
-#include "iom.h"
+#include "ev_cpp.h"
 
-#include "rxvtlib.h"
 #include "rxvtutil.h"
 
 #include "callback.h"
@@ -62,12 +61,14 @@ enum {
   XA_NET_WM_NAME,
   XA_NET_WM_ICON_NAME,
   XA_NET_WM_PING,
+  XA_NET_WM_ICON,
+  XA_NET_WM_USER_TIME,
 #endif
 #if USE_XIM
   XA_WM_LOCALE_NAME,
   XA_XIM_SERVERS,
 #endif
-#if TRANSPARENT
+#if ENABLE_TRANSPARENCY
   XA_XROOTPMAP_ID,
   XA_ESETROOT_PMAP_ID,
 #endif
@@ -76,7 +77,7 @@ enum {
   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,
@@ -102,7 +103,31 @@ struct rxvt_display;
 struct im_watcher;
 struct xevent_watcher;
 
-struct refcounted {
+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;
 
@@ -113,7 +138,8 @@ struct refcounted {
 };
 
 template<class T>
-struct refcache : vector<T *> {
+struct refcache : vector<T *>
+{
   T *get (const char *id);
   void put (T *obj);
   void clear ();
@@ -128,7 +154,8 @@ struct refcache : vector<T *> {
 
 struct rxvt_screen;
 
-struct rxvt_drawable {
+struct rxvt_drawable
+{
   rxvt_screen *screen;
   Drawable drawable;
   operator Drawable() { return drawable; }
@@ -154,7 +181,8 @@ struct rxvt_drawable {
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef USE_XIM
-struct rxvt_xim : refcounted {
+struct rxvt_xim : refcounted
+{
   void destroy ();
   rxvt_display *display;
 
@@ -167,7 +195,8 @@ struct rxvt_xim : refcounted {
 };
 #endif
 
-struct rxvt_screen {
+struct rxvt_screen
+{
   rxvt_display *display;
   Display *dpy;
   int depth;
@@ -185,14 +214,16 @@ struct 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;
+struct rxvt_display : refcounted
+{
+  event_vec<xevent_watcher> xw;
 
-  io_watcher x_ev; void x_cb (io_watcher &w, short 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
   refcache<rxvt_xim> xims;
@@ -207,6 +238,7 @@ struct rxvt_display : refcounted {
   int       screen;
   Window    root;
   rxvt_term *selection_owner;
+  rxvt_term *clipboard_owner;
   Atom      xa[NUM_XA];
   bool      is_local;
 #ifdef POINTER_BLANK
@@ -219,9 +251,13 @@ struct rxvt_display : refcounted {
   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);
@@ -236,16 +272,13 @@ struct rxvt_display : refcounted {
 };
 
 #ifdef USE_XIM
-struct im_watcher : watcher, callback<void (void)> {
-  template<class O, class M>
-  im_watcher (O object, M method)
-  : callback<void (void)> (object, method)
-  { }
-
+struct im_watcher : rxvt_watcher, callback<void (void)>
+{
   void start (rxvt_display *display)
   {
     display->reg (this);
   }
+
   void stop (rxvt_display *display)
   {
     display->unreg (this);
@@ -253,19 +286,16 @@ struct im_watcher : watcher, callback<void (void)> {
 };
 #endif
 
-struct xevent_watcher : 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;
     display->reg (this);
   }
+
   void stop (rxvt_display *display)
   {
     display->unreg (this);
@@ -278,7 +308,8 @@ extern refcache<rxvt_display> displays;
 
 typedef unsigned long Pixel;
 
-struct rgba {
+struct rgba
+{
   unsigned short r, g, b, a;
 
   enum { MIN_CC = 0x0000, MAX_CC  = 0xffff };
@@ -291,7 +322,8 @@ struct rgba {
   { }
 };
 
-struct rxvt_color {
+struct rxvt_color
+{
 #if XFT
   XftColor c;
 #else
@@ -303,17 +335,34 @@ struct rxvt_color {
   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);
 
   void get (rgba &color);
   void get (XColor &color);
- 
+
   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));
 };
 
+#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 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
+
 #endif