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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.177 by root, Sat Jan 20 00:45:30 2007 UTC vs.
Revision 1.199 by sasha, Fri Aug 3 22:40:10 2007 UTC

     COLOR_BACKGROUND,
     /* low-intensity colors */
     "rgb:00/00/00",             // 0: black             (Black)
     "rgb:cd/00/00",             // 1: red               (Red3)
     "rgb:00/cd/00",             // 2: green             (Green3)
-    "rgb:cd/cd/00",             // 3: ywlloe            (Yellow3)
+    "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)
   pix_colors_focused   = new rxvt_color [TOTAL_COLORS];
 #ifdef OFF_FOCUS_FADING
   pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
 #endif
-#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
-  pixmap = None;
-#endif
   MEvent.time = CurrentTime;
   MEvent.button = AnyButton;
-  options = DEFAULT_OPTIONS;
   want_refresh = 1;
   priv_modes = SavedModes = PrivMode_Default;
   ncol = 80;
   nrow = 24;
   int_bwidth = INTERNALBORDERWIDTH;
   ext_bwidth = EXTERNALBORDERWIDTH;
   lineSpace = LINESPACE;
   saveLines = SAVELINES;
   numpix_colors = TOTAL_COLORS;
-  refresh_limit = 1;
   refresh_type = SLOW_REFRESH;
   oldcursor.row = oldcursor.col = -1;
-#ifdef XPM_BACKGROUND
+#ifdef HAVE_BG_PIXMAP
+#ifdef HAVE_AFTERIMAGE
+  bgPixmap.original_asim = NULL;
+#endif
   /*  bgPixmap.w = bgPixmap.h = 0; */
-  bgPixmap.x = bgPixmap.y = 50;
+  bgPixmap.h_scale = bgPixmap.v_scale = 0;
+  bgPixmap.h_align = bgPixmap.v_align = 0;
+  bgPixmap.flags = 0;
   bgPixmap.pixmap = None;
 #endif
   last_bot = last_state = -1;
+  set_option (Opt_scrollBar);
+  set_option (Opt_scrollTtyOutput);
+  set_option (Opt_jumpScroll);
+  set_option (Opt_skipScroll);
+  set_option (Opt_secondaryScreen);
+  set_option (Opt_secondaryScroll);
+  set_option (Opt_pastableTabs);
+  set_option (Opt_intensityStyles);
+  set_option (Opt_iso14755_52);
   return true;
 }
 void
 #if XFT
   if (rs[Rs_depth])
     select_visual (strtol (rs[Rs_depth], 0, 0));
 #endif
+#ifdef HAVE_AFTERIMAGE
+  asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
+#endif
   free (r_argv);
   for (int i = NUM_RESOURCES; i--; )
     if (rs [i] == resval_undef)
       rs [i] = 0;
   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 (OPTION (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])
     if (!rs[Rs_color + i])
       rs[Rs_color + i] = def_colorName[i];
 #ifndef XTERM_REVERSE_VIDEO
   /* this is how we implement reverseVideo */
-  if (OPTION (Opt_reverseVideo))
+  if (option (Opt_reverseVideo))
     ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
 #endif
   /* convenient aliases for setting fg/bg to colors */
   color_aliases (Color_fg);
    * Initialize the command connection.
    * This should be called after the X server connection is established.
    */
 #ifdef META8_OPTION
-  meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
+  meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
 #endif
   get_ourmods ();
-  if (!OPTION (Opt_scrollTtyOutput))
+  if (!option (Opt_scrollTtyOutput))
     priv_modes |= PrivMode_TtyOutputInh;
-  if (OPTION (Opt_scrollTtyKeypress))
+  if (option (Opt_scrollTtyKeypress))
     priv_modes |= PrivMode_Keypress;
-  if (!OPTION (Opt_jumpScroll))
+  if (!option (Opt_jumpScroll))
     priv_modes |= PrivMode_smoothScroll;
 #ifndef NO_BACKSPACE_KEY
   if (strcmp (key_backspace, "DEC") == 0)
     priv_modes |= PrivMode_HaveBackSpace;
       rxvt_color xcol;
       if (!set_color (xcol, name))
         {
 #ifndef XTERM_REVERSE_VIDEO
-          if (i < 2 && OPTION (Opt_reverseVideo))
+          if (i < 2 && option (Opt_reverseVideo))
             name = def_colorName [1 - i];
           else
 #endif
             name = def_colorName [i];
 rxvt_term::create_windows (int argc, const char *const *argv)
 {
   XClassHint classHint;
   XWMHints wmHint;
 #if ENABLE_FRILLS
-  MWMHints mwmhints;
+  MWMHints mwmhints = { };
 #endif
   XGCValues gcvalue;
   XSetWindowAttributes attributes;
   Window top, parent;
   if (!set_fonts ())
     rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
   parent = display->root;
-  attributes.override_redirect = !!OPTION (Opt_override_redirect);
+  attributes.override_redirect = !!option (Opt_override_redirect);
 #if ENABLE_FRILLS
-  if (OPTION (Opt_borderLess))
+  if (option (Opt_borderLess))
     {
       if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
         {
           /*     print_warning("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");*/
           attributes.override_redirect = true;
   classHint.res_name  = (char *)rs[Rs_name];
   classHint.res_class = (char *)RESCLASS;
   wmHint.flags         = InputHint | StateHint | WindowGroupHint;
   wmHint.input         = True;
-  wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
+  wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
   wmHint.window_group  = top;
   XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
                       &szHint, &wmHint, &classHint);
   attributes.bit_gravity = NorthWestGravity;
   XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
-  if (OPTION (Opt_pointerBlank))
+  if (option (Opt_pointerBlank))
     vt_emask |= PointerMotionMask;
   else
     vt_emask |= Button1MotionMask | Button3MotionMask;
   vt_select_input ();
   vt_ev.start (display, vt);
 #ifdef XPM_BACKGROUND
-  if (rs[Rs_backgroundPixmap] != NULL
+  if (rs[Rs_backgroundPixmap] != NULL)
-      && !OPTION (Opt_transparent))
     {
       const char *p = rs[Rs_backgroundPixmap];
       if ((p = strchr (p, ';')) != NULL)
         {
           p++;
-          scale_pixmap (p);
+          bgPixmap.handle_geometry (p);
         }
       set_bgPixmap (rs[Rs_backgroundPixmap]);
       scr_touch (true);
     }
   else
 #endif
     er = -1;
   rxvt_get_ttymode (&tio, er);
+  SET_TERMIOS (pty->tty, &tio);       /* init terminal attributes */
   pty->set_utf8_mode (enc_utf8);
-  SET_TTYMODE (pty->tty, &tio);       /* init terminal attributes */
   /* set initial window size */
   tt_winch ();
 #if ENABLE_FRILLS
           }
         _exit (EXIT_FAILURE);
       default:
-        if (!OPTION (Opt_utmpInhibit))
+        if (!option (Opt_utmpInhibit))
-          pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
+          pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
         pty->close_tty ();
         child_ev.start (cmd_pid);
 int
 rxvt_term::run_child (const char *const *argv)
 {
   char *login;
-  if (OPTION (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 (OPTION (Opt_loginShell))
+      if (option (Opt_loginShell))
         {
           login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
           login[0] = '-';
           strcpy (&login[1], argv0);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.177 by root, Sat Jan 20 00:45:30 2007 UTC vs. Revision 1.199 by sasha, Fri Aug 3 22:40:10 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.177 by root, Sat Jan 20 00:45:30 2007 UTC vs.
Revision 1.199 by sasha, Fri Aug 3 22:40:10 2007 UTC