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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.215 by root, Mon Oct 8 15:36:13 2007 UTC vs.
Revision 1.234 by ayin, Fri Dec 28 14:57:04 2007 UTC

  * Copyright (c) 1996      Chuck Blake <cblake@BBN.COM>
  * Copyright (c) 1997      mj olesen <olesen@me.queensu.ca>
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * 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-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 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 <limits>
 #include <csignal>
+#include <fcntl.h>
+#ifdef HAVE_XSETLOCALE
+# define X_LOCALE
+# include <X11/Xlocale.h>
+#else
+# ifdef HAVE_SETLOCALE
+#  include <clocale>
+# endif
+#endif
+#ifdef HAVE_NL_LANGINFO
+# include <langinfo.h>
+#endif
 #ifdef DISPLAY_IS_IP
 /* On Solaris link with -lsocket and -lnsl */
 #include <sys/types.h>
 #include <sys/socket.h>
     "rgb:00/cd/00",             // 2: green             (Green3)
     "rgb:cd/cd/00",             // 3: yellow            (Yellow3)
     "rgb:00/00/cd",             // 4: blue              (Blue3)
     "rgb:cd/00/cd",             // 5: magenta           (Magenta3)
     "rgb:00/cd/cd",             // 6: cyan              (Cyan3)
 # ifdef XTERM_COLORS
     "rgb:e5/e5/e5",             // 7: white             (Grey90)
 # else
     "rgb:fa/eb/d7",             // 7: white             (AntiqueWhite)
 # endif
     /* high-intensity colors */
 # ifdef XTERM_COLORS
     "rgb:4d/4d/4d",             // 8: bright black      (Grey30)
     "rgb:e7/e7/e7",
 #ifndef NO_CURSORCOLOR
     COLOR_CURSOR_BACKGROUND,
     COLOR_CURSOR_FOREGROUND,
-#endif                          /* ! NO_CURSORCOLOR */
+#endif /* ! NO_CURSORCOLOR */
     NULL,                       /* Color_pointer_fg               */
     NULL,                       /* Color_pointer_bg               */
     NULL,                       /* Color_border                   */
 #ifndef NO_BOLD_UNDERLINE_REVERSE
     NULL,                       /* Color_BD                       */
     NULL,                       /* Color_IT                       */
     NULL,                       /* Color_UL                       */
     NULL,                       /* Color_RV                       */
-#endif                          /* ! NO_BOLD_UNDERLINE_REVERSE */
+#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
 #if ENABLE_FRILLS
     NULL,			// Color_underline
 #endif
 #ifdef OPTION_HC
     NULL,
 #endif
 #ifdef KEEP_SCROLLCOLOR
     COLOR_SCROLLBAR,
     COLOR_SCROLLTROUGH,
-#endif                          /* KEEP_SCROLLCOLOR */
+#endif /* KEEP_SCROLLCOLOR */
 #if ENABLE_TRANSPARENCY
     NULL,
 #endif
 #if OFF_FOCUS_FADING
     "rgb:00/00/00",
 #endif
   };
-bool
+void
 rxvt_term::init_vars ()
 {
-  pix_colors           = //
+  pix_colors = pix_colors_focused;
-  pix_colors_focused   = new rxvt_color [TOTAL_COLORS];
-#ifdef OFF_FOCUS_FADING
-  pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
-#endif
   MEvent.time = CurrentTime;
   MEvent.button = AnyButton;
   want_refresh = 1;
   priv_modes = SavedModes = PrivMode_Default;
   nrow = 24;
   int_bwidth = INTERNALBORDERWIDTH;
   ext_bwidth = EXTERNALBORDERWIDTH;
   lineSpace = LINESPACE;
   saveLines = SAVELINES;
-  numpix_colors = TOTAL_COLORS;
   refresh_type = SLOW_REFRESH;
   oldcursor.row = oldcursor.col = -1;
   last_bot = last_state = -1;
   set_option (Opt_secondaryScreen);
   set_option (Opt_secondaryScroll);
   set_option (Opt_pastableTabs);
   set_option (Opt_intensityStyles);
   set_option (Opt_iso14755_52);
-  return true;
 }
 void
 rxvt_term::init_secondary ()
 {
    */
   for (r_argc = 0; r_argc < argc; r_argc++)
     if (!strcmp (argv[r_argc], "-e"))
       break;
+  if (r_argc == argc)
+    cmd_argv = NULL;
+  else if (!argv[r_argc + 1])
+    rxvt_fatal ("option '-e' requires an argument, aborting.\n");
+  else
+    {
+      cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
+      for (i = 0; i < argc - r_argc - 1; i++)
+        cmd_argv[i] = (const char *)argv[i + r_argc + 1];
+      cmd_argv[i] = NULL;
+    }
   r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
   for (i = 0; i < r_argc; i++)
     r_argv[i] = (const char *)argv[i];
   r_argv[i] = NULL;
-  if (r_argc == argc)
-    cmd_argv = NULL;
-  else
-    {
-      cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
-      for (i = 0; i < argc - r_argc - 1; i++)
-        cmd_argv[i] = (const char *)argv[i + r_argc + 1];
-      cmd_argv[i] = NULL;
-    }
   rs[Rs_name] = rxvt_basename (argv[0]);
   /*
    * Open display, get options/resources and create the window
     rs[Rs_display_name] = ":0";
   get_options (r_argc, r_argv);
   if (!(display = displays.get (rs[Rs_display_name])))
+    {
+      free (r_argv);
-    rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+      rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+    }
   // using a local pointer decreases code size a lot
   xa = display->xa;
   set (display);
   if (rs[Rs_depth])
     select_visual (strtol (rs[Rs_depth], 0, 0));
 #endif
 #ifdef HAVE_AFTERIMAGE
+  set_application_name ((char*)rs[Rs_name]);
+  set_output_threshold (OUTPUT_LEVEL_WARNING);
   asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
 #endif
   free (r_argv);
   for (int i = NUM_RESOURCES; i--; )
   color_aliases (Color_fg);
   color_aliases (Color_bg);
 #ifndef NO_CURSORCOLOR
   color_aliases (Color_cursor);
   color_aliases (Color_cursor2);
-#endif                          /* NO_CURSORCOLOR */
+#endif /* NO_CURSORCOLOR */
   color_aliases (Color_pointer_fg);
   color_aliases (Color_pointer_bg);
   color_aliases (Color_border);
 #ifndef NO_BOLD_UNDERLINE_REVERSE
   color_aliases (Color_BD);
   color_aliases (Color_UL);
   color_aliases (Color_RV);
-#endif                          /* ! NO_BOLD_UNDERLINE_REVERSE */
+#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
   if (!rs[Rs_color + Color_border])
     rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
   return cmd_argv;
    */
   val = rxvt_network_display (rs[Rs_display_name]);
   rs[Rs_display_name] = (const char *)val;
   if (val == NULL)
-#endif                          /* DISPLAY_IS_IP */
+#endif /* DISPLAY_IS_IP */
     val = XDisplayString (dpy);
   if (rs[Rs_display_name] == NULL)
     rs[Rs_display_name] = val;   /* use broken `:0' value */
 #ifdef HAVE_UNSETENV
   /* avoid passing old settings and confusing term size */
   unsetenv ("LINES");
   unsetenv ("COLUMNS");
   unsetenv ("TERMCAP");        /* terminfo should be okay */
-#endif                          /* HAVE_UNSETENV */
+#endif /* HAVE_UNSETENV */
 }
 /*----------------------------------------------------------------------*/
 /*
  * This is more or less stolen straight from XFree86 xterm.
       this->locale = "C";
     }
-  this->locale = rxvt_strdup (this->locale);
+  this->locale = strdup (this->locale);
   SET_LOCALE (this->locale);
   mbstate.reset ();
 #endif
 #if HAVE_NL_LANGINFO
   int i;
 #ifdef OFF_FOCUS_FADING
   pix_colors = pix_colors_focused;
 #endif
   for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
     {
       const char *name = rs[Rs_color + i];
       if (!name)
                          min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
                          cscroll.a)
                        ))
         alias_color (Color_topShadow, Color_White);
     }
-#endif                          /* KEEP_SCROLLCOLOR */
+#endif /* KEEP_SCROLLCOLOR */
 #ifdef OFF_FOCUS_FADING
   for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
     update_fade_color (i);
 #endif
   if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
     {
       int i = atoi (rs[Rs_color + idx]);
       if (i >= 8 && i <= 15)
-        {        /* bright colors */
+        /* bright colors */
-          i -= 8;
-          rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
+        rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
-          return;
+      else if (i >= 0 && i <= 7)
-        }
+        /* normal colors */
-      if (i >= 0 && i <= 7)   /* normal colors */
         rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
     }
 }
 /*----------------------------------------------------------------------*/
 rxvt_get_ttymode (ttymode_t *tio, int erase)
 {
   /*
    * standard System V termios interface
    */
-  if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
+  if (tcgetattr (STDIN_FILENO, tio) < 0)
     {
       // return error - use system defaults,
       // where possible, and zero elsewhere
       memset (tio, 0, sizeof (ttymode_t));
   /*
    * Debugging
    */
 #ifdef DEBUG_TTYMODE
-#ifdef HAVE_TERMIOS_H
   /* c_iflag bits */
   fprintf (stderr, "Input flags\n");
   /* cpp token stringize doesn't work on all machines <sigh> */
 # define FOO(flag,name)                 \
   FOO (VLNEXT, "VLNEXT");
 # endif
   fprintf (stderr, "\n");
 # undef FOO
-# endif                         /* HAVE_TERMIOS_H */
+#endif /* DEBUG_TTYMODE */
-#endif                          /* DEBUG_TTYMODE */
 }
 /*----------------------------------------------------------------------*/
 /*
  * Run the command in a subprocess and return a file descriptor for the
   else
 #endif
     er = -1;
   rxvt_get_ttymode (&tio, er);
-  SET_TERMIOS (pty->tty, &tio);       /* init terminal attributes */
+  /* init terminal attributes */
+  cfsetospeed (&tio, BAUDRATE);
+  cfsetispeed (&tio, BAUDRATE);
+  tcsetattr (pty->tty, TCSANOW, &tio);
   pty->set_utf8_mode (enc_utf8);
   /* set initial window size */
   tt_winch ();
 rxvt_term::run_child (const char *const *argv)
 {
   char *login;
   if (option (Opt_console))
+    {
-    {     /* be virtual console, fail silently */
+      /* be virtual console, fail silently */
 #ifdef TIOCCONS
       unsigned int on = 1;
       ioctl (STDIN_FILENO, TIOCCONS, &on);
 #elif defined (SRIOCSREDIR)
       fd = open (CONSOLE, O_WRONLY, 0);
       if (fd >= 0)
         if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
           close (fd);
-#endif                          /* SRIOCSREDIR */
+#endif /* SRIOCSREDIR */
     }
   /* reset signals and spin off the command interpreter */
   signal (SIGINT,  SIG_DFL);
   signal (SIGQUIT, SIG_DFL);
    */
 #ifdef SIGTSTP
   signal (SIGTSTP, SIG_IGN);
   signal (SIGTTIN, SIG_IGN);
   signal (SIGTTOU, SIG_IGN);
-#endif                          /* SIGTSTP */
+#endif /* SIGTSTP */
   // unblock signals (signals are blocked by iom.C
   sigset_t ss;
   sigemptyset (&ss);
   sigprocmask (SIG_SETMASK, &ss, 0);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.215 by root, Mon Oct 8 15:36:13 2007 UTC vs. Revision 1.234 by ayin, Fri Dec 28 14:57:04 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.215 by root, Mon Oct 8 15:36:13 2007 UTC vs.
Revision 1.234 by ayin, Fri Dec 28 14:57:04 2007 UTC