--- rxvt-unicode/src/screen.C	2011/01/05 22:29:50	1.360
+++ rxvt-unicode/src/screen.C	2011/02/09 23:07:18	1.371
@@ -40,8 +40,6 @@
 }
 
 /* ------------------------------------------------------------------------- */
-#define PROP_SIZE               256*1024
-#define PASTE_SIZE		32768
 #define TABSIZE                 8       /* default tab size */
 
 /* ------------------------------------------------------------------------- *
@@ -1687,7 +1685,7 @@
 
       ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
 #ifdef HAVE_BG_PIXMAP
-      if (bgPixmap.pixmap == None)
+      if (bg_pixmap == None)
 #endif
           XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
 
@@ -2033,7 +2031,7 @@
   unsigned int old_screen_flags = screen.flags;
   char have_bg = 0;
 #ifdef HAVE_BG_PIXMAP
-  have_bg = bgPixmap.pixmap != None;
+  have_bg = bg_pixmap != None;
 #endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
 
@@ -2510,28 +2508,52 @@
 }
 
 void
-rxvt_term::scr_recolour () NOTHROW
+rxvt_term::scr_recolour (bool refresh) NOTHROW
 {
+  bool transparent = false;
+
 #ifdef HAVE_BG_PIXMAP
-  bgPixmap.apply ();
-#else
+  if (bg_pixmap != None)
+    {
+# ifdef ENABLE_TRANSPARENCY
+      if (bg_flags & BG_IS_TRANSPARENT)
+        {
+          XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
+          XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
+
+          transparent = true;
+        }
+      else
+# endif
+        {
+          XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
+          XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
+        }
+    }
+  else
+#endif
+    {
+      XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
+      XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
+    }
 
-  XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
   XClearWindow (dpy, parent[0]);
-  XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
 
   if (scrollBar.win)
-   {
-     XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
-     scrollBar.state = STATE_IDLE;
-     scrollBar.show (0);
-   }
-
-#endif
+    {
+      if (transparent)
+        XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
+      else
+        XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
+      scrollBar.state = STATE_IDLE;
+      scrollBar.show (0);
+    }
 
-  /* bgPixmap.apply () does not do the following : */
-  scr_clear ();
-  scr_touch (true);
+  if (refresh)
+    {
+      scr_clear ();
+      scr_touch (true);
+    }
   want_refresh = 1;
 }
 
@@ -2720,24 +2742,18 @@
 {
   if (prop == None)         /* check for failed XConvertSelection */
     {
+      int selnum = selection_type & Sel_whereMask;
+
       if ((selection_type & Sel_CompoundText))
         {
-          int selnum = selection_type & Sel_whereMask;
-
           selection_type = 0;
-          if (selnum != Sel_direct)
-            selection_request_other (XA_STRING, selnum);
+          selection_request_other (XA_STRING, selnum);
         }
 
       if ((selection_type & Sel_UTF8String))
         {
-          int selnum = selection_type & Sel_whereMask;
-
           selection_type = Sel_CompoundText;
-          if (selnum != Sel_direct)
-            selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
-          else
-            selection_type = 0;
+          selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
         }
 
       return;
@@ -2746,8 +2762,9 @@
   unsigned long bytes_after;
   XTextProperty ct;
 
+  // length == (2^31 - 1) / 4, as gdk
   if (XGetWindowProperty (dpy, win, prop,
-                          0, PROP_SIZE / 4,
+                          0, 0x1fffffff,
                           delete_prop, AnyPropertyType,
                           &ct.encoding, &ct.format,
                           &ct.nitems, &bytes_after,
@@ -2760,27 +2777,6 @@
   if (ct.encoding == None)
     goto bailout;
 
-  if (bytes_after)
-    {
-      // fetch and append remaining data
-      XTextProperty ct2;
-
-      if (XGetWindowProperty (dpy, win, prop,
-                              ct.nitems / 4, (bytes_after + 3) / 4,
-                              delete_prop, AnyPropertyType,
-                              &ct2.encoding, &ct2.format,
-                              &ct2.nitems, &bytes_after,
-                              &ct2.value) != Success)
-        goto bailout;
-
-      // realloc should be compatible to XFree, here, and elsewhere, too
-      ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
-      memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
-      ct.nitems += ct2.nitems;
-
-      XFree (ct2.value);
-    }
-
   if (ct.value == 0)
     goto bailout;
 
@@ -2820,7 +2816,7 @@
                * pass through again trying CUT_BUFFER0 if we've come from
                * XConvertSelection () but nothing was presented
                */
-              selection_paste (display->root, XA_CUT_BUFFER0, False);
+              selection_paste (display->root, XA_CUT_BUFFER0, false);
             }
 
           goto bailout;
@@ -2833,7 +2829,7 @@
       while (incr_buf_fill + ct.nitems > incr_buf_size)
         {
           incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
-          incr_buf = (char *)realloc (incr_buf, incr_buf_size);
+          incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
         }
 
       memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
@@ -2884,6 +2880,7 @@
 
   incr_buf_size = 0;
   free (incr_buf);
+  incr_buf = 0;
 
   rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
 }
@@ -3093,14 +3090,12 @@
         }
       else
 #endif
-        if (!ROW(row).is_longer () && row != selection.end.row
+        if (!ROW(row).is_longer ()
+            && (row != selection.end.row || end_col != selection.end.col)
             && (row != selection.beg.row || selection.beg.col < ncol))
           new_selection_text[ofs++] = C0_LF;
     }
 
-  if (end_col != selection.end.col)
-    new_selection_text[ofs++] = C0_LF;
-
   new_selection_text[ofs] = 0;
 
   if (ofs == 0)