--- rxvt-unicode/src/screen.C	2011/01/04 18:22:11	1.358
+++ rxvt-unicode/src/screen.C	2011/01/31 15:40:22	1.367
@@ -402,7 +402,7 @@
   free (tabs);
   tabs = (char *)rxvt_malloc (ncol);
 
-  for (int col = ncol; --col; )
+  for (int col = ncol; col--; )
     tabs [col] = col % TABSIZE == 0;
 
   CLEAR_ALL_SELECTION ();
@@ -1687,7 +1687,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 +2033,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 +2510,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 +2744,21 @@
 {
   if (prop == None)         /* check for failed XConvertSelection */
     {
+      int selnum = selection_type & Sel_whereMask;
+
+      if (selnum == Sel_direct)
+        selection_type = 0;
+
       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;
@@ -2774,7 +2795,7 @@
         goto bailout;
 
       // realloc should be compatible to XFree, here, and elsewhere, too
-      ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
+      ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
       memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
       ct.nitems += ct2.nitems;
 
@@ -2833,7 +2854,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);
@@ -3043,7 +3064,7 @@
       if (selection.rect)
         {
           col = selection.beg.col;
-          end_col = ncol + 1;
+          end_col = selection.end.col;
         }
       else
 #endif
@@ -3051,11 +3072,7 @@
 
       col = max (col, 0);
 
-      if (row == selection.end.row
-#if !ENABLE_MINIMAL
-          || selection.rect
-#endif
-          )
+      if (row == selection.end.row)
         min_it (end_col, selection.end.col);
 
       t = ROW(row).t + col;
@@ -3097,14 +3114,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)