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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.121 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.129 by root, Mon Jan 2 22:23:26 2006 UTC

 #include "../config.h"          /* NECESSARY */
 #include "rxvt.h"               /* NECESSARY */
 #include "rxvtutil.h"
 #include "init.h"
+#include <limits>
 #include <csignal>
 const char *const def_colorName[] =
   {
   if (pix_colors == NULL)
     return false;
 #if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
-  TermWin.pixmap = None;
+  pixmap = None;
 #endif
   MEvent.time = CurrentTime;
   MEvent.button = AnyButton;
   options = DEFAULT_OPTIONS;
   want_refresh = 1;
   priv_modes = SavedModes = PrivMode_Default;
-  TermWin.focus = 0;
+  focus = 0;
-  TermWin.ncol = 80;
+  ncol = 80;
-  TermWin.nrow = 24;
+  nrow = 24;
-  TermWin.int_bwidth = INTERNALBORDERWIDTH;
+  int_bwidth = INTERNALBORDERWIDTH;
-  TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
+  ext_bwidth = EXTERNALBORDERWIDTH;
-  TermWin.lineSpace = LINESPACE;
+  lineSpace = LINESPACE;
-  TermWin.saveLines = SAVELINES;
+  saveLines = SAVELINES;
   numpix_colors = TOTAL_COLORS;
   refresh_limit = 1;
   refresh_type = SLOW_REFRESH;
   prev_nrow = prev_ncol = 0;
       if (!rs[Rs_iconName])
         rs[Rs_iconName] = rs[Rs_name];
     }
   if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
-    TermWin.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)
-    TermWin.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)
-    TermWin.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)
-    TermWin.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;
   else
     pointerBlankDelay = 2;
 #endif
   /* no point having a scrollbar without having any scrollback! */
-  if (!TermWin.saveLines)
+  if (!saveLines)
-    options &= ~Opt_scrollBar;
+    CLR_OPTION (Opt_scrollBar);
 #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);
   env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
   sprintf (env_display, "DISPLAY=%s", val);
   /* avoiding the math library:
-   * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
+   * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
-  for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
+  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)TermWin.parent[0]);
+           (unsigned int)parent[0]);
   /* add entries to the environment:
    * @ DISPLAY:   in case we started with -display
    * @ WINDOWID:  X window id number of the window
    * @ COLORTERM: terminal sub-name and also indicates its color
    * 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;
       priv_modes |= PrivMode_menuBar;
       SavedModes |= PrivMode_menuBar;
     }
 #ifdef CURSOR_BLINK
-  if (options & Opt_cursorBlink)
+  if (OPTION (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];
 #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)
         {
       if (!XGetWindowAttributes (disp, parent, &wattr))
         rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
       window_calc (wattr.width, wattr.height);
     }
 #endif
   window_calc (0, 0);
   /* sub-window placement & size in rxvt_resize_subwindows () */
 #ifdef PREFER_24BIT
   attributes.background_pixel = pix_colors_focused[Color_border];
   attributes.border_pixel = pix_colors_focused[Color_border];
   attributes.colormap = display->cmap;
   top = XCreateWindow (disp, parent,
                        szHint.x, szHint.y,
                        szHint.width, szHint.height,
-                       TermWin.ext_bwidth,
+                       ext_bwidth,
                        display->depth, InputOutput,
                        display->visual,
                        CWColormap | CWBackPixel | CWBorderPixel, &attributes);
 #else
   top = XCreateSimpleWindow (disp, parent,
                              szHint.x, szHint.y,
                              szHint.width, szHint.height,
-                             TermWin.ext_bwidth,
+                             ext_bwidth,
                              pix_colors_focused[Color_border],
                              pix_colors_focused[Color_border]);
 #endif
-  TermWin.parent[0] = top;
+  this->parent[0] = top;
   old_width = szHint.width;
   old_height = szHint.height;
   process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
   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);
   /* cursor (menuBar/scrollBar): Black-on-White */
   leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
 #endif
   /* the vt window */
-  TermWin.vt = XCreateSimpleWindow (disp, top,
+  vt = XCreateSimpleWindow (disp, top,
                                     window_vt_x,
                                     window_vt_y,
                                     TermWin_TotalWidth (),
                                     TermWin_TotalHeight (),
                                     0,
                                     pix_colors_focused[Color_fg],
                                     pix_colors_focused[Color_bg]);
 #ifdef DEBUG_X
-  XStoreName (disp, TermWin.vt, "vt window");
+  XStoreName (disp, vt, "vt window");
 #endif
   attributes.bit_gravity = NorthWestGravity;
-  XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
+  XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
 #ifdef POINTER_BLANK
-  if (options & Opt_pointerBlank)
+  if (OPTION (Opt_pointerBlank))
     vt_emask |= PointerMotionMask;
   else
 #endif
     vt_emask |= Button1MotionMask | Button3MotionMask;
-  XSelectInput (disp, TermWin.vt, vt_emask);
+  XSelectInput (disp, vt, vt_emask);
-  vt_ev.start (display, TermWin.vt);
+  vt_ev.start (display, vt);
 #if defined(MENUBAR) && (MENUBAR_MAX > 1)
   if (menuBar_height ())
     {
       menuBar.win = XCreateSimpleWindow (disp, top,
     }
 #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)
         {
   /* graphics context for the vt window */
   gcvalue.foreground = pix_colors[Color_fg];
   gcvalue.background = pix_colors[Color_bg];
   gcvalue.graphics_exposures = 1;
-  TermWin.gc = XCreateGC (disp, TermWin.vt,
+  gc = XCreateGC (disp, vt,
                           GCForeground | GCBackground | GCGraphicsExposures,
                           &gcvalue);
-  TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
+  drawable = new rxvt_drawable (display, vt);
 #if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
   gcvalue.foreground = pix_colors[Color_topShadow];
-  topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
+  topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
   gcvalue.foreground = pix_colors[Color_bottomShadow];
-  botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
+  botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
   gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
-  scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
+  scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
 #endif
 #ifdef OFF_FOCUS_FADING
   // initially we are in unfocused state
   if (rs[Rs_fade])
   /*
    * 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 (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);
       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);
       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.121 by root, Wed Nov 30 21:05:39 2005 UTC vs. Revision 1.129 by root, Mon Jan 2 22:23:26 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.121 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.129 by root, Mon Jan 2 22:23:26 2006 UTC