--- rxvt-unicode/src/rxvt.h	2004/02/22 08:28:36	1.38
+++ rxvt-unicode/src/rxvt.h	2004/02/24 12:00:45	1.41
@@ -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,26 +295,30 @@
 #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 {
   UP,
   DN,
-  NO_DIR
+  NO_DIR,
 };
 
 /* arguments for rxvt_scr_change_screen () */
 enum {
   PRIMARY = 0,
-  SECONDARY
+  SECONDARY,
 };
 
 #define RS_None                 0               /* Normal */
@@ -346,7 +352,7 @@
           C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
   C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
   C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
-  C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1
+  C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
 }; 
 #define CHAR_ST                 0x9c    /* 0234 */
 
@@ -354,27 +360,38 @@
  * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
  * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
  */
-#define XTerm_name              0
-#define XTerm_iconName          1
-#define XTerm_title             2
-#define XTerm_Color             4       /* change colors */
-#define XTerm_Color_cursor      12      /* change actual 'Cursor' color */
-#define XTerm_Color_pointer     13      /* change actual 'Pointer' color */
-#define XTerm_Color_RV          17      /* change actual 'Highlight' color */
-#define XTerm_Color_BD          18      /* change actual 'Bold' color */
-#define XTerm_Color_UL          19      /* change actual 'Underline' color */
-#define XTerm_logfile           46      /* not implemented */
-#define XTerm_font              50
-
-/*
- * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
- */
-#define XTerm_locale		 9	/* change locale */
-#define XTerm_Menu              10      /* set menu item */
-#define XTerm_Pixmap            20      /* new bg pixmap */
-#define XTerm_restoreFG         39      /* change default fg color */
-#define XTerm_restoreBG         49      /* change default bg color */
-#define XTerm_dumpscreen        55      /* dump scrollback and all of screen */
+enum {
+  XTerm_name             =  0,
+  XTerm_iconName         =  1,
+  XTerm_title            =  2,
+  XTerm_property         =  3,      /* change X property, not yet implemented */
+  XTerm_Color            =  4,      /* change colors */
+  XTerm_Color00          = 10,      /* not implemented, CLASH! */
+  XTerm_Color01          = 11,      /* not implemented */
+  XTerm_Color_cursor     = 12,      /* change actual 'Cursor' color */
+  XTerm_Color_pointer    = 13,      /* change actual 'Pointer' color */
+  XTerm_Color04          = 14,      /* not implemented */
+  XTerm_Color05          = 15,      /* not implemented */
+  XTerm_Color06          = 16,      /* not implemented */
+  XTerm_Color_RV         = 17,      /* change actual 'Highlight' color */
+  XTerm_logfile          = 46,      /* not implemented */
+  XTerm_font             = 50,
+
+  XTerm_konsole30        = 30,      /* reserved for konsole */
+  XTerm_konsole31        = 31,      /* reserved for konsole */
+  XTerm_emacs51          = 51,      /* reserved for emacs shell */
+  /*
+   * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
+   */
+  XTerm_locale		=  9,      /* change locale */
+  XTerm_Menu             = 10,     /* set menu item */
+  XTerm_Color_BD         = 18,     /* change actual 'Bold' color */
+  XTerm_Color_UL         = 19,     /* change actual 'Underline' color */
+  XTerm_Pixmap           = 20,     /* new bg pixmap */
+  XTerm_restoreFG        = 39,     /* change default fg color */
+  XTerm_restoreBG        = 49,     /* change default bg color */
+  XTerm_dumpscreen       = 55,     /* dump scrollback and all of screen */
+};
 
 /* Words starting with `Color_' are colours.  Others are counts */
 /*
@@ -1150,6 +1167,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 +1176,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 +1223,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 +1244,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