--- rxvt-unicode/src/rxvt.h	2004/12/13 19:16:36	1.131
+++ rxvt-unicode/src/rxvt.h	2005/02/04 11:41:23	1.145
@@ -12,7 +12,7 @@
 #include <X11/keysymdef.h>
 #include <X11/Xatom.h>
 #if ENABLE_FRILLS
-#include <X11/Xmd.h>
+# include <X11/Xmd.h>
 #endif
 
 #include "encoding.h"
@@ -502,6 +502,9 @@
   Color_UL,
   Color_RV,
 #endif
+#if ENABLE_FRILLS
+  Color_underline,
+#endif
 #ifdef OPTION_HC
   Color_HC,
 #endif
@@ -562,8 +565,9 @@
   Rs_scrollBar_right,
   Rs_scrollBar_floating,
   Rs_scrollBar_align,
-#endif
   Rs_scrollstyle,     /* Rs_scrollBar_style */
+  Rs_scrollBar_thickness,
+#endif
   Rs_scrollTtyOutput,
   Rs_scrollTtyKeypress,
   Rs_scrollWithBuffer,
@@ -602,8 +606,7 @@
   Rs_int_bwidth,
   Rs_borderLess,
 #endif
-  Rs_scrollBar_thickness,
-#ifndef NO_LINESPACE
+#if ENABLE_FRILLS
   Rs_lineSpace,
 #endif
   Rs_cutchars,
@@ -615,6 +618,7 @@
   Rs_pointerBlank,
   Rs_pointerBlankDelay,
   Rs_imLocale,
+  Rs_imFont,
   Rs_pastableTabs,
 #ifndef NO_SECONDARY_SCREEN
   Rs_secondaryScreen,
@@ -640,15 +644,24 @@
   XA_VT_SELECTION,
   XA_INCR,
   XA_WMDELETEWINDOW,
-#ifdef TRANSPARENT
-  XA_XROOTPMAPID,
-  XA_XSETROOTID,
+  XA_CLIPBOARD,
+#if ENABLE_FRILLS
+  XA_NET_WM_PID,
+  XA_MOTIF_WM_HINTS,
+  XA_NET_WM_NAME,
+  XA_NET_WM_ICON_NAME,
+#endif
+#if USE_XIM
+  XA_WM_LOCALE_NAME,
+#endif
+#if TRANSPARENT
+  XA_XROOTPMAP_ID,
+  XA_ESETROOT_PMAP_ID,
 #endif
-#ifdef OFFIX_DND                /* OffiX Dnd (drag 'n' drop) support */
+#if OFFIX_DND                /* OffiX Dnd (drag 'n' drop) support */
   XA_DNDPROTOCOL,
   XA_DNDSELECTION,
-#endif                          /* OFFIX_DND */
-  XA_CLIPBOARD,
+#endif
   NUM_XA
 };
 
@@ -748,6 +761,8 @@
 #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 */
 #define Pixel2Col(x)            Pixel2Width((int32_t)(x))
 #define Pixel2Row(y)            Pixel2Height((int32_t)(y))
@@ -855,13 +870,6 @@
 # define XPMClearArea(a, b, c, d, e, f, g)
 #endif
 
-#ifndef STRICT_FONT_CHECKING
-# define rxvt_get_fontwidest(font)      ((font)->max_bounds.width)
-#endif
-
-#define rxvt_Gr_ButtonPress(x,y)        rxvt_Gr_ButtonReport (R, 'P',(x),(y))
-#define rxvt_Gr_ButtonRelease(x,y)      rxvt_Gr_ButtonReport (R, 'R',(x),(y))
-
 #ifdef UTMP_SUPPORT
 # if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
 #  undef HAVE_UTMPX_H
@@ -944,6 +952,8 @@
   mbstate () { reset (); }
 };
 
+#define UNICODE_MASK 0x1fffffUL
+
 #if UNICODE3
 # define COMPOSE_LO 0x40000000UL
 # define COMPOSE_HI 0x400fffffUL
@@ -982,6 +992,10 @@
 #endif
 
 
+#ifdef KEYSYM_RESOURCE
+  class keyboard_manager;
+#endif
+
 struct rxvt_term : zero_initialized, rxvt_vars {
   log_callback *log_hook;               // log error messages through this hook, if != 0
 
@@ -1008,7 +1022,7 @@
 #ifdef POINTER_BLANK
                   hidden_pointer:1,
 #endif
-//                  enc_utf8:1,		/* wether locale uses utf-8 */
+                  enc_utf8:1,		/* wether locale uses utf-8 */
                   seen_input:1,         /* wether we have seen some program output yet */
                   seen_resize:1,	/* wether we had a resize event */
                   parsed_geometry:1;
@@ -1064,7 +1078,8 @@
 # endif
                   allowedxerror;
 /* ---------- */
-  unsigned int    ModMetaMask,
+  unsigned int    ModLevel3Mask,
+                  ModMetaMask,
                   ModNumLockMask;
   int             old_width,  /* last used width in screen resize          */
                   old_height; /* last used height in screen resize         */
@@ -1108,9 +1123,6 @@
   size_t          incr_buf_size, incr_buf_fill;
 /* ---------- */
   Cursor          leftptr_cursor;
-#ifdef POINTER_BLANK
-  Cursor          blank_cursor;
-#endif
 /* ---------- */
 #ifndef NO_BACKSPACE_KEY
   const char     *key_backspace;
@@ -1178,9 +1190,11 @@
   unsigned 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 */
+
 #ifdef KEYSYM_RESOURCE
-  const unsigned char *Keysym_map[256];
+  keyboard_manager *keyboard;
 #endif
+
   const char     *rs[NUM_RESOURCES];
   /* command input buffering */
   unsigned char  *cmdbuf_ptr, *cmdbuf_endp;
@@ -1213,7 +1227,7 @@
 #endif
 
 
-  void sig_term (sig_watcher &w); sig_watcher sw_term;
+  void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
   void sig_chld (sig_watcher &w); sig_watcher sw_chld;
 
   void x_cb (XEvent &xev);
@@ -1266,6 +1280,7 @@
   rxvt_term ();
   ~rxvt_term ();
   void destroy ();
+  void emergency_cleanup ();
 
   bool init (int argc, const char *const *argv);
   bool init_vars ();
@@ -1499,7 +1514,7 @@
   void get_options (int argc, const char *const *argv);
   int parse_keysym (const char *str, const char *arg);
   void get_xdefaults (FILE *stream, const char *name);
-  void extract_resources (Display *display, const char *name);
+  void extract_resources ();
   // xpm.C
   int scale_pixmap (const char *geom);
   void resize_pixmap ();