repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 0d28866fac78a1ce76baaf526e0f62d2e5393708:
path_to: 
revision_to: 

commit 0d28866fac78a1ce76baaf526e0f62d2e5393708
Author: Emanuele Giaquinta 
Date:   Thu Jan 19 23:15:21 2006 +0000

    *** empty log message ***

diff --git a/src/screen.C b/src/screen.C

--- 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 () */

-----END OF PAGE-----