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.304 by sf-exg, Tue Dec 6 10:27:15 2011 UTC vs.
Revision 1.308 by sf-exg, Sun Dec 18 02:14:59 2011 UTC

… …
567 567
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;
573 const char **cmd_argv; 573 const char **cmd_argv;
574
575 /*
576 * Look for -e option. Find => split and make cmd_argv[] of command args
577 */
578 for (r_argc = 0; r_argc < argc; r_argc++)
579 if (!strcmp (argv[r_argc], "-e"))
580 break;
581
582 if (r_argc == argc)
583 cmd_argv = NULL;
584 else if (!argv[r_argc + 1])
585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
586 else
587 {
588 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
589
590 for (i = 0; i < argc - r_argc - 1; i++)
591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
592
593 cmd_argv[i] = NULL;
594 }
595 574
596 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
597 576
598 /* 577 /*
599 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
600 */ 579 */
601 580
602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
603 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
604 583
605 get_options (r_argc, argv); 584 cmd_argv = get_options (argc, argv);
606 585
607 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
608 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
609 588
610 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
… …
754 return cmd_argv; 733 return cmd_argv;
755} 734}
756 735
757/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
758void 737void
759rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
760{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
761 this->envv = envv; 744 this->envv = envv;
762 745
746 init2 (argv->size () - 1, argv->begin ());
747}
748
749void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
751{
752#if ENABLE_PERL
753 // perl might want to access the stringvecs later, so we need to copy them
754 stringvec *args = new stringvec;
755 for (int i = 0; i < argc; i++)
756 args->push_back (strdup (argv [i]));
757
758 stringvec *envs = new stringvec;
759 for (const char *const *var = envv; *var; var++)
760 envs->push_back (strdup (*var));
761
762 init (args, envs);
763#else
764 init2 (argc, argv);
765#endif
766}
767
768void
769rxvt_term::init2 (int argc, const char *const *argv)
770{
763 SET_R (this); 771 SET_R (this);
764 set_locale (""); 772 set_locale ("");
765 set_environ (envv); // a few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
766 774
767 init_vars (); 775 init_vars ();
… …
833 } 841 }
834#endif 842#endif
835 843
836#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
838 {
839 if (bg_set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
840 if (!bg_window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
841 update_background (); 848 update_background ();
842 }
843#endif 849#endif
844 } 850 }
845#endif 851#endif
846 852
847#if ENABLE_PERL 853#if ENABLE_PERL
… …
849#endif 855#endif
850 856
851 set_colorfgbg (); 857 set_colorfgbg ();
852 858
853 init_command (cmd_argv); 859 init_command (cmd_argv);
854
855 free (cmd_argv);
856 860
857 if (pty->pty >= 0) 861 if (pty->pty >= 0)
858 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
859 863
860 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
971 unsetenv ("TERMCAP"); /* terminfo should be okay */ 975 unsetenv ("TERMCAP"); /* terminfo should be okay */
972#endif /* HAVE_UNSETENV */ 976#endif /* HAVE_UNSETENV */
973} 977}
974 978
975/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
976/*
977 * This is more or less stolen straight from XFree86 xterm.
978 * This should support all European type languages.
979 */
980void 980void
981rxvt_term::set_locale (const char *locale) 981rxvt_term::set_locale (const char *locale)
982{ 982{
983 set_environ (envv); 983 set_environ (envv);
984 984
… …
1004 SET_LOCALE (this->locale); 1004 SET_LOCALE (this->locale);
1005 mbstate.reset (); 1005 mbstate.reset ();
1006#endif 1006#endif
1007 1007
1008#if HAVE_NL_LANGINFO 1008#if HAVE_NL_LANGINFO
1009 char *codeset = strdup (nl_langinfo (CODESET)); 1009 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 1010 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1012 && (codeset[1] == 'T' || codeset[1] == 't') 1012 && (codeset[1] == 'T' || codeset[1] == 't')
1013 && (codeset[2] == 'F' || codeset[2] == 'f') 1013 && (codeset[2] == 'F' || codeset[2] == 'f')
1014 && (codeset[3] == '8' || codeset[4] == '8'); 1014 && (codeset[3] == '8' || codeset[4] == '8');
1015 free (codeset);
1016#else 1015#else
1017 enc_utf8 = 0; 1016 enc_utf8 = 0;
1018#endif 1017#endif
1019} 1018}
1020 1019
… …
1023{ 1022{
1024 set_environ (envv); 1023 set_environ (envv);
1025 1024
1026#ifdef USE_XIM 1025#ifdef USE_XIM
1027 if (!locale) 1026 if (!locale)
1028 rxvt_warn ("setting locale failed, working without locale support.\n"); 1027 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1029 else 1028 else
1030 { 1029 {
1031 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1030 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1032 1031
1033 if (!XSupportsLocale ()) 1032 if (!XSupportsLocale ())
1034 { 1033 {
1035 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1034 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1036 return; 1035 return;
1037 } 1036 }
1038 1037
1039 im_ev.start (display); 1038 im_ev.start (display);
1040 1039

Diff Legend

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