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

Comparing rxvt-unicode/src/rxvttoolkit.h (file contents):
Revision 1.46 by root, Tue Nov 4 11:03:29 2008 UTC vs.
Revision 1.49 by sf-exg, Fri Oct 22 16:49:26 2010 UTC

 //public
   Display   *dpy;
   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
   {
     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);
 #ifdef USE_XIM
   void put_xim (rxvt_xim *xim);
 #endif
 };
 #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);
   }
   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

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