| … | |
… | |
| 169 | COLOR_SCROLLTROUGH, |
169 | COLOR_SCROLLTROUGH, |
| 170 | #endif /* KEEP_SCROLLCOLOR */ |
170 | #endif /* KEEP_SCROLLCOLOR */ |
| 171 | #if TINTING |
171 | #if TINTING |
| 172 | NULL, |
172 | NULL, |
| 173 | #endif |
173 | #endif |
|
|
174 | #if OFF_FOCUS_FADING |
|
|
175 | "black", |
|
|
176 | #endif |
| 174 | }; |
177 | }; |
| 175 | |
178 | |
| 176 | const char *const xa_names[] = |
179 | const char *const xa_names[] = |
| 177 | { |
180 | { |
| 178 | "TEXT", |
181 | "TEXT", |
| … | |
… | |
| 344 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
347 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
| 345 | rs[Rs_display_name] = ":0"; |
348 | rs[Rs_display_name] = ":0"; |
| 346 | |
349 | |
| 347 | get_options (r_argc, r_argv); |
350 | get_options (r_argc, r_argv); |
| 348 | |
351 | |
| 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]))) |
352 | if (!(display = displays.get (rs[Rs_display_name]))) |
| 362 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
353 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
| 363 | |
354 | |
| 364 | extract_resources (); |
355 | extract_resources (); |
| 365 | free (r_argv); |
356 | free (r_argv); |
| 366 | |
357 | |
| … | |
… | |
| 749 | } |
740 | } |
| 750 | } |
741 | } |
| 751 | } |
742 | } |
| 752 | |
743 | |
| 753 | pix_colors[i] = xcol; |
744 | pix_colors[i] = xcol; |
|
|
745 | SET_PIXCOLOR (i); |
|
|
746 | } |
|
|
747 | |
| 754 | #ifdef OFF_FOCUS_FADING |
748 | #ifdef OFF_FOCUS_FADING |
| 755 | if (rs[Rs_fade]) |
749 | if (rs[Rs_fade]) |
|
|
750 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
| 756 | pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); |
751 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
| 757 | #endif |
752 | #endif |
| 758 | SET_PIXCOLOR (i); |
|
|
| 759 | } |
|
|
| 760 | |
753 | |
| 761 | if (display->depth <= 2) |
754 | if (display->depth <= 2) |
| 762 | { |
755 | { |
| 763 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
756 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
| 764 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
757 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
| … | |
… | |
| 772 | * from the fvwm window manager. |
765 | * from the fvwm window manager. |
| 773 | */ |
766 | */ |
| 774 | #ifdef KEEP_SCROLLCOLOR |
767 | #ifdef KEEP_SCROLLCOLOR |
| 775 | |
768 | |
| 776 | if (display->depth <= 2) |
769 | if (display->depth <= 2) |
|
|
770 | { |
| 777 | { /* Monochrome */ |
771 | /* Monochrome */ |
| 778 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
772 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
| 779 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
773 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
| 780 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
774 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
| 781 | } |
775 | } |
| 782 | else |
776 | else |
