From ed24d62e58b2d2e8ddf387d1b5058de303393d69 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Sun, 18 Dec 2005 00:59:42 +0000
Subject: [PATCH] *** empty log message ***

---
 Changes              |    2 +
 src/command.C        |  218 +++++----
 src/init.C           |   60 +--
 src/main.C           |  205 ++++-----
 src/menubar.C        |   36 +-
 src/rxvt.h           |   58 ++-
 src/rxvtfont.C       |   30 +-
 src/rxvtlib.h.in     |   68 ++-
 src/salloc.C         |    3 +
 src/screen.C         | 1044 +++++++++++++++++++++---------------------
 src/scrollbar-next.C |    4 +-
 src/scrollbar.C      |   20 +-
 src/xpm.C            |   30 +-
 13 files changed, 902 insertions(+), 876 deletions(-)

diff --git a/Changes b/Changes
index b6bed077..df162d3d 100644
--- a/Changes
+++ b/Changes
@@ -11,6 +11,8 @@ WISH: meta-tagging of data by regex/master process (my dream project)
 WISH: OnTheSpot editing, or maybe switch to miiiiiiif
 WISH: just for fun, do shade and tint with XRender.
 
+	- make it compile without SMART_RESIZE again.
+
 5.9  Sat Dec 17 21:53:17 CET 2005
 	- fix a bug in the menu code of unknown impact, found by darix.
         - clean up signal handling to be global, not per terminal
diff --git a/src/command.C b/src/command.C
index 2e110fff..32066eb8 100644
--- a/src/command.C
+++ b/src/command.C
@@ -137,18 +137,19 @@ rxvt_term::iso14755_54 (int x, int y)
   x = Pixel2Col (x);
   y = Pixel2Row (y);
 
-  if (x < 0 || x >= TermWin.ncol
-      || y < 0 || y >= TermWin.nrow)
+  if (x < 0 || x >= ncol
+      || y < 0 || y >= nrow)
     return;
 
   for (;;)
     {
-      text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
+      const line_t &l = save[y + saveLines - view_start];
+
+      text_t t = l.t[x];
 
       if (t != NOCHAR || !x)
         {
-          iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
-                       screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
+          iso14755_51 (l.t[x], l.r[x]);
           iso14755buf = ISO_14755_54;
           break;
         }
@@ -368,7 +369,7 @@ rxvt_term::lookup_key (XKeyEvent &ev)
         return;
 #endif
 
-      if (TermWin.saveLines)
+      if (saveLines)
         {
 #ifdef UNSHIFTED_SCROLLKEYS
           if (!ctrl && !meta)
@@ -379,9 +380,9 @@ rxvt_term::lookup_key (XKeyEvent &ev)
               int lnsppg;
 
 #ifdef PAGING_CONTEXT_LINES
-              lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
+              lnsppg = nrow - PAGING_CONTEXT_LINES;
 #else
-              lnsppg = TermWin.nrow * 4 / 5;
+              lnsppg = nrow * 4 / 5;
 #endif
               if (keysym == XK_Prior)
                 {
@@ -847,9 +848,9 @@ rxvt_term::lookup_key (XKeyEvent &ev)
     return;			/* not mapped */
 
   if (options & Opt_scrollTtyKeypress)
-    if (TermWin.view_start)
+    if (view_start)
       {
-        TermWin.view_start = 0;
+        view_start = 0;
         want_refresh = 1;
       }
 
@@ -1036,8 +1037,8 @@ rxvt_term::slip_wheel_cb (time_watcher &w)
       || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
                                     : scr_page (UP,  mouse_slip_wheel_speed))
     {
-      if (TermWin.view_start == TermWin.nscrolled ||
-          TermWin.view_start == 0)
+      if (view_start == nscrolled ||
+          view_start == 0)
         mouse_slip_wheel_speed = 0;
 
       refresh_type |= SMOOTH_REFRESH;
@@ -1094,7 +1095,7 @@ rxvt_term::pty_cb (io_watcher &w, short revents)
 void
 rxvt_term::pointer_unblank ()
 {
-  XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
+  XDefineCursor (display->display, vt, TermWin_cursor);
   recolour_cursor ();
 
 #ifdef POINTER_BLANK
@@ -1112,7 +1113,7 @@ rxvt_term::pointer_blank ()
   if (! (options & Opt_pointerBlank))
     return;
 
-  XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
+  XDefineCursor (display->display, vt, display->blank_cursor);
   XFlush (display->display);
 
   hidden_pointer = 1;
@@ -1424,22 +1425,15 @@ rxvt_term::x_cb (XEvent &ev)
         break;
 
       case ConfigureNotify:
-        if (ev.xconfigure.window == TermWin.parent[0])
+        if (ev.xconfigure.window == parent[0])
           {
-            int height, width;
-
-            do
-              {	/* Wrap lots of configures into one */
-                width = ev.xconfigure.width;
-                height = ev.xconfigure.height;
-                D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
-              }
-            while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
+            while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
+              ;
 
-            if (szHint.width != width || szHint.height != height)
+            if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
               {
                 seen_resize = 1;
-                resize_all_windows (width, height, 1);
+                resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
               }
 
 #ifdef TRANSPARENT		/* XXX: maybe not needed - leave in for now */
@@ -1470,14 +1464,14 @@ rxvt_term::x_cb (XEvent &ev)
         break;
 
       case UnmapNotify:
-        TermWin.mapped = 0;
+        mapped = 0;
 #ifdef TEXT_BLINK
         text_blink_ev.stop ();
 #endif
         break;
 
       case MapNotify:
-        TermWin.mapped = 1;
+        mapped = 1;
 #ifdef TEXT_BLINK
         text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
 #endif
@@ -1491,16 +1485,16 @@ rxvt_term::x_cb (XEvent &ev)
 
       case GraphicsExpose:
       case Expose:
-        if (ev.xany.window == TermWin.vt)
+        if (ev.xany.window == vt)
           {
             do
               scr_expose (ev.xexpose.x, ev.xexpose.y,
                           ev.xexpose.width, ev.xexpose.height, False);
-            while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
+            while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
 
             ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
 
-            while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
+            while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
               scr_expose (ev.xexpose.x, ev.xexpose.y,
                           ev.xexpose.width, ev.xexpose.height, False);
 
@@ -1526,7 +1520,7 @@ rxvt_term::x_cb (XEvent &ev)
 #endif
 
 #ifdef TRANSPARENT
-            if (am_transparent && ev.xany.window == TermWin.parent[0])
+            if (am_transparent && ev.xany.window == parent[0])
               XClearWindow (disp, ev.xany.window);
 #endif
           }
@@ -1547,14 +1541,14 @@ rxvt_term::x_cb (XEvent &ev)
         if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
           break;
 
-        if (ev.xany.window == TermWin.vt)
+        if (ev.xany.window == vt)
           {
             if (ev.xbutton.state & (Button1Mask | Button3Mask))
               {
-                while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
+                while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
                   ;
 
-                XQueryPointer (disp, TermWin.vt,
+                XQueryPointer (disp, vt,
                                &unused_root, &unused_child,
                                &unused_root_x, &unused_root_y,
                                &ev.xbutton.x, &ev.xbutton.y,
@@ -1576,8 +1570,8 @@ rxvt_term::x_cb (XEvent &ev)
                                       ev.xbutton.state & Button3Mask ? 2 : 0);
 
 #ifdef SELECTION_SCROLLING
-                    if (ev.xbutton.y < TermWin.int_bwidth
-                        || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
+                    if (ev.xbutton.y < int_bwidth
+                        || Pixel2Row (ev.xbutton.y) > (nrow-1))
                       {
                         int dist;
 
@@ -1595,15 +1589,15 @@ rxvt_term::x_cb (XEvent &ev)
                         selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
 
                         /* calc number of lines to scroll */
-                        if (ev.xbutton.y < TermWin.int_bwidth)
+                        if (ev.xbutton.y < int_bwidth)
                           {
                             scroll_selection_dir = UP;
-                            dist = TermWin.int_bwidth - ev.xbutton.y;
+                            dist = int_bwidth - ev.xbutton.y;
                           }
                         else
                           {
                             scroll_selection_dir = DN;
-                            dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
+                            dist = ev.xbutton.y - (int_bwidth + height);
                           }
 
                         scroll_selection_lines = Pixel2Height (dist)
@@ -1650,9 +1644,9 @@ rxvt_term::x_cb (XEvent &ev)
 void
 rxvt_term::focus_in ()
 {
-  if (!TermWin.focus)
+  if (!focus)
     {
-      TermWin.focus = 1;
+      focus = 1;
       want_refresh = 1;
 #if USE_XIM
       if (Input_Context != NULL)
@@ -1678,9 +1672,9 @@ rxvt_term::focus_in ()
 void
 rxvt_term::focus_out ()
 {
-  if (TermWin.focus)
+  if (focus)
     {
-      TermWin.focus = 0;
+      focus = 0;
       want_refresh = 1;
 
 #if ENABLE_FRILLS || ISO_14755
@@ -1747,7 +1741,7 @@ rxvt_term::button_press (XButtonEvent &ev)
   /*
    * VT window processing of button press
    */
-  if (ev.window == TermWin.vt)
+  if (ev.window == vt)
     {
 #if ISO_14755
       // 5.4
@@ -1962,15 +1956,15 @@ rxvt_term::button_press (XButtonEvent &ev)
                     {
                       if (scrollbar_above_slider (ev.y))
 # ifdef RXVT_SCROLL_FULL
-                        scr_page (UP, TermWin.nrow - 1);
+                        scr_page (UP, nrow - 1);
 # else
-                        scr_page (UP, TermWin.nrow / 4);
+                        scr_page (UP, nrow / 4);
 # endif
                       else if (scrollbar_below_slider (ev.y))
 # ifdef RXVT_SCROLL_FULL
-                        scr_page (DN, TermWin.nrow - 1);
+                        scr_page (DN, nrow - 1);
 # else
-                        scr_page (DN, TermWin.nrow / 4);
+                        scr_page (DN, nrow / 4);
 # endif
                       else
                         scrollBar.setMotion ();
@@ -1978,7 +1972,7 @@ rxvt_term::button_press (XButtonEvent &ev)
                   else
                     {
                       scr_page ((ev.button == Button1 ? DN : UP),
-                                (TermWin.nrow
+                                (nrow
                                  * scrollbar_position (ev.y)
                                  / scrollbar_size ()));
                     }
@@ -2020,7 +2014,7 @@ rxvt_term::button_release (XButtonEvent &ev)
     sel_scroll_ev.stop();
 #endif
 
-  if (ev.window == TermWin.vt)
+  if (ev.window == vt)
     {
 #if ISO_14755
       // 5.4
@@ -2081,7 +2075,7 @@ rxvt_term::button_release (XButtonEvent &ev)
               if (ev.state & ShiftMask)
                 i = 1;
               else if (options & Opt_mouseWheelScrollPage)
-                i = TermWin.nrow - 1;
+                i = nrow - 1;
               else
                 i = 5;
 
@@ -2089,8 +2083,8 @@ rxvt_term::button_release (XButtonEvent &ev)
               if (ev.state & ControlMask)
                 {
                   mouse_slip_wheel_speed += v ? -1 : 1;
-                  if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
-                  if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
+                  if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
+                  if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
 
                   if (slip_wheel_ev.at < NOW)
                     slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
@@ -2382,14 +2376,14 @@ rxvt_term::check_our_parents ()
   XGetWindowAttributes (disp, display->root, &wrootattr);
   rootdepth = wrootattr.depth;
 
-  XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
+  XGetWindowAttributes (disp, parent[0], &wattr);
 
   if (rootdepth != wattr.depth)
     {
       if (am_transparent)
         {
           pchanged = 1;
-          XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
+          XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
           am_transparent = am_pixmap_trans = 0;
         }
 
@@ -2440,7 +2434,7 @@ rxvt_term::check_our_parents ()
       GC gc;
       XGCValues gcvalue;
 
-      XTranslateCoordinates (disp, TermWin.parent[0], display->root,
+      XTranslateCoordinates (disp, parent[0], display->root,
                              0, 0, &sx, &sy, &cr);
       nw = (unsigned int)szHint.width;
       nh = (unsigned int)szHint.height;
@@ -2476,10 +2470,10 @@ rxvt_term::check_our_parents ()
           if (am_transparent && am_pixmap_trans)
             {
               pchanged = 1;
-              if (TermWin.pixmap != None)
+              if (pixmap != None)
                 {
-                  XFreePixmap (disp, TermWin.pixmap);
-                  TermWin.pixmap = None;
+                  XFreePixmap (disp, pixmap);
+                  pixmap = None;
                 }
             }
 
@@ -2487,8 +2481,8 @@ rxvt_term::check_our_parents ()
         }
       else
         {
-          if (TermWin.pixmap != None)
-            XFreePixmap (disp, TermWin.pixmap);
+          if (pixmap != None)
+            XFreePixmap (disp, pixmap);
 
 #if TINTING
           if (ISSET_PIXCOLOR (Color_tint))
@@ -2502,15 +2496,15 @@ rxvt_term::check_our_parents ()
             }
 #endif
 
-          TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
+          pixmap = XCreatePixmap (disp, vt,
                                           szHint.width, szHint.height, image->depth);
-          gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
-          XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
+          gc = XCreateGC (disp, vt, 0UL, &gcvalue);
+          XPutImage (disp, pixmap, gc, image, 0, 0,
                      nx, ny, image->width, image->height);
           XFreeGC (disp, gc);
           XDestroyImage (image);
-          XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
-          XClearWindow (disp, TermWin.parent[0]);
+          XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
+          XClearWindow (disp, parent[0]);
 
           if (!am_transparent || !am_pixmap_trans)
             pchanged = 1;
@@ -2520,21 +2514,21 @@ rxvt_term::check_our_parents ()
     }
 
   if (am_pixmap_trans)
-    XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
+    XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
   else
     {
       unsigned int n;
       /*
        * InheritPixmap transparency
        */
-      for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
+      for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
         {
-          oldp = TermWin.parent[i];
-          XQueryTree (disp, TermWin.parent[i - 1], &root,
-                      &TermWin.parent[i], &list, &n);
+          oldp = parent[i];
+          XQueryTree (disp, parent[i - 1], &root,
+                      &parent[i], &list, &n);
           XFree (list);
 
-          if (TermWin.parent[i] == display->root)
+          if (parent[i] == display->root)
             {
               if (oldp != None)
                 pchanged = 1;
@@ -2542,7 +2536,7 @@ rxvt_term::check_our_parents ()
               break;
             }
 
-          if (oldp != TermWin.parent[i])
+          if (oldp != parent[i])
             pchanged = 1;
         }
 
@@ -2552,19 +2546,19 @@ rxvt_term::check_our_parents ()
         {
           for (; n < (unsigned int)i; n++)
             {
-              XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
+              XGetWindowAttributes (disp, parent[n], &wattr);
               if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
                 {
-                  n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
+                  n = (int) (sizeof (parent) / sizeof (Window)) + 1;
                   break;
                 }
             }
         }
 
-      if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
+      if (n > (int) (sizeof (parent) / sizeof (parent[0])))
         {
-          XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_border]);
-          XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
+          XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
+          XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
           am_transparent = 0;
           /* XXX: also turn off Opt_transparent? */
         }
@@ -2577,16 +2571,16 @@ rxvt_term::check_our_parents ()
 #endif
           for (n = 0; n < (unsigned int)i; n++)
             {
-              XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
-              XClearWindow (disp, TermWin.parent[n]);
+              XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
+              XClearWindow (disp, parent[n]);
             }
 
-          XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
+          XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
           am_transparent = 1;
         }
 
-      for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
-        TermWin.parent[i] = None;
+      for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
+        parent[i] = None;
     }
 
   if (scrollBar.win)
@@ -2648,7 +2642,7 @@ rxvt_term::cmd_parse ()
           bool refreshnow = false;
           int nlines = 0;
           unicode_t *str = buf;
-          unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ);
+          unicode_t *eol = str + min (ncol, UBUFSIZ);
 
           for (;;)
             {
@@ -2665,20 +2659,20 @@ rxvt_term::cmd_parse ()
                   refresh_count++;
 
                   if (!(options & Opt_jumpScroll)
-                      || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
+                      || (refresh_count >= refresh_limit * (nrow - 1)))
                     {
                       refreshnow = true;
                       ch = NOCHAR;
                       break;
                     }
 
-                  // scr_add_lines only works for nlines <= TermWin.nrow - 1.
-                  if (nlines >= TermWin.nrow - 1)
+                  // scr_add_lines only works for nlines <= nrow - 1.
+                  if (nlines >= nrow - 1)
                     {
                       scr_add_lines (buf, nlines, str - buf);
                       nlines = 0;
                       str = buf;
-                      eol = str + min (TermWin.ncol, UBUFSIZ);
+                      eol = str + min (ncol, UBUFSIZ);
                     }
 
                   if (str >= eol)
@@ -2689,7 +2683,7 @@ rxvt_term::cmd_parse ()
                           break;
                         }
                       else
-                        eol = min (eol + TermWin.ncol, buf + UBUFSIZ);
+                        eol = min (eol + ncol, buf + UBUFSIZ);
                     }
 
                 }
@@ -3495,36 +3489,36 @@ rxvt_term::process_window_ops (const int *args, unsigned int nargs)
        * commands
        */
       case 1:			/* deiconify window */
-        XMapWindow (disp, TermWin.parent[0]);
+        XMapWindow (disp, parent[0]);
         break;
       case 2:			/* iconify window */
-        XIconifyWindow (disp, TermWin.parent[0], display->screen);
+        XIconifyWindow (disp, parent[0], display->screen);
         break;
       case 3:			/* set position (pixels) */
-        XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
+        XMoveWindow (disp, parent[0], args[1], args[2]);
         break;
       case 4:			/* set size (pixels) */
         set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
         break;
       case 5:			/* raise window */
-        XRaiseWindow (disp, TermWin.parent[0]);
+        XRaiseWindow (disp, parent[0]);
         break;
       case 6:			/* lower window */
-        XLowerWindow (disp, TermWin.parent[0]);
+        XLowerWindow (disp, parent[0]);
         break;
       case 7:			/* refresh window */
         scr_touch (true);
         break;
       case 8:			/* set size (chars) */
-        set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
-                         (unsigned int) (args[1] * TermWin.fheight));
+        set_widthheight ((unsigned int) (args[2] * fwidth),
+                         (unsigned int) (args[1] * fheight));
         break;
 
       //case 9: NYI, TODO, restore maximized window or maximize window
       default:
         if (args[0] >= 24)	/* set height (chars) */
-          set_widthheight ((unsigned int)TermWin.width,
-                           (unsigned int) (args[1] * TermWin.fheight));
+          set_widthheight ((unsigned int)width,
+                           (unsigned int) (args[1] * fheight));
         break;
 
 
@@ -3532,30 +3526,30 @@ rxvt_term::process_window_ops (const int *args, unsigned int nargs)
        * reports - some output format copied from XTerm
        */
       case 11:			/* report window state */
-        XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
+        XGetWindowAttributes (disp, parent[0], &wattr);
         tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
         break;
       case 13:			/* report window position */
-        XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
-        XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
+        XGetWindowAttributes (disp, parent[0], &wattr);
+        XTranslateCoordinates (disp, parent[0], wattr.root,
                                -wattr.border_width, -wattr.border_width,
                                &x, &y, &wdummy);
         tt_printf ("\033[3;%d;%dt", x, y);
         break;
       case 14:			/* report window size (pixels) */
-        XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
+        XGetWindowAttributes (disp, parent[0], &wattr);
         tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
         break;
       case 18:			/* report text area size (chars) */
-        tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
+        tt_printf ("\033[8;%d;%dt", nrow, ncol);
         break;
       case 19:			/* report window size (chars) */
-        tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
+        tt_printf ("\033[9;%d;%dt", nrow, ncol);
         break;
       case 20:			/* report icon label */
         {
           char *s;
-          XGetIconName (disp, TermWin.parent[0], &s);
+          XGetIconName (disp, parent[0], &s);
           tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : "");	/* 8bit ST */
           XFree (s);
         }
@@ -3563,7 +3557,7 @@ rxvt_term::process_window_ops (const int *args, unsigned int nargs)
       case 21:			/* report window title */
         {
           char *s;
-          XFetchName (disp, TermWin.parent[0], &s);
+          XFetchName (disp, parent[0], &s);
           tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : "");	/* 8bit ST */
           XFree (s);
         }
@@ -3719,7 +3713,7 @@ rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
             const char *str = "";
 
             if (prop
-                && XGetWindowProperty (disp, TermWin.parent[0],
+                && XGetWindowProperty (disp, parent[0],
                                        prop, 0, 1<<16, 0, AnyPropertyType,
                                        &actual_type, &actual_format,
                                        &nitems, &bytes_after, &value) == Success
@@ -3741,7 +3735,7 @@ rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
                 set_utf8_property (display->atom (str), eq + 1);
               }
             else
-              XDeleteProperty (disp, TermWin.parent[0],
+              XDeleteProperty (disp, parent[0],
                                display->atom (str));
           }
         break;
@@ -3876,8 +3870,8 @@ rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
 #endif
         if (query)
           tt_printf ("\33]%d;%-.250s%c", saveop,
-                     (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
-                       ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
+                     (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
+                       ? fontset[op - URxvt_font]->fontdesc : "",
                      resp);
         else
           {
@@ -4054,7 +4048,7 @@ rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), u
               break;
             case 3:			/* 80/132 */
               if (priv_modes & PrivMode_132OK)
-                set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
+                set_widthheight (((state ? 132 : 80) * fwidth), height);
               break;
             case 4:			/* smooth scrolling */
               if (state)
diff --git a/src/init.C b/src/init.C
index e0da5eea..70fbc72b 100644
--- a/src/init.C
+++ b/src/init.C
@@ -228,7 +228,7 @@ rxvt_term::init_vars ()
     return false;
 
 #if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
-  TermWin.pixmap = None;
+  pixmap = None;
 #endif
 
   MEvent.time = CurrentTime;
@@ -236,13 +236,13 @@ rxvt_term::init_vars ()
   options = DEFAULT_OPTIONS;
   want_refresh = 1;
   priv_modes = SavedModes = PrivMode_Default;
-  TermWin.focus = 0;
-  TermWin.ncol = 80;
-  TermWin.nrow = 24;
-  TermWin.int_bwidth = INTERNALBORDERWIDTH;
-  TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
-  TermWin.lineSpace = LINESPACE;
-  TermWin.saveLines = SAVELINES;
+  focus = 0;
+  ncol = 80;
+  nrow = 24;
+  int_bwidth = INTERNALBORDERWIDTH;
+  ext_bwidth = EXTERNALBORDERWIDTH;
+  lineSpace = LINESPACE;
+  saveLines = SAVELINES;
   numpix_colors = TOTAL_COLORS;
 
   refresh_limit = 1;
@@ -371,15 +371,15 @@ rxvt_term::init_resources (int argc, const char *const *argv)
     }
 
   if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
-    TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
+    saveLines = BOUND_POSITIVE_INT16 (i);
 
 #if ENABLE_FRILLS
   if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
-    TermWin.int_bwidth = min (i, 100);    /* arbitrary limit */
+    int_bwidth = min (i, 100);    /* arbitrary limit */
   if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
-    TermWin.ext_bwidth = min (i, 100);    /* arbitrary limit */
+    ext_bwidth = min (i, 100);    /* arbitrary limit */
   if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
-    TermWin.lineSpace = min (i, 100);     /* arbitrary limit */
+    lineSpace = min (i, 100);     /* arbitrary limit */
 #endif
 
 #ifdef POINTER_BLANK
@@ -390,7 +390,7 @@ rxvt_term::init_resources (int argc, const char *const *argv)
 #endif
 
   /* no point having a scrollbar without having any scrollback! */
-  if (!TermWin.saveLines)
+  if (!saveLines)
     options &= ~Opt_scrollBar;
 
 #ifdef PRINTPIPE
@@ -520,14 +520,14 @@ rxvt_term::init_env ()
   sprintf (env_display, "DISPLAY=%s", val);
 
   /* avoiding the math library:
-   * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
-  for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
+   * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
+  for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
     ;
   MAX_IT (i, 1);
   env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
 
   sprintf (env_windowid, "WINDOWID=%u",
-           (unsigned int)TermWin.parent[0]);
+           (unsigned int)parent[0]);
 
   /* add entries to the environment:
    * @ DISPLAY:   in case we started with -display
@@ -986,8 +986,8 @@ rxvt_term::create_windows (int argc, const char *const *argv)
 
       window_calc (wattr.width, wattr.height);
     }
-
 #endif
+
   window_calc (0, 0);
 
   /* sub-window placement & size in rxvt_resize_subwindows () */
@@ -998,7 +998,7 @@ rxvt_term::create_windows (int argc, const char *const *argv)
   top = XCreateWindow (disp, parent,
                        szHint.x, szHint.y,
                        szHint.width, szHint.height,
-                       TermWin.ext_bwidth,
+                       ext_bwidth,
                        display->depth, InputOutput,
                        display->visual,
                        CWColormap | CWBackPixel | CWBorderPixel, &attributes);
@@ -1006,12 +1006,12 @@ rxvt_term::create_windows (int argc, const char *const *argv)
   top = XCreateSimpleWindow (disp, parent,
                              szHint.x, szHint.y,
                              szHint.width, szHint.height,
-                             TermWin.ext_bwidth,
+                             ext_bwidth,
                              pix_colors_focused[Color_border],
                              pix_colors_focused[Color_border]);
 #endif
 
-  TermWin.parent[0] = top;
+  this->parent[0] = top;
 
   old_width = szHint.width;
   old_height = szHint.height;
@@ -1074,7 +1074,7 @@ rxvt_term::create_windows (int argc, const char *const *argv)
 #endif
 
   /* the vt window */
-  TermWin.vt = XCreateSimpleWindow (disp, top,
+  vt = XCreateSimpleWindow (disp, top,
                                     window_vt_x,
                                     window_vt_y,
                                     TermWin_TotalWidth (),
@@ -1083,11 +1083,11 @@ rxvt_term::create_windows (int argc, const char *const *argv)
                                     pix_colors_focused[Color_fg],
                                     pix_colors_focused[Color_bg]);
 #ifdef DEBUG_X
-  XStoreName (disp, TermWin.vt, "vt window");
+  XStoreName (disp, vt, "vt window");
 #endif
 
   attributes.bit_gravity = NorthWestGravity;
-  XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
+  XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
 
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
 
@@ -1098,8 +1098,8 @@ rxvt_term::create_windows (int argc, const char *const *argv)
 #endif
     vt_emask |= Button1MotionMask | Button3MotionMask;
 
-  XSelectInput (disp, TermWin.vt, vt_emask);
-  vt_ev.start (display, TermWin.vt);
+  XSelectInput (disp, vt, vt_emask);
+  vt_ev.start (display, vt);
 
 #if defined(MENUBAR) && (MENUBAR_MAX > 1)
   if (menuBar_height ())
@@ -1148,19 +1148,19 @@ rxvt_term::create_windows (int argc, const char *const *argv)
   gcvalue.foreground = pix_colors[Color_fg];
   gcvalue.background = pix_colors[Color_bg];
   gcvalue.graphics_exposures = 1;
-  TermWin.gc = XCreateGC (disp, TermWin.vt,
+  gc = XCreateGC (disp, vt,
                           GCForeground | GCBackground | GCGraphicsExposures,
                           &gcvalue);
 
-  TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
+  drawable = new rxvt_drawable (display, vt);
 
 #if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
   gcvalue.foreground = pix_colors[Color_topShadow];
-  topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
+  topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
   gcvalue.foreground = pix_colors[Color_bottomShadow];
-  botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
+  botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
   gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
-  scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
+  scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
 #endif
 
 #ifdef OFF_FOCUS_FADING
diff --git a/src/main.C b/src/main.C
index ddffb0dc..fb221f44 100644
--- a/src/main.C
+++ b/src/main.C
@@ -201,10 +201,10 @@ rxvt_term::~rxvt_term ()
 
 #if ENABLE_STYLES
   for (int i = RS_styleCount; --i; )
-    if (TermWin.fontset[i] != TermWin.fontset[0])
-      delete TermWin.fontset[i];
+    if (fontset[i] != fontset[0])
+      delete fontset[i];
 #endif
-  delete TermWin.fontset[0];
+  delete fontset[0];
 
   if (display)
     {
@@ -242,17 +242,17 @@ rxvt_term::~rxvt_term ()
       if (botShadowGC)  XFreeGC (disp, botShadowGC);
       if (scrollbarGC)  XFreeGC (disp, scrollbarGC);
 #endif
-      if (TermWin.gc)   XFreeGC (disp, TermWin.gc);
+      if (gc)   XFreeGC (disp, gc);
 
 #if defined(MENUBAR) && (MENUBAR_MAX > 1)
       delete menuBar.drawable;
       //if (menuBar.win)
       //  XDestroyWindow (disp, menuBar.win);
 #endif
-      delete TermWin.drawable;
+      delete drawable;
       // destroy all windows
-      if (TermWin.parent[0])
-        XDestroyWindow (disp, TermWin.parent[0]);
+      if (parent[0])
+        XDestroyWindow (disp, parent[0]);
     }
 
   // TODO: free pixcolours, colours should become part of rxvt_display
@@ -493,8 +493,8 @@ rxvt_term::init (int argc, const char *const *argv)
     }
 #endif
 
-  XMapWindow (disp, TermWin.vt);
-  XMapWindow (disp, TermWin.parent[0]);
+  XMapWindow (disp, vt);
+  XMapWindow (disp, parent[0]);
 
   set_colorfgbg ();
 
@@ -693,7 +693,7 @@ rxvt_term::privileged_utmp (rxvt_privaction action)
  * if width/height are non-zero then override calculated width/height
  */
 void
-rxvt_term::window_calc (unsigned int width, unsigned int height)
+rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
 {
   short recalc_x, recalc_y;
   int x, y, sb_w, mb_h, flags;
@@ -702,29 +702,31 @@ rxvt_term::window_calc (unsigned int width, unsigned int height)
   dDisp;
 
   D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
-          TermWin.ncol, TermWin.nrow, szHint.width,
-          szHint.height));
+          ncol, nrow, szHint.width, szHint.height));
+
   szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
   szHint.win_gravity = NorthWestGravity;
   /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
 
   recalc_x = recalc_y = 0;
   flags = 0;
+
   if (!parsed_geometry)
     {
       parsed_geometry = 1;
+
       if (rs[Rs_geometry])
         flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
 
       if (flags & WidthValue)
         {
-          TermWin.ncol = BOUND_POSITIVE_INT16 (w);
+          ncol = BOUND_POSITIVE_INT16 (w);
           szHint.flags |= USSize;
         }
 
       if (flags & HeightValue)
         {
-          TermWin.nrow = BOUND_POSITIVE_INT16 (h);
+          nrow = BOUND_POSITIVE_INT16 (h);
           szHint.flags |= USSize;
         }
 
@@ -732,6 +734,7 @@ rxvt_term::window_calc (unsigned int width, unsigned int height)
         {
           szHint.x = x;
           szHint.flags |= USPosition;
+
           if (flags & XNegative)
             {
               recalc_x = 1;
@@ -743,9 +746,11 @@ rxvt_term::window_calc (unsigned int width, unsigned int height)
         {
           szHint.y = y;
           szHint.flags |= USPosition;
+
           if (flags & YNegative)
             {
               recalc_y = 1;
+
               if (szHint.win_gravity == NorthEastGravity)
                 szHint.win_gravity = SouthEastGravity;
               else
@@ -755,15 +760,15 @@ rxvt_term::window_calc (unsigned int width, unsigned int height)
     }
 
   /* TODO: BOUNDS */
-  TermWin.width = TermWin.ncol * TermWin.fwidth;
-  TermWin.height = TermWin.nrow * TermWin.fheight;
-  max_width = MAX_COLS * TermWin.fwidth;
-  max_height = MAX_ROWS * TermWin.fheight;
+  width = ncol * fwidth;
+  height = nrow * fheight;
+  max_width = MAX_COLS * fwidth;
+  max_height = MAX_ROWS * fheight;
 
-  szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
+  szHint.base_width = szHint.base_height = 2 * int_bwidth;
 
   sb_w = mb_h = 0;
-  window_vt_x = window_vt_y = TermWin.int_bwidth;
+  window_vt_x = window_vt_y = int_bwidth;
 
   if (scrollbar_visible ())
     {
@@ -780,47 +785,45 @@ rxvt_term::window_calc (unsigned int width, unsigned int height)
       window_vt_y += mb_h;
     }
 
-  szHint.width_inc = TermWin.fwidth;
-  szHint.height_inc = TermWin.fheight;
+  szHint.width_inc = fwidth;
+  szHint.height_inc = fheight;
   szHint.min_width = szHint.base_width + szHint.width_inc;
   szHint.min_height = szHint.base_height + szHint.height_inc;
 
-  if (width && width - szHint.base_width < max_width)
+  if (newwidth && newwidth - szHint.base_width < max_width)
     {
-      szHint.width = width;
-      TermWin.width = width - szHint.base_width;
+      szHint.width = newwidth;
+      width = newwidth - szHint.base_width;
     }
   else
     {
-      MIN_IT (TermWin.width, max_width);
-      szHint.width = szHint.base_width + TermWin.width;
+      MIN_IT (width, max_width);
+      szHint.width = szHint.base_width + width;
     }
 
-  if (height && height - szHint.base_height < max_height)
+  if (newheight && newheight - szHint.base_height < max_height)
     {
-      szHint.height = height;
-      TermWin.height = height - szHint.base_height;
+      szHint.height = newheight;
+      height = newheight - szHint.base_height;
     }
   else
     {
-      MIN_IT (TermWin.height, max_height);
-      szHint.height = szHint.base_height + TermWin.height;
+      MIN_IT (height, max_height);
+      szHint.height = szHint.base_height + height;
     }
 
   if (scrollbar_visible () && (options & Opt_scrollBar_right))
     window_sb_x = szHint.width - sb_w;
 
   if (recalc_x)
-    szHint.x += (DisplayWidth (disp, display->screen)
-                 - szHint.width - 2 * TermWin.ext_bwidth);
+    szHint.x += DisplayWidth  (disp, display->screen) - szHint.width  - 2 * ext_bwidth;
   if (recalc_y)
-    szHint.y += (DisplayHeight (disp, display->screen)
-                 - szHint.height - 2 * TermWin.ext_bwidth);
+    szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
 
-  TermWin.ncol = TermWin.width / TermWin.fwidth;
-  TermWin.nrow = TermWin.height / TermWin.fheight;
+  ncol = width / fwidth;
+  nrow = height / fheight;
   D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
-          TermWin.ncol, TermWin.nrow, szHint.width,
+          ncol, nrow, szHint.width,
           szHint.height));
   return;
 }
@@ -838,10 +841,10 @@ rxvt_term::tt_winch ()
 
   struct winsize ws;
 
-  ws.ws_col = TermWin.ncol;
-  ws.ws_row = TermWin.nrow;
-  ws.ws_xpixel = TermWin.width;
-  ws.ws_ypixel = TermWin.height;
+  ws.ws_col = ncol;
+  ws.ws_row = nrow;
+  ws.ws_xpixel = width;
+  ws.ws_ypixel = height;
   (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
 
 #if 0
@@ -875,22 +878,22 @@ rxvt_term::set_fonts ()
 
 #if ENABLE_STYLES
   for (int i = RS_styleCount; --i; )
-    if (TermWin.fontset[i] != TermWin.fontset[0])
-      delete TermWin.fontset[i];
+    if (fontset[i] != fontset[0])
+      delete fontset[i];
 #endif
 
-  delete TermWin.fontset[0];
-  TermWin.fontset[0] = fs;
+  delete fontset[0];
+  fontset[0] = fs;
 
   prop = (*fs)[1]->properties ();
-  prop.height += TermWin.lineSpace;
+  prop.height += lineSpace;
   fs->set_prop (prop);
 
-  TermWin.fwidth  = prop.width;
-  TermWin.fheight = prop.height;
-  TermWin.fweight = prop.weight;
-  TermWin.fslant  = prop.slant;
-  TermWin.fbase   = (*fs)[1]->ascent;
+  fwidth  = prop.width;
+  fheight = prop.height;
+  fweight = prop.weight;
+  fslant  = prop.slant;
+  fbase   = (*fs)[1]->ascent;
 
   for (int style = 1; style < 4; style++)
     {
@@ -898,17 +901,17 @@ rxvt_term::set_fonts ()
       const char *res = rs[Rs_font + style];
 
       if (res && !*res)
-        TermWin.fontset[style] = TermWin.fontset[0];
+        fontset[style] = fontset[0];
       else
         {
-          TermWin.fontset[style] = fs = new rxvt_fontset (this);
+          fontset[style] = fs = new rxvt_fontset (this);
           rxvt_fontprop prop2 = prop;
 
           if (res)
             prop2.weight = prop2.slant = rxvt_fontprop::unset;
           else
             {
-              res = TermWin.fontset[0]->fontdesc;
+              res = fontset[0]->fontdesc;
 
               if (SET_STYLE (0, style) & RS_Bold)   prop2.weight = rxvt_fontprop::bold;
               if (SET_STYLE (0, style) & RS_Italic) prop2.slant  = rxvt_fontprop::italic;
@@ -918,11 +921,11 @@ rxvt_term::set_fonts ()
           fs->set_prop (prop2);
         }
 #else
-      TermWin.fontset[style] = TermWin.fontset[0];
+      fontset[style] = fontset[0];
 #endif
     }
 
-  if (TermWin.parent[0])
+  if (parent[0])
     {
       resize_all_windows (0, 0, 0);
       scr_remap_chars ();
@@ -935,7 +938,7 @@ rxvt_term::set_fonts ()
 void rxvt_term::set_string_property (Atom prop, const char *str, int len)
 {
   // TODO: SMART_WINDOW_TITLE
-  XChangeProperty (display->display, TermWin.parent[0],
+  XChangeProperty (display->display, parent[0],
                    prop, XA_STRING, 8, PropModeReplace,
                    (const unsigned char *)str, len >= 0 ? len : strlen (str));
 }
@@ -946,7 +949,7 @@ void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
   wchar_t *ws = rxvt_mbstowcs (str, len);
   char *s = rxvt_wcstoutf8 (ws);
 
-  XChangeProperty (display->display, TermWin.parent[0],
+  XChangeProperty (display->display, parent[0],
                    prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
                    (const unsigned char *)s, strlen (s));
 
@@ -1119,16 +1122,14 @@ rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
  * -                         WINDOW RESIZING                          - *
  * -------------------------------------------------------------------- */
 void
-rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
+rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
 {
   int fix_screen;
-#ifdef SMART_RESIZE
   int old_width = szHint.width, old_height = szHint.height;
-#endif
   dDisp;
 
-  window_calc (width, height);
-  XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
+  window_calc (newwidth, newheight);
+  XSetWMNormalHints (disp, parent[0], &szHint);
 
   if (!ignoreparent)
     {
@@ -1142,9 +1143,9 @@ rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int igno
       unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
       Window unused_cr;
 
-      XTranslateCoordinates (disp, TermWin.parent[0], display->root,
+      XTranslateCoordinates (disp, parent[0], display->root,
                              0, 0, &x, &y, &unused_cr);
-      XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
+      XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
                     &unused_w1, &unused_h1, &unused_b1, &unused_d1);
       /*
        * if display->root isn't the parent window, a WM will probably have offset
@@ -1171,16 +1172,16 @@ rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int igno
       else if (y == y1)       /* exact center */
         dy /= 2;
 
-      XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
+      XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
                          szHint.width, szHint.height);
 #else
-      XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
+      XResizeWindow (disp, parent[0], szHint.width, szHint.height);
 #endif
     }
 
-  fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
+  fix_screen = ncol != prev_ncol || nrow != prev_nrow;
 
-  if (fix_screen || width != old_width || height != old_height)
+  if (fix_screen || newwidth != old_width || newheight != old_height)
     {
       if (scrollbar_visible ())
         {
@@ -1195,7 +1196,7 @@ rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int igno
                            window_vt_x, 0,
                            TermWin_TotalWidth (), menuBar_TotalHeight ());
 
-      XMoveResizeWindow (disp, TermWin.vt,
+      XMoveResizeWindow (disp, vt,
                          window_vt_x, window_vt_y,
                          TermWin_TotalWidth (), TermWin_TotalHeight ());
 
@@ -1213,10 +1214,10 @@ rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int igno
       /* scr_reset only works on the primary screen */
       if (old_height)      /* this is not the first time through */
         {
-          unsigned int ncol = TermWin.ncol;
-          TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
+          unsigned int ocol = ncol;
+          ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
           curr_screen = scr_change_screen (PRIMARY);
-          TermWin.ncol = ncol;
+          ncol = ocol;
         }
 
       scr_reset ();
@@ -1224,7 +1225,7 @@ rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int igno
       if (curr_screen >= 0) /* this is not the first time through */
         {
           scr_change_screen (curr_screen);
-          selection_check (old_ncol != TermWin.ncol ? 4 : 0);
+          selection_check (old_ncol != ncol ? 4 : 0);
         }
     }
 
@@ -1232,7 +1233,7 @@ rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int igno
   old_height = szHint.height;
 
 #ifdef XPM_BACKGROUND
-  if (TermWin.pixmap)
+  if (pixmap)
     scr_touch (false);
 #endif
 
@@ -1246,25 +1247,25 @@ rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int igno
  * good for toggling 80/132 columns
  */
 void
-rxvt_term::set_widthheight (unsigned int width, unsigned int height)
+rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
 {
   XWindowAttributes wattr;
 
-  if (width == 0 || height == 0)
+  if (newwidth == 0 || newheight == 0)
     {
       XGetWindowAttributes (display->display, display->root, &wattr);
 
-      if (width == 0)
-        width = wattr.width - szHint.base_width;
-      if (height == 0)
-        height = wattr.height - szHint.base_height;
+      if (newwidth == 0)
+        newwidth = wattr.width - szHint.base_width;
+      if (newheight == 0)
+        newheight = wattr.height - szHint.base_height;
     }
 
-  if (width != TermWin.width || height != TermWin.height)
+  if (newwidth != width || newheight != height)
     {
-      width += szHint.base_width;
-      height += szHint.base_height;
-      resize_all_windows (width, height, 0);
+      newwidth += szHint.base_width;
+      newheight += szHint.base_height;
+      resize_all_windows (newwidth, newheight, 0);
     }
 }
 
@@ -1284,10 +1285,10 @@ void
 rxvt_term::im_set_size (XRectangle &size)
 {
   // the int_bwidth terms make no sense to me
-  size.x      = TermWin.int_bwidth;
-  size.y      = TermWin.int_bwidth;
-  size.width  = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
-  size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
+  size.x      = int_bwidth;
+  size.y      = int_bwidth;
+  size.width  = Width2Pixel (ncol) + int_bwidth;
+  size.height = Height2Pixel (nrow) + int_bwidth;
 }
 
 void
@@ -1297,13 +1298,13 @@ rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
 {
   preedit_rect.x      = needed_rect.width;
   preedit_rect.y      = 0;
-  preedit_rect.width  = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
-  preedit_rect.height = TermWin.fheight;
+  preedit_rect.width  = Width2Pixel (ncol) - needed_rect.width + 1;
+  preedit_rect.height = fheight;
 
   status_rect.x       = 0;
   status_rect.y       = 0;
-  status_rect.width   = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
-  status_rect.height  = TermWin.fheight;
+  status_rect.width   = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
+  status_rect.height  = fheight;
 }
 
 /* Checking whether input method is running. */
@@ -1341,7 +1342,7 @@ rxvt_term::IMSendSpot ()
   XVaNestedList preedit_attr;
 
   if (!Input_Context
-      || !TermWin.focus
+      || !focus
       || !(input_style & XIMPreeditPosition))
     return;
 
@@ -1471,9 +1472,9 @@ foundpet:
                "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
                "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
                "*",
-               TermWin.fheight,
-               TermWin.fheight + 1, TermWin.fheight - 1,
-               TermWin.fheight - 2, TermWin.fheight + 2);
+               fheight,
+               fheight + 1, fheight - 1,
+               fheight - 2, fheight + 2);
 
       fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
                            &missing_charset_list, &missing_charset_count, &def_string);
@@ -1529,8 +1530,8 @@ foundpet:
 
   Input_Context = XCreateIC (xim,
                              XNInputStyle, input_style,
-                             XNClientWindow, TermWin.vt,
-                             XNFocusWindow, TermWin.parent[0],
+                             XNClientWindow, vt,
+                             XNFocusWindow, parent[0],
                              preedit_attr ? XNPreeditAttributes : NULL,
                              preedit_attr,
                              status_attr ? XNStatusAttributes : NULL,
@@ -1624,7 +1625,7 @@ rxvt_term::IMSetStatusPosition ()
   XVaNestedList preedit_attr, status_attr;
 
   if (!Input_Context
-      || !TermWin.focus
+      || !focus
       || !(input_style & XIMPreeditArea)
       || !IMisRunning ())
     return;
diff --git a/src/menubar.C b/src/menubar.C
index 375cdbb5..9de7f33f 100644
--- a/src/menubar.C
+++ b/src/menubar.C
@@ -755,9 +755,9 @@ rxvt_term::drawbox_menubar (int x, int len, int state)
 
   x = Width2Pixel (x);
   len = Width2Pixel (len + HSPACE);
-  if (x >= TermWin.width)
+  if (x >= width)
     return;
-  else if (x + len >= TermWin.width)
+  else if (x + len >= width)
     len = (TermWin_TotalWidth () - x);
 
 #ifdef MENUBAR_SHADOW_IN
@@ -944,7 +944,7 @@ rxvt_term::menu_show ()
       ActiveMenu->y = 1;
       ActiveMenu->w = Menu_PixelWidth (ActiveMenu);
 
-      if ((x + ActiveMenu->w) >= TermWin.width)
+      if ((x + ActiveMenu->w) >= width)
         x = (TermWin_TotalWidth () - ActiveMenu->w);
 
       /* find the height */
@@ -956,7 +956,7 @@ rxvt_term::menu_show ()
 
   if (ActiveMenu->win == None)
     {
-      ActiveMenu->win = XCreateSimpleWindow (display->display, TermWin.vt,
+      ActiveMenu->win = XCreateSimpleWindow (display->display, vt,
                                              x, ActiveMenu->y,
                                              ActiveMenu->w, ActiveMenu->h,
                                              0,
@@ -1024,10 +1024,10 @@ rxvt_term::menu_show ()
               menu->h = h + 2 * SHADOW;
 
               /* ensure menu is in window limits */
-              if ((x1 + menu->w) >= TermWin.width)
+              if ((x1 + menu->w) >= width)
                 x1 = (TermWin_TotalWidth () - menu->w);
 
-              if ((y1 + menu->h) >= TermWin.height)
+              if ((y1 + menu->h) >= height)
                 y1 = (TermWin_TotalHeight () - menu->h);
 
               menu->x = (x1 < 0 ? 0 : x1);
@@ -1037,14 +1037,14 @@ rxvt_term::menu_show ()
             name = NULL;
 
           if (len && name)
-            draw_string (*ActiveMenu->drawable, gc, TermWin.fontset[0],
+            draw_string (*ActiveMenu->drawable, gc, fontset[0],
                          xoff, 2 * SHADOW + y, name, len);
 
           len = item->len2;
           name = item->name2;
 
           if (len && name)
-            draw_string (*ActiveMenu->drawable, gc, TermWin.fontset[0],
+            draw_string (*ActiveMenu->drawable, gc, fontset[0],
                          ActiveMenu->w - (xoff + Width2Pixel (xright)), 2 * SHADOW + y, name, len);
 
           h = HEIGHT_TEXT + 2 * SHADOW;
@@ -2061,30 +2061,30 @@ rxvt_term::menubar_expose ()
           rxvt_print_menu_descendants (menu);
 #endif
 
-          if (x >= TermWin.ncol)
-            len = (TermWin.ncol - (menu->x + HSPACE));
+          if (x >= ncol)
+            len = (ncol - (menu->x + HSPACE));
 
           drawbox_menubar (menu->x, len, +1);
-          draw_string (*menuBar.drawable, menubarGC, TermWin.fontset[0],
+          draw_string (*menuBar.drawable, menubarGC, fontset[0],
                        (Width2Pixel (menu->x) + Width2Pixel (HSPACE) / 2),
                        SHADOW, menu->name, len);
 
-          if (x >= TermWin.ncol)
+          if (x >= ncol)
             break;
         }
     }
-  drawbox_menubar (x, TermWin.ncol, (CurrentBar ? +1 : -1));
+  drawbox_menubar (x, ncol, (CurrentBar ? +1 : -1));
 
   /* add the menuBar title, if it exists and there's plenty of room */
   Arrows_x = 0;
-  if (x < TermWin.ncol)
+  if (x < ncol)
     {
       const char     *str;
       int             ncol;
       unsigned int    len;
       char            title[256];
 
-      ncol = (int)TermWin.ncol;
+      ncol = (int)ncol;
       if (x < (ncol - (NARROWS + 1)))
         {
           ncol -= (NARROWS + 1);
@@ -2128,7 +2128,7 @@ rxvt_term::menubar_expose ()
 
       ncol -= (x + len + HSPACE);
       if (len > 0 && ncol >= 0)
-        draw_string (*menuBar.drawable, menubarGC, TermWin.fontset[0],
+        draw_string (*menuBar.drawable, menubarGC, fontset[0],
                      Width2Pixel (x) + Width2Pixel (ncol + HSPACE) / 2,
                      SHADOW, title, len);
     }
@@ -2406,8 +2406,8 @@ rxvt_term::menubar_control (XButtonEvent &ev)
         break;
 
       case MotionNotify:
-        while (XCheckTypedWindowEvent (display->display, TermWin.parent[0],
-                                       MotionNotify, (XEvent *)&ev)) ;
+        while (XCheckTypedWindowEvent (display->display, parent[0],
+                                       MotionNotify, (XEvent *)&ev));
 
         if (ActiveMenu)
           while (menu_select (ev)) ;
diff --git a/src/rxvt.h b/src/rxvt.h
index 37c098de..267e7c79 100644
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -820,15 +820,15 @@ enum {
 /* convert pixel dimensions to row/column values.  Everything as int32_t */
 #define Pixel2Col(x)            Pixel2Width((int32_t)(x))
 #define Pixel2Row(y)            Pixel2Height((int32_t)(y))
-#define Pixel2Width(x)          ((int32_t)(x) / (int32_t)TermWin.fwidth)
-#define Pixel2Height(y)         ((int32_t)(y) / (int32_t)TermWin.fheight)
+#define Pixel2Width(x)          ((int32_t)(x) / (int32_t)fwidth)
+#define Pixel2Height(y)         ((int32_t)(y) / (int32_t)fheight)
 #define Col2Pixel(col)          ((int32_t)Width2Pixel(col))
 #define Row2Pixel(row)          ((int32_t)Height2Pixel(row))
-#define Width2Pixel(n)          ((int32_t)(n) * (int32_t)TermWin.fwidth)
-#define Height2Pixel(n)         ((int32_t)(n) * (int32_t)TermWin.fheight)
+#define Width2Pixel(n)          ((int32_t)(n) * (int32_t)fwidth)
+#define Height2Pixel(n)         ((int32_t)(n) * (int32_t)fheight)
 
-#define TermWin_TotalWidth()    ((int32_t)TermWin.width)
-#define TermWin_TotalHeight()   ((int32_t)TermWin.height)
+#define TermWin_TotalWidth()    ((int32_t)width)
+#define TermWin_TotalHeight()   ((int32_t)height)
 
 /* how to build & extract colors and attributes */
 #define GET_BASEFG(x)           (((x) & RS_fgMask))
@@ -872,9 +872,9 @@ enum {
 #define ISSET_PIXCOLOR(x)       (pixcolor_set[(x) / NPIXCLR_BITS] &  (1 << ((x) % NPIXCLR_BITS)))
 
 #if ENABLE_STYLES
-# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]
+# define FONTSET(style) fontset[GET_STYLE (style)]
 #else
-# define FONTSET(style) TermWin.fontset[0]
+# define FONTSET(style) fontset[0]
 #endif
 
 #ifdef HAVE_SCROLLBARS
@@ -909,7 +909,7 @@ enum {
 
 #if (MENUBAR_MAX > 1)
 /* rendition style flags */
-# define menuBar_height()       (TermWin.fheight + SHADOW)
+# define menuBar_height()       (fheight + SHADOW)
 # define menuBar_TotalHeight()  (menuBar_height() + SHADOW + menuBar_margin)
 # define isMenuBarWindow(w)     ((w) == menuBar.win)
 #else
@@ -1350,8 +1350,8 @@ struct rxvt_term : zero_initialized, rxvt_vars {
   void color_aliases (int idx);
   void recolour_cursor ();
   void create_windows (int argc, const char *const *argv);
-  void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
-  void window_calc (unsigned int width, unsigned int height);
+  void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
+  void window_calc (unsigned int newwidth, unsigned int newheight);
 
 #if USE_XIM
   rxvt_xim       *input_method;
@@ -1433,7 +1433,7 @@ struct rxvt_term : zero_initialized, rxvt_vars {
   void set_window_color (int idx, const char *color);
   void set_colorfgbg ();
   int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
-  void set_widthheight (unsigned int width, unsigned int height);
+  void set_widthheight (unsigned int newwidth, unsigned int newheight);
 
 #ifdef MENUBAR
   // menubar.C
@@ -1469,8 +1469,36 @@ struct rxvt_term : zero_initialized, rxvt_vars {
 #endif
 
   // screen.C
-  void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
-  void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
+
+  void lalloc (line_t &l)
+  {
+    l.t = (text_t *)talloc->alloc ();
+    l.r = (rend_t *)ralloc->alloc ();
+  }
+
+  void lfree (line_t &l)
+  {
+    talloc->free (l.t);
+    ralloc->free (l.r);
+  }
+
+  void lresize (line_t &l)
+  {
+    if (!l.t)
+      return;
+
+    l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
+    l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
+
+    MIN_IT (l.l, (int16_t)ncol);
+
+    if (ncol > prev_ncol)
+      scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
+  }
+
+  void scr_update_term ();
+  void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
+  void scr_blank_screen_mem (line_t &l, rend_t efs);
   int scr_scroll_text (int row1, int row2, int count, int spec);
   void scr_reset ();
   void scr_reset_realloc ();
@@ -1489,7 +1517,7 @@ struct rxvt_term : zero_initialized, rxvt_vars {
   rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
   void scr_recolour ();
   void scr_remap_chars ();
-  void scr_remap_chars (text_t *tp, rend_t *rp);
+  void scr_remap_chars (const line_t &l);
 
   void scr_poweron ();
   void scr_cursor (int mode);
diff --git a/src/rxvtfont.C b/src/rxvtfont.C
index 2d931bad..5fda418f 100644
--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -29,7 +29,7 @@
 #include <inttypes.h>
 
 #define DISPLAY  r->display->display
-#define TGC      r->TermWin.gc
+#define TGC      r->gc
 
 #define MAX_OVERLAP (4 + 1)	// max. character width in 4ths of the base width
 
@@ -335,7 +335,7 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
 {
   Display *disp = d.display->display;
 
-  clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
+  clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
 
   XSetForeground (disp, TGC, r->pix_colors[fg]);
 
@@ -351,7 +351,7 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
         ;
 
       int width = text - tp;
-      int fwidth = r->TermWin.fwidth * width;
+      int fwidth = r->fwidth * width;
 
       if (0x2500 <= t && t <= 0x259f)
         {
@@ -360,7 +360,7 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
           uint32_t *b = a + (offs & 15);
 
           int W = fwidth;
-          int H = r->TermWin.fheight;
+          int H = r->fheight;
 
           int x_[16];
           int y_[16];
@@ -466,7 +466,7 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
 
             default:
               XDrawRectangle (disp, d, TGC, x + 2, y + 2,
-                              fwidth - 4, r->TermWin.fheight - 4);
+                              fwidth - 4, r->fheight - 4);
           }
 
       x += fwidth;
@@ -958,10 +958,10 @@ rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
   // but the result still isn't perfect /.
 
   bool slow = this->slow
-              || width != r->TermWin.fwidth
-              || height != r->TermWin.fheight;
+              || width != r->fwidth
+              || height != r->fheight;
 
-  int base = ascent; // sorry, incorrect: r->TermWin.fbase;
+  int base = ascent; // sorry, incorrect: r->fbase;
 
   XGCValues v;
   v.foreground = r->pix_colors[fg];
@@ -979,7 +979,7 @@ rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
         }
       else
         {
-          clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
+          clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
 
           XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
           
@@ -990,7 +990,7 @@ rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
                   if (xc->byte1 || xc->byte2)
                     XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
 
-                  x += r->TermWin.fwidth;
+                  x += r->fwidth;
                   xc++; len--;
                 }
               while (len);
@@ -1011,7 +1011,7 @@ rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
         }
       else
         {
-          clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
+          clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
 
           XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
           
@@ -1022,7 +1022,7 @@ rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
                   if (*xc)
                     XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
 
-                  x += r->TermWin.fwidth;
+                  x += r->fwidth;
                   xc++; len--;
                 }
               while (len);
@@ -1264,7 +1264,7 @@ rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
                      const text_t *text, int len,
                      int fg, int bg)
 {
-  clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
+  clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
 
   int base = ascent; // should be fbase, but that is incorrect
 
@@ -1275,11 +1275,11 @@ rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
 
   while (len)
     {
-      int cwidth = r->TermWin.fwidth;
+      int cwidth = r->fwidth;
       FcChar32 fc = *text++; len--;
 
       while (len && *text == NOCHAR)
-        text++, len--, cwidth += r->TermWin.fwidth;
+        text++, len--, cwidth += r->fwidth;
       
       if (fc == ' ' && ep == enc) // skip leading spaces
         x += cwidth;
diff --git a/src/rxvtlib.h.in b/src/rxvtlib.h.in
index e9b5506d..f8411ca6 100644
--- a/src/rxvtlib.h.in
+++ b/src/rxvtlib.h.in
@@ -79,6 +79,27 @@ typedef uint32_t text_t;
 typedef uint16_t text_t; // saves lots of memory
 #endif
 typedef uint32_t rend_t;
+typedef int16_t  tlen_t;
+
+#define LINE_CONT -1
+
+struct line_t {
+   text_t *t; // terminal the text
+   rend_t *r; // rendition, uses RS_ flags
+   tlen_t l;  // length of each text line, LINE_CONT == continued on next line
+
+   bool is_cont ()
+   {
+     return l < 0;
+   }
+
+   void clear ()
+   {
+     t = 0;
+     r = 0;
+     l = 0;
+   }
+};
 
 /*
  * TermWin elements limits
@@ -87,11 +108,12 @@ typedef uint32_t rend_t;
  *  ncol      : 1 <= ncol       <= MAX(int16_t)
  *  nrow      : 1 <= nrow       <= MAX(int16_t)
  *  saveLines : 0 <= saveLines  <= MAX(int16_t)
- *  nscrolled : 0 <= nscrolled  <= saveLines
- *  view_start: 0 <= view_start <= nscrolled
+ *  nsaved    : 0 <= nscrolled  <= saveLines
+ *  term_start: 0 <= term_start < saveLines
+ *  view_start: 0 <= view_start < saveLines
  */
 
-typedef struct {
+struct TermWin_t {
   int            width;         /* window width                    [pixels] */
   int            height;        /* window height                   [pixels] */
   int            fwidth;        /* font width                      [pixels] */
@@ -106,7 +128,9 @@ typedef struct {
   int            ext_bwidth;    /* external border width                    */
   int            lineSpace;     /* number of extra pixels between rows      */
   int            saveLines;     /* number of lines that fit in scrollback   */
-  int            nscrolled;     /* number of line actually scrolled         */
+  int            nsaved;        /* number of line actually scrolled         */
+  int nscrolled; /*D*///TODO remove
+  int            term_start;    /* term lines start here                    */
   int            view_start;    /* scrollback view starts here              */
   Window         parent[6];     /* parent identifiers - we're parent[0]     */
   Window         vt;            /* vt100 window                             */
@@ -114,21 +138,21 @@ typedef struct {
   Pixmap         pixmap;
   rxvt_drawable *drawable;
   rxvt_fontset  *fontset[4];
-} TermWin_t;
+};
 
 /*
  * screen accounting:
  * screen_t elements
  *   text:      Contains all text information including the scrollback buffer.
- *              Each line is length TermWin.ncol
+ *              Each line is length ncol
  *   tlen:      The length of the line or -1 for wrapped lines.
  *   rend:      Contains rendition information: font, bold, colour, etc.
  * * Note: Each line for both text and rend are only allocated on demand, and
  *         text[x] is allocated <=> rend[x] is allocated  for all x.
- *   row:       Cursor row position                   : 0 <= row < TermWin.nrow
- *   col:       Cursor column position                : 0 <= col < TermWin.ncol
- *   tscroll:   Scrolling region top row inclusive    : 0 <= row < TermWin.nrow
- *   bscroll:   Scrolling region bottom row inclusive : 0 <= row < TermWin.nrow
+ *   row:       Cursor row position                   : 0 <= row < nrow
+ *   col:       Cursor column position                : 0 <= col < ncol
+ *   tscroll:   Scrolling region top row inclusive    : 0 <= row < nrow
+ *   bscroll:   Scrolling region bottom row inclusive : 0 <= row < nrow
  *
  * selection_t elements
  *   clicks:    1, 2 or 3 clicks - 4 indicates a special condition of 1 where
@@ -136,19 +160,18 @@ typedef struct {
  *   beg:       row/column of beginning of selection  : never past mark
  *   mark:      row/column of initial click           : never past end
  *   end:       row/column of one character past end of selection
- * * Note: -TermWin.nscrolled <= beg.row <= mark.row <= end.row < TermWin.nrow
+ * * Note: -nscrolled <= beg.row <= mark.row <= end.row < nrow
  * * Note: col == -1 ==> we're left of screen
  *
  * Layout of text/rend information in the screen_t text/rend structures:
- *   Rows [0] ... [TermWin.saveLines - 1]
- *     scrollback region : we're only here if TermWin.view_start != 0
- *   Rows [TermWin.saveLines] ... [TermWin.saveLines + TermWin.nrow - 1]
+ *   Rows [0] ... [saveLines - 1]
+ *     scrollback region : we're only here if view_start != 0
+ *   Rows [saveLines] ... [saveLines + nrow - 1]
  *     normal `unscrolled' screen region
  */
 typedef struct {
-  int16_t        *tlen; /* length of each text line                  */
-  text_t        **text; /* _all_ the text                            */
-  rend_t        **rend; /* rendition, uses RS_ flags                 */
+  line_t        **line;
+
   row_col_t       cur;  /* cursor position on the screen             */
   unsigned int    tscroll;      /* top of settable scroll region             */
   unsigned int    bscroll;      /* bottom of settable scroll region          */
@@ -256,8 +279,7 @@ typedef struct {
   void setDn()     { state = 'D'; }
 } scrollBar_t;
 
-struct rxvt_vars {
-  TermWin_t       TermWin;
+struct rxvt_vars : TermWin_t {
   scrollBar_t     scrollBar;
   menuBar_t       menuBar;
   unsigned long   options;
@@ -273,10 +295,10 @@ struct rxvt_vars {
   int             sb_shadow;    /* scrollbar shadow width                    */
   rxvt_ptytty     pty;
   int             numlock_state;
-  text_t        **drawn_text;   /* text drawn on screen (characters)         */
-  rend_t        **drawn_rend;   /* text drawn on screen (rendition)          */
-  text_t        **buf_text;
-  rend_t        **buf_rend;
+  line_t         *save;         // all lines, scorllback + terminal, circular
+  line_t         *drawn;        // text on screen
+  line_t         *buf;          // temporary buffer
+  line_t         *swap_save;    // lines for swap buffer
   char           *tabs;         /* per location: 1 == tab-stop               */
   screen_t        screen;
   screen_t        swap;
diff --git a/src/salloc.C b/src/salloc.C
index e229932e..0cf4f27e 100644
--- a/src/salloc.C
+++ b/src/salloc.C
@@ -89,6 +89,9 @@ rxvt_salloc::alloc (void *data, unsigned int datalen)
 void
 rxvt_salloc::free (void *data)
 {
+  if (!data)
+    return;
+
   chain *line = (chain *)data;
   line->next = firstline;
   firstline = line;
diff --git a/src/screen.C b/src/screen.C
index b15690d6..46ddedf2 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -49,7 +49,7 @@ inline void fill_text (text_t *start, text_t value, int len)
  * ------------------------------------------------------------------------- */
 #define ZERO_SCROLLBACK()                                              \
     if (options & Opt_scrollTtyOutput)                                 \
-        TermWin.view_start = 0
+        view_start = 0
 #define CLEAR_SELECTION()                                              \
     selection.beg.row = selection.beg.col                              \
         = selection.end.row = selection.end.col = 0
@@ -90,24 +90,24 @@ inline void fill_text (text_t *start, text_t value, int len)
  * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
  * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
  */
-#define drawBuffer      TermWin.vt
+#define drawBuffer      vt
 
 #define CLEAR_ROWS(row, num)                                           \
-    if (TermWin.mapped)                                                \
+    if (mapped)                                                \
         XClearArea (display->display, drawBuffer, 0,                   \
-                    Row2Pixel (row), (unsigned int)TermWin.width,      \
+                    Row2Pixel (row), (unsigned int)width,      \
                     (unsigned int)Height2Pixel (num), False)
 
 #define CLEAR_CHARS(x, y, num)                                         \
-    if (TermWin.mapped)                                                \
+    if (mapped)                                                \
         XClearArea (display->display, drawBuffer, x, y,                \
                     (unsigned int)Width2Pixel (num),                   \
                     (unsigned int)Height2Pixel (1), False)
 
 #define ERASE_ROWS(row, num)                                           \
-    XFillRectangle (display->display, drawBuffer, TermWin.gc,          \
+    XFillRectangle (display->display, drawBuffer, gc,          \
                     0, Row2Pixel (row),                                \
-                    (unsigned int)TermWin.width,                       \
+                    (unsigned int)width,                       \
                     (unsigned int)Height2Pixel (num))
 
 /* ------------------------------------------------------------------------- *
@@ -116,11 +116,14 @@ inline void fill_text (text_t *start, text_t value, int len)
 
 /* Fill part/all of a line with blanks. */
 void
-rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
+rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
 {
   efs &= ~RS_baseattrMask;
   efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
 
+  text_t *et = l.t + col;
+  rend_t *er = l.r + col;
+
   while (width--)
     {
       *et++ = ' ';
@@ -131,18 +134,12 @@ rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t ef
 /* ------------------------------------------------------------------------- */
 /* Fill a full line with blanks - make sure it is allocated first */
 void
-rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs)
+rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
 {
-#ifdef DEBUG_STRICT
-  assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
-#endif
-  if (tp[row] == NULL)
-    {
-      tp[row] = (text_t *)talloc->alloc ();
-      rp[row] = (rend_t *)ralloc->alloc ();
-    }
+  if (!l.t)
+    lalloc (l);
 
-  scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);
+  scr_blank_line (l, 0, ncol, efs);
 }
 
 /* ------------------------------------------------------------------------- *
@@ -151,82 +148,71 @@ rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, ren
 void
 rxvt_term::scr_reset ()
 {
-  unsigned int ncol, nrow, total_rows, prev_total_rows;
   unsigned int p, q;
   int k;
-  rend_t setrstyle;
 
 #if ENABLE_OVERLAY
   scr_overlay_off ();
 #endif
 
-  TermWin.view_start = 0;
+  view_start = 0;
   num_scr = 0;
 
-  if (TermWin.ncol == 0)
-    TermWin.ncol = 80;
-
-  if (TermWin.nrow == 0)
-    TermWin.nrow = 24;
+  if (ncol == 0)
+    ncol = 80;
 
-  ncol = TermWin.ncol;
-  nrow = TermWin.nrow;
+  if (nrow == 0)
+    nrow = 24;
 
   if (ncol == prev_ncol && nrow == prev_nrow)
     return;
 
   // we need at least two lines for wrapping to work correctly
-  if (nrow + TermWin.saveLines < 2)
+  if (nrow + saveLines < 2)
     {
-      TermWin.saveLines++;
+      saveLines++;
       prev_nrow--;
-      TermWin.nscrolled++;
+      nscrolled++;
     }
 
   want_refresh = 1;
 
-  prev_total_rows = prev_nrow + TermWin.saveLines;
-  total_rows = nrow + TermWin.saveLines;
+  int prev_total_rows = prev_nrow + saveLines;
+  int total_rows = nrow + saveLines;
 
   screen.tscroll = 0;
   screen.bscroll = nrow - 1;
 
-  if (!talloc)
-    {
-      talloc = new rxvt_salloc (ncol * sizeof (text_t));
-      ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
-    }
-
-  if (!screen.text)
+  if (!save)
     {
       /*
        * first time called so just malloc everything: don't rely on realloc
        * Note: this is still needed so that all the scrollback lines are NULL
        */
-      screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
-      buf_text    = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
-      drawn_text  = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
-      swap.text   = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
+      nscrolled = 0;       /* no saved lines */
+      term_start = 0;
+      nsaved = 0;
 
-      screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
-      swap.tlen   = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
+      talloc = new rxvt_salloc (ncol * sizeof (text_t));
+      ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
+
+      save      = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
+      buf       = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
+      drawn     = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
+      swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
+
+      screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
 
-      screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
-      buf_rend    = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
-      drawn_rend  = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
-      swap.rend   = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
+      scr_update_term ();
 
-      for (p = 0; p < nrow; p++)
+      for (p = nrow; p--; )
         {
-          q = p + TermWin.saveLines;
-          scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
-          scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
-          screen.tlen[q] = swap.tlen[p] = 0;
-          scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
+          scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE);
+          scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
+          scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
         }
 
       memset (charsets, 'B', sizeof (charsets));
-      TermWin.nscrolled = 0;       /* no saved lines */
       rstyle = DEFAULT_RSTYLE;
       screen.flags = Screen_DefaultFlags;
       screen.cur.row = screen.cur.col = 0;
@@ -256,42 +242,22 @@ rxvt_term::scr_reset ()
       /*
        * add or delete rows as appropriate
        */
-      setrstyle = DEFAULT_RSTYLE;
+
+      rxvt_salloc *old_ta;
+      rxvt_salloc *old_ra;
 
       if (nrow < prev_nrow)
         {
           /* delete rows */
-          k = min (TermWin.nscrolled, prev_nrow - nrow);
+          k = min (nscrolled, prev_nrow - nrow);
           // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
           scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
 
           for (p = nrow; p < prev_nrow; p++)
             {
-              q = p + TermWin.saveLines;
-
-              if (screen.text[q])
-                {
-#ifdef DEBUG_STRICT
-                  assert (screen.rend[q]);
-#endif
-                  talloc->free (screen.text[q]);
-                  ralloc->free (screen.rend[q]);
-                }
-
-              if (swap.text[p])
-                {
-#ifdef DEBUG_STRICT
-                  assert (swap.rend[p]);
-#endif
-                  talloc->free (swap.text[p]);
-                  ralloc->free (swap.rend[p]);
-                }
-
-#ifdef DEBUG_STRICT
-              assert (drawn_text[p] && drawn_rend[p]);
-#endif
-              talloc->free (drawn_text[p]);
-              ralloc->free (drawn_rend[p]);
+              lfree (save[p + saveLines]);
+              lfree (swap_save[p]);
+              lfree (drawn[p]);
             }
 
           /* we have fewer rows so fix up cursor position */
@@ -304,29 +270,23 @@ rxvt_term::scr_reset ()
           /* add rows */
           scr_reset_realloc (); /* realloc _first_ */
 
-          TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
+          int ocol = ncol;
+          ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
 
-          k = min (TermWin.nscrolled, nrow - prev_nrow);
+          k = min (nscrolled, nrow - prev_nrow);
 
           for (p = prev_total_rows; p < total_rows; p++)
-            {
-              screen.tlen[p] = 0;
-              screen.text[p] = NULL;
-              screen.rend[p] = NULL;
-            }
+            save[p].clear ();
 
           for (p = prev_total_rows; p < total_rows - k; p++)
-            scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
+            scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
+
+          scr_update_term ();
 
           for (p = prev_nrow; p < nrow; p++)
             {
-              swap.tlen[p] = 0;
-              swap.text[p] = NULL;
-              swap.rend[p] = NULL;
-              drawn_text[p] = NULL;
-              drawn_rend[p] = NULL;
-              scr_blank_screen_mem (swap.text,  swap.rend,  p, setrstyle);
-              scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
+              swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
+              drawn[p].clear ();     scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
             }
 
           if (k > 0)
@@ -334,70 +294,133 @@ rxvt_term::scr_reset ()
               scr_scroll_text (0, (int)nrow - 1, -k, 1);
               screen.cur.row += k;
               screen.s_cur.row += k;
-              TermWin.nscrolled -= k;
+              nscrolled -= k;
             }
 
 #ifdef DEBUG_STRICT
-          assert (screen.cur.row < TermWin.nrow);
+          assert (screen.cur.row < nrow);
 #else                           /* drive with your eyes closed */
           MIN_IT (screen.cur.row, nrow - 1);
 #endif
-          TermWin.ncol =  ncol; // save b/c scr_blank_screen_mem uses this
+          ncol =  ocol; // save b/c scr_blank_screen_mem uses this
         }
 
       /* resize columns */
       if (ncol != prev_ncol)
         {
-          rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
-          rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
+          old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
+          old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
 
-          for (p = 0; p < total_rows; p++)
+          for (p = total_rows; p--; )
+            lresize (save[p]);
+
+          for (p = nrow; p--; )
             {
-              if (screen.text[p])
-                {
-                  screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
-                  screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
+              lresize (drawn[p]);
+              lresize (swap_save[p]);
+            }
 
-                  MIN_IT (screen.tlen[p], (int16_t)ncol);
+          MIN_IT (screen.cur.col, (int16_t)ncol - 1);
 
-                  if (ncol > prev_ncol)
-                    scr_blank_line (&screen.text[p][prev_ncol],
-                                    &screen.rend[p][prev_ncol],
-                                    ncol - prev_ncol, setrstyle);
-                }
-            }
+          delete old_ta;
+          delete old_ra;
+        }
+
+#if 0
+      // re-wrap lines, this is rather ugly, possibly because I am too dumb
+      // to come up with a lean and mean algorithm.
+      rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
+      rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
+      
+      text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
+      rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
+      tlen_t *tl  = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
 
-          for (p = 0; p < nrow; p++)
+      for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
+
+      p = prev_total_rows;
+      q = total_rows;
+
+      while (p > 0 && q > 0)
+        {
+          --p;
+
+          printf ("pq %d:%d\n", p, q);
+          if (save[p].t)
             {
-              drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
-              drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
+              int llen = save[p].l;
+
+              assert (llen >= 0);
 
-              if (ncol > prev_ncol)
-                scr_blank_line (&drawn_text[p][prev_ncol],
-                                &drawn_rend[p][prev_ncol],
-                                ncol - prev_ncol, setrstyle);
+              while (p && save[p - 1].l < 0)
+                {
+                  --p;
+                  llen += prev_ncol;
+                }
+
+              int qlines = llen / ncol + 1;
+              int lofs = 0;
 
-              if (swap.text[p])
+              q -= qlines;
+
+              int qrow = q;
+
+                 printf ("QL %d llen %d\n", qlines, llen);//D
+              for (; qlines--; qrow++)
                 {
-                  swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
-                  swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
+                  if (qrow >= 0)
+                    {
+                      tp [qrow] = (text_t *)ta->alloc ();
+                      rp [qrow] = (rend_t *)ra->alloc ();
+                      tl [qrow] = -1;
 
-                  MIN_IT (swap.tlen[p], (int16_t)ncol);
+                      int qcol = 0;
 
-                  if (ncol > prev_ncol)
-                    scr_blank_line (&swap.text[p][prev_ncol],
-                                    &swap.rend[p][prev_ncol],
-                                    ncol - prev_ncol, setrstyle);
-                }
+                      for (;;)
+                        {
+                          int prow = lofs / prev_ncol + p;
+                          int pcol = lofs % prev_ncol;
 
-            }
+                          int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
 
-          MIN_IT (screen.cur.col, (int16_t)ncol - 1);
+                          printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
+
+                          if (len <= 0)
+                            {
+                              tl [qrow] = qcol;
+
+                              TODO
+                              scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
+                                              ncol - qcol, DEFAULT_RSTYLE);
+
+                              break;
+                            }
 
-          delete talloc; talloc = ta;
-          delete ralloc; ralloc = ra;
+                          assert (lofs < 1000);
+
+                          memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));
+                          memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));
+
+                          lofs += len;
+                          qcol += len;
+
+                          if (qcol == ncol)
+                            break;
+                        }
+                    }
+                  else
+                    lofs += ncol;
+                }
+            }
         }
 
+      free (screen.text); screen.text = tp;
+      free (screen.rend); screen.rend = rp;
+      free (screen.tlen); screen.tlen = tl;
+
+      for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
+#endif
+
       if (tabs)
         free (tabs);
     }
@@ -416,24 +439,13 @@ rxvt_term::scr_reset ()
 void
 rxvt_term::scr_reset_realloc ()
 {
-  unsigned int total_rows, nrow;
-
-  nrow = TermWin.nrow;
-  total_rows = nrow + TermWin.saveLines;
-  /* *INDENT-OFF* */
-  screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
-  buf_text    = (text_t **)rxvt_realloc (buf_text   , total_rows * sizeof (text_t *));
-  drawn_text  = (text_t **)rxvt_realloc (drawn_text , nrow       * sizeof (text_t *));
-  swap.text   = (text_t **)rxvt_realloc (swap.text  , nrow       * sizeof (text_t *));
+  unsigned int total_rows = nrow + saveLines;
 
-  screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
-  swap.tlen   = (int16_t *)rxvt_realloc (swap.tlen  , total_rows * sizeof (int16_t));
-
-  screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
-  buf_rend    = (rend_t **)rxvt_realloc (buf_rend   , total_rows * sizeof (rend_t *));
-  drawn_rend  = (rend_t **)rxvt_realloc (drawn_rend , nrow       * sizeof (rend_t *));
-  swap.rend   = (rend_t **)rxvt_realloc (swap.rend  , nrow       * sizeof (rend_t *));
-  /* *INDENT-ON* */
+  screen.line = (line_t **)rxvt_realloc (screen.line, nrow       * sizeof (line_t *));
+  swap_save   = (line_t *) rxvt_realloc (swap_save  , nrow       * sizeof (line_t));
+  drawn       = (line_t *) rxvt_realloc (drawn      , nrow       * sizeof (line_t));
+  save        = (line_t *) rxvt_realloc (save       , total_rows * sizeof (line_t));
+  buf         = (line_t *) rxvt_realloc (buf        , total_rows * sizeof (line_t));
 }
 
 /* ------------------------------------------------------------------------- */
@@ -445,30 +457,17 @@ rxvt_term::scr_release ()
 {
   unsigned int total_rows;
 
-  total_rows = TermWin.nrow + TermWin.saveLines;
+  total_rows = nrow + saveLines;
 
   delete talloc; talloc = 0;
   delete ralloc; ralloc = 0;
 
-  free (screen.text);
-  free (screen.tlen);
-  free (screen.rend);
-  free (drawn_text);
-  free (drawn_rend);
-  free (swap.text);
-  free (swap.tlen);
-  free (swap.rend);
-  free (buf_text);
-  free (buf_rend);
+  free (screen.line);
+  free (save);
+  free (swap_save);
+  free (drawn);
+  free (buf);
   free (tabs);
-
-  /* NULL these so if anything tries to use them, we'll know about it */
-  screen.text = drawn_text = swap.text = NULL;
-  screen.rend = drawn_rend = swap.rend = NULL;
-  screen.tlen = swap.tlen = NULL;
-  buf_text = NULL;
-  buf_rend = NULL;
-  tabs = NULL;
 }
 
 /* ------------------------------------------------------------------------- */
@@ -529,8 +528,8 @@ rxvt_term::scr_cursor (int mode)
     }
 
   /* boundary check in case screen size changed between SAVE and RESTORE */
-  MIN_IT (s->cur.row, TermWin.nrow - 1);
-  MIN_IT (s->cur.col, TermWin.ncol - 1);
+  MIN_IT (s->cur.row, nrow - 1);
+  MIN_IT (s->cur.col, ncol - 1);
 #ifdef DEBUG_STRICT
   assert (s->cur.row >= 0);
   assert (s->cur.col >= 0);
@@ -556,7 +555,7 @@ rxvt_term::scr_change_screen (int scrn)
 
   want_refresh = 1;
 
-  TermWin.view_start = 0;
+  view_start = 0;
 
   if (current_screen == scrn)
     return scrn;
@@ -576,14 +575,10 @@ rxvt_term::scr_change_screen (int scrn)
   if (options & Opt_secondaryScreen)
     {
       num_scr = 0;
-      offset = TermWin.saveLines;
+      offset = saveLines;
 
       for (i = prev_nrow; i--;)
-        {
-          SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
-          SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
-          SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
-        }
+        SWAP_IT (*(screen.line[i]), swap_save[i], line_t);
 
       SWAP_IT (screen.charset, swap.charset, int16_t);
       SWAP_IT (screen.flags, swap.flags, int);
@@ -611,7 +606,7 @@ rxvt_term::scr_do_wrap ()
 
   if (screen.cur.row == screen.bscroll)
     scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
-  else if (screen.cur.row < TermWin.nrow - 1)
+  else if (screen.cur.row < nrow - 1)
     screen.cur.row++;
 }
 
@@ -646,6 +641,14 @@ rxvt_term::scr_rendition (int set, int style)
       rstyle &= ~style;
   }
 
+// set screen.line pointers to the actual lines in the save buffer
+void
+rxvt_term::scr_update_term ()
+{
+  for (int i = nrow; i--; )
+    screen.line[i] = save + saveLines + i;
+}
+
 /* ------------------------------------------------------------------------- */
 /*
  * Scroll text between <row1> and <row2> inclusive, by <count> lines
@@ -657,7 +660,6 @@ int
 rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)
 {
   int i, j;
-  long nscrolled;
 
   if (count == 0 || (row1 > row2))
     return 0;
@@ -667,27 +669,26 @@ rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)
   if (row1 == 0 && count > 0
       && (current_screen == PRIMARY || options & Opt_secondaryScroll))
     {
-      nscrolled = (long)TermWin.nscrolled + (long)count;
+      nscrolled += count;
 
-      if (nscrolled > (long)TermWin.saveLines)
-        TermWin.nscrolled = TermWin.saveLines;
-      else
-        TermWin.nscrolled = (unsigned int)nscrolled;
+      if (nscrolled > saveLines)
+        nscrolled = saveLines;
 
       if ((options & Opt_scrollWithBuffer)
-          && TermWin.view_start != 0
-          && TermWin.view_start != TermWin.saveLines)
+          && view_start != 0
+          && view_start != saveLines)
         scr_page (UP, count);
     }
   else if (!spec)
-    row1 += TermWin.saveLines;
+    row1 += saveLines;
 
-  row2 += TermWin.saveLines;
+  row2 += saveLines;
 
   if (selection.op && current_screen == selection.screen)
     {
-      i = selection.beg.row + TermWin.saveLines;
-      j = selection.end.row + TermWin.saveLines;
+      i = selection.beg.row + saveLines;
+      j = selection.end.row + saveLines;
+
       if ((i < row1 && j > row1)
           || (i < row2 && j > row2)
           || (i - count < row1 && i >= row1)
@@ -707,7 +708,7 @@ rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)
         }
     }
 
-  selection_check (0);        /* _after_ TermWin.nscrolled update */
+  selection_check (0);        /* _after_ nscrolled update */
 
   num_scr += count;
   j = count;
@@ -723,14 +724,11 @@ rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)
       /* scroll up */
 
       /* Copy lines that will get clobbered by the rotation */
-      memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
-      memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
+      memcpy (buf, save + row1, count * sizeof (line_t));
 
       /* Rotate lines */
       i = row2 - row1 - count + 1;
-      memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
-      memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
-      memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
+      memmove (save + row1, save + row1 + count, i * sizeof (line_t));
 
       j = row2 - count + 1, i = count;
     }
@@ -740,30 +738,24 @@ rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)
 
       /* Copy lines that will get clobbered by the rotation */
       for (i = 0, j = row2; i < count; i++, j--)
-        {
-          buf_text[i] = screen.text[j];
-          buf_rend[i] = screen.rend[j];
-        }
+        buf[i] = save[j];
 
       /* Rotate lines */
       for (j = row2, i = j - count; i >= row1; i--, j--)
-        {
-          screen.tlen[j] = screen.tlen[i];
-          screen.text[j] = screen.text[i];
-          screen.rend[j] = screen.rend[i];
-        }
+        save[j] = save[i];
 
       j = row1, i = count;
       count = -count;
     }
 
   /* Resurrect lines */
-  memset (screen.tlen + j, 0, i * sizeof (int16_t));
-  memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
-  memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
-  if (!spec) /* line length may not equal TermWin.ncol */
+  memcpy (save + j, buf, i * sizeof (line_t));
+
+  scr_update_term ();
+
+  if (!spec) /* line length may not equal ncol */
     for (; i--; j++)
-      scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
+      scr_blank_screen_mem (save[j], rstyle);
 
   return count;
 }
@@ -781,20 +773,18 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
   unsigned char checksel;
   unicode_t c;
   int row, last_col;
-  text_t *stp;
-  rend_t *srp;
   const unicode_t *strend = str + len;
 
   want_refresh = 1;
   ZERO_SCROLLBACK ();
-  last_col = TermWin.ncol;
+  last_col = ncol;
 
   if (nlines > 0)
     {
       nlines += screen.cur.row - screen.bscroll;
       if ((nlines > 0)
           && (screen.tscroll == 0)
-          && (screen.bscroll == (TermWin.nrow - 1)))
+          && (screen.bscroll == (nrow - 1)))
         {
           /* _at least_ this many lines need to be scrolled */
           scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
@@ -804,19 +794,18 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
 
 #ifdef DEBUG_STRICT
   assert (screen.cur.col < last_col);
-  assert ((screen.cur.row < TermWin.nrow)
-          && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
+  assert ((screen.cur.row < nrow)
+          && (screen.cur.row >= - (int32_t)nscrolled));
 #else                           /* drive with your eyes closed */
   MIN_IT (screen.cur.col, last_col - 1);
-  MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
-  MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
+  MIN_IT (screen.cur.row, (int32_t)nrow - 1);
+  MAX_IT (screen.cur.row, - (int32_t)nscrolled);
 #endif
-  row = screen.cur.row + TermWin.saveLines;
+  row = screen.cur.row + saveLines;
 
   checksel = selection.op && current_screen == selection.screen ? 1 : 0;
 
-  stp = screen.text[row];
-  srp = screen.rend[row];
+  line_t *line = save + row;
 
   while (str < strend)
     {
@@ -825,24 +814,23 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
       if (c < 0x20)
         if (c == C0_LF)
           {          
-            if (screen.tlen[row] != -1)      /* XXX: think about this */
-              MAX_IT (screen.tlen[row], screen.cur.col);
+            if (line->l != -1)      /* XXX: think about this */
+              MAX_IT (line->l, screen.cur.col);
 
             screen.flags &= ~Screen_WrapNext;
 
             if (screen.cur.row == screen.bscroll)
               scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
-            else if (screen.cur.row < (TermWin.nrow - 1))
-              row = (++screen.cur.row) + TermWin.saveLines;
+            else if (screen.cur.row < (nrow - 1))
+              row = (++screen.cur.row) + saveLines;
 
-            stp = screen.text[row];  /* _must_ refresh */
-            srp = screen.rend[row];  /* _must_ refresh */
+            line = save + row;  /* _must_ refresh */
             continue;
           }
         else if (c == C0_CR)
           {
-            if (screen.tlen[row] != -1)      /* XXX: think about this */
-              MAX_IT (screen.tlen[row], screen.cur.col);
+            if (line->l != -1)      /* XXX: think about this */
+              MAX_IT (line->l, screen.cur.col);
 
             screen.flags &= ~Screen_WrapNext;
             screen.cur.col = 0;
@@ -869,13 +857,12 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
 
       if (screen.flags & Screen_WrapNext)
         {
-          screen.tlen[row] = -1;
+          line->l = -1;
 
           scr_do_wrap ();
           
-          row = screen.cur.row + TermWin.saveLines;
-          stp = screen.text[row];  /* _must_ refresh */
-          srp = screen.rend[row];  /* _must_ refresh */
+          row = screen.cur.row + saveLines;
+          line = save + row;   /* _must_ refresh */
         }
 
       // some utf-8 decoders "decode" surrogate characters: let's fix this.
@@ -927,24 +914,24 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
 #endif
 
           // nuke the character at this position, if required
-          if (stp[screen.cur.col] == NOCHAR
-              || (screen.cur.col < TermWin.ncol - 1
-                  && stp[screen.cur.col + 1] == NOCHAR))
+          if (line->t[screen.cur.col] == NOCHAR
+              || (screen.cur.col < ncol - 1
+                  && line->t[screen.cur.col + 1] == NOCHAR))
             {
               int col = screen.cur.col;
 
               // find begin
-              while (col > 0 && stp[col] == NOCHAR)
+              while (col > 0 && line->t[col] == NOCHAR)
                 col--;
 
-              rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
+              rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
 
               // found begin, nuke
               do {
-                stp[col] = ' ';
-                srp[col] = rend;
+                line->t[col] = ' ';
+                line->r[col] = rend;
                 col++;
-              } while (col < TermWin.ncol && stp[col] == NOCHAR);
+              } while (col < ncol && line->t[col] == NOCHAR);
             }
 
           rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
@@ -960,14 +947,14 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
 
           do
             {
-              stp[screen.cur.col] = c;
-              srp[screen.cur.col] = rend;
+              line->t[screen.cur.col] = c;
+              line->r[screen.cur.col] = rend;
 
               if (screen.cur.col < last_col - 1)
                 screen.cur.col++;
               else
                 {
-                  screen.tlen[row] = last_col;
+                  line->l = last_col;
                   if (screen.flags & Screen_Autowrap)
                     screen.flags |= Screen_WrapNext;
                   break;
@@ -979,10 +966,10 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
 
           // pad with spaces when overwriting wide character with smaller one
           if (!width)
-            for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
+            for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
               {
-                stp[c] = ' ';
-                srp[c] = rend;
+                line->t[c] = ' ';
+                line->r[c] = rend;
               }
         }
       else // width == 0
@@ -997,21 +984,21 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
 
           if (screen.cur.col > 0)
             {
-              tp = stp + screen.cur.col - 1;
-              rp = srp + screen.cur.col - 1;
+              tp = line->t + screen.cur.col - 1;
+              rp = line->r + screen.cur.col - 1;
 
-              while (*tp == NOCHAR && tp > stp)
+              while (*tp == NOCHAR && tp > line->t)
                 tp--, rp--;
             }
           else if (screen.cur.row > 0
-                   && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
+                   && save [screen.cur.row - 1 + saveLines].l == -1)
             {
-              int line = screen.cur.row - 1 + TermWin.saveLines;
+              line_t *line = save + (screen.cur.row - 1 + saveLines);
 
-              tp = screen.text[line] + last_col - 1;
-              rp = screen.rend[line] + last_col - 1;
+              tp = line->t + last_col - 1;
+              rp = line->r + last_col - 1;
 
-              while (*tp == NOCHAR && tp > screen.text[line])
+              while (*tp == NOCHAR && tp > line->t)
                 tp--, rp--;
             }
           else
@@ -1028,8 +1015,8 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
         }
     }
 
-  if (screen.tlen[row] != -1)      /* XXX: think about this */
-    MAX_IT (screen.tlen[row], screen.cur.col);
+  if (line->l != -1)      /* XXX: think about this */
+    MAX_IT (line->l, screen.cur.col);
 
 #ifdef DEBUG_STRICT
   assert (screen.cur.row >= 0);
@@ -1053,7 +1040,7 @@ rxvt_term::scr_backspace ()
       if (screen.cur.row > 0)
         {
 #ifdef TERMCAP_HAS_BW
-          screen.cur.col = TermWin.ncol - 1;
+          screen.cur.col = ncol - 1;
           screen.cur.row--;
           return;
 #endif
@@ -1083,13 +1070,13 @@ rxvt_term::scr_tab (int count, bool ht)
     return;
   else if (count > 0)
     {
-      int row = TermWin.saveLines + screen.cur.row;
-      text_t *tp = screen.text[row];
-      rend_t *rp = screen.rend[row];
-      rend_t base_rend = rp[i];
-      ht &= tp[i] == ' ';
+      int row = saveLines + screen.cur.row;
 
-      for (; ++i < TermWin.ncol; )
+      line_t &l = save[row];
+      rend_t base_rend = l.r[i];
+      ht &= l.t[i] == ' ';
+
+      for (; ++i < ncol; )
         if (tabs[i])
           {
             x = i;
@@ -1097,11 +1084,11 @@ rxvt_term::scr_tab (int count, bool ht)
               break;
           }
         else 
-          ht &= tp[i] == ' '
-                && RS_SAME (rp[i], base_rend);
+          ht &= l.t[i] == ' '
+                && RS_SAME (l.r[i], base_rend);
 
       if (count)
-        x = TermWin.ncol - 1;
+        x = ncol - 1;
 
       // store horizontal tab commands as characters inside the text
       // buffer so they can be selected and pasted.
@@ -1109,18 +1096,18 @@ rxvt_term::scr_tab (int count, bool ht)
         {
           base_rend = SET_FONT (base_rend, 0);
 
-          if (screen.tlen[row] != -1)      /* XXX: think about this */
-            MAX_IT (screen.tlen[row], x);
+          if (l.l != -1)      /* XXX: think about this */
+            MAX_IT (l.l, x);
 
           i = screen.cur.col;
 
-          tp[i] = '\t';
-          rp[i] = base_rend;
+          l.t[i] = '\t';
+          l.r[i] = base_rend;
 
           while (++i < x)
             {
-              tp[i] = NOCHAR;
-              rp[i] = base_rend;
+              l.t[i] = NOCHAR;
+              l.r[i] = base_rend;
             }
         }
     }
@@ -1157,7 +1144,7 @@ rxvt_term::scr_backindex ()
     scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
   else
     {
-      if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
+      if (save[screen.cur.row + saveLines].l == 0)
         return;             /* um, yeah? */
 
       scr_insdel_chars (1, INSERT);
@@ -1177,20 +1164,20 @@ rxvt_term::scr_forwardindex ()
 {
   int row;
 
-  if (screen.cur.col < TermWin.ncol - 1)
+  if (screen.cur.col < ncol - 1)
     scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
   else
     {
-      row = screen.cur.row + TermWin.saveLines;
+      row = screen.cur.row + saveLines;
 
-      if (screen.tlen[row] == 0)
+      if (save[row].l == 0)
         return;             /* um, yeah? */
-      else if (screen.tlen[row] == -1)
-        screen.tlen[row] = TermWin.ncol;
+      else if (save[row].l == -1)
+        save[row].l = ncol;
 
       scr_gotorc (0, 0, R_RELATIVE);
       scr_insdel_chars (1, DELETE);
-      scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
+      scr_gotorc (0, ncol - 1, R_RELATIVE);
     }
 }
 #endif
@@ -1207,7 +1194,7 @@ rxvt_term::scr_gotorc (int row, int col, int relative)
 
   screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
   MAX_IT (screen.cur.col, 0);
-  MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
+  MIN_IT (screen.cur.col, (int32_t)ncol - 1);
 
   screen.flags &= ~Screen_WrapNext;
 
@@ -1242,7 +1229,7 @@ rxvt_term::scr_gotorc (int row, int col, int relative)
     }
 
   MAX_IT (screen.cur.row, 0);
-  MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
+  MIN_IT (screen.cur.row, (int32_t)nrow - 1);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1268,7 +1255,7 @@ rxvt_term::scr_index (enum page_dirn direction)
     screen.cur.row += dirn;
 
   MAX_IT (screen.cur.row, 0);
-  MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
+  MIN_IT (screen.cur.row, (int32_t)nrow - 1);
   selection_check (0);
 }
 
@@ -1289,13 +1276,14 @@ rxvt_term::scr_erase_line (int mode)
 
   selection_check (1);
 
-  row = TermWin.saveLines + screen.cur.row;
+  row = saveLines + screen.cur.row;
+
   switch (mode)
     {
       case 0:                     /* erase to end of line */
         col = screen.cur.col;
-        num = TermWin.ncol - col;
-        MIN_IT (screen.tlen[row], (int16_t)col);
+        num = ncol - col;
+        MIN_IT (save[row].l, (int16_t)col);
         if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
             || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
           CLEAR_SELECTION ();
@@ -1309,8 +1297,8 @@ rxvt_term::scr_erase_line (int mode)
         break;
       case 2:                     /* erase whole line */
         col = 0;
-        num = TermWin.ncol;
-        screen.tlen[row] = 0;
+        num = ncol;
+        save[row].l = 0;
         if (selection.beg.row <= screen.cur.row
             && selection.end.row >= screen.cur.row)
           CLEAR_SELECTION ();
@@ -1319,10 +1307,10 @@ rxvt_term::scr_erase_line (int mode)
         return;
     }
 
-  if (screen.text[row])
-    scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
+  if (save[row].t)
+    scr_blank_line (save[row], col, num, rstyle);
   else
-    scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
+    scr_blank_screen_mem (save[row], rstyle);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1343,7 +1331,7 @@ rxvt_term::scr_erase_screen (int mode)
   want_refresh = 1;
   ZERO_SCROLLBACK ();
 
-  row_offset = (int32_t)TermWin.saveLines;
+  row_offset = (int32_t)saveLines;
 
   switch (mode)
     {
@@ -1351,7 +1339,7 @@ rxvt_term::scr_erase_screen (int mode)
         selection_check (1);
         scr_erase_line (0);
         row = screen.cur.row + 1;    /* possible OOB */
-        num = TermWin.nrow - row;
+        num = nrow - row;
         break;
       case 1:                     /* erase to beginning of screen */
         selection_check (3);
@@ -1362,7 +1350,7 @@ rxvt_term::scr_erase_screen (int mode)
       case 2:                     /* erase whole screen */
         selection_check (3);
         row = 0;
-        num = TermWin.nrow;
+        num = nrow;
         break;
       default:
         return;
@@ -1374,10 +1362,10 @@ rxvt_term::scr_erase_screen (int mode)
               && selection.end.row <= row + num)))
     CLEAR_SELECTION ();
 
-  if (row >= TermWin.nrow) /* Out Of Bounds */
+  if (row >= nrow) /* Out Of Bounds */
     return;
 
-  MIN_IT (num, (TermWin.nrow - row));
+  MIN_IT (num, (nrow - row));
 
   if (rstyle & (RS_RVid | RS_Uline))
     ren = (rend_t) ~RS_None;
@@ -1390,17 +1378,17 @@ rxvt_term::scr_erase_screen (int mode)
     {
       ren = rstyle & (RS_fgMask | RS_bgMask);
       gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
-      XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
+      XChangeGC (display->display, gc, GCForeground, &gcvalue);
       ERASE_ROWS (row, num);
       gcvalue.foreground = pix_colors[Color_fg];
-      XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
+      XChangeGC (display->display, gc, GCForeground, &gcvalue);
     }
 
   for (; num--; row++)
     {
-      scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
-      screen.tlen[row + row_offset] = 0;
-      scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
+      scr_blank_screen_mem (save[row + row_offset], rstyle);
+      save[row + row_offset].l = 0;
+      scr_blank_line (drawn[row], 0, ncol, ren);
     }
 }
 
@@ -1411,7 +1399,7 @@ rxvt_term::scr_erase_savelines ()
   want_refresh = 1;
   ZERO_SCROLLBACK ();
 
-  TermWin.nscrolled = 0;
+  nscrolled = 0;
 }
 #endif
 
@@ -1433,11 +1421,11 @@ rxvt_term::scr_E ()
   selection_check (3);
 
   fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
-  for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
+  for (k = saveLines, i = nrow; i--; k++)
     {
-      screen.tlen[k] = TermWin.ncol;    /* make the `E's selectable */
-      fill_text (screen.text[k], 'E', TermWin.ncol);
-      for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
+      save[k].l = ncol;    /* make the `E's selectable */
+      fill_text (save[k].t, 'E', ncol);
+      for (r1 = save[k].r, j = ncol; j--; )
         *r1++ = fs;
     }
 }
@@ -1481,9 +1469,6 @@ rxvt_term::scr_insdel_chars (int count, int insdel)
 {
   int col, row;
   rend_t tr;
-  text_t *stp;
-  rend_t *srp;
-  int16_t *slp;
 
   want_refresh = 1;
   ZERO_SCROLLBACK ();
@@ -1494,34 +1479,32 @@ rxvt_term::scr_insdel_chars (int count, int insdel)
   scr_do_wrap ();
 
   selection_check (1);
-  MIN_IT (count, (TermWin.ncol - screen.cur.col));
+  MIN_IT (count, (ncol - screen.cur.col));
 
-  row = screen.cur.row + TermWin.saveLines;
+  row = screen.cur.row + saveLines;
 
-  stp = screen.text[row];
-  srp = screen.rend[row];
-  slp = &screen.tlen[row];
+  line_t *line = save + row;
 
   switch (insdel)
     {
       case INSERT:
-        for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
+        for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
           {
-            stp[col] = stp[col - count];
-            srp[col] = srp[col - count];
+            line->t[col] = line->t[col - count];
+            line->r[col] = line->r[col - count];
           }
 
-        if (*slp != -1)
+        if (line->l != -1)
           {
-            *slp += count;
-            MIN_IT (*slp, TermWin.ncol);
+            line->l += count;
+            MIN_IT (line->l, ncol);
           }
 
         if (selection.op && current_screen == selection.screen
             && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
           {
             if (selection.end.row != screen.cur.row
-                || (selection.end.col + count >= TermWin.ncol))
+                || (selection.end.col + count >= ncol))
               CLEAR_SELECTION ();
             else
               {              /* shift selection */
@@ -1531,42 +1514,39 @@ rxvt_term::scr_insdel_chars (int count, int insdel)
               }
           }
 
-        scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
-                        (unsigned int)count, rstyle);
+        scr_blank_line (save[row], screen.cur.col, count, rstyle);
         break;
 
       case ERASE:
-        screen.cur.col += count;     /* don't worry if > TermWin.ncol */
+        screen.cur.col += count;     /* don't worry if > ncol */
         selection_check (1);
         screen.cur.col -= count;
-        scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
-                        (unsigned int)count, rstyle);
+        scr_blank_line (save[row], screen.cur.col, count, rstyle);
         break;
 
       case DELETE:
-        tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
+        tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
 
-        for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
+        for (col = screen.cur.col; (col + count) < ncol; col++)
           {
-            stp[col] = stp[col + count];
-            srp[col] = srp[col + count];
+            line->t[col] = line->t[col + count];
+            line->r[col] = line->r[col + count];
           }
 
-        scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
-                        (unsigned int)count, tr);
+        scr_blank_line (*line, ncol - count, count, tr);
 
-        if (*slp == -1) /* break line continuation */
-          *slp = TermWin.ncol;
+        if (line->l == -1) /* break line continuation */
+          line->l = ncol;
         
-        *slp -= count;
-        MAX_IT (*slp, 0);
+        line->l -= count;
+        MAX_IT (line->l, 0);
 
         if (selection.op && current_screen == selection.screen
             && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
           {
             if (selection.end.row != screen.cur.row
                 || (screen.cur.col >= selection.beg.col - count)
-                || selection.end.col >= TermWin.ncol)
+                || selection.end.col >= ncol)
               CLEAR_SELECTION ();
             else
               {
@@ -1590,7 +1570,7 @@ void
 rxvt_term::scr_scroll_region (int top, int bot)
 {
   MAX_IT (top, 0);
-  MIN_IT (bot, (int)TermWin.nrow - 1);
+  MIN_IT (bot, (int)nrow - 1);
 
   if (top > bot)
     return;
@@ -1679,8 +1659,8 @@ void
 rxvt_term::scr_set_tab (int mode)
 {
   if (mode < 0)
-    memset (tabs, 0, TermWin.ncol * sizeof (char));
-  else if (screen.cur.col < TermWin.ncol)
+    memset (tabs, 0, ncol * sizeof (char));
+  else if (screen.cur.col < ncol)
     tabs[screen.cur.col] = (mode ? 1 : 0);
 }
 
@@ -1705,12 +1685,12 @@ rxvt_term::scr_rvideo_mode (int mode)
 #if TRANSPARENT
         if (! (options & Opt_transparent) || am_transparent == 0)
 #endif
-          XSetWindowBackground (display->display, TermWin.vt,
+          XSetWindowBackground (display->display, vt,
                                pix_colors[Color_bg]);
 
       gcvalue.foreground = pix_colors[Color_fg];
       gcvalue.background = pix_colors[Color_bg];
-      XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
+      XChangeGC (display->display, gc, GCBackground | GCForeground,
                 &gcvalue);
       scr_clear ();
       scr_touch (true);
@@ -1801,12 +1781,12 @@ rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
 {
   bool found = false;
 
-  for (int i = 0; i < TermWin.nrow; i++)
+  for (int i = 0; i < nrow; i++)
     {
       int col = 0;
-      rend_t *drp = drawn_rend [i];
+      rend_t *drp = drawn[i].r;
 
-      for (; col < TermWin.ncol; col++, drp++)
+      for (; col < ncol; col++, drp++)
         if ((*drp & mask) == value)
           {
             found = true;
@@ -1827,45 +1807,45 @@ enum {
 };
 
 void
-rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)
+rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
 {
   int i;
   row_col_t rc[RC_COUNT];
 
-  if (drawn_text == NULL)  /* sanity check */
+  if (!drawn)  /* sanity check */
     return;
 
 #ifndef NO_SLOW_LINK_SUPPORT
   if (refresh_type == FAST_REFRESH && !display->is_local)
     {
       y = 0;
-      height = TermWin.height;
+      eheight = height;
     }
 #endif
 
 #ifdef DEBUG_STRICT
   x = max (x, 0);
-  x = min (x, (int)TermWin.width);
+  x = min (x, (int)width);
   y = max (y, 0);
-  y = min (y, (int)TermWin.height);
+  y = min (y, (int)height);
 #endif
 
   /* round down */
   rc[PART_BEG].col = Pixel2Col (x);
   rc[PART_BEG].row = Pixel2Row (y);
   /* round up */
-  rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1);
-  rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1);
+  rc[PART_END].col = Pixel2Width (x + ewidth  + fwidth  - 1);
+  rc[PART_END].row = Pixel2Row   (y + eheight + fheight - 1);
 
   /* sanity checks */
   for (i = PART_BEG; i < RC_COUNT; i++)
     {
-      MIN_IT (rc[i].col, TermWin.ncol - 1);
-      MIN_IT (rc[i].row, TermWin.nrow - 1);
+      MIN_IT (rc[i].col, ncol - 1);
+      MIN_IT (rc[i].row, nrow - 1);
     }
 
   for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
-    fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
+    fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
 
   if (refresh)
     scr_refresh (SLOW_REFRESH);
@@ -1878,7 +1858,7 @@ rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)
 void
 rxvt_term::scr_touch (bool refresh)
 {
-  scr_expose (0, 0, TermWin.width, TermWin.height, refresh);
+  scr_expose (0, 0, width, height, refresh);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1892,16 +1872,16 @@ rxvt_term::scr_move_to (int y, int len)
   long p = 0;
   unsigned int oldviewstart;
 
-  oldviewstart = TermWin.view_start;
+  oldviewstart = view_start;
 
   if (y < len)
     {
-      p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
-      p -= (long) (TermWin.nrow - 1);
+      p = (nrow + nscrolled) * (len - y) / len;
+      p -= (long) (nrow - 1);
       p = max (p, 0);
     }
 
-  TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
+  view_start = (unsigned int)min (p, nscrolled);
 
   return scr_changeview (oldviewstart);
 }
@@ -1917,17 +1897,17 @@ rxvt_term::scr_page (enum page_dirn direction, int nlines)
   int n;
   unsigned int oldviewstart;
 
-  oldviewstart = TermWin.view_start;
+  oldviewstart = view_start;
 
   if (direction == UP)
     {
-      n = TermWin.view_start + nlines;
-      TermWin.view_start = min (n, TermWin.nscrolled);
+      n = view_start + nlines;
+      view_start = min (n, nscrolled);
     }
   else
     {
-      n = TermWin.view_start - nlines;
-      TermWin.view_start = max (n, 0);
+      n = view_start - nlines;
+      view_start = max (n, 0);
     }
 
   return scr_changeview (oldviewstart);
@@ -1936,13 +1916,13 @@ rxvt_term::scr_page (enum page_dirn direction, int nlines)
 int
 rxvt_term::scr_changeview (unsigned int oldviewstart)
 {
-  if (TermWin.view_start != oldviewstart)
+  if (view_start != oldviewstart)
     {
       want_refresh = 1;
-      num_scr -= (TermWin.view_start - oldviewstart);
+      num_scr -= (view_start - oldviewstart);
     }
 
-  return (int) (TermWin.view_start - oldviewstart);
+  return (int) (view_start - oldviewstart);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1955,7 +1935,7 @@ rxvt_term::scr_bell ()
 #  ifdef MAPALERT_OPTION
   if (options & Opt_mapAlert)
 #  endif
-    XMapWindow (display->display, TermWin.parent[0]);
+    XMapWindow (display->display, parent[0]);
 # endif
 
   if (options & Opt_visualBell)
@@ -1982,25 +1962,25 @@ rxvt_term::scr_printscreen (int fullhist)
   if ((fd = popen_printer ()) == NULL)
     return;
 
-  nrows = TermWin.nrow;
-  row_offset = TermWin.saveLines;
+  nrows = nrow;
+  row_offset = saveLines;
 
   if (!fullhist)
-    row_offset -= TermWin.view_start;
+    row_offset -= view_start;
   else
     {
-      nrows += TermWin.nscrolled;
-      row_offset -= TermWin.nscrolled;
+      nrows += nscrolled;
+      row_offset -= nscrolled;
     }
 
   wctomb (0, 0);
 
   for (r1 = 0; r1 < nrows; r1++)
     {
-      text_t *tp = screen.text[r1 + row_offset];
-      int len = screen.tlen[r1 + row_offset];
+      text_t *tp = save[r1 + row_offset].t;
+      int len = save[r1 + row_offset].l;
 
-      for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
+      for (i = len >= 0 ? len : ncol - 1; i--; )
         {
           char mb[MB_LEN_MAX];
           text_t t = *tp++;
@@ -2047,7 +2027,7 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
 
   want_refresh = 0;        /* screen is current */
 
-  if (refresh_type == NO_REFRESH || !TermWin.mapped)
+  if (refresh_type == NO_REFRESH || !mapped)
     return;
 
   /*
@@ -2056,7 +2036,7 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
   must_clear = 0;
   refresh_count = 0;
 
-  row_offset = TermWin.saveLines - TermWin.view_start;
+  row_offset = saveLines - view_start;
 
 #if XPM_BACKGROUND
   must_clear |= bgPixmap.pixmap != None;
@@ -2089,12 +2069,12 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
       {
         int col = screen.cur.col;
 
-        while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
+        while (col && screen.line[screen.cur.row]->t[col] == NOCHAR)
           col--;
 
-        crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
+        crp = &screen.line[screen.cur.row]->r[col];
 
-        if (showcursor && TermWin.focus)
+        if (showcursor && focus)
           {
             if (options & Opt_cursorUnderline)
               *crp ^= RS_Uline;
@@ -2131,29 +2111,29 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
     setoldcursor = 0;
     if (ocrow != -1)
       {
-        if (screen.cur.row + TermWin.view_start != ocrow
+        if (screen.cur.row + view_start != ocrow
             || screen.cur.col != oldcursor.col)
           {
-            if (ocrow < TermWin.nrow
-                && oldcursor.col < TermWin.ncol)
-              drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
+            if (ocrow < nrow
+                && oldcursor.col < ncol)
+              drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
 
-            if (TermWin.focus || !showcursor)
+            if (focus || !showcursor)
               oldcursor.row = -1;
             else
               setoldcursor = 1;
           }
       }
-    else if (!TermWin.focus)
+    else if (!focus)
       setoldcursor = 1;
 
     if (setoldcursor)
       {
-        if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
+        if (screen.cur.row + view_start >= nrow)
           oldcursor.row = -1;
         else
           {
-            oldcursor.row = screen.cur.row + TermWin.view_start;
+            oldcursor.row = screen.cur.row + view_start;
             oldcursor.col = screen.cur.col;
           }
       }
@@ -2171,38 +2151,35 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
   i = num_scr;
   if (!display->is_local
       && refresh_type == FAST_REFRESH && num_scr_allow && i
-      && abs (i) < TermWin.nrow && !must_clear)
+      && abs (i) < nrow && !must_clear)
     {
       int16_t nits;
       int j;
       int len, wlen;
 
-      j = TermWin.nrow;
+      j = nrow;
       wlen = len = -1;
       row = i > 0 ? 0 : j - 1;
       for (; j-- >= 0; row += (i > 0 ? 1 : -1))
         {
-          if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
+          if (row + i >= 0 && row + i < nrow && row + i != ocrow)
             {
-              text_t *stp  = screen.text[row + row_offset];
-              rend_t *srp  = screen.rend[row + row_offset];
-              text_t *dtp  = drawn_text[row];
-              text_t *dtp2 = drawn_text[row + i];
-              rend_t *drp  = drawn_rend[row];
-              rend_t *drp2 = drawn_rend[row + i];
-
-              for (nits = 0, col = TermWin.ncol; col--; )
-                if (stp[col] != dtp2[col] || srp[col] != drp2[col])
+              line_t s  = save[row + row_offset];
+              line_t d  = drawn[row];
+              line_t d2 = drawn[row + i];
+
+              for (nits = 0, col = ncol; col--; )
+                if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
                   nits--;
-                else if (stp[col] != dtp[col] || srp[col] != drp[col])
+                else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
                   nits++;
 
               if (nits > 8) /* XXX: arbitrary choice */
                 {
-                  for (col = TermWin.ncol; col--; )
+                  for (col = ncol; col--; )
                     {
-                      *dtp++ = *dtp2++;
-                      *drp++ = *drp2++;
+                      *d.t++ = *d2.t++;
+                      *d.r++ = *d2.r++;
                     }
 
                   if (len == -1)
@@ -2219,8 +2196,8 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
               if (wlen < len)
                 SWAP_IT (wlen, len, int);
 
-              XCopyArea (display->display, TermWin.vt, TermWin.vt,
-                         TermWin.gc, 0, Row2Pixel (len + i),
+              XCopyArea (display->display, vt, vt,
+                         gc, 0, Row2Pixel (len + i),
                          (unsigned int)TermWin_TotalWidth (),
                          (unsigned int)Height2Pixel (wlen - len + 1),
                          0, Row2Pixel (len));
@@ -2233,19 +2210,19 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
   /*
    * E: main pass across every character
    */
-  for (row = 0; row < TermWin.nrow; row++)
+  for (row = 0; row < nrow; row++)
     {
-      text_t *stp = screen.text[row + row_offset];
-      rend_t *srp = screen.rend[row + row_offset];
-      text_t *dtp = drawn_text[row];
-      rend_t *drp = drawn_rend[row];
+      text_t *stp = save[row + row_offset].t;
+      rend_t *srp = save[row + row_offset].r;
+      text_t *dtp = drawn[row].t;
+      rend_t *drp = drawn[row].r;
 
       /*
        * E2: OK, now the real pass
        */
       int ypixel = (int)Row2Pixel (row);
 
-      for (col = 0; col < TermWin.ncol; col++)
+      for (col = 0; col < ncol; col++)
         {
           /* compare new text with old - if exactly the same then continue */
           if (stp[col] == dtp[col]    /* Must match characters to skip. */
@@ -2269,7 +2246,7 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
 
           int xpixel = Col2Pixel (col);
 
-          for (i = 0; ++col < TermWin.ncol; )
+          for (i = 0; ++col < ncol; )
             {
               if (stp[col] == NOCHAR)
                 {
@@ -2318,14 +2295,14 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
             {
 #if ENABLE_STYLES
               // force redraw after "careful" characters to avoid pixel droppings
-              if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
+              if (srp[col] & RS_Careful && col < ncol - 1 && 0)
                 drp[col + 1] = ~srp[col + 1];
 
               // 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 -= TermWin.fwidth;
+                text--, count++, xpixel -= fwidth;
 #endif
 
               bool invert = rend & RS_RVid;
@@ -2390,11 +2367,11 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
           /*
            * Actually do the drawing of the string here
            */
-          rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
+          rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
 
           if (back == fore)
-            font->clear_rect (*TermWin.drawable, xpixel, ypixel,
-                              TermWin.fwidth * count, TermWin.fheight,
+            font->clear_rect (*drawable, xpixel, ypixel,
+                              fwidth * count, fheight,
                               back);
           else if (back == Color_bg)
             {
@@ -2405,26 +2382,26 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
                   for (i = 0; i < count; i++) /* don't draw empty strings */
                     if (text[i] != ' ')
                       {
-                        font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
+                        font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
                         break;
                       }
                 }
               else
-                font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
+                font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
             }
           else
-            font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
+            font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
 
           if (rend & RS_Uline && font->descent > 1 && fore != back)
             {
 #if ENABLE_FRILLS
               if (ISSET_PIXCOLOR (Color_underline))
-                XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
+                XSetForeground (display->display, gc, pix_colors[Color_underline]);
               else
 #endif
-                XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
+                XSetForeground (display->display, gc, pix_colors[fore]);
 
-              XDrawLine (display->display, drawBuffer, TermWin.gc,
+              XDrawLine (display->display, drawBuffer, gc,
                          xpixel, ypixel + font->ascent + 1,
                          xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
             }
@@ -2440,7 +2417,7 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
    */
   if (showcursor)
     {
-      if (TermWin.focus)
+      if (focus)
         {
           if (options & Opt_cursorUnderline)
             *crp ^= RS_Uline;
@@ -2457,23 +2434,23 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
           int cursorwidth = 1;
           int col = oldcursor.col;
 
-          while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
+          while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR)
             col--;
 
-          while (col + cursorwidth < TermWin.ncol
-                 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
+          while (col + cursorwidth < ncol
+                 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
             cursorwidth++;
 
 #ifndef NO_CURSORCOLOR
           if (ISSET_PIXCOLOR (Color_cursor))
-            XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
+            XSetForeground (display->display, gc, pix_colors[Color_cursor]);
 #endif
 
-          XDrawRectangle (display->display, drawBuffer, TermWin.gc,
+          XDrawRectangle (display->display, drawBuffer, gc,
                           Col2Pixel (col),
                           Row2Pixel (oldcursor.row),
                           (unsigned int) (Width2Pixel (cursorwidth) - 1),
-                          (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
+                          (unsigned int) (Height2Pixel (1) - lineSpace - 1));
         }
     }
 
@@ -2490,25 +2467,25 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
 }
 
 void
-rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
+rxvt_term::scr_remap_chars (const line_t &l)
 {
-  if (!rp || !tp)
+  if (!l.t)
     return;
 
-  for (int i = TermWin.ncol; i; i--, rp++, tp++)
-    *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
+  for (int i = ncol; i--; )
+    l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
 }
 
 void
 rxvt_term::scr_remap_chars ()
 {
-  for (int i = TermWin.nrow + TermWin.saveLines; i--; )
-    scr_remap_chars (screen.text[i], screen.rend[i]);
+  for (int i = nrow + saveLines; i--; )
+    scr_remap_chars (save[i]);
 
-  for (int i = TermWin.nrow; i--; )
+  for (int i = nrow; i--; )
     {
-      scr_remap_chars (drawn_text[i], drawn_rend[i]);
-      scr_remap_chars (swap.text[i], swap.rend[i]);
+      scr_remap_chars (drawn[i]);
+      scr_remap_chars (swap_save[i]);
     }
 }
 
@@ -2524,9 +2501,9 @@ rxvt_term::scr_recolour ()
 #endif
       )
     {
-      XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
-      XClearWindow (display->display, TermWin.parent[0]);
-      XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
+      XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
+      XClearWindow (display->display, parent[0]);
+      XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
 #if HAVE_SCROLLBARS
       if (scrollBar.win)
         {
@@ -2546,14 +2523,14 @@ rxvt_term::scr_recolour ()
 void
 rxvt_term::scr_clear (bool really)
 {
-  if (!TermWin.mapped)
+  if (!mapped)
     return;
 
   num_scr_allow = 0;
   want_refresh = 1;
 
   if (really)
-    XClearWindow (display->display, TermWin.vt);
+    XClearWindow (display->display, vt);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -2562,18 +2539,18 @@ rxvt_term::scr_reverse_selection ()
 {
   if (selection.op && current_screen == selection.screen)
     {
-      int end_row = TermWin.saveLines - TermWin.view_start;
-      int i = selection.beg.row + TermWin.saveLines;
-      int col, row = selection.end.row + TermWin.saveLines;
+      int end_row = saveLines - view_start;
+      int i = selection.beg.row + saveLines;
+      int col, row = selection.end.row + saveLines;
       rend_t *srp;
 
 #if ENABLE_FRILLS
       if (selection.rect)
         {
-          end_row += TermWin.nrow;
+          end_row += nrow;
 
           for (; i <= row && i <= end_row; i++)
-            for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
+            for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++)
               srp[col] ^= RS_RVid;
         }
       else
@@ -2587,14 +2564,14 @@ rxvt_term::scr_reverse_selection ()
               i = end_row;
             }
 
-          end_row += TermWin.nrow;
+          end_row += nrow;
 
           for (; i < row && i < end_row; i++, col = 0)
-            for (srp = screen.rend[i]; col < TermWin.ncol; col++)
+            for (srp = save[i].r; col < ncol; col++)
               srp[col] ^= RS_RVid;
 
           if (i == row && i < end_row)
-            for (srp = screen.rend[i]; col < selection.end.col; col++)
+            for (srp = save[i].r; col < selection.end.col; col++)
               srp[col] ^= RS_RVid;
         }
     }
@@ -2613,19 +2590,19 @@ rxvt_term::scr_dump (int fd)
   unsigned int    width, towrite;
   char            r1[] = "\n";
 
-  for (row = TermWin.saveLines - TermWin.nscrolled;
-       row < TermWin.saveLines + TermWin.nrow - 1; row++)
+  for (row = saveLines - nscrolled;
+       row < saveLines + nrow - 1; row++)
     {
-      width = screen.tlen[row] >= 0 ? screen.tlen[row]
-              : TermWin.ncol;
+      width = save[row].l >= 0 ? save[row].l
+              : ncol;
       for (towrite = width; towrite; towrite -= wrote)
         {
-          wrote = write (fd, & (screen.text[row][width - towrite]),
+          wrote = write (fd, & (save[row].t[width - towrite]),
                         towrite);
           if (wrote < 0)
             return;         /* XXX: death, no report */
         }
-      if (screen.tlen[row] >= 0)
+      if (save[row].l >= 0)
         if (write (fd, r1, 1) <= 0)
           return; /* XXX: death, no report */
     }
@@ -2637,7 +2614,7 @@ rxvt_term::scr_dump (int fd)
  * ------------------------------------------------------------------------- */
 
 /*
- * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
+ * -nscrolled <= (selection row) <= nrow - 1
  */
 void
 rxvt_term::selection_check (int check_more)
@@ -2648,12 +2625,12 @@ rxvt_term::selection_check (int check_more)
     return;
 
   pos.row = pos.col = 0;
-  if ((selection.beg.row < - (int32_t)TermWin.nscrolled)
-      || (selection.beg.row >= TermWin.nrow)
-      || (selection.mark.row < - (int32_t)TermWin.nscrolled)
-      || (selection.mark.row >= TermWin.nrow)
-      || (selection.end.row < - (int32_t)TermWin.nscrolled)
-      || (selection.end.row >= TermWin.nrow)
+  if ((selection.beg.row < - (int32_t)nscrolled)
+      || (selection.beg.row >= nrow)
+      || (selection.mark.row < - (int32_t)nscrolled)
+      || (selection.mark.row >= nrow)
+      || (selection.end.row < - (int32_t)nscrolled)
+      || (selection.end.row >= nrow)
       || (check_more == 1
           && current_screen == selection.screen
           && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
@@ -2665,7 +2642,7 @@ rxvt_term::selection_check (int check_more)
           && ROWCOL_IS_AFTER (selection.end, pos))
       || (check_more == 4     /* screen width change */
           && (selection.beg.row != selection.end.row
-              || selection.end.col > TermWin.ncol)))
+              || selection.end.col > ncol)))
     CLEAR_SELECTION ();
 }
 
@@ -2884,7 +2861,7 @@ rxvt_term::selection_property (Window win, Atom prop)
 void
 rxvt_term::selection_request (Time tm, int x, int y)
 {
-  if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
+  if (x < 0 || x >= width || y < 0 || y >= height)
     return;                 /* outside window */
 
   if (selection.text)
@@ -2936,7 +2913,7 @@ rxvt_term::selection_request_other (Atom target, int selnum)
   if (XGetSelectionOwner (display->display, sel) != None)
     {
       XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
-                         TermWin.vt, selection_request_time);
+                         vt, selection_request_time);
       return 1;
     }
 
@@ -2992,36 +2969,36 @@ rxvt_term::selection_make (Time tm)
   if (selection.clicks == 4)
     return;                 /* nothing selected, go away */
 
-  i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
+  i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
   new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
 
   col = selection.beg.col;
-  row = selection.beg.row + TermWin.saveLines;
-  end_row = selection.end.row + TermWin.saveLines;
+  row = selection.beg.row + saveLines;
+  end_row = selection.end.row + saveLines;
   int ofs = 0;
   int extra = 0;
 
   for (; row <= end_row; row++, col = 0)
     {
-      end_col = screen.tlen[row];
+      end_col = save[row].l;
 
 #if ENABLE_FRILLS
       if (selection.rect)
         {
           col = selection.beg.col;
-          end_col = TermWin.ncol + 1;
+          end_col = ncol + 1;
         }
 #endif
 
       MAX_IT (col, 0);
 
       if (end_col == -1)
-        end_col = TermWin.ncol;
+        end_col = ncol;
 
       if (row == end_row || selection.rect)
         MIN_IT (end_col, selection.end.col);
 
-      t = &screen.text[row][col];
+      t = &save[row].t[col];
       for (; col < end_col; col++)
         {
           if (*t == NOCHAR)
@@ -3047,7 +3024,7 @@ rxvt_term::selection_make (Time tm)
             new_selection_text[ofs++] = *t++;
         }
 
-      if (screen.tlen[row] != -1 && row != end_row)
+      if (save[row].l != -1 && row != end_row)
         new_selection_text[ofs++] = C0_LF;
     }
 
@@ -3068,8 +3045,8 @@ rxvt_term::selection_make (Time tm)
   selection.len = ofs;
   selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
 
-  XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
-  if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
+  XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
+  if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
     display->set_selection_owner (this);
   else
     rxvt_warn ("can't get primary selection, ignoring.\n");
@@ -3102,7 +3079,7 @@ rxvt_term::selection_click (int clicks, int x, int y)
 
   if (clicks == 2 || clicks == 3)
     selection_extend_colrow (selection.mark.col,
-                             selection.mark.row + TermWin.view_start,
+                             selection.mark.row + view_start,
                              0, /* button 3     */
                              1, /* button press */
                              0);        /* click change */
@@ -3117,15 +3094,15 @@ rxvt_term::selection_start_colrow (int col, int row)
 {
   want_refresh = 1;
   selection.mark.col = col;
-  selection.mark.row = row - TermWin.view_start;
+  selection.mark.row = row - view_start;
 
-  MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
-  MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
+  MAX_IT (selection.mark.row, - (int32_t)nscrolled);
+  MIN_IT (selection.mark.row, (int32_t)nrow - 1);
   MAX_IT (selection.mark.col, 0);
-  MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
+  MIN_IT (selection.mark.col, (int32_t)ncol - 1);
 
   while (selection.mark.col > 0
-         && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
+         && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR)
     --selection.mark.col;
   
   if (selection.op)
@@ -3159,25 +3136,25 @@ rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, r
 
   if (dirn == UP)
     {
-      bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
+      bound.row = saveLines - nscrolled - 1;
       bound.col = 0;
       dirnadd = -1;
     }
   else
     {
-      bound.row = TermWin.saveLines + TermWin.nrow;
-      bound.col = TermWin.ncol - 1;
+      bound.row = saveLines + nrow;
+      bound.col = ncol - 1;
       dirnadd = 1;
     }
 
-  row = mark->row + TermWin.saveLines;
+  row = mark->row + saveLines;
   col = mark->col;
   MAX_IT (col, 0);
   /* find the edge of a word */
-  stp = &screen.text[row][col];
+  stp = &save[row].t[col];
   w1 = DELIMIT_TEXT (*stp);
 
-  srp = &screen.rend[row][col];
+  srp = &save[row].r[col];
   w2 = DELIMIT_REND (*srp);
 
   for (;;)
@@ -3198,16 +3175,16 @@ rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, r
 
       if ((col == bound.col) && (row != bound.row))
         {
-          if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
+          if (save[ (row - (dirn == UP ? 1 : 0))].l == -1)
             {
               trow = row + dirnadd;
-              tcol = dirn == UP ? TermWin.ncol - 1 : 0;
+              tcol = dirn == UP ? ncol - 1 : 0;
 
-              if (screen.text[trow] == NULL)
+              if (save[trow].t == NULL)
                 break;
 
-              stp = & (screen.text[trow][tcol]);
-              srp = & (screen.rend[trow][tcol]);
+              stp = & (save[trow].t[tcol]);
+              srp = & (save[trow].r[tcol]);
 
               if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
                 break;
@@ -3225,7 +3202,7 @@ Old_Word_Selection_You_Die:
     col++;                  /* put us on one past the end */
 
   /* Poke the values back in */
-  ret->row = row - TermWin.saveLines;
+  ret->row = row - saveLines;
   ret->col = col;
 }
 
@@ -3245,9 +3222,9 @@ rxvt_term::selection_extend (int x, int y, int flag)
   col = Pixel2Col (x);
   row = Pixel2Row (y);
   MAX_IT (row, 0);
-  MIN_IT (row, (int)TermWin.nrow - 1);
+  MIN_IT (row, (int)nrow - 1);
   MAX_IT (col, 0);
-  MIN_IT (col, (int)TermWin.ncol);
+  MIN_IT (col, (int)ncol);
 
   /*
   * If we're selecting characters (single click) then we must check first
@@ -3257,7 +3234,7 @@ rxvt_term::selection_extend (int x, int y, int flag)
   */
   if (((selection.clicks % 3) == 1) && !flag
       && (col == selection.mark.col
-          && (row == selection.mark.row + TermWin.view_start)))
+          && (row == selection.mark.row + view_start)))
     {
       /* select nothing */
       selection.beg.row = selection.end.row = 0;
@@ -3282,7 +3259,6 @@ rxvt_term::selection_extend (int x, int y, int flag)
 void
 rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
 {
-  int16_t ncol = TermWin.ncol;
   int end_col;
   row_col_t pos;
   enum {
@@ -3326,7 +3302,7 @@ rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int b
   pos.col = col;
   pos.row = row;
 
-  pos.row -= TermWin.view_start;   /* adjust for scroll */
+  pos.row -= view_start;   /* adjust for scroll */
 
   /*
    * This is mainly xterm style selection with a couple of differences, mainly
@@ -3395,7 +3371,7 @@ rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int b
 
   if (selection.clicks == 1)
     {
-      end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
+      end_col = save[selection.beg.row + saveLines].l;
 
       if (selection.beg.col > end_col
           && end_col != -1
@@ -3405,7 +3381,7 @@ rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int b
          )
         selection.beg.col = ncol;
 
-      end_col = screen.tlen[selection.end.row + TermWin.saveLines];
+      end_col = save[selection.end.row + saveLines].l;
 
       if (
           selection.end.col > end_col
@@ -3432,11 +3408,11 @@ rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int b
           int end_row;
 
           selection_delimit_word (UP, &selection.beg, &selection.beg);
-          end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
+          end_row = save[selection.mark.row + saveLines].l;
 
-          for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
+          for (end_row = selection.mark.row; end_row < nrow; end_row++)
             {
-              end_col = screen.tlen[end_row + TermWin.saveLines];
+              end_col = save[end_row + saveLines].l;
 
               if (end_col != -1)
                 {
@@ -3457,12 +3433,12 @@ rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int b
           selection.end.col = ncol;
 
           // select a complete logical line
-          while (selection.beg.row > -TermWin.saveLines
-                 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
+          while (selection.beg.row > -saveLines
+                 && save[selection.beg.row - 1 + saveLines].l == -1)
             selection.beg.row--;
 
-          while (selection.end.row < TermWin.nrow
-                 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
+          while (selection.end.row < nrow
+                 && save[selection.end.row + saveLines].l == -1)
             selection.end.row++;
         }
     }
@@ -3499,7 +3475,7 @@ rxvt_term::selection_remove_trailing_spaces ()
 
   for ( ; end_row >= selection.beg.row; )
     {
-      stp = screen.text[end_row + TermWin.saveLines];
+      stp = save[end_row + saveLines].t;
 
       while (--end_col >= 0)
         {
@@ -3510,7 +3486,7 @@ rxvt_term::selection_remove_trailing_spaces ()
         }
 
       if (end_col >= 0
-          || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
+          || save[end_row - 1 + saveLines].l != -1)
         {
           selection.end.col = end_col + 1;
           selection.end.row = end_row;
@@ -3518,7 +3494,7 @@ rxvt_term::selection_remove_trailing_spaces ()
         }
 
       end_row--;
-      end_col = TermWin.ncol;
+      end_col = ncol;
     }
 
   if (selection.mark.row > selection.end.row)
@@ -3691,9 +3667,9 @@ void
 rxvt_term::pixel_position (int *x, int *y)
 {
   *x = Pixel2Col (*x);
-  /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
+  /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
   *y = Pixel2Row (*y);
-  /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
+  /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
 }
 
 /* ------------------------------------------------------------------------- */
@@ -3703,10 +3679,10 @@ rxvt_term::im_set_position (XPoint &pos)
 {
   XWindowAttributes xwa;
 
-  XGetWindowAttributes (display->display, TermWin.vt, &xwa);
+  XGetWindowAttributes (display->display, vt, &xwa);
 
   pos.x = xwa.x + Col2Pixel    (screen.cur.col);
-  pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
+  pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
 }
 #endif
 
@@ -3714,25 +3690,25 @@ rxvt_term::im_set_position (XPoint &pos)
 void
 rxvt_term::scr_overlay_new (int x, int y, int w, int h)
 {
-  if (TermWin.nrow < 3 || TermWin.ncol < 3)
+  if (nrow < 3 || ncol < 3)
     return;
 
   want_refresh = 1;
 
   scr_overlay_off ();
 
-  if (x < 0) x = TermWin.ncol - w;
-  if (y < 0) y = TermWin.nrow - h;
+  if (x < 0) x = ncol - w;
+  if (y < 0) y = nrow - h;
 
   // make space for border
-  w += 2; MIN_IT (w, TermWin.ncol);
-  h += 2; MIN_IT (h, TermWin.nrow);
+  w += 2; MIN_IT (w, ncol);
+  h += 2; MIN_IT (h, nrow);
 
   x -= 1; MAX_IT (x, 0);
   y -= 1; MAX_IT (y, 0);
 
-  MIN_IT (x, TermWin.ncol - w);
-  MIN_IT (y, TermWin.nrow - h);
+  MIN_IT (x, ncol - w);
+  MIN_IT (y, nrow - h);
 
   ov_x = x; ov_y = y;
   ov_w = w; ov_h = h;
@@ -3828,7 +3804,7 @@ rxvt_term::scr_swap_overlay ()
   if (!ov_text)
     return;
 
-  int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
+  int row_offset = ov_y + saveLines - view_start;
 
   // swap screen mem with overlay
   for (int y = ov_h; y--; )
@@ -3836,8 +3812,8 @@ rxvt_term::scr_swap_overlay ()
       text_t *t1 = ov_text[y];
       rend_t *r1 = ov_rend[y];
 
-      text_t *t2 = screen.text[y + row_offset] + ov_x;
-      rend_t *r2 = screen.rend[y + row_offset] + ov_x;
+      text_t *t2 = save[y + row_offset].t + ov_x;
+      rend_t *r2 = save[y + row_offset].r + ov_x;
 
       for (int x = ov_w; x--; )
         {
diff --git a/src/scrollbar-next.C b/src/scrollbar-next.C
index 6733c8fe..8a5d472e 100644
--- a/src/scrollbar-next.C
+++ b/src/scrollbar-next.C
@@ -242,7 +242,7 @@ rxvt_term::scrollbar_show_next (int update, int last_top, int last_bot, int scro
       init_scrollbar_stuff ();
     }
 
-  if (TermWin.nscrolled == 0 || !update)
+  if (nscrolled == 0 || !update)
     {
       XFillRectangle (disp, scrollBar.win, grayGC, 0, 0,
                      SB_WIDTH_NEXT + 1, height);
@@ -253,7 +253,7 @@ rxvt_term::scrollbar_show_next (int update, int last_top, int last_bot, int scro
                      SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height);
     }
 
-  if (TermWin.nscrolled)
+  if (nscrolled)
     {
       if (last_top < scrollBar.top || !update)
         XFillRectangle (disp, scrollBar.win, stippleGC,
diff --git a/src/scrollbar.C b/src/scrollbar.C
index 3b21ef32..5fca9fee 100644
--- a/src/scrollbar.C
+++ b/src/scrollbar.C
@@ -112,13 +112,13 @@ rxvt_term::resize_scrollbar ()
     {
       /* create the scrollbar window */
       scrollBar.win = XCreateSimpleWindow (display->display,
-                                          TermWin.parent[0],
-                                          window_sb_x, 0,
-                                          scrollbar_TotalWidth (),
-                                          szHint.height,
-                                          0,
-                                          pix_colors[Color_fg],
-                                          pix_colors[Color_border]);
+                                           parent[0],
+                                           window_sb_x, 0,
+                                           scrollbar_TotalWidth (),
+                                           szHint.height,
+                                           0,
+                                           pix_colors[Color_fg],
+                                           pix_colors[Color_border]);
 #ifdef DEBUG_X
       XStoreName (display->display, scrollBar.win, "scrollbar");
 #endif
@@ -155,9 +155,9 @@ rxvt_term::scrollbar_show (int update)
 
   if (update)
     {
-      top = (TermWin.nscrolled - TermWin.view_start);
-      bot = top + (TermWin.nrow - 1);
-      len = max ((TermWin.nscrolled + (TermWin.nrow - 1)), 1);
+      top = nscrolled - view_start;
+      bot = top + (nrow - 1);
+      len = max (nscrolled + (nrow - 1), 1);
       adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
 
       scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
diff --git a/src/xpm.C b/src/xpm.C
index 01f4f4d7..f59771d8 100644
--- a/src/xpm.C
+++ b/src/xpm.C
@@ -166,22 +166,22 @@ rxvt_term::resize_pixmap ()
   unsigned int    height = TermWin_TotalHeight ();
   dDisp;
 
-  if (TermWin.pixmap != None)
-    XFreePixmap (disp, TermWin.pixmap);
+  if (pixmap != None)
+    XFreePixmap (disp, pixmap);
 
   if (bgPixmap.pixmap == None)
     { /* So be it: I'm not using pixmaps */
-      TermWin.pixmap = None;
+      pixmap = None;
 
       if (!(options & Opt_transparent) || !am_transparent)
-        XSetWindowBackground (disp, TermWin.vt,
+        XSetWindowBackground (disp, vt,
                               pix_colors[Color_bg]);
 
       return;
     }
 
   gcvalue.foreground = pix_colors[Color_bg];
-  gc = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
+  gc = XCreateGC (disp, vt, GCForeground, &gcvalue);
 
   if (bgPixmap.pixmap != None)
     {	/* we have a specified pixmap */
@@ -202,10 +202,10 @@ rxvt_term::resize_pixmap ()
       if (w == 0)
         {
           /* basic X tiling - let the X server do it */
-          TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
+          pixmap = XCreatePixmap (disp, vt,
                                          xpmw, xpmh,
                                          (unsigned int)display->depth);
-          XCopyArea (disp, bgPixmap.pixmap, TermWin.pixmap, gc,
+          XCopyArea (disp, bgPixmap.pixmap, pixmap, gc,
                     0, 0, xpmw, xpmh, 0, 0);
         }
       else
@@ -213,7 +213,7 @@ rxvt_term::resize_pixmap ()
           float           incr, p;
           Pixmap          tmp;
 
-          TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
+          pixmap = XCreatePixmap (disp, vt,
                                          width, height,
                                          (unsigned int)display->depth);
           /*
@@ -221,7 +221,7 @@ rxvt_term::resize_pixmap ()
            */
           rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
 
-          tmp = XCreatePixmap (disp, TermWin.vt,
+          tmp = XCreatePixmap (disp, vt,
                               width, xpmh, (unsigned int)display->depth);
           XFillRectangle (disp, tmp, gc, 0, 0, width,
                          xpmh);
@@ -241,10 +241,10 @@ rxvt_term::resize_pixmap ()
           rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
 
           if (y > 0)
-            XFillRectangle (disp, TermWin.pixmap, gc, 0, 0, width, y);
+            XFillRectangle (disp, pixmap, gc, 0, 0, width, y);
 
           if (h < height)
-            XFillRectangle (disp, TermWin.pixmap, gc, 0, (int)h, width, height - h + 1);
+            XFillRectangle (disp, pixmap, gc, 0, (int)h, width, height - h + 1);
 
           for ( /*nil */ ; y < h; y++, p += incr)
             {
@@ -252,7 +252,7 @@ rxvt_term::resize_pixmap ()
                 p = 0;
 
               /* copy one row from the tmp pixmap to the main pixmap */
-              XCopyArea (disp, tmp, TermWin.pixmap, gc,
+              XCopyArea (disp, tmp, pixmap, gc,
                         0, (int)p, width, 1, 0, (int)y);
             }
 
@@ -260,7 +260,7 @@ rxvt_term::resize_pixmap ()
         }
     }
 
-  XSetWindowBackgroundPixmap (disp, TermWin.vt, TermWin.pixmap);
+  XSetWindowBackgroundPixmap (disp, vt, pixmap);
   XFreeGC (disp, gc);
   am_transparent = 0;
 }
@@ -354,7 +354,7 @@ rxvt_term::set_bgPixmap (const char *file)
       bgPixmap.pixmap = None;
     }
 
-  XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
+  XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
 
   if (*file != '\0')
     {
@@ -363,7 +363,7 @@ rxvt_term::set_bgPixmap (const char *file)
       /*
        * we already have the required attributes
        */
-      /*      XGetWindowAttributes (display->display, TermWin.vt, &attr); */
+      /*      XGetWindowAttributes (display->display, vt, &attr); */
 
       xpmAttr.closeness = 30000;
       xpmAttr.colormap = display->cmap;
-- 
2.34.1