clear rvideo mode differently to avoid race

diff --git a/Changes b/Changes
index 55206758b7ec74a6ec12b718c904e120451b5c72..e31e0336ad499047eec47c69c0eb7bb62e7dec96 100644 (file)
--- a/Changes
+++ b/Changes
@@ -18,6 +18,9 @@ WISH: anyevent mouse notification / manage MotionMask better.
 WISH: kick out xpm.C, replace by pixbuf
 DUMB: support tex fonts
 
+       - fix possible race betwen visual bell and poweron.
+          (reported by Martin von Gagern, gentoo?).
+
 8.3  Wed Aug  1 20:21:31 CEST 2007
        - new option: skipScroll/-ss, enabled by default.
         - go with the times and expect x11 library files in /usr/lib, not

diff --git a/src/command.C b/src/command.C
index 72db7adae81ede978f2638a43a2f955a519c7ff1..fe90a6eb2b962906bd7baffa786df2cc1b099db8 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -3623,12 +3623,10 @@ rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs,
   int state;
 
   static const struct
-    {
-      const int       argval;
-      const unsigned long bit;
-    }
-
-  argtopriv[] = {
+  {
+    const int       argval;
+    const unsigned long bit;
+  } argtopriv[] = {
                   { 1, PrivMode_aplCUR },
                   { 2, PrivMode_vt52 },
                   { 3, PrivMode_132 },

diff --git a/src/screen.C b/src/screen.C
index 93a7fdea456a757809f90d97df64994331b5af39..b4bb9898e4fcff55f357a9a50a387d51ff1a58e8 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -163,6 +163,7 @@ rxvt_term::scr_reset ()
   scr_overlay_off ();
 #endif
 
+  rvideo_mode = false;
   view_start = 0;
   num_scr = 0;
 
@@ -239,7 +240,6 @@ rxvt_term::scr_reset ()
       selection.op = SELECTION_CLEAR;
       selection.screen = PRIMARY;
       selection.clicks = 0;
-      rvideo_state = rvideo_mode = false;
     }
   else
     {
@@ -1916,7 +1916,6 @@ rxvt_term::scr_bell () NOTHROW
     }
   else
     XBell (dpy, 0);
-
 #endif
 }