--- rxvt-unicode/src/rxvt.h	2006/01/02 18:20:23	1.182
+++ rxvt-unicode/src/rxvt.h	2006/01/04 04:42:45	1.186
@@ -240,9 +240,9 @@
 
 /* width of scrollBar, menuBar shadow, must be 1 or 2 */
 #ifdef HALFSHADOW
-# define SHADOW 1
+# define MENU_SHADOW 1
 #else
-# define SHADOW 2
+# define MENU_SHADOW 2
 #endif
 
 #define R_SB_ALIGN_CENTRE       0
@@ -471,6 +471,8 @@
 
   URxvt_view_up          = 720,
   URxvt_view_down        = 721,
+
+  URxvt_perl             = 777,
 };
 
 /* Words starting with `Color_' are colours.  Others are counts */
@@ -557,11 +559,11 @@
  * Resource list
  */
 enum {
-#define Rs_def(name) Rs_ ## name,
-#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
-#include "rsinc.h"
-#undef Rs_def
-#undef Rs_reserve
+# define def(name) Rs_ ## name,
+# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
+# include "rsinc.h"
+# undef def
+# undef reserve
   NUM_RESOURCES
 };
 
@@ -685,22 +687,6 @@
  * MACRO DEFINES
  *****************************************************************************
  */
-#define memset(x, y, z)         memset((x), (y), (size_t)(z))
-#define memcpy(x, y, z)         memcpy((void *)(x), (const void *)(y), (z))
-#define memmove(x, y, z)        memmove((void *)(x), (const void *)(y), (z))
-#define strcasecmp(x, y)        strcasecmp((x), (y))
-#define strncasecmp(x, y, z)    strncasecmp((x), (y), (z))
-#define strcpy(x, y)            strcpy((char *)(x), (const char *)(y))
-#define strncpy(x, y, z)        strncpy((char *)(x), (const char *)(y), (z))
-#define strcmp(x, y)            strcmp((const char *)(x), (const char *)(y))
-#define strncmp(x, y, z)        strncmp((const char *)(x), (const char *)(y), (z))
-#define strcat(x, y)            strcat((char *)(x), (const char *)(y))
-#define strncat(x, y, z)        strncat((char *)(x), (const char *)(y), (z))
-#define strdup(x)               strdup((const char *)(x))
-#define strlen(x)               strlen((const char *)(x))
-#define strchr(x, y)            strchr((const char *)(x), (int)(y))
-#define strrchr(x, y)           strrchr((const char *)(x), (int)(y))
-
 #define dDisp			Display *disp = display->display
 
 /* convert pixel dimensions to row/column values.  Everything as int32_t */
@@ -713,9 +699,6 @@
 #define Width2Pixel(n)          ((int32_t)(n) * (int32_t)fwidth)
 #define Height2Pixel(n)         ((int32_t)(n) * (int32_t)fheight)
 
-#define TermWin_TotalWidth()    ((int32_t)this->width)
-#define TermWin_TotalHeight()   ((int32_t)this->height)
-
 // for m >= -n, ensure remainder lies between 0..n-1
 #define MOD(m,n) (((m) + (n)) % (n))
 
@@ -784,8 +767,8 @@
 
 #if (MENUBAR_MAX > 1)
 /* rendition style flags */
-# define menuBar_height()       (fheight + SHADOW)
-# define menuBar_TotalHeight()  (menuBar_height() + SHADOW + menuBar_margin)
+# define menuBar_height()       (fheight + MENU_SHADOW)
+# define menuBar_TotalHeight()  (menuBar_height() + MENU_SHADOW + menuBar_margin)
 # define isMenuBarWindow(w)     ((w) == menuBar.win)
 #else
 # define menuBar_height()       (0)
@@ -1095,12 +1078,6 @@
   bar_t           BarList;
 # endif                         /* (MENUBAR_MAX > 1) */
 #endif
-#ifdef CURSOR_BLINK
-  struct timeval  lastcursorchange;
-#endif
-#ifdef POINTER_BLANK
-  struct timeval  lastmotion;
-#endif
 
 #if ENABLE_OVERLAY
   int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
@@ -1125,7 +1102,7 @@
   char           *env_colorfgbg;
   char           *locale;
   char            charsets[4];
-  unsigned char  *v_buffer;           /* pointer to physical buffer */
+  char           *v_buffer;           /* pointer to physical buffer */
   unsigned int    v_buflen;           /* size of area to write */
   stringvec      *argv, *envv;        /* if != 0, will be freed on destroy time */
 
@@ -1135,8 +1112,8 @@
 
   const char     *rs[NUM_RESOURCES];
   /* command input buffering */
-  unsigned char  *cmdbuf_ptr, *cmdbuf_endp;
-  unsigned char   cmdbuf_base[CBUFSIZ];
+  char           *cmdbuf_ptr, *cmdbuf_endp;
+  char            cmdbuf_base[CBUFSIZ];
 
   rxvt_salloc    *talloc;             // text line allocator
   rxvt_salloc    *ralloc;             // rend line allocator
@@ -1155,7 +1132,7 @@
 #endif
 
   // modifies first argument(!)
-  void paste (unsigned char *data, unsigned int len);
+  void paste (char *data, unsigned int len);
 
   void flush ();
 
@@ -1206,7 +1183,7 @@
   void pointer_unblank ();
 
   void tt_printf (const char *fmt,...);
-  void tt_write (const unsigned char *data, unsigned int len);
+  void tt_write (const char *data, unsigned int len);
   void pty_write ();
 
   void tt_winch ();
@@ -1268,7 +1245,7 @@
 
   // command.C
   void lookup_key (XKeyEvent &ev);
-  unsigned int cmd_write (const unsigned char *str, unsigned int count);
+  unsigned int cmd_write (const char *str, unsigned int count);
 
   unicode_t next_char ();
   unicode_t cmd_getc ();
@@ -1292,11 +1269,11 @@
   void process_escape_seq ();
   void process_csi_seq ();
   void process_window_ops (const int *args, unsigned int nargs);
-  unsigned char *get_to_st (unicode_t &ends_how);
+  char *get_to_st (unicode_t &ends_how);
   void process_dcs_seq ();
   void process_osc_seq ();
-  void process_color_seq (int report, int color, const char *str, unsigned char resp);
-  void process_xterm_seq (int op, const char *str, unsigned char resp);
+  void process_color_seq (int report, int color, const char *str, char resp);
+  void process_xterm_seq (int op, const char *str, char resp);
   int privcases (int mode, unsigned long bit);
   void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
   void process_sgr_mode (unsigned int nargs, const int *arg);