--- rxvt-unicode/src/screen.C	2007/12/11 03:30:50	1.285
+++ rxvt-unicode/src/screen.C	2008/01/20 14:12:39	1.298
@@ -3,7 +3,7 @@
  *---------------------------------------------------------------------------*
  *
  * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -598,14 +598,14 @@
  */
 void
 rxvt_term::scr_rendition (int set, int style) NOTHROW
-  {
-    if (set)
-      rstyle |= style;
-    else if (style == ~RS_None)
-      rstyle = DEFAULT_RSTYLE;
-    else
-      rstyle &= ~style;
-  }
+{
+  if (set)
+    rstyle |= style;
+  else if (style == ~RS_None)
+    rstyle = DEFAULT_RSTYLE;
+  else
+    rstyle &= ~style;
+}
 
 /* ------------------------------------------------------------------------- */
 /*
@@ -1013,23 +1013,20 @@
 void
 rxvt_term::scr_backspace () NOTHROW
 {
-  want_refresh = 1;
-
   if (screen.cur.col == 0)
     {
       if (screen.cur.row > 0)
         {
 #ifdef TERMCAP_HAS_BW
           screen.cur.col = ncol - 1;
-          screen.cur.row--;
-          return;
+          --screen.cur.row;
+
+          want_refresh = 1;
 #endif
         }
     }
-  else if (!(screen.flags & Screen_WrapNext))
+  else
     scr_gotorc (0, -1, RELATIVE);
-
-  screen.flags &= ~Screen_WrapNext;
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1874,6 +1871,7 @@
 {
   rvideo_bell = false;
   scr_rvideo_mode (rvideo_mode);
+  refresh_check ();
 }
 #endif
 
@@ -1905,7 +1903,7 @@
     {
       rvideo_bell = true;
       scr_rvideo_mode (rvideo_mode);
-      display->flush ();
+      flush ();
 
       bell_ev.start (VISUAL_BELL_DURATION);
     }
@@ -2265,8 +2263,7 @@
               bool invert = rend & RS_RVid;
 
 #ifndef NO_BOLD_UNDERLINE_REVERSE
-              if (rend & RS_Bold
-                  && fore == Color_fg)
+              if (rend & RS_Bold && fore == Color_fg)
                 {
                   if (ISSET_PIXCOLOR (Color_BD))
                     fore = Color_BD;
@@ -2276,8 +2273,7 @@
 # endif
                 }
 
-              if (rend & RS_Italic
-                  && fore == Color_fg)
+              if (rend & RS_Italic && fore == Color_fg)
                 {
                   if (ISSET_PIXCOLOR (Color_IT))
                     fore = Color_IT;
@@ -2321,9 +2317,9 @@
 #ifdef TEXT_BLINK
               if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
                 {
-                  if (!ev_is_active (&text_blink_ev))
+                  if (!text_blink_ev.is_active ())
                     {
-                      text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL);
+                      text_blink_ev.again ();
                       hidden_text = 0;
                     }
                   else if (hidden_text)
@@ -2477,9 +2473,11 @@
 #ifdef HAVE_BG_PIXMAP
   bgPixmap.apply ();
 #else
+
   XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
   XClearWindow (dpy, parent[0]);
   XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
+
 # if HAVE_SCROLLBARS
   if (scrollBar.win)
    {
@@ -2488,11 +2486,12 @@
      scrollbar_show (0);
    }
 # endif
+
   scr_clear ();
   scr_touch (true);
   want_refresh = 1;
-#endif
 
+#endif
 }
 
 /* ------------------------------------------------------------------------- */
@@ -2652,7 +2651,13 @@
     if (data[i] == C0_LF)
       data[i] = C0_CR;
 
+  if (priv_modes & PrivMode_BracketPaste)
+    tt_printf ("\e[200~");
+
   tt_write (data, len);
+
+  if (priv_modes & PrivMode_BracketPaste)
+    tt_printf ("\e[201~");
 }
 
 /* ------------------------------------------------------------------------- */