--- rxvt-unicode/src/init.C	2005/12/31 17:16:17	1.128
+++ rxvt-unicode/src/init.C	2006/01/11 02:24:12	1.138
@@ -11,7 +11,7 @@
  *                              - extensive modifications
  * Copyright (c) 1999      D J Hawkey Jr <hawkeyd@visi.com>
  *                              - QNX support
- * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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) */
@@ -343,13 +341,17 @@
   /*
    * Open display, get options/resources and create the window
    */
-  if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
-    rs[Rs_display_name] = ":0";
+  {
+    TEMP_ENV;
+
+    if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
+      rs[Rs_display_name] = ":0";
 
-  get_options (r_argc, r_argv);
+    get_options (r_argc, r_argv);
 
-  if (!(display = displays.get (rs[Rs_display_name])))
-    rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+    if (!(display = displays.get (rs[Rs_display_name])))
+      rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+  }
 
   extract_resources ();
   free (r_argv);
@@ -395,7 +397,7 @@
 
   /* no point having a scrollbar without having any scrollback! */
   if (!saveLines)
-    CLR_OPTION (Opt_scrollBar);
+    set_option (Opt_scrollBar, 0);
 
 #ifdef PRINTPIPE
   if (!rs[Rs_print_pipe])
@@ -580,6 +582,8 @@
 void
 rxvt_term::set_locale (const char *locale)
 {
+  TEMP_ENV;
+
 #if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
   this->locale = setlocale (LC_CTYPE, locale);
@@ -588,13 +592,13 @@
     {
       if (*locale)
         {
-          rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
-          setlocale (LC_CTYPE, "");
+          rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
+          setlocale (LC_CTYPE, "C");
         }
       else
         rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
 
-      this->locale = "";
+      this->locale = "C";
     }
 
 
@@ -619,6 +623,8 @@
 void
 rxvt_term::init_xlocale ()
 {
+  TEMP_ENV;
+
 #ifdef USE_XIM
   if (!locale)
     rxvt_warn ("setting locale failed, working without locale support.\n");
@@ -650,7 +656,7 @@
    */
 
 #ifdef META8_OPTION
-  meta_char = OPTION ((Opt_meta8) ? 0x80 : C0_ESC);
+  meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
 #endif
 
   get_ourmods ();
@@ -680,11 +686,6 @@
       SavedModes |= PrivMode_menuBar;
     }
 
-#ifdef CURSOR_BLINK
-  if (OPTION (Opt_cursorBlink))
-    (void)gettimeofday (&lastcursorchange, NULL);
-#endif
-
   run_command (argv);
 }
 
@@ -815,10 +816,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 +1042,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 +1085,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 +1099,13 @@
 
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
 
-#ifdef POINTER_BLANK
-  if (OPTION (Opt_pointerBlank))
+  if (OPTION (Opt_pointerBlank)
+#ifdef ENABLE_PERL
+      || perl.self
+#endif
+      )
     vt_emask |= PointerMotionMask;
   else
-#endif
     vt_emask |= Button1MotionMask | Button3MotionMask;
 
   XSelectInput (disp, vt, vt_emask);
@@ -1110,7 +1116,7 @@
     {
       menuBar.win = XCreateSimpleWindow (disp, top,
                                          window_vt_x, 0,
-                                         TermWin_TotalWidth (),
+                                         width,
                                          menuBar_TotalHeight (),
                                          0,
                                          pix_colors_focused[Color_fg],
@@ -1408,16 +1414,21 @@
 void
 rxvt_term::run_command (const char *const *argv)
 {
+  TEMP_ENV; // not very temporary...
+
 #if ENABLE_FRILLS
   if (rs[Rs_pty_fd])
     {
       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
@@ -1581,7 +1592,7 @@
     }
   else
     {
-      const char     *argv0, *shell;
+      const char *argv0, *shell;
 
       if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
         shell = "/bin/sh";
@@ -1596,6 +1607,7 @@
           strcpy (&login[1], argv0);
           argv0 = login;
         }
+
       execlp (shell, argv0, NULL);
       /* no error message: STDERR is closed! */
     }