--- rxvt-unicode/src/init.C	2006/01/02 22:23:26	1.129
+++ rxvt-unicode/src/init.C	2006/01/06 05:28:55	1.133
@@ -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) */
@@ -680,11 +678,6 @@
       SavedModes |= PrivMode_menuBar;
     }
 
-#ifdef CURSOR_BLINK
-  if (OPTION (Opt_cursorBlink))
-    (void)gettimeofday (&lastcursorchange, NULL);
-#endif
-
   run_command (argv);
 }
 
@@ -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 */
@@ -1043,6 +1034,11 @@
 
   XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
 
+#if ENABLE_FRILLS
+  if (rs[Rs_transient_for])
+    XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
+#endif
+
 #if ENABLE_EWMH
   long pid = getpid ();
 
@@ -1081,8 +1077,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]);
@@ -1095,11 +1091,13 @@
 
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
 
-#ifdef POINTER_BLANK
-  if (OPTION (Opt_pointerBlank))
+  if (OPTION (Opt_pointerBlank)
+#ifdef ENABLE_PERL
+      || self
+#endif
+      )
     vt_emask |= PointerMotionMask;
   else
-#endif
     vt_emask |= Button1MotionMask | Button3MotionMask;
 
   XSelectInput (disp, vt, vt_emask);
@@ -1110,7 +1108,7 @@
     {
       menuBar.win = XCreateSimpleWindow (disp, top,
                                          window_vt_x, 0,
-                                         TermWin_TotalWidth (),
+                                         width,
                                          menuBar_TotalHeight (),
                                          0,
                                          pix_colors_focused[Color_fg],
@@ -1413,11 +1411,14 @@
     {
       pty.pty = atoi (rs[Rs_pty_fd]);
 
-      if (getfd_hook)
-        pty.pty = (*getfd_hook) (pty.pty);
+      if (pty.pty >= 0)
+        {
+          if (getfd_hook)
+            pty.pty = (*getfd_hook) (pty.pty);
 
-      if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
-        rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
+          if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
+            rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
+        }
     }
   else
 #endif