*** empty log message ***

diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod
index 56cd3c6..7e4781f 100644 (file)
--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -1473,7 +1473,7 @@ Project Coordinator (Changes 1.0 -)
 
 =item Emanuele Giaquinta L<< <e.giaquinta@glauco.it> >>
 
-Pty/tty/utmp/wtmp rewrite, lots of random hacking and bugxifing.
+Pty/tty/utmp/wtmp rewrite, lots of random hacking and bugfixing.
 
 =back
 

diff --git a/src/rxvt.h b/src/rxvt.h
index 5db7c1a..c090b81 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1471,7 +1471,7 @@ struct rxvt_term : zero_initialized, rxvt_vars {
   void selection_check (int check_more);
   void selection_paste (Window win, Atom prop, bool delete_prop);
   void selection_property (Window win, Atom prop);
-  void selection_request (Time tm);
+  void selection_request (Time tm, int selnum);
   int selection_request_other (Atom target, int selnum);
   void selection_clear ();
   void selection_make (Time tm);

diff --git a/src/screen.C b/src/screen.C
index d770260..37f3558 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -2804,8 +2804,13 @@ rxvt_term::selection_property (Window win, Atom prop)
  * EXT: button 2 release
  */
 void
-rxvt_term::selection_request (Time tm)
+rxvt_term::selection_request (Time tm, int selnum)
 {
+/* After making a selection with selection_make this function will always
+ * return the internal selection, which is not correct IMO, now much more since
+ * I added the selnum parameter.
+ */
+#if 0
   if (selection.text)
     { /* internal selection */
       char *str = rxvt_wcstombs (selection.text, selection.len);
@@ -2814,24 +2819,20 @@ rxvt_term::selection_request (Time tm)
       return;
     }
   else
+#endif
     {
-      int i;
-
       selection_request_time = tm;
       selection_wait = Sel_normal;
 
-      for (i = Sel_Primary; i <= Sel_Clipboard; i++)
-        {
 #if X_HAVE_UTF8_STRING
-          selection_type = Sel_UTF8String;
-          if (selection_request_other (xa[XA_UTF8_STRING], i))
-            return;
+      selection_type = Sel_UTF8String;
+      if (selection_request_other (xa[XA_UTF8_STRING], selnum))
+       return;
 #else
-          selection_type = Sel_CompoundText;
-          if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
-            return;
+      selection_type = Sel_CompoundText;
+      if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
+       return;
 #endif
-        }
     }
 
   selection_wait = Sel_none;       /* don't loop in selection_paste () */