--- rxvt-unicode/src/screen.C	2006/01/15 06:02:41	1.228
+++ rxvt-unicode/src/screen.C	2006/02/02 18:04:46	1.258
@@ -95,18 +95,18 @@
 
 #define CLEAR_ROWS(row, num)                                           \
     if (mapped)                                                \
-        XClearArea (display->display, drawBuffer, 0,                   \
+        XClearArea (dpy, drawBuffer, 0,                   \
                     Row2Pixel (row), (unsigned int)width,      \
                     (unsigned int)Height2Pixel (num), False)
 
 #define CLEAR_CHARS(x, y, num)                                         \
     if (mapped)                                                \
-        XClearArea (display->display, drawBuffer, x, y,                \
+        XClearArea (dpy, drawBuffer, x, y,                \
                     (unsigned int)Width2Pixel (num),                   \
                     (unsigned int)Height2Pixel (1), False)
 
 #define ERASE_ROWS(row, num)                                           \
-    XFillRectangle (display->display, drawBuffer, gc,          \
+    XFillRectangle (dpy, drawBuffer, gc,          \
                     0, Row2Pixel (row),                                \
                     (unsigned int)width,                       \
                     (unsigned int)Height2Pixel (num))
@@ -117,7 +117,7 @@
 
 /* Fill part/all of a line with blanks. */
 void
-rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
+rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
 {
   if (!l.t)
     {
@@ -128,7 +128,7 @@
 
   l.touch ();
 
-  efs &= ~RS_baseattrMask;
+  efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
   efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
 
   text_t *et = l.t + col;
@@ -144,7 +144,7 @@
 /* ------------------------------------------------------------------------- */
 /* Fill a full line with blanks - make sure it is allocated first */
 void
-rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
+rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
 {
   scr_blank_line (l, 0, ncol, efs);
 
@@ -175,8 +175,11 @@
   if (ncol == prev_ncol && nrow == prev_nrow)
     return;
 
+  if (current_screen != PRIMARY)
+    scr_swap_screen ();
+
   // we need at least two lines for wrapping to work correctly
-  if (nrow + saveLines < 2)
+  while (nrow + saveLines < 2)
     {
       //TODO//FIXME
       saveLines++;
@@ -197,7 +200,7 @@
       /*
        * first time called so just malloc everything: don't rely on realloc
        */
-      top_row = 0;       /* no saved lines */
+      top_row    = 0;
       term_start = 0;
 
       talloc = new rxvt_salloc (ncol * sizeof (text_t));
@@ -236,8 +239,7 @@
       selection.op = SELECTION_CLEAR;
       selection.screen = PRIMARY;
       selection.clicks = 0;
-      CLEAR_ALL_SELECTION ();
-      rvideo = 0;
+      rvideo_state = rvideo_mode = false;
     }
   else
     {
@@ -283,7 +285,7 @@
 
       if (top_row)
         {
-          // re-wrap lines, this is rather ugly, possibly because I am too dumb
+          // Re-wrap lines. This is rather ugly, possibly because I am too dumb
           // to come up with a lean and mean algorithm.
 
           row_col_t ocur = screen.cur;
@@ -327,6 +329,10 @@
 
                   int qcol = 0;
 
+                  // see below for cursor adjustment rationale
+                  if (p == ocur.row)
+                    screen.cur.row = q - (total_rows - nrow);
+                  
                   // fill a single destination line
                   while (lofs < llen && qcol < ncol)
                     {
@@ -346,9 +352,6 @@
 
                       int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
 
-                      assert (len);
-                      assert (pline.t);
-
                       memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
                       memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
 
@@ -391,11 +394,6 @@
           term_start = 0;
         }
 
-#ifdef DEBUG_STRICT //TODO: remove
-      for (int i = top_row; i < nrow; i++)
-        assert (ROW (i).t);
-#endif
-
       free (old_buf);
       delete old_ta;
       delete old_ra;
@@ -403,10 +401,11 @@
       clamp_it (screen.cur.row, 0, nrow - 1);
       clamp_it (screen.cur.col, 0, ncol - 1);
 
-      if (tabs)
-        free (tabs);
+      free (tabs);
     }
 
+  CLEAR_ALL_SELECTION ();
+
   prev_nrow = nrow;
   prev_ncol = ncol;
 
@@ -415,6 +414,9 @@
   for (int col = ncol; col--; )
     tabs [col] = col % TABSIZE == 0;
 
+  if (current_screen != PRIMARY)
+    scr_swap_screen ();
+
   tt_winch ();
 
   HOOK_INVOKE ((this, HOOK_RESET, DT_END));
@@ -425,17 +427,20 @@
  * Free everything.  That way malloc debugging can find leakage.
  */
 void
-rxvt_term::scr_release ()
+rxvt_term::scr_release () NOTHROW
 {
-  delete talloc; talloc = 0;
-  delete ralloc; ralloc = 0;
+  if (row_buf)
+    {
+      delete talloc; talloc = 0;
+      delete ralloc; ralloc = 0;
 
-  free (row_buf);
-  free (swap_buf);
-  free (drawn_buf);
-  free (tabs);
+      free (row_buf);
+      free (swap_buf);
+      free (drawn_buf);
+      free (tabs);
 
-  row_buf = 0; // signal that we freed all the arrays
+      row_buf = 0; // signal that we freed all the arrays
+    }
 }
 
 /* ------------------------------------------------------------------------- */
@@ -450,7 +455,7 @@
   scr_reset ();
 
   scr_clear (true);
-  scr_refresh (SLOW_REFRESH);
+  scr_refresh ();
 }
 
 /* ------------------------------------------------------------------------- *
@@ -462,7 +467,7 @@
  * XTERM_SEQ: Restore cursor: ESC 8
  */
 void
-rxvt_term::scr_cursor (int mode)
+rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
 {
   screen_t *s;
 
@@ -504,55 +509,61 @@
 #endif
 }
 
+void
+rxvt_term::scr_swap_screen ()
+{
+  if (!OPTION (Opt_secondaryScreen))
+    return;
+
+  for (int i = prev_nrow; i--; )
+    ::swap (ROW(i), swap_buf [i]);
+
+  ::swap (screen.cur, swap.cur);
+
+  screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
+  screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
+}
+
 /* ------------------------------------------------------------------------- */
 /*
  * Swap between primary and secondary screens
  * XTERM_SEQ: Primary screen  : ESC [ ? 4 7 h
  * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
  */
-int
+void
 rxvt_term::scr_change_screen (int scrn)
 {
+  if (scrn == current_screen)
+    return;
+
   want_refresh = 1;
   view_start = 0;
 
-  if (current_screen == scrn)
-    return scrn;
-
   selection_check (2);        /* check for boundary cross */
 
   int i = current_screen; current_screen = scrn; scrn = i;
 
-  ::swap (screen.cur.row, swap.cur.row);
-  ::swap (screen.cur.col, swap.cur.col);
-
-  screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
-  screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
-
 #if NSCREENS
   if (OPTION (Opt_secondaryScreen))
     {
       num_scr = 0;
 
-      for (int i = prev_nrow; i--; )
-        ::swap (ROW(i), swap_buf [i]);
+      scr_swap_screen ();
 
       ::swap (screen.charset, swap.charset);
-      ::swap (screen.flags, swap.flags);
+      ::swap (screen.flags,   swap.flags);
       screen.flags |= Screen_VisibleCursor;
-      swap.flags |= Screen_VisibleCursor;
+      swap.flags   |= Screen_VisibleCursor;
     }
   else
 #endif
     if (OPTION (Opt_secondaryScroll))
       scr_scroll_text (0, prev_nrow - 1, prev_nrow);
-
-  return scrn;
 }
 
 // clear WrapNext indicator, solidifying position on next line
 void
-rxvt_term::scr_do_wrap ()
+rxvt_term::scr_do_wrap () NOTHROW
 {
   if (!(screen.flags & Screen_WrapNext))
     return;
@@ -572,7 +583,7 @@
  * Change the colour for following text
  */
 void
-rxvt_term::scr_color (unsigned int color, int fgbg)
+rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
 {
   if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
     color = fgbg;
@@ -588,7 +599,7 @@
  * Change the rendition style for following text
  */
 void
-rxvt_term::scr_rendition (int set, int style)
+rxvt_term::scr_rendition (int set, int style) NOTHROW
   {
     if (set)
       rstyle |= style;
@@ -605,7 +616,7 @@
  * count negative ==> scroll down
  */
 int
-rxvt_term::scr_scroll_text (int row1, int row2, int count)
+rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
 {
   if (count == 0 || (row1 > row2))
     return 0;
@@ -619,29 +630,31 @@
     {
       top_row = max (top_row - count, -saveLines);
 
-      HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
-      
       // scroll everything up 'count' lines
       term_start = (term_start + count) % total_rows;
 
+      // sever bottommost line
       {
-        // severe bottommost scrolled line
         line_t &l = ROW(row2 - count);
-        l.touch ();
         l.is_longer (0);
+        l.touch ();
       }
 
-      // erase newly scorlled-in lines
-      for (int i = count; i; --i )
+      // erase newly scrolled-in lines
+      for (int i = count; i--; )
         {
-          // basically this is a slightly optimized scr_blank_screen_mem
-          // it is worth the effort on slower machines
-          line_t &l = ROW(nrow - i);
-
-          scr_blank_line (l, 0, l.l, rstyle);
+          line_t &l = ROW(nrow - 1 - i);
 
-          l.l = 0;
-          l.f = 0;
+          // optimize if already cleared, can be significant on slow machines
+          // could be rolled into scr_blank_screen_mem
+          if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask))
+            {
+              scr_blank_line (l, 0, l.l, rstyle);
+              l.l = 0;
+              l.f = 0;
+            }
+          else
+            scr_blank_screen_mem (l, rstyle);
         }
 
       // now copy lines below the scroll region bottom to the
@@ -677,6 +690,9 @@
           && view_start != 0
           && view_start != -saveLines)
         scr_page (UP, count);
+
+      if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
+        HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
     }
   else
     {
@@ -732,7 +748,7 @@
  * Add text given in <str> of length <len> to screen struct
  */
 void
-rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
+rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
 {
   if (len <= 0)               /* sanity */
     return;
@@ -748,6 +764,7 @@
   if (minlines > 0)
     {
       minlines += screen.cur.row - screen.bscroll;
+      min_it (minlines, screen.cur.row - top_row);
 
       if (minlines > 0
           && screen.tscroll == 0
@@ -818,11 +835,11 @@
 
       if (screen.flags & Screen_WrapNext)
         {
-          max_it (line->l, ncol);
-          line->is_longer (1);
-
           scr_do_wrap ();
           
+          line->l = ncol;
+          line->is_longer (1);
+
           row = screen.cur.row;
           line = &ROW(row);   /* _must_ refresh */
         }
@@ -831,11 +848,11 @@
       if (IN_RANGE_INC (c, 0xd800, 0xdfff))
         c = 0xfffd;
 
-      // rely on wcwidth to tell us the character width, at least for non-latin1
-      // do wcwidth before further replacements, as wcwidth might return -1
-      // for the line drawing characters below as they might be invalid in the current
+      // rely on wcwidth to tell us the character width, do wcwidth before
+      // further replacements, as wcwidth might return -1 for the line
+      // drawing characters below as they might be invalid in the current
       // locale.
-      int width = c < 0x100 ? 1 : wcwidth (c);
+      int width = WCWIDTH (c);
 
       if (charsets [screen.charset] == '0') // DEC SPECIAL
         {
@@ -996,7 +1013,7 @@
  * XTERM_SEQ: CTRL-H
  */
 void
-rxvt_term::scr_backspace ()
+rxvt_term::scr_backspace () NOTHROW
 {
   want_refresh = 1;
 
@@ -1024,7 +1041,7 @@
  * XTERM_SEQ: CTRL-I
  */
 void
-rxvt_term::scr_tab (int count, bool ht)
+rxvt_term::scr_tab (int count, bool ht) NOTHROW
 {
   int i, x;
 
@@ -1099,9 +1116,9 @@
  * Move cursor left in row.  If we're at the left boundary, shift everything
  * in that row right.  Clear left column.
  */
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 void
-rxvt_term::scr_backindex ()
+rxvt_term::scr_backindex () NOTHROW
 {
   if (screen.cur.col > 0)
     scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
@@ -1116,9 +1133,9 @@
  * Move cursor right in row.  If we're at the right boundary, shift everything
  * in that row left.  Clear right column.
  */
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 void
-rxvt_term::scr_forwardindex ()
+rxvt_term::scr_forwardindex () NOTHROW
 {
   if (screen.cur.col < ncol - 1)
     scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
@@ -1141,7 +1158,7 @@
  * Goto Row/Column
  */
 void
-rxvt_term::scr_gotorc (int row, int col, int relative)
+rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
 {
   want_refresh = 1;
   ZERO_SCROLLBACK ();
@@ -1189,7 +1206,7 @@
  * direction should be UP or DN
  */
 void
-rxvt_term::scr_index (enum page_dirn direction)
+rxvt_term::scr_index (enum page_dirn direction) NOTHROW
 {
   int dirn;
 
@@ -1218,7 +1235,7 @@
  * XTERM_SEQ: Clear whole line   : ESC [ 2 K
  */
 void
-rxvt_term::scr_erase_line (int mode)
+rxvt_term::scr_erase_line (int mode) NOTHROW
 {
   unsigned int col, num;
 
@@ -1272,7 +1289,7 @@
  * XTERM_SEQ: Clear whole screen        : ESC [ 2 J
  */
 void
-rxvt_term::scr_erase_screen (int mode)
+rxvt_term::scr_erase_screen (int mode) NOTHROW
 {
   int num;
   int32_t row;
@@ -1327,10 +1344,10 @@
     {
       ren = rstyle & (RS_fgMask | RS_bgMask);
       gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
-      XChangeGC (display->display, gc, GCForeground, &gcvalue);
+      XChangeGC (dpy, gc, GCForeground, &gcvalue);
       ERASE_ROWS (row, num);
       gcvalue.foreground = pix_colors[Color_fg];
-      XChangeGC (display->display, gc, GCForeground, &gcvalue);
+      XChangeGC (dpy, gc, GCForeground, &gcvalue);
     }
 
   for (; num--; row++)
@@ -1340,9 +1357,9 @@
     }
 }
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 void
-rxvt_term::scr_erase_savelines ()
+rxvt_term::scr_erase_savelines () NOTHROW
 {
   want_refresh = 1;
   ZERO_SCROLLBACK ();
@@ -1357,7 +1374,7 @@
  * XTERM_SEQ: Screen Alignment Test: ESC # 8
  */
 void
-rxvt_term::scr_E ()
+rxvt_term::scr_E () NOTHROW
 {
   rend_t fs;
 
@@ -1388,7 +1405,7 @@
  * Insert/Delete <count> lines
  */
 void
-rxvt_term::scr_insdel_lines (int count, int insdel)
+rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
 {
   int end;
 
@@ -1418,7 +1435,7 @@
  * Insert/Delete <count> characters from the current position
  */
 void
-rxvt_term::scr_insdel_chars (int count, int insdel)
+rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
 {
   int col, row;
   rend_t tr;
@@ -1516,7 +1533,7 @@
  * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
  */
 void
-rxvt_term::scr_scroll_region (int top, int bot)
+rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
 {
   max_it (top, 0);
   min_it (bot, nrow - 1);
@@ -1536,7 +1553,7 @@
  * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
  */
 void
-rxvt_term::scr_cursor_visible (int mode)
+rxvt_term::scr_cursor_visible (int mode) NOTHROW
 {
   want_refresh = 1;
 
@@ -1553,7 +1570,7 @@
  * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
  */
 void
-rxvt_term::scr_autowrap (int mode)
+rxvt_term::scr_autowrap (int mode) NOTHROW
 {
   if (mode)
     screen.flags |= Screen_Autowrap;
@@ -1572,7 +1589,7 @@
  * XTERM_SEQ: Set Relative: ESC [ ? 6 l
  */
 void
-rxvt_term::scr_relative_origin (int mode)
+rxvt_term::scr_relative_origin (int mode) NOTHROW
 {
   if (mode)
     screen.flags |= Screen_Relative;
@@ -1589,7 +1606,7 @@
  * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
  */
 void
-rxvt_term::scr_insert_mode (int mode)
+rxvt_term::scr_insert_mode (int mode) NOTHROW
 {
   if (mode)
     screen.flags |= Screen_Insert;
@@ -1605,7 +1622,7 @@
  * XTERM_SEQ: Clear all tabs             : ESC [ 3 g
  */
 void
-rxvt_term::scr_set_tab (int mode)
+rxvt_term::scr_set_tab (int mode) NOTHROW
 {
   if (mode < 0)
     memset (tabs, 0, ncol * sizeof (char));
@@ -1620,27 +1637,32 @@
  * XTERM_SEQ: Normal video : ESC [ ? 5 l
  */
 void
-rxvt_term::scr_rvideo_mode (int mode)
+rxvt_term::scr_rvideo_mode (bool on) NOTHROW
 {
-  XGCValues gcvalue;
+  rvideo_mode = on;
 
-  if (rvideo != mode)
+#ifndef NO_BELL
+  on ^= rvideo_bell;
+#endif
+
+  if (rvideo_state != on)
     {
-      rvideo = mode;
+      rvideo_state = on;
+
       ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
 #if XPM_BACKGROUND
       if (bgPixmap.pixmap == None)
 #endif
 #if TRANSPARENT
-        if (! OPTION (Opt_transparent) || am_transparent == 0)
+        if (!OPTION (Opt_transparent) || am_transparent == 0)
 #endif
-          XSetWindowBackground (display->display, vt,
-                               pix_colors[Color_bg]);
+          XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
 
+      XGCValues gcvalue;
       gcvalue.foreground = pix_colors[Color_fg];
       gcvalue.background = pix_colors[Color_bg];
-      XChangeGC (display->display, gc, GCBackground | GCForeground,
-                &gcvalue);
+      XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
+
       scr_clear ();
       scr_touch (true);
     }
@@ -1652,7 +1674,7 @@
  * XTERM_SEQ: Report position: ESC [ 6 n
  */
 void
-rxvt_term::scr_report_position ()
+rxvt_term::scr_report_position () NOTHROW
 {
   tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
 }
@@ -1665,7 +1687,7 @@
  * Set font style
  */
 void
-rxvt_term::set_font_style ()
+rxvt_term::set_font_style () NOTHROW
 {
 #if 0
   switch (charsets [screen.charset])
@@ -1697,7 +1719,7 @@
  * XTERM_SEQ: Invoke G3 character set: ESC O
  */
 void
-rxvt_term::scr_charset_choose (int set)
+rxvt_term::scr_charset_choose (int set) NOTHROW
 {
   screen.charset = set;
   set_font_style ();
@@ -1713,7 +1735,7 @@
  * See set_font_style for possible values for <C>
  */
 void
-rxvt_term::scr_charset_set (int set, unsigned int ch)
+rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
 {
   charsets[set] = (unsigned char)ch;
   set_font_style ();
@@ -1728,16 +1750,15 @@
  * refresh matching text.
  */
 bool
-rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
+rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
 {
   bool found = false;
 
   for (int i = 0; i < nrow; i++)
     {
-      int col = 0;
       rend_t *drp = drawn_buf[i].r;
 
-      for (; col < ncol; col++, drp++)
+      for (int col = 0; col < ncol; col++, drp++)
         if ((*drp & mask) == value)
           {
             found = true;
@@ -1758,7 +1779,7 @@
 };
 
 void
-rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
+rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
 {
   int i;
   row_col_t rc[RC_COUNT];
@@ -1791,8 +1812,10 @@
   for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
     fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
 
+  num_scr_allow = 0;
+
   if (refresh)
-    scr_refresh (SLOW_REFRESH);
+    scr_refresh ();
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1800,7 +1823,7 @@
  * Refresh the entire screen
  */
 void
-rxvt_term::scr_touch (bool refresh)
+rxvt_term::scr_touch (bool refresh) NOTHROW
 {
   scr_expose (0, 0, width, height, refresh);
 }
@@ -1811,11 +1834,9 @@
  * the top of the screen
  */
 void
-rxvt_term::scr_move_to (int y, int len)
+rxvt_term::scr_move_to (int y, int len) NOTHROW
 {
-  int p = (top_row - nrow) * (len - y) / len + (nrow - 1);
-
-  scr_changeview (p);
+  scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1824,7 +1845,7 @@
  * direction should be UP or DN
  */
 bool
-rxvt_term::scr_page (enum page_dirn direction, int nlines)
+rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
 {
   int new_view_start =
     direction == UP ? view_start - nlines
@@ -1834,26 +1855,34 @@
 }
 
 bool
-rxvt_term::scr_changeview (int new_view_start)
+rxvt_term::scr_changeview (int new_view_start) NOTHROW
 {
   clamp_it (new_view_start, top_row, 0);
 
-  if (new_view_start != view_start)
-    {
-      num_scr += new_view_start - view_start;
-      view_start = new_view_start;
-      HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
-      want_refresh = 1;
-
-      return true;
-    }
-  else
+  if (new_view_start == view_start)
     return false;
+
+  num_scr += new_view_start - view_start;
+  view_start = new_view_start;
+  want_refresh = 1;
+
+  HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
+
+  return true;
 }
 
+#ifndef NO_BELL
+void
+rxvt_term::bell_cb (time_watcher &w)
+{
+  rvideo_bell = false;
+  scr_rvideo_mode (rvideo_mode);
+}
+#endif
+
 /* ------------------------------------------------------------------------- */
 void
-rxvt_term::scr_bell ()
+rxvt_term::scr_bell () NOTHROW
 {
 #ifndef NO_BELL
 
@@ -1861,18 +1890,19 @@
 #  ifdef MAPALERT_OPTION
   if (OPTION (Opt_mapAlert))
 #  endif
-    XMapWindow (display->display, parent[0]);
+    XMapWindow (dpy, parent[0]);
 # endif
 
   if (OPTION (Opt_visualBell))
     {
-      scr_rvideo_mode (!rvideo); /* refresh also done */
+      rvideo_bell = true;
+      scr_rvideo_mode (rvideo_mode);
       display->flush ();
-      rxvt_usleep (VISUAL_BELL_DURATION);
-      scr_rvideo_mode (!rvideo); /* refresh also done */
+
+      bell_ev.start (NOW + VISUAL_BELL_DURATION);
     }
   else
-    XBell (display->display, 0);
+    XBell (dpy, 0);
 
 #endif
 }
@@ -1880,7 +1910,7 @@
 /* ------------------------------------------------------------------------- */
 /* ARGSUSED */
 void
-rxvt_term::scr_printscreen (int fullhist)
+rxvt_term::scr_printscreen (int fullhist) NOTHROW
 {
 #ifdef PRINTPIPE
   int nrows, row_start;
@@ -1939,7 +1969,7 @@
  * screen.text/screen.rend contain what the screen will change to.
  */
 void
-rxvt_term::scr_refresh (unsigned char refresh_type)
+rxvt_term::scr_refresh () NOTHROW
 {
   unsigned char must_clear, /* use draw_string not draw_image_string     */
                 showcursor; /* show the cursor                           */
@@ -2073,7 +2103,6 @@
    * D: CopyArea pass - very useful for slower links
    *    This has been deliberately kept simple.
    */
-  i = num_scr;
   if (!display->is_local
       && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
       && abs (num_scr) < nrow && !must_clear)
@@ -2081,6 +2110,7 @@
       int16_t nits;
       int j;
       int len, wlen;
+      dLocal (int, num_scr);
 
       j = nrow;
       wlen = len = -1;
@@ -2121,7 +2151,7 @@
               if (wlen < len)
                 ::swap (wlen, len);
 
-              XCopyArea (display->display, vt, vt,
+              XCopyArea (dpy, vt, vt,
                          gc, 0, Row2Pixel (len + i),
                          (unsigned int)this->width,
                          (unsigned int)Height2Pixel (wlen - len + 1),
@@ -2219,15 +2249,21 @@
           if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
             {
 #if ENABLE_STYLES
-              // force redraw after "careful" characters to avoid pixel droppings
-              if (srp[col] & RS_Careful && col < ncol - 1 && 0)
-                drp[col + 1] = ~srp[col + 1];
+              // "careful" (too wide) character handling
 
               // include previous careful character(s) if possible, looks nicer (best effort...)
               while (text > stp
                   && srp[text - stp - 1] & RS_Careful
                   && RS_SAME (rend, srp[text - stp - 1]))
                 text--, count++, xpixel -= fwidth;
+
+              // force redraw after "careful" characters to avoid pixel droppings
+              for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
+                drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
+
+              // force redraw before "careful" characters to avoid pixel droppings
+              for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
+                drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
 #endif
 
               bool invert = rend & RS_RVid;
@@ -2295,9 +2331,7 @@
           rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
 
           if (back == fore)
-            font->clear_rect (*drawable, xpixel, ypixel,
-                              fwidth * count, fheight,
-                              back);
+            font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
           else if (back == Color_bg)
             {
               if (must_clear)
@@ -2321,12 +2355,12 @@
             {
 #if ENABLE_FRILLS
               if (ISSET_PIXCOLOR (Color_underline))
-                XSetForeground (display->display, gc, pix_colors[Color_underline]);
+                XSetForeground (dpy, gc, pix_colors[Color_underline]);
               else
 #endif
-                XSetForeground (display->display, gc, pix_colors[fore]);
+                XSetForeground (dpy, gc, pix_colors[fore]);
 
-              XDrawLine (display->display, drawBuffer, gc,
+              XDrawLine (dpy, drawBuffer, gc,
                          xpixel, ypixel + font->ascent + 1,
                          xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
             }
@@ -2369,10 +2403,10 @@
 
 #ifndef NO_CURSORCOLOR
           if (ISSET_PIXCOLOR (Color_cursor))
-            XSetForeground (display->display, gc, pix_colors[Color_cursor]);
+            XSetForeground (dpy, gc, pix_colors[Color_cursor]);
 #endif
 
-          XDrawRectangle (display->display, drawBuffer, gc,
+          XDrawRectangle (dpy, drawBuffer, gc,
                           Col2Pixel (col),
                           Row2Pixel (oldcursor.row),
                           (unsigned int) (Width2Pixel (cursorwidth) - 1),
@@ -2390,7 +2424,7 @@
 }
 
 void
-rxvt_term::scr_remap_chars (line_t &l)
+rxvt_term::scr_remap_chars (line_t &l) NOTHROW
 {
   if (!l.t)
     return;
@@ -2402,7 +2436,7 @@
 }
 
 void
-rxvt_term::scr_remap_chars ()
+rxvt_term::scr_remap_chars () NOTHROW
 {
   for (int i = total_rows; i--; )
     scr_remap_chars (row_buf [i]);
@@ -2415,7 +2449,7 @@
 }
 
 void
-rxvt_term::scr_recolour ()
+rxvt_term::scr_recolour () NOTHROW
 {
   if (1
 #if TRANSPARENT
@@ -2426,13 +2460,13 @@
 #endif
       )
     {
-      XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
-      XClearWindow (display->display, parent[0]);
-      XSetWindowBackground (display->display, 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 HAVE_SCROLLBARS
       if (scrollBar.win)
         {
-          XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
+          XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
           scrollBar.setIdle ();
           scrollbar_show (0);
         }
@@ -2446,7 +2480,7 @@
 
 /* ------------------------------------------------------------------------- */
 void
-rxvt_term::scr_clear (bool really)
+rxvt_term::scr_clear (bool really) NOTHROW
 {
   if (!mapped)
     return;
@@ -2455,11 +2489,11 @@
   want_refresh = 1;
 
   if (really)
-    XClearWindow (display->display, vt);
+    XClearWindow (dpy, vt);
 }
 
 void
-rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
+rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
 {
   int view_end = view_start + nrow;
   int row, col;
@@ -2481,7 +2515,7 @@
 }
 
 void
-rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
+rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
 {
   int view_end = view_start + nrow;
   int row, col;
@@ -2508,13 +2542,13 @@
 
 /* ------------------------------------------------------------------------- */
 void
-rxvt_term::scr_reverse_selection ()
+rxvt_term::scr_reverse_selection () NOTHROW
 {
   if (selection.op
       && current_screen == selection.screen
       && selection.end.row >= view_start)
     {
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       if (selection.rect)
         scr_xor_rect (selection.beg.row, selection.beg.col,
                       selection.end.row, selection.end.col,
@@ -2534,7 +2568,7 @@
  */
 #if 0
 void
-rxvt_term::scr_dump (int fd)
+rxvt_term::scr_dump (int fd) NOTHROW
 {
   int             row, wrote;
   unsigned int    width, towrite;
@@ -2563,7 +2597,7 @@
  *                           CHARACTER SELECTION                             *
  * ------------------------------------------------------------------------- */
 void
-rxvt_term::selection_check (int check_more)
+rxvt_term::selection_check (int check_more) NOTHROW
 {
   row_col_t pos;
 
@@ -2594,7 +2628,7 @@
  * Paste a selection direct to the command fd
  */
 void
-rxvt_term::paste (char *data, unsigned int len)
+rxvt_term::paste (char *data, unsigned int len) NOTHROW
 {
   /* convert normal newline chars into common keyboard Return key sequence */
   for (unsigned int i = 0; i < len; i++)
@@ -2610,7 +2644,7 @@
  * EXT: SelectionNotify
  */
 void
-rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
+rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
 {
   if (prop == None)         /* check for failed XConvertSelection */
     {
@@ -2640,7 +2674,7 @@
   unsigned long bytes_after;
   XTextProperty ct;
 
-  if (XGetWindowProperty (display->display, win, prop,
+  if (XGetWindowProperty (dpy, win, prop,
                           0, PROP_SIZE / 4,
                           delete_prop, AnyPropertyType,
                           &ct.encoding, &ct.format,
@@ -2659,7 +2693,7 @@
       // fetch and append remaining data
       XTextProperty ct2;
 
-      if (XGetWindowProperty (display->display, win, prop,
+      if (XGetWindowProperty (dpy, win, prop,
                               ct.nitems / 4, (bytes_after + 3) / 4,
                               delete_prop, AnyPropertyType,
                               &ct2.encoding, &ct2.format,
@@ -2682,7 +2716,7 @@
     {
       // INCR selection, start handshake
       if (!delete_prop)
-        XDeleteProperty (display->display, win, prop);
+        XDeleteProperty (dpy, win, prop);
 
       selection_wait = Sel_incr;
       incr_buf_fill = 0;
@@ -2739,7 +2773,7 @@
   char **cl;
   int cr;
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
   // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
   // so recode it manually
   if (ct.encoding == xa[XA_UTF8_STRING])
@@ -2753,7 +2787,7 @@
     }
   else
 #endif
-  if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
+  if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
       && cl)
     {
       for (int i = 0; i < cr; i++)
@@ -2772,7 +2806,7 @@
 }
 
 void
-rxvt_term::incr_cb (time_watcher &w)
+rxvt_term::incr_cb (time_watcher &w) NOTHROW
 {
   selection_wait = Sel_none;
 
@@ -2783,7 +2817,7 @@
 }
 
 void
-rxvt_term::selection_property (Window win, Atom prop)
+rxvt_term::selection_property (Window win, Atom prop) NOTHROW
 {
   if (prop == None || selection_wait != Sel_incr)
     return;
@@ -2802,12 +2836,9 @@
  * EXT: button 2 release
  */
 void
-rxvt_term::selection_request (Time tm, int x, int y)
+rxvt_term::selection_request (Time tm, int selnum) NOTHROW
 {
-  if (x < 0 || x >= width || y < 0 || y >= height)
-    return;                 /* outside window */
-
-  if (selection.text)
+  if (selection.text && selnum == Sel_Primary)
     { /* internal selection */
       char *str = rxvt_wcstombs (selection.text, selection.len);
       paste (str, strlen (str));
@@ -2816,23 +2847,18 @@
     }
   else
     {
-      int i;
-
       selection_request_time = tm;
       selection_wait = Sel_normal;
 
-      for (i = Sel_Primary; i <= Sel_Clipboard; i++)
-        {
 #if X_HAVE_UTF8_STRING
-          selection_type = Sel_UTF8String;
-          if (selection_request_other (xa[XA_UTF8_STRING], i))
-            return;
+      selection_type = Sel_UTF8String;
+      if (selection_request_other (xa[XA_UTF8_STRING], selnum))
+	return;
 #else
-          selection_type = Sel_CompoundText;
-          if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
-            return;
+      selection_type = Sel_CompoundText;
+      if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
+	return;
 #endif
-        }
     }
 
   selection_wait = Sel_none;       /* don't loop in selection_paste () */
@@ -2840,7 +2866,7 @@
 }
 
 int
-rxvt_term::selection_request_other (Atom target, int selnum)
+rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
 {
   Atom sel;
 
@@ -2853,9 +2879,9 @@
   else
     sel = xa[XA_CLIPBOARD];
 
-  if (XGetSelectionOwner (display->display, sel) != None)
+  if (XGetSelectionOwner (dpy, sel) != None)
     {
-      XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
+      XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
                          vt, selection_request_time);
       return 1;
     }
@@ -2869,7 +2895,7 @@
  * EXT: SelectionClear
  */
 void
-rxvt_term::selection_clear ()
+rxvt_term::selection_clear () NOTHROW
 {
   want_refresh = 1;
   free (selection.text);
@@ -2928,7 +2954,7 @@
 
   for (; row <= selection.end.row; row++, col = 0)
     {
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       if (selection.rect)
         {
           col = selection.beg.col;
@@ -2941,7 +2967,7 @@
       col = max (col, 0);
 
       if (row == selection.end.row
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
           || selection.rect
 #endif
           )
@@ -2974,7 +3000,7 @@
             new_selection_text[ofs++] = *t++;
         }
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       if (selection.rect)
         {
           while (ofs
@@ -3014,12 +3040,12 @@
 }
 
 bool
-rxvt_term::selection_grab (Time tm)
+rxvt_term::selection_grab (Time tm) NOTHROW
 {
   selection_time = tm;
 
-  XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
-  if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
+  XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
+  if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
     {
       display->set_selection_owner (this);
       return true;
@@ -3033,7 +3059,7 @@
 #if 0
   XTextProperty ct;
 
-  if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
+  if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
     {
       set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
       XFree (ct.value);
@@ -3047,7 +3073,7 @@
  * EXT: button 1 press
  */
 void
-rxvt_term::selection_click (int clicks, int x, int y)
+rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
 {
   clicks = ((clicks - 1) % 3) + 1;
   selection.clicks = clicks;       /* save clicks so extend will work */
@@ -3076,7 +3102,7 @@
  * Mark a selection at the specified col/row
  */
 void
-rxvt_term::selection_start_colrow (int col, int row)
+rxvt_term::selection_start_colrow (int col, int row) NOTHROW
 {
   want_refresh = 1;
 
@@ -3112,7 +3138,7 @@
 #define DELIMIT_REND(x)        1
 
 void
-rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
+rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
 {
   int col, row, dirnadd, tcol, trow, w1, w2;
   row_col_t bound;
@@ -3196,7 +3222,7 @@
  * flag == 2 ==> button 3 motion
  */
 void
-rxvt_term::selection_extend (int x, int y, int flag)
+rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
 {
   int col = clamp (Pixel2Col (x), 0, ncol);
   int row = clamp (Pixel2Row (y), 0, nrow - 1);
@@ -3232,7 +3258,7 @@
  * Extend the selection to the specified col/row
  */
 void
-rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
+rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
 {
   row_col_t pos;
   enum {
@@ -3345,7 +3371,7 @@
     {
       if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
           && !ROW(selection.beg.row).is_longer ()
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
           && !selection.rect
 #endif
          )
@@ -3354,7 +3380,7 @@
       if (
           selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
           && !ROW(selection.end.row).is_longer ()
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
           && !selection.rect
 #endif
          )
@@ -3381,7 +3407,9 @@
                 {
                   selection.end.row = end_row;
                   selection.end.col = ROW(end_row).l;
+# if !ENABLE_MINIMAL
                   selection_remove_trailing_spaces ();
+# endif
                   break;
                 }
             }
@@ -3420,15 +3448,15 @@
         }
     }
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
   if (selection.rect && selection.beg.col > selection.end.col)
     ::swap (selection.beg.col, selection.end.col);
 #endif
 }
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 void
-rxvt_term::selection_remove_trailing_spaces ()
+rxvt_term::selection_remove_trailing_spaces () NOTHROW
 {
   int32_t end_col, end_row;
   text_t *stp;
@@ -3476,7 +3504,7 @@
  * EXT: button 3 double click
  */
 void
-rxvt_term::selection_rotate (int x, int y)
+rxvt_term::selection_rotate (int x, int y) NOTHROW
 {
   selection.clicks = selection.clicks % 3 + 1;
   selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
@@ -3488,10 +3516,9 @@
  * EXT: SelectionRequest
  */
 void
-rxvt_term::selection_send (const XSelectionRequestEvent &rq)
+rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
 {
   XSelectionEvent ev;
-  dDisp;
 
   ev.type = SelectionNotify;
   ev.property = None;
@@ -3515,7 +3542,7 @@
       *target++ = xa[XA_UTF8_STRING];
 #endif
 
-      XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
+      XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
                        32, PropModeReplace,
                        (unsigned char *)target_list, target - target_list);
       ev.property = rq.property;
@@ -3528,7 +3555,7 @@
 #endif
   else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
     {
-      XChangeProperty (disp, rq.requestor, rq.property, rq.target,
+      XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
                        32, PropModeReplace, (unsigned char *)&selection_time, 1);
       ev.property = rq.property;
     }
@@ -3562,7 +3589,7 @@
         style = enc_text;
       else if (target == xa[XA_COMPOUND_TEXT])
         style = enc_compound_text;
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       else if (target == xa[XA_UTF8_STRING])
         style = enc_utf8;
 #endif
@@ -3583,7 +3610,7 @@
           selectlen = 0;
         }
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
       // so recode it manually
       if (style == enc_utf8)
@@ -3596,7 +3623,7 @@
         }
       else
 #endif
-      if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
+      if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
         freect = 1;
       else
         {
@@ -3606,7 +3633,7 @@
           ct.encoding = target;
         }
 
-      XChangeProperty (disp, rq.requestor, rq.property,
+      XChangeProperty (dpy, rq.requestor, rq.property,
                        ct.encoding, 8, PropModeReplace,
                        ct.value, (int)ct.nitems);
       ev.property = rq.property;
@@ -3615,7 +3642,7 @@
         XFree (ct.value);
     }
 
-  XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
+  XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
 }
 
 /* ------------------------------------------------------------------------- *
@@ -3626,7 +3653,7 @@
  * return col/row values corresponding to x/y pixel values
  */
 void
-rxvt_term::pixel_position (int *x, int *y)
+rxvt_term::pixel_position (int *x, int *y) NOTHROW
 {
   *x = Pixel2Col (*x);
   /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
@@ -3637,11 +3664,11 @@
 /* ------------------------------------------------------------------------- */
 #ifdef USE_XIM
 void
-rxvt_term::im_set_position (XPoint &pos)
+rxvt_term::im_set_position (XPoint &pos) NOTHROW
 {
   XWindowAttributes xwa;
 
-  XGetWindowAttributes (display->display, vt, &xwa);
+  XGetWindowAttributes (dpy, vt, &xwa);
 
   pos.x = xwa.x + Col2Pixel    (screen.cur.col);
   pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
@@ -3650,7 +3677,7 @@
 
 #if ENABLE_OVERLAY
 void
-rxvt_term::scr_overlay_new (int x, int y, int w, int h)
+rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
 {
   if (nrow < 1 || ncol < 1)
     return;
@@ -3705,7 +3732,7 @@
 }
 
 void
-rxvt_term::scr_overlay_off ()
+rxvt_term::scr_overlay_off () NOTHROW
 {
   if (!ov_text)
     return;
@@ -3723,7 +3750,7 @@
 }
 
 void
-rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
+rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
 {
   if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
     return;
@@ -3735,19 +3762,19 @@
 }
 
 void
-rxvt_term::scr_overlay_set (int x, int y, const char *s)
+rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
 {
   while (*s)
     scr_overlay_set (x++, y, *s++);
 }
 
 void
-rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
+rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
 {
   while (*s)
     {
       text_t t = *s++;
-      int width = wcwidth (t);
+      int width = WCWIDTH (t);
 
       while (width--)
         {
@@ -3758,7 +3785,7 @@
 }
 
 void
-rxvt_term::scr_swap_overlay ()
+rxvt_term::scr_swap_overlay () NOTHROW
 {
   if (!ov_text)
     return;