*** empty log message ***

diff --git a/src/rxvttoolkit.C b/src/rxvttoolkit.C
index 666b0e2c36e8096873dedc8a0e72361a665da4b0..c60ae968ce902673ccda6bb7087a7eb14b3f2216 100644 (file)
--- a/src/rxvttoolkit.C
+++ b/src/rxvttoolkit.C
@@ -575,12 +575,13 @@ void rxvt_display::x_cb (ev::io &w, int revents)
 
 void rxvt_display::flush ()
 {
-  XFlush (dpy);
+  flush_ev.start ();
 }
 
 void rxvt_display::flush_cb (ev::prepare &w, int revents)
 {
-  flush ();
+  w.stop ();
+  XFlush (dpy);
 }
 
 void rxvt_display::reg (xevent_watcher *w)

diff --git a/src/screen.C b/src/screen.C
index 29bf32cecee66d18844375f4d9fa3b4be58457d3..d992582c61e59fe32cdeea234c9f65c6cdc19d8d 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -1905,7 +1905,7 @@ rxvt_term::scr_bell () NOTHROW
     {
       rvideo_bell = true;
       scr_rvideo_mode (rvideo_mode);
-      display->flush ();
+      flush ();
 
       bell_ev.start (VISUAL_BELL_DURATION);
     }
@@ -2265,8 +2265,7 @@ rxvt_term::scr_refresh () NOTHROW
               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 +2275,7 @@ rxvt_term::scr_refresh () NOTHROW
 # endif
                 }
 
-              if (rend & RS_Italic
-                  && fore == Color_fg)
+              if (rend & RS_Italic && fore == Color_fg)
                 {
                   if (ISSET_PIXCOLOR (Color_IT))
                     fore = Color_IT;
@@ -2477,9 +2475,11 @@ rxvt_term::scr_recolour () NOTHROW
 #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 +2488,12 @@ rxvt_term::scr_recolour () NOTHROW
      scrollbar_show (0);
    }
 # endif
+
   scr_clear ();
   scr_touch (true);
   want_refresh = 1;
-#endif
 
+#endif
 }
 
 /* ------------------------------------------------------------------------- */