--- rxvt-unicode/src/rxvtlib.h.in	2003/11/27 10:12:10	1.4
+++ rxvt-unicode/src/rxvtlib.h.in	2004/01/19 17:26:43	1.8
@@ -1,5 +1,5 @@
 /*
- * $Id: rxvtlib.h.in,v 1.4 2003/11/27 10:12:10 pcg Exp $
+ * $Id: rxvtlib.h.in,v 1.8 2004/01/19 17:26:43 pcg Exp $
  */
 
 #ifndef _RXVTLIB_H_             /* include once only */
@@ -186,8 +186,8 @@
  *     normal `unscrolled' screen region
  */
 typedef struct {
-  text_t        **text; /* _all_ the text                            */
   int16_t        *tlen; /* length of each text line                  */
+  text_t        **text; /* _all_ the text                            */
   rend_t        **rend; /* rendition, uses RS_ flags                 */
   row_col_t       cur;  /* cursor position on the screen             */
   uint16_t        tscroll;      /* top of settable scroll region             */
@@ -281,25 +281,31 @@
   short           width;        /* scrollbar width                          */
   Window          win;
   int             (*update)(pR_ int, int, int, int);
+
+  void setIdle()   { state =  1 ; }
+  void setMotion() { state = 'm'; }
+  void setUp()     { state = 'U'; }
+  void setDn()     { state = 'D'; }
 } scrollBar_t;
 
 struct rxvt_vars {
   TermWin_t       TermWin;
   scrollBar_t     scrollBar;
   menuBar_t       menuBar;
-  Display        *Xdisplay;
   unsigned long   Options;
   XSizeHints      szHint;
+  Display        *Xdisplay;
+  int             Xdepth;
+  int             Xscreen;
+  Visual         *Xvisual;
   Colormap        Xcmap;
   rxvt_color     *PixColors;
   short           numPixColors;
   Cursor          TermWin_cursor;       /* cursor for vt window */
-  int             Xdepth;
   int             sb_shadow;    /* scrollbar shadow width                    */
   int             Xfd;          /* file descriptor of X server connection    */
   int             cmd_fd;       /* pty file descriptor; connected to command */
   int             tty_fd;       /* tty file descriptor; connected to child   */
-  int             num_fds;      /* number of file descriptors being used     */
   int             numlock_state;
   text_t        **drawn_text;   /* text drawn on screen (characters)         */
   rend_t        **drawn_rend;   /* text drawn on screen (rendition)          */