| … | |
… | |
| 344 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
344 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
| 345 | rs[Rs_display_name] = ":0"; |
345 | rs[Rs_display_name] = ":0"; |
| 346 | |
346 | |
| 347 | get_options (r_argc, r_argv); |
347 | get_options (r_argc, r_argv); |
| 348 | |
348 | |
| 349 | #ifdef LOCAL_X_IS_UNIX |
|
|
| 350 | if (rs[Rs_display_name][0] == ':') |
|
|
| 351 | { |
|
|
| 352 | val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); |
|
|
| 353 | strcpy (val, "unix"); |
|
|
| 354 | strcat (val, rs[Rs_display_name]); |
|
|
| 355 | display = displays.get (val); |
|
|
| 356 | free (val); |
|
|
| 357 | } |
|
|
| 358 | #endif |
|
|
| 359 | |
|
|
| 360 | if (!display |
|
|
| 361 | && ! (display = displays.get (rs[Rs_display_name]))) |
349 | if (!(display = displays.get (rs[Rs_display_name]))) |
| 362 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
350 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
| 363 | |
351 | |
| 364 | extract_resources (); |
352 | extract_resources (); |
| 365 | free (r_argv); |
353 | free (r_argv); |
| 366 | |
354 | |
