| … | |
… | |
| 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 | |
| … | |
… | |
| 772 | * from the fvwm window manager. |
760 | * from the fvwm window manager. |
| 773 | */ |
761 | */ |
| 774 | #ifdef KEEP_SCROLLCOLOR |
762 | #ifdef KEEP_SCROLLCOLOR |
| 775 | |
763 | |
| 776 | if (display->depth <= 2) |
764 | if (display->depth <= 2) |
|
|
765 | { |
| 777 | { /* Monochrome */ |
766 | /* Monochrome */ |
| 778 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
767 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
| 779 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
768 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
| 780 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
769 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
| 781 | } |
770 | } |
| 782 | else |
771 | else |
