[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvttoolkit.h

Comparing rxvt-unicode/src/rxvttoolkit.h (file contents):
Revision 1.27 by root, Mon Feb 20 22:42:01 2006 UTC vs.
Revision 1.30 by sasha, Fri Jun 8 20:04:12 2007 UTC

   rxvt_screen ();
 #endif
   void set (rxvt_display *disp);
-  void set (rxvt_display *disp, int bitdepth);
+  void select_visual (int bitdepth);
   void clear ();
 };
+#ifdef HAVE_AFTERIMAGE
+struct ASVisual;
+#endif
 struct rxvt_display : refcounted {
   io_manager_vec<xevent_watcher> xw;
   io_watcher x_ev; void x_cb (io_watcher &w, short revents);
 //public
   Display   *dpy;
   int       screen;
   Window    root;
+#ifdef HAVE_AFTERIMAGE
+  struct ASVisual  *asv;
+#endif
   rxvt_term *selection_owner;
   Atom      xa[NUM_XA];
   bool      is_local;
 #ifdef POINTER_BLANK
   Cursor    blank_cursor;
   void put_xim (rxvt_xim *xim);
 #endif
 };
 #ifdef USE_XIM
-struct im_watcher : watcher, callback0<void> {
+struct im_watcher : watcher, callback<void (void)> {
-  template<class O1, class O2>
+  template<class O, class M>
-  im_watcher (O1 *object, void (O2::*method) ())
+  im_watcher (O object, M method)
-  : callback0<void> (object,method)
+  : callback<void (void)> (object, method)
   { }
   void start (rxvt_display *display)
   {
     display->reg (this);
     display->unreg (this);
   }
 };
 #endif
-struct xevent_watcher : watcher, callback1<void, XEvent &> {
+struct xevent_watcher : watcher, callback<void (XEvent &)> {
   Window window;
-  template<class O1, class O2>
+  template<class O, class M>
-  xevent_watcher (O1 *object, void (O2::*method) (XEvent &))
+  xevent_watcher (O object, M method)
-  : callback1<void, XEvent &> (object,method)
+  : callback<void (XEvent &)> (object, method)
   { }
   void start (rxvt_display *display, Window window)
   {
     this->window = window;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/rxvttoolkit.h (file contents): Revision 1.27 by root, Mon Feb 20 22:42:01 2006 UTC vs. Revision 1.30 by sasha, Fri Jun 8 20:04:12 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvttoolkit.h (file contents):
Revision 1.27 by root, Mon Feb 20 22:42:01 2006 UTC vs.
Revision 1.30 by sasha, Fri Jun 8 20:04:12 2007 UTC