--- rxvt-unicode/src/rxvt.h	2004/02/22 08:28:36	1.38
+++ rxvt-unicode/src/rxvt.h	2004/02/24 00:02:44	1.40
@@ -271,11 +271,13 @@
   *           +---< SB_WIDTH_NEXT
   */
 
-#define NO_REFRESH              0       /* Window not visible at all!        */
-#define FAST_REFRESH            (1<<0)  /* Fully exposed window              */
-#define SLOW_REFRESH            (1<<1)  /* Partially exposed window          */
-#define SMOOTH_REFRESH          (1<<2)  /* Do sync'ing to make it smooth     */
-#define REFRESH_BOUNDS          (1<<3)
+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     */
+  REFRESH_BOUNDS   = 1<<3
+};
 
 #ifdef NO_SECONDARY_SCREEN
 # define NSCREENS               0
@@ -293,14 +295,18 @@
 #define FONT_UP                 "#+"
 
 /* flags for rxvt_scr_gotorc () */
-#define C_RELATIVE              1       /* col movement is relative */
-#define R_RELATIVE              2       /* row movement is relative */
-#define RELATIVE                (R_RELATIVE|C_RELATIVE)
+enum {
+  C_RELATIVE = 1    ,       /* col movement is relative */
+  R_RELATIVE =     2,       /* row movement is relative */
+  RELATIVE   = 1 | 2
+};
 
 /* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
-#define INSERT                  -1      /* don't change these values */
-#define DELETE                  +1
-#define ERASE                   +2
+enum {
+  INSERT = -1,				/* don't change these values */
+  DELETE = +1,
+  ERASE  = +2
+};
 
 /* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
 enum page_dirn {
@@ -1150,6 +1156,8 @@
   void scr_erase_screen (int mode);
   void scr_touch (bool refresh);
   void scr_expose (int x, int y, int width, int height, bool refresh);
+  void scr_remap_chars ();
+  void scr_remap_chars (text_t *tp, rend_t *rp);
 
   /* autoconvert */
 
@@ -1157,12 +1165,12 @@
   void lookup_key (XKeyEvent &ev);
   unsigned int cmd_write (const unsigned char *str, unsigned int count);
   uint32_t cmd_getc ();
-  void mouse_report (const XButtonEvent &ev);
-  void button_press (const XButtonEvent &ev);
-  void button_release (const XButtonEvent &ev);
+  void mouse_report (XButtonEvent &ev);
+  void button_press (XButtonEvent &ev);
+  void button_release (XButtonEvent &ev);
   int check_our_parents ();
 #ifdef PRINTPIPE
-  FILE * popen_printer ();
+  FILE *popen_printer ();
   int pclose_printer (FILE *stream);
 #endif
   void process_print_pipe ();
@@ -1204,19 +1212,19 @@
   int action_dispatch (action_t *action);
   void menuarrow_free (char name);
   void menuarrow_add (char *string);
-  char * menu_find_base (menu_t **menu, char *path);
-  menu_t * menu_delete (menu_t *menu);
-  menu_t * menu_add (menu_t *parent, char *path);
+  char *menu_find_base (menu_t **menu, char *path);
+  menu_t *menu_delete (menu_t *menu);
+  menu_t *menu_add (menu_t *parent, char *path);
   void drawbox_menubar (int x, int len, int state);
   void drawtriangle (int x, int y, int state);
   void drawbox_menuitem (int y, int state);
   void menu_show ();
-  void menu_display (void (*update) (rxvt_t *));
+  void menu_display (void (rxvt_term::*update) ());
   void menu_hide_all ();
   void menu_hide ();
   void menu_clear (menu_t *menu);
   void menubar_clear ();
-  bar_t * menubar_find (const char *name);
+  bar_t *menubar_find (const char *name);
   int menubar_push (const char *name);
   void menubar_remove (const char *name);
   void menubar_dump (FILE *fp);
@@ -1225,9 +1233,9 @@
   void draw_Arrows (int name, int state);
   void menubar_expose ();
   int menubar_mapping (int map);
-  int menu_select (XButtonEvent *ev);
-  void menubar_select (XButtonEvent *ev);
-  void menubar_control (XButtonEvent *ev);
+  int menu_select (XButtonEvent &ev);
+  void menubar_select (XButtonEvent &ev);
+  void menubar_control (XButtonEvent &ev);
   void map_menuBar (int map);
 #endif