--- rxvt-unicode/src/rxvt.h	2005/12/18 00:59:42	1.162
+++ rxvt-unicode/src/rxvt.h	2005/12/20 22:27:49	1.165
@@ -827,8 +827,11 @@
 #define Width2Pixel(n)          ((int32_t)(n) * (int32_t)fwidth)
 #define Height2Pixel(n)         ((int32_t)(n) * (int32_t)fheight)
 
-#define TermWin_TotalWidth()    ((int32_t)width)
-#define TermWin_TotalHeight()   ((int32_t)height)
+#define TermWin_TotalWidth()    ((int32_t)this->width)
+#define TermWin_TotalHeight()   ((int32_t)this->height)
+
+#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
+#define ROW(n) (save [LINENO (n)])
 
 /* how to build & extract colors and attributes */
 #define GET_BASEFG(x)           (((x) & RS_fgMask))
@@ -1496,10 +1499,9 @@
       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);
+  int scr_scroll_text (int row1, int row2, int count);
   void scr_reset ();
   void scr_reset_realloc ();
   void scr_release ();