… | |
… | |
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++) |
… | |
… | |
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 | 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]); |
616 | |
609 | |
617 | // using a local pointer decreases code size a lot |
610 | // using a local pointer decreases code size a lot |
… | |
… | |
622 | |
615 | |
623 | #if XFT |
616 | #if XFT |
624 | if (rs[Rs_depth]) |
617 | if (rs[Rs_depth]) |
625 | select_visual (strtol (rs[Rs_depth], 0, 0)); |
618 | select_visual (strtol (rs[Rs_depth], 0, 0)); |
626 | #endif |
619 | #endif |
627 | |
|
|
628 | free (r_argv); |
|
|
629 | |
620 | |
630 | for (int i = NUM_RESOURCES; i--; ) |
621 | for (int i = NUM_RESOURCES; i--; ) |
631 | if (rs [i] == resval_undef) |
622 | if (rs [i] == resval_undef) |
632 | rs [i] = 0; |
623 | rs [i] = 0; |
633 | |
624 | |