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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.249 by ayin, Tue Feb 19 10:47:03 2008 UTC vs.
Revision 1.256 by root, Wed Nov 5 12:28:15 2008 UTC

 #if XFT
   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--; )
     if (rs [i] == resval_undef)
       rs [i] = 0;
+#ifdef HAVE_AFTERIMAGE
+  set_application_name ((char *)rs[Rs_name]);
+  set_output_threshold (OUTPUT_LEVEL_WARNING);
+#endif
 #if ENABLE_PERL
   if (!rs[Rs_perl_ext_1])
     rs[Rs_perl_ext_1] = "default";
    */
   if (cmd_argv && cmd_argv[0])
     {
       if (!rs[Rs_title])
         rs[Rs_title] = rxvt_basename (cmd_argv[0]);
       if (!rs[Rs_iconName])
         rs[Rs_iconName] = rs[Rs_title];
     }
   else
     {
       if (!rs[Rs_title])
         rs[Rs_title] = rs[Rs_name];
       if (!rs[Rs_iconName])
         rs[Rs_iconName] = rs[Rs_name];
     }
   if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
 #endif
   /* no point having a scrollbar without having any scrollback! */
   if (!saveLines)
     set_option (Opt_scrollBar, 0);
-#ifdef PRINTPIPE
-  if (!rs[Rs_print_pipe])
-    rs[Rs_print_pipe] = PRINTPIPE;
-#endif
   if (!rs[Rs_cutchars])
     rs[Rs_cutchars] = CUTCHARS;
 #ifndef NO_BACKSPACE_KEY
 {
   this->envv = envv;
   SET_R (this);
   set_locale ("");
-  set_environ (envv); // few things in X do not call setlocale :(
+  set_environ (envv); // a few things in X do not call setlocale :(
   init_vars ();
   init_secondary ();
 #ifdef KEYSYM_RESOURCE
   keyboard->register_done ();
 #endif
+  if (const char *path = rs[Rs_chdir])
+    if (*path) // ignored if empty
+      {
+        if (*path != '/')
+          rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
+        if (chdir (path))
+          rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
+      }
   if (option (Opt_scrollBar))
     scrollBar.state = STATE_IDLE;    /* set existence for size calculations */
   pty = ptytty::create ();
   create_windows (argc, argv);
   init_xlocale ();
-  scr_reset (); // initialize screen
+  scr_poweron (); // initialize screen
 #if 0
   XSynchronize (dpy, True);
 #endif
   run_command (argv);
 }
 /*----------------------------------------------------------------------*/
 void
-rxvt_term::Get_Colours ()
+rxvt_term::get_colours ()
 {
   int i;
 #ifdef OFF_FOCUS_FADING
   pix_colors = pix_colors_focused;
   Window top, parent;
   dLocal (Display *, dpy);
   /* grab colors before netscape does */
-  Get_Colours ();
+  get_colours ();
   if (!set_fonts ())
     rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
   parent = display->root;
   wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
   wmHint.window_group  = top;
   XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
                       &szHint, &wmHint, &classHint);
+#if ENABLE_EWMH
+# ifdef HAVE_AFTERIMAGE
+  /*
+   * set up icon hint
+   * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
+   */
+  if (rs [Rs_iconfile])
+    {
+      init_asv ();
+      ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
+      if (asv && im)
+        {
+          int w = im->width;
+          int h = im->height;
+          long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
+          ASImage *result = scale_asimage (asv, im,
+                                           w, h, ASA_ARGB32,
+                                           100, ASIMAGE_QUALITY_DEFAULT);
+          destroy_asimage (&im);
+          if (buffer && result)
+            {
+              ARGB32 *asbuf = result->alt.argb32;
+              buffer [0] = w;
+              buffer [1] = h;
+              for (unsigned int i = 0; i < w * h; ++i)
+                buffer [i + 2] = asbuf [i];
+              destroy_asimage (&result);
+              XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
+                               PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
+              free (buffer);
+            }
+          else
+            {
+              if (!buffer)
+                rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
+              if (!result)
+                rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
+            }
+        }
+      else
+        rxvt_warn ("Loading image icon failed, continuing without.\n");
+    }
+# endif
+#endif
 #if ENABLE_FRILLS
   if (mwmhints.flags)
     XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
                      PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
   signal (SIGTSTP, SIG_IGN);
   signal (SIGTTIN, SIG_IGN);
   signal (SIGTTOU, SIG_IGN);
 #endif /* SIGTSTP */
-  // unblock signals (signals are blocked by iom.C
-  sigset_t ss;
-  sigemptyset (&ss);
-  sigprocmask (SIG_SETMASK, &ss, 0);
   /* command interpreter path */
   if (argv)
     {
 # ifdef DEBUG_CMD
       int             i;

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.249 by ayin, Tue Feb 19 10:47:03 2008 UTC vs. Revision 1.256 by root, Wed Nov 5 12:28:15 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.249 by ayin, Tue Feb 19 10:47:03 2008 UTC vs.
Revision 1.256 by root, Wed Nov 5 12:28:15 2008 UTC