--- rxvt-unicode/src/rxvt.h	2006/01/16 15:12:48	1.209
+++ rxvt-unicode/src/rxvt.h	2006/01/17 09:24:53	1.214
@@ -39,6 +39,7 @@
 #include "salloc.h"
 
 #include "rxvtperl.h"
+#include "logging.h"
 
 // try to avoid some macros to decrease code size, on some systems
 #if ENABLE_MINIMAL
@@ -131,8 +132,6 @@
 char          ** rxvt_splitcommastring            (const char *cs);
 void             rxvt_freecommastring             (char **cs);
 char           * rxvt_File_find                   (const char *file, const char *ext, const char *path);
-void             rxvt_Draw_Shadow                 (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
-void             rxvt_Draw_Triangle               (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
 void             rxvt_usleep                      (int usecs);
 
 /////////////////////////////////////////////////////////////////////////////
@@ -340,10 +339,9 @@
   */
 
 enum {
-  NO_REFRESH       = 0   ,  /* Window not visible at all!        */
-  FAST_REFRESH     = 1<<0,  /* Fully exposed window              */
-  SLOW_REFRESH     = 1<<1,  /* Partially exposed window          */
-  SMOOTH_REFRESH   = 1<<2,  /* Do sync'ing to make it smooth     */
+  NO_REFRESH       = 0,  /* Window not visible at all!        */
+  FAST_REFRESH     = 1,  /* Fully exposed window              */
+  SLOW_REFRESH     = 2,  /* Partially exposed window          */
 };
 
 #ifdef NO_SECONDARY_SCREEN
@@ -704,7 +702,8 @@
  * MACRO DEFINES
  *****************************************************************************
  */
-#define dDisp			Display *disp = display->display
+#define dLocal(type,name)       type const name = this->name
+#define dDisp			Display *disp = this->display->display
 
 /* convert pixel dimensions to row/column values.  Everything as int32_t */
 #define Pixel2Col(x)            Pixel2Width((int32_t)(x))
@@ -793,24 +792,6 @@
 # define XPMClearArea(a, b, c, d, e, f, g)
 #endif
 
-#ifdef UTMP_SUPPORT
-# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
-#  undef HAVE_UTMPX_H
-#  undef HAVE_STRUCT_UTMPX
-# endif
-# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
-#  undef HAVE_UTMP_H
-#  undef HAVE_STRUCT_UTMP
-# endif
-
-# ifdef HAVE_UTMPX_H
-#  include <utmpx.h>
-# endif
-# ifdef HAVE_UTMP_H
-#  include <utmp.h>
-# endif
-#endif
-
 #ifdef DEBUG_CMD
 # define D_CMD(x)               fprintf x ; fputc('\n', stderr)
 #else
@@ -1102,18 +1083,6 @@
   struct mouse_event MEvent;
   XComposeStatus  compose;
   ttymode_t       tio;
-#ifdef UTMP_SUPPORT
-# ifdef HAVE_STRUCT_UTMP
-  struct utmp     ut;
-# endif
-# ifdef HAVE_STRUCT_UTMPX
-  struct utmpx    utx;
-# endif
-# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
-  char            ut_id[5];
-# endif
-  int             utmp_pos;
-#endif
   row_col_t       oldcursor;
 #ifdef XPM_BACKGROUND
   bgPixmap_t      bgPixmap;
@@ -1156,6 +1125,9 @@
   char           *cmdbuf_ptr, *cmdbuf_endp;
   char            cmdbuf_base[CBUFSIZ];
 
+  rxvt_ptytty     pty;
+  rxvt_session    session;
+
   rxvt_salloc    *talloc;             // text line allocator
   rxvt_salloc    *ralloc;             // rend line allocator
 
@@ -1333,9 +1305,6 @@
   // init.C
   void Get_Colours ();
   void get_ourmods ();
-  // logging.C
-  void makeutent (const char *pty, const char *hostname);
-  void cleanutent ();
   // main.C
   void privileged_utmp (rxvt_privaction action);
   bool set_fonts ();
@@ -1425,7 +1394,7 @@
   void scr_reset ();
   void scr_release ();
   void scr_clear (bool really = false);
-  void scr_refresh (unsigned char refresh_type);
+  void scr_refresh ();
   bool scr_refresh_rend (rend_t mask, rend_t value);
   void scr_erase_screen (int mode);
 #if ENABLE_FRILLS
@@ -1499,7 +1468,6 @@
 
 #if defined(RXVT_SCROLLBAR)
   // scrollbar-rxvt.C
-  void Draw_button (int x, int y, int state, int dirn);
   int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
 #endif