--- rxvt-unicode/src/rxvt.h	2004/03/06 00:05:01	1.51
+++ rxvt-unicode/src/rxvt.h	2004/03/15 00:08:11	1.54
@@ -10,6 +10,7 @@
 #include <X11/keysymdef.h>
 #include <X11/Xatom.h>
 
+#include "encoding.h"
 #include "defaultfont.h"
 #include "rxvtcolor.h"
 #include "iom.h"
@@ -137,10 +138,6 @@
  *****************************************************************************
  */
 
-#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION)
-# error if you disable both selection styles, how can you select, silly?
-#endif
-
 /* COLORTERM, TERM environment variables */
 #define COLORTERMENV    "rxvt"
 #ifdef XPM_BACKGROUND
@@ -523,10 +520,6 @@
   Rs_preeditType,
   Rs_inputMethod,
 #endif
-#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
-  Rs_bigfont_key,
-  Rs_smallfont_key,
-#endif
 #ifdef TRANSPARENT
   Rs_transparent,
   Rs_transparent_all,
@@ -540,9 +533,6 @@
   Rs_lineSpace,
 #endif
   Rs_cutchars,
-#ifdef ACS_ASCII
-  Rs_acs_chars,
-#endif
   Rs_modifier,
   Rs_answerbackstring,
   Rs_tripleclickwords,
@@ -604,14 +594,12 @@
     if (test)                           \
         PrivateModes |= (bit);          \
     else                                \
-        PrivateModes &= ~ (bit)
+        PrivateModes &= ~(bit)
 
 #ifdef ALLOW_132_MODE
-# define PrivMode_Default                                                \
-(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
+# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
 #else
-# define PrivMode_Default                                                \
-(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
+# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
 #endif
 
 #define XDEPTH                 display->depth
@@ -842,13 +830,13 @@
 # define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)
 #endif
 
-#if ENCODING_COMPOSE
+#if ENABLE_COMBINING
 // compose chars are used to represent composite characters
 // that are not representable in unicode, as well as characters
 // not fitting in the BMP.
 struct compose_char {
-  uint32_t c1, c2; // any chars != NOCHAR are valid
-  compose_char (uint32_t c1, uint32_t c2)
+  unicode_t c1, c2; // any chars != NOCHAR are valid
+  compose_char (unicode_t c1, unicode_t c2)
   : c1(c1), c2(c2)
   { }
 };
@@ -856,8 +844,8 @@
 class rxvt_composite_vec {
   vector<compose_char> v;
 public:
-  text_t compose (uint32_t c1, uint32_t c2 = NOCHAR);
-  int expand (uint32_t c, wchar_t *r);
+  text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
+  int expand (unicode_t c, wchar_t *r);
   compose_char *operator [](text_t c)
   {
     return c >= COMPOSE_LO && c < COMPOSE_LO + v.size ()
@@ -1024,9 +1012,6 @@
 #ifndef NO_DELETE_KEY
   const char     *key_delete;
 #endif
-#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
-  KeySym          ks_bigfont, ks_smallfont;
-#endif
 #ifdef USE_XIM
   rxvt_xim       *input_method;
   XIC             Input_Context;
@@ -1081,7 +1066,6 @@
   char            charsets[4];
   unsigned char  *v_buffer;   /* pointer to physical buffer */
   unsigned int    v_buflen;   /* size of area to write */
-  char           *newfont[MAX_NFONTS];
   stringvec      *argv, *envv;       /* if != 0, will be freed on destroy time */
 #ifdef KEYSYM_RESOURCE
   const unsigned char *Keysym_map[256];
@@ -1143,7 +1127,7 @@
   bool init (int argc, const char *const *argv);
   bool init_vars ();
 
-  uint32_t next_char ();
+  unicode_t next_char ();
 
   bool pty_fill ();
 
@@ -1208,7 +1192,7 @@
   // command.C
   void lookup_key (XKeyEvent &ev);
   unsigned int cmd_write (const unsigned char *str, unsigned int count);
-  uint32_t cmd_getc ();
+  unicode_t cmd_getc ();
   bool cmd_parse ();
   void mouse_report (XButtonEvent &ev);
   void button_press (XButtonEvent &ev);
@@ -1290,7 +1274,7 @@
   int scr_change_screen (int scrn);
   void scr_color (unsigned int color, int fgbg);
   void scr_rendition (int set, int style);
-  void scr_add_lines (const uint32_t *str, int nlines, int len);
+  void scr_add_lines (const unicode_t *str, int nlines, int len);
   void scr_backspace ();
   void scr_tab (int count);
   void scr_backindex ();