--- rxvt-unicode/src/init.C	2005/12/23 14:46:34	1.127
+++ rxvt-unicode/src/init.C	2006/01/04 20:43:38	1.131
@@ -46,7 +46,6 @@
     COLOR_BACKGROUND,
     /* low-intensity colors */
     "Black",                    /* 0: black             (#000000) */
-#ifndef NO_BRIGHTCOLOR
     "Red3",                     /* 1: red               (#CD0000) */
     "Green3",                   /* 2: green             (#00CD00) */
     "Yellow3",                  /* 3: yellow            (#CDCD00) */
@@ -64,7 +63,6 @@
 # else
     "Grey25",                   /* 8: bright black      (#404040) */
 # endif
-#endif                          /* NO_BRIGHTCOLOR */
     "Red",                      /* 1/9: bright red      (#FF0000) */
     "Green",                    /* 2/10: bright green   (#00FF00) */
     "Yellow",                   /* 3/11: bright yellow  (#FFFF00) */
@@ -395,7 +393,7 @@
 
   /* no point having a scrollbar without having any scrollback! */
   if (!saveLines)
-    options &= ~Opt_scrollBar;
+    CLR_OPTION (Opt_scrollBar);
 
 #ifdef PRINTPIPE
   if (!rs[Rs_print_pipe])
@@ -448,7 +446,7 @@
 
 #ifdef XTERM_REVERSE_VIDEO
   /* this is how xterm implements reverseVideo */
-  if (options & Opt_reverseVideo)
+  if (OPTION (Opt_reverseVideo))
     {
       if (!rs[Rs_color + Color_fg])
         rs[Rs_color + Color_fg] = def_colorName[Color_bg];
@@ -463,7 +461,7 @@
 
 #ifndef XTERM_REVERSE_VIDEO
   /* this is how we implement reverseVideo */
-  if (options & Opt_reverseVideo)
+  if (OPTION (Opt_reverseVideo))
     ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
 #endif
 
@@ -650,16 +648,16 @@
    */
 
 #ifdef META8_OPTION
-  meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
+  meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
 #endif
 
   get_ourmods ();
 
-  if (!(options & Opt_scrollTtyOutput))
+  if (!OPTION (Opt_scrollTtyOutput))
     priv_modes |= PrivMode_TtyOutputInh;
-  if (options & Opt_scrollTtyKeypress)
+  if (OPTION (Opt_scrollTtyKeypress))
     priv_modes |= PrivMode_Keypress;
-  if (!(options & Opt_jumpScroll))
+  if (!OPTION (Opt_jumpScroll))
     priv_modes |= PrivMode_smoothScroll;
 
 #ifndef NO_BACKSPACE_KEY
@@ -680,11 +678,6 @@
       SavedModes |= PrivMode_menuBar;
     }
 
-#ifdef CURSOR_BLINK
-  if (options & Opt_cursorBlink)
-    (void)gettimeofday (&lastcursorchange, NULL);
-#endif
-
   run_command (argv);
 }
 
@@ -708,7 +701,7 @@
       if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
         {
 #ifndef XTERM_REVERSE_VIDEO
-          if (i < 2 && (options & Opt_reverseVideo))
+          if (i < 2 && OPTION (Opt_reverseVideo))
             rs[Rs_color + i] = def_colorName[!i];
           else
 #endif
@@ -815,10 +808,8 @@
       if (i >= 8 && i <= 15)
         {        /* bright colors */
           i -= 8;
-#ifndef NO_BRIGHTCOLOR
           rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
           return;
-#endif
         }
 
       if (i >= 0 && i <= 7)   /* normal colors */
@@ -941,14 +932,14 @@
   assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
   XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
 
-  if (options & Opt_transparent)
+  if (OPTION (Opt_transparent))
     {
       XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
       display->depth = gattr.depth; // doh //TODO, per-term not per-display?
     }
 
 #if ENABLE_FRILLS
-  if (options & Opt_borderLess)
+  if (OPTION (Opt_borderLess))
     {
       prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
 
@@ -1028,7 +1019,7 @@
 
   wmHint.flags = InputHint | StateHint | WindowGroupHint;
   wmHint.input = True;
-  wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
+  wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
   wmHint.window_group = top;
 
   XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
@@ -1081,8 +1072,8 @@
   vt = XCreateSimpleWindow (disp, top,
                                     window_vt_x,
                                     window_vt_y,
-                                    TermWin_TotalWidth (),
-                                    TermWin_TotalHeight (),
+                                    width,
+                                    height,
                                     0,
                                     pix_colors_focused[Color_fg],
                                     pix_colors_focused[Color_bg]);
@@ -1096,7 +1087,7 @@
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
 
 #ifdef POINTER_BLANK
-  if (options & Opt_pointerBlank)
+  if (OPTION (Opt_pointerBlank))
     vt_emask |= PointerMotionMask;
   else
 #endif
@@ -1110,7 +1101,7 @@
     {
       menuBar.win = XCreateSimpleWindow (disp, top,
                                          window_vt_x, 0,
-                                         TermWin_TotalWidth (),
+                                         width,
                                          menuBar_TotalHeight (),
                                          0,
                                          pix_colors_focused[Color_fg],
@@ -1133,7 +1124,7 @@
 
 #ifdef XPM_BACKGROUND
   if (rs[Rs_backgroundPixmap] != NULL
-      && ! (options & Opt_transparent))
+      && ! OPTION (Opt_transparent))
     {
       const char *p = rs[Rs_backgroundPixmap];
 
@@ -1528,7 +1519,7 @@
 
   SET_TTYMODE (STDIN_FILENO, &tio);       /* init terminal attributes */
 
-  if (options & Opt_console)
+  if (OPTION (Opt_console))
     {     /* be virtual console, fail silently */
 #ifdef TIOCCONS
       unsigned int on = 1;
@@ -1588,7 +1579,7 @@
 
       argv0 = (const char *)rxvt_r_basename (shell);
 
-      if (options & Opt_loginShell)
+      if (OPTION (Opt_loginShell))
         {
           login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
 
@@ -1633,7 +1624,7 @@
 
       arg_a[0] = my_basename (command);
 
-      if (options & Opt_loginShell)
+      if (OPTION (Opt_loginShell))
         {
           login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));