ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.302 by sf-exg, Fri Dec 2 09:03:43 2011 UTC vs.
Revision 1.305 by sf-exg, Tue Dec 6 11:29:52 2011 UTC

… …
568/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
569const char ** 569const char **
570rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
571{ 571{
572 int i, r_argc; 572 int i, r_argc;
573 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
574 574
575 /* 575 /*
576 * Look for -e option. Find => split and make cmd_argv[] of command args 576 * Look for -e option. Find => split and make cmd_argv[] of command args
577 */ 577 */
578 for (r_argc = 0; r_argc < argc; r_argc++) 578 for (r_argc = 0; r_argc < argc; r_argc++)
… …
591 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
592 592
593 cmd_argv[i] = NULL; 593 cmd_argv[i] = NULL;
594 } 594 }
595 595
596 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
597
598 for (i = 0; i < r_argc; i++)
599 r_argv[i] = (const char *)argv[i];
600
601 r_argv[i] = NULL;
602
603 rs[Rs_name] = rxvt_basename (argv[0]); 596 rs[Rs_name] = rxvt_basename (argv[0]);
604 597
605 /* 598 /*
606 * Open display, get options/resources and create the window 599 * Open display, get options/resources and create the window
607 */ 600 */
608 601
609 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
610 rs[Rs_display_name] = ":0"; 603 rs[Rs_display_name] = ":0";
611 604
612 get_options (r_argc, r_argv); 605 get_options (r_argc, argv);
613 606
614 if (!(display = displays.get (rs[Rs_display_name]))) 607 if (!(display = displays.get (rs[Rs_display_name])))
615 {
616 free (r_argv);
617 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 608 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
618 }
619 609
620 // using a local pointer decreases code size a lot 610 // using a local pointer decreases code size a lot
621 xa = display->xa; 611 xa = display->xa;
622 612
623 set (display); 613 set (display);
… …
625 615
626#if XFT 616#if XFT
627 if (rs[Rs_depth]) 617 if (rs[Rs_depth])
628 select_visual (strtol (rs[Rs_depth], 0, 0)); 618 select_visual (strtol (rs[Rs_depth], 0, 0));
629#endif 619#endif
630
631 free (r_argv);
632 620
633 for (int i = NUM_RESOURCES; i--; ) 621 for (int i = NUM_RESOURCES; i--; )
634 if (rs [i] == resval_undef) 622 if (rs [i] == resval_undef)
635 rs [i] = 0; 623 rs [i] = 0;
636 624
… …
766 return cmd_argv; 754 return cmd_argv;
767} 755}
768 756
769/*----------------------------------------------------------------------*/ 757/*----------------------------------------------------------------------*/
770void 758void
771rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 759rxvt_term::init (int argc, const char *const *argv)
772{ 760{
773 this->envv = envv;
774
775 SET_R (this); 761 SET_R (this);
776 set_locale (""); 762 set_locale ("");
777 set_environ (envv); // a few things in X do not call setlocale :( 763 set_environ (envv); // a few things in X do not call setlocale :(
778 764
779 init_vars (); 765 init_vars ();

Diff Legend

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