[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.122 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.142 by root, Fri Jan 13 04:59:04 2006 UTC

  *                              - extensive modifications
  * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
  *                              - 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
 #include "../config.h"          /* NECESSARY */
 #include "rxvt.h"               /* NECESSARY */
 #include "rxvtutil.h"
 #include "init.h"
+#include <limits>
 #include <csignal>
 const char *const def_colorName[] =
   {
     COLOR_FOREGROUND,
     COLOR_BACKGROUND,
     /* low-intensity colors */
     "Black",                    /* 0: black             (#000000) */
-#ifndef NO_BRIGHTCOLOR
     "Red3",                     /* 1: red               (#CD0000) */
     "Green3",                   /* 2: green             (#00CD00) */
     "Yellow3",                  /* 3: yellow            (#CDCD00) */
     "Blue3",                    /* 4: blue              (#0000CD) */
     "Magenta3",                 /* 5: magenta           (#CD00CD) */
 # ifdef XTERM_COLORS
     "Grey30",                   /* 8: bright black      (#4D4D4D) */
 # 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) */
     "Blue",                     /* 4/12: bright blue    (#0000FF) */
     "Magenta",                  /* 5/13: bright magenta (#FF00FF) */
   rs[Rs_name] = rxvt_r_basename (argv[0]);
   /*
    * Open display, get options/resources and create the window
    */
   if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
     rs[Rs_display_name] = ":0";
   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]);
   extract_resources ();
   free (r_argv);
   /*
    * set any defaults not already set
    */
       if (!rs[Rs_iconName])
         rs[Rs_iconName] = rs[Rs_name];
     }
   if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
-    saveLines = BOUND_POSITIVE_INT16 (i);
+    saveLines = min (i, MAX_SAVELINES);
 #if ENABLE_FRILLS
   if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
-    int_bwidth = min (i, 100);    /* arbitrary limit */
+    int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
   if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
-    ext_bwidth = min (i, 100);    /* arbitrary limit */
+    ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
   if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
-    lineSpace = min (i, 100);     /* arbitrary limit */
+    lineSpace = min (i, std::numeric_limits<int16_t>::max ());
 #endif
 #ifdef POINTER_BLANK
   if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
     pointerBlankDelay = i;
     pointerBlankDelay = 2;
 #endif
   /* no point having a scrollbar without having any scrollback! */
   if (!saveLines)
-    options &= ~Opt_scrollBar;
+    set_option (Opt_scrollBar, 0);
 #ifdef PRINTPIPE
   if (!rs[Rs_print_pipe])
     rs[Rs_print_pipe] = PRINTPIPE;
 #endif
   setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
 #endif
 #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];
       if (!rs[Rs_color + Color_bg])
         rs[Rs_color + Color_bg] = def_colorName[Color_fg];
     if (!rs[Rs_color + i])
       rs[Rs_color + i] = def_colorName[i];
 #ifndef XTERM_REVERSE_VIDEO
   /* this is how we implement reverseVideo */
-  if (options & Opt_reverseVideo)
+  if (OPTION (Opt_reverseVideo))
-    SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
+    ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
 #endif
   /* convenient aliases for setting fg/bg to colors */
   color_aliases (Color_fg);
   color_aliases (Color_bg);
   /* avoiding the math library:
    * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
   for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
     ;
-  MAX_IT (i, 1);
+  max_it (i, 1);
   env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
   sprintf (env_windowid, "WINDOWID=%u",
            (unsigned int)parent[0]);
  * This should support all European type languages.
  */
 void
 rxvt_term::set_locale (const char *locale)
 {
+  set_environ (envv);
 #if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
   this->locale = setlocale (LC_CTYPE, locale);
   if (!this->locale)
     {
       if (*locale)
         {
-          rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
+          rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
-          setlocale (LC_CTYPE, "");
+          setlocale (LC_CTYPE, "C");
         }
       else
         rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
-      this->locale = "";
+      this->locale = "C";
     }
   this->locale = rxvt_strdup (this->locale);
   SET_LOCALE (this->locale);
 }
 void
 rxvt_term::init_xlocale ()
 {
+  set_environ (envv);
 #ifdef USE_XIM
   if (!locale)
     rxvt_warn ("setting locale failed, working without locale support.\n");
   else
     {
    * Initialize the command connection.
    * This should be called after the X server connection is established.
    */
 #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
   if (strcmp (key_backspace, "DEC") == 0)
     priv_modes |= PrivMode_HaveBackSpace;
   if (menubar_visible ())
     {
       priv_modes |= PrivMode_menuBar;
       SavedModes |= PrivMode_menuBar;
     }
-#ifdef CURSOR_BLINK
-  if (options & Opt_cursorBlink)
-    (void)gettimeofday (&lastcursorchange, NULL);
-#endif
   run_command (argv);
 }
 /*----------------------------------------------------------------------*/
         continue;
       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
             rs[Rs_color + i] = def_colorName[i];
       int i = atoi (rs[Rs_color + idx]);
       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 */
         rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
     }
 #if ENABLE_FRILLS
   Atom prop = None;
   MWMHints mwmhints;
 #endif
   XGCValues gcvalue;
-  long vt_emask;
   XSetWindowAttributes attributes;
   XWindowAttributes gattr;
   Window top, parent;
   dDisp;
 #endif
   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);
       if (prop == None)
         {
   classHint.res_name = (char *)rs[Rs_name];
   classHint.res_class = (char *)RESCLASS;
   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,
                       &szHint, &wmHint, &classHint);
 #endif
   };
   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 ();
   XChangeProperty (disp, top,
                    xa[XA_NET_WM_PID], XA_CARDINAL, 32,
   /* the vt window */
   vt = XCreateSimpleWindow (disp, top,
                                     window_vt_x,
                                     window_vt_y,
-                                    TermWin_TotalWidth (),
+                                    width,
-                                    TermWin_TotalHeight (),
+                                    height,
                                     0,
                                     pix_colors_focused[Color_fg],
                                     pix_colors_focused[Color_bg]);
 #ifdef DEBUG_X
   XStoreName (disp, vt, "vt window");
   attributes.bit_gravity = NorthWestGravity;
   XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
-#ifdef POINTER_BLANK
+  if (OPTION (Opt_pointerBlank))
-  if (options & Opt_pointerBlank)
     vt_emask |= PointerMotionMask;
   else
-#endif
     vt_emask |= Button1MotionMask | Button3MotionMask;
-  XSelectInput (disp, vt, vt_emask);
+  vt_select_input ();
   vt_ev.start (display, vt);
 #if defined(MENUBAR) && (MENUBAR_MAX > 1)
   if (menuBar_height ())
     {
       menuBar.win = XCreateSimpleWindow (disp, top,
                                          window_vt_x, 0,
-                                         TermWin_TotalWidth (),
+                                         width,
                                          menuBar_TotalHeight (),
                                          0,
                                          pix_colors_focused[Color_fg],
                                          pix_colors_focused[Color_scroll]);
     }
 #endif
 #ifdef XPM_BACKGROUND
   if (rs[Rs_backgroundPixmap] != NULL
-      && ! (options & Opt_transparent))
+      && ! OPTION (Opt_transparent))
     {
       const char *p = rs[Rs_backgroundPixmap];
       if ((p = strchr (p, ';')) != NULL)
         {
   /*
    * standard System V termios interface
    */
   if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
     {
-      /* return error - use system defaults */
+      // return error - use system defaults,
+      // where possible, and zero elsewhere
+      memset (tio, 0, sizeof (ttymode_t));
       tio->c_cc[VINTR] = CINTR;
       tio->c_cc[VQUIT] = CQUIT;
       tio->c_cc[VERASE] = CERASE;
+#ifdef VERASE2
+      tio->c_cc[VERASE2] = CERASE2;
+#endif
       tio->c_cc[VKILL] = CKILL;
       tio->c_cc[VSTART] = CSTART;
       tio->c_cc[VSTOP] = CSTOP;
       tio->c_cc[VSUSP] = CSUSP;
 # ifdef VDSUSP
 {
 #if ENABLE_FRILLS
   if (rs[Rs_pty_fd])
     {
       pty.pty = atoi (rs[Rs_pty_fd]);
+      if (pty.pty >= 0)
+        {
+          if (getfd_hook)
+            pty.pty = (*getfd_hook) (pty.pty);
-      fcntl (pty.pty, F_SETFL, O_NONBLOCK);
+          if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
+            rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
+        }
     }
   else
 #endif
     if (!pty.get ())
       rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
 {
   char *login;
   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;
       ioctl (STDIN_FILENO, TIOCCONS, &on);
       execvp (argv[0], (char *const *)argv);
       /* no error message: STDERR is closed! */
     }
   else
     {
-      const char     *argv0, *shell;
+      const char *argv0, *shell;
       if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
         shell = "/bin/sh";
       argv0 = (const char *)rxvt_r_basename (shell);
-      if (options & Opt_loginShell)
+      if (OPTION (Opt_loginShell))
         {
           login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
           login[0] = '-';
           strcpy (&login[1], argv0);
           argv0 = login;
         }
       execlp (shell, argv0, NULL);
       /* no error message: STDERR is closed! */
     }
 #else                           /* __QNX__ uses qnxspawn () */
       if ((command = getenv ("SHELL")) == NULL || *command == '\0')
         command = "/bin/sh";
       arg_a[0] = my_basename (command);
-      if (options & Opt_loginShell)
+      if (OPTION (Opt_loginShell))
         {
           login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
           login[0] = '-';
           strcpy (&login[1], arg_a[0]);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.122 by root, Sun Dec 18 00:59:42 2005 UTC vs. Revision 1.142 by root, Fri Jan 13 04:59:04 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.122 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.142 by root, Fri Jan 13 04:59:04 2006 UTC