| … | |
… | |
| 610 | rs[Rs_display_name] = ":0"; |
610 | rs[Rs_display_name] = ":0"; |
| 611 | |
611 | |
| 612 | get_options (r_argc, r_argv); |
612 | get_options (r_argc, r_argv); |
| 613 | |
613 | |
| 614 | if (!(display = displays.get (rs[Rs_display_name]))) |
614 | 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]); |
615 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
| 618 | } |
|
|
| 619 | |
616 | |
| 620 | // using a local pointer decreases code size a lot |
617 | // using a local pointer decreases code size a lot |
| 621 | xa = display->xa; |
618 | xa = display->xa; |
| 622 | |
619 | |
| 623 | set (display); |
620 | set (display); |
| … | |
… | |
| 644 | { |
641 | { |
| 645 | rxvt_perl.init (this); |
642 | rxvt_perl.init (this); |
| 646 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
643 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
| 647 | } |
644 | } |
| 648 | #endif |
645 | #endif |
|
|
646 | |
|
|
647 | // must be called after initialising the perl interpreter as it |
|
|
648 | // may invoke the `on_register_command' hook |
|
|
649 | extract_keysym_resources (); |
| 649 | |
650 | |
| 650 | /* |
651 | /* |
| 651 | * set any defaults not already set |
652 | * set any defaults not already set |
| 652 | */ |
653 | */ |
| 653 | if (cmd_argv && cmd_argv[0]) |
654 | if (cmd_argv && cmd_argv[0]) |
