--- rxvt-unicode/src/rxvt.h	2007/11/22 15:07:10	1.322
+++ rxvt-unicode/src/rxvt.h	2007/12/12 09:33:48	1.329
@@ -20,6 +20,7 @@
 # define ENABLE_XIM_ONTHESPOT 1
 # define CURSOR_BLINK         1
 # define OPTION_HC            1
+# define BUILTIN_GLYPHS       1
 #else
 # define ENABLE_MINIMAL 1
 #endif
@@ -30,9 +31,6 @@
 #include <X11/keysym.h>
 #include <X11/keysymdef.h>
 #include <X11/Xatom.h>
-#if ENABLE_FRILLS
-# include <X11/Xmd.h>
-#endif
 
 #include "encoding.h"
 #include "rxvtutil.h"
@@ -171,16 +169,6 @@
   unsigned int button;   /* detail */
 };
 
-#if ENABLE_FRILLS
-typedef struct _mwmhints {
-  CARD32 flags;
-  CARD32 functions;
-  CARD32 decorations;
-  INT32  input_mode;
-  CARD32 status;
-} MWMHints;
-#endif
-
 #if ENABLE_XEMBED
 // XEMBED messages
 # define XEMBED_EMBEDDED_NOTIFY          0
@@ -594,8 +582,6 @@
 #define PrivMode_LFNL		(1UL<<19)
 #define PrivMode_MouseBtnEvent  (1UL<<20)
 #define PrivMode_MouseAnyEvent  (1UL<<21)
-/* too annoying to implement X11 highlight tracking */
-/* #define PrivMode_MouseX11Track       (1LU<<20) */
 
 #define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
 
@@ -615,6 +601,17 @@
 # define PATH_MAX 16384
 #endif
 
+#if ENABLE_FRILLS
+# include <X11/Xmd.h>
+typedef struct _mwmhints {
+  CARD32 flags;
+  CARD32 functions;
+  CARD32 decorations;
+  INT32  input_mode;
+  CARD32 status;
+} MWMHints;
+#endif
+
 /* Motif window hints */
 #define MWM_HINTS_FUNCTIONS     (1L << 0)
 #define MWM_HINTS_DECORATIONS   (1L << 1)
@@ -1054,7 +1051,7 @@
 #ifdef HAVE_BG_PIXMAP
   int update_background ();
 #if TRACE_PIXMAPS
-  int trace_update_background (const char* file, int line);
+  int trace_update_background (const char *file, int line);
 # define update_background() trace_update_background (__FILE__, __LINE__)
 #endif
   void update_background_cb (ev::timer &w, int revents);
@@ -1176,7 +1173,7 @@
   void process_sgr_mode (unsigned int nargs, const int *arg);
   void process_graphics ();
   // init.C
-  bool init_vars ();
+  void init_vars ();
   void init_secondary ();
   const char **init_resources (int argc, const char *const *argv);
   void init_env ();
@@ -1272,11 +1269,19 @@
 
   bool option (uint8_t opt) const NOTHROW
   {
+    if (!opt)
+      return 0;
+
+    --opt;
     return options[opt >> 3] & (1 << (opt & 7));
   }
 
   void set_option (uint8_t opt, bool set = true) NOTHROW
   {
+    if (!opt)
+      return;
+
+    --opt;
     if (set)
       options[opt >> 3] |= (1 << (opt & 7));
     else