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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.103 by root, Fri Sep 4 15:40:13 2009 UTC vs.
Revision 1.104 by sf-exg, Sun Jan 24 21:53:13 2010 UTC

 /////////////////////////////////////////////////////////////////////////////
 rxvt_display::rxvt_display (const char *id)
 : refcounted (id)
 , selection_owner (0)
+, clipboard_owner (0)
 {
   x_ev    .set<rxvt_display, &rxvt_display::x_cb    > (this);
   flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
 }
       xw[w->active - 1] = 0;
       w->active = 0;
     }
 }
-void rxvt_display::set_selection_owner (rxvt_term *owner)
+void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
 {
+  rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
-  if (selection_owner && selection_owner != owner)
+  if (cur_owner && cur_owner != owner)
     {
-      rxvt_term *owner = selection_owner;
-      owner->selection_clear ();
+      cur_owner->selection_clear (clipboard);
-      owner->flush ();
+      cur_owner->flush ();
     }
-  selection_owner = owner;
+  cur_owner = owner;
 }
 #ifdef USE_XIM
 void rxvt_display::reg (im_watcher *w)

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