… | |
… | |
568 | /*----------------------------------------------------------------------*/ |
568 | /*----------------------------------------------------------------------*/ |
569 | const char ** |
569 | const char ** |
570 | rxvt_term::init_resources (int argc, const char *const *argv) |
570 | rxvt_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++) |
… | |
… | |
582 | if (r_argc == argc) |
582 | if (r_argc == argc) |
583 | cmd_argv = NULL; |
583 | cmd_argv = NULL; |
584 | else if (!argv[r_argc + 1]) |
584 | else if (!argv[r_argc + 1]) |
585 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
585 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
586 | else |
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]; |
587 | cmd_argv = (const char **)argv + r_argc + 1; |
592 | |
|
|
593 | cmd_argv[i] = NULL; |
|
|
594 | } |
|
|
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 | |
588 | |
603 | rs[Rs_name] = rxvt_basename (argv[0]); |
589 | rs[Rs_name] = rxvt_basename (argv[0]); |
604 | |
590 | |
605 | /* |
591 | /* |
606 | * Open display, get options/resources and create the window |
592 | * Open display, get options/resources and create the window |
607 | */ |
593 | */ |
608 | |
594 | |
609 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
595 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
610 | rs[Rs_display_name] = ":0"; |
596 | rs[Rs_display_name] = ":0"; |
611 | |
597 | |
612 | get_options (r_argc, r_argv); |
598 | get_options (r_argc, argv); |
613 | |
599 | |
614 | if (!(display = displays.get (rs[Rs_display_name]))) |
600 | 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]); |
601 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
618 | } |
|
|
619 | |
602 | |
620 | // using a local pointer decreases code size a lot |
603 | // using a local pointer decreases code size a lot |
621 | xa = display->xa; |
604 | xa = display->xa; |
622 | |
605 | |
623 | set (display); |
606 | set (display); |
… | |
… | |
625 | |
608 | |
626 | #if XFT |
609 | #if XFT |
627 | if (rs[Rs_depth]) |
610 | if (rs[Rs_depth]) |
628 | select_visual (strtol (rs[Rs_depth], 0, 0)); |
611 | select_visual (strtol (rs[Rs_depth], 0, 0)); |
629 | #endif |
612 | #endif |
630 | |
|
|
631 | free (r_argv); |
|
|
632 | |
613 | |
633 | for (int i = NUM_RESOURCES; i--; ) |
614 | for (int i = NUM_RESOURCES; i--; ) |
634 | if (rs [i] == resval_undef) |
615 | if (rs [i] == resval_undef) |
635 | rs [i] = 0; |
616 | rs [i] = 0; |
636 | |
617 | |
… | |
… | |
766 | return cmd_argv; |
747 | return cmd_argv; |
767 | } |
748 | } |
768 | |
749 | |
769 | /*----------------------------------------------------------------------*/ |
750 | /*----------------------------------------------------------------------*/ |
770 | void |
751 | void |
771 | rxvt_term::init (int argc, const char *const *argv, stringvec *envv) |
752 | rxvt_term::init (int argc, const char *const *argv) |
772 | { |
753 | { |
773 | this->envv = envv; |
|
|
774 | |
|
|
775 | SET_R (this); |
754 | SET_R (this); |
776 | set_locale (""); |
755 | set_locale (""); |
777 | set_environ (envv); // a few things in X do not call setlocale :( |
756 | set_environ (envv); // a few things in X do not call setlocale :( |
778 | |
757 | |
779 | init_vars (); |
758 | init_vars (); |
… | |
… | |
861 | #endif |
840 | #endif |
862 | |
841 | |
863 | set_colorfgbg (); |
842 | set_colorfgbg (); |
864 | |
843 | |
865 | init_command (cmd_argv); |
844 | init_command (cmd_argv); |
866 | |
|
|
867 | free (cmd_argv); |
|
|
868 | |
845 | |
869 | if (pty->pty >= 0) |
846 | if (pty->pty >= 0) |
870 | pty_ev.start (pty->pty, ev::READ); |
847 | pty_ev.start (pty->pty, ev::READ); |
871 | |
848 | |
872 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
849 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |