… | |
… | |
297 | get_options (r_argc, r_argv); |
297 | get_options (r_argc, r_argv); |
298 | |
298 | |
299 | if (!(display = displays.get (rs[Rs_display_name]))) |
299 | if (!(display = displays.get (rs[Rs_display_name]))) |
300 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
300 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
301 | |
301 | |
|
|
302 | // using a local pointer decreases code size a lot |
302 | xa = display->xa; |
303 | xa = display->xa; |
303 | |
304 | |
304 | #if ENABLE_FRILLS |
305 | #if XFT |
305 | if (rs[Rs_depth]) |
306 | if (rs[Rs_depth]) |
306 | set (display, strtol (rs[Rs_depth], 0, 0)); |
307 | set (display, strtol (rs[Rs_depth], 0, 0)); |
307 | else |
308 | else |
308 | #endif |
309 | #endif |
309 | set (display); |
310 | set (display); |
310 | |
311 | |
311 | extract_resources (); |
312 | extract_resources (); |
312 | |
313 | |
313 | free (r_argv); |
314 | free (r_argv); |
|
|
315 | |
|
|
316 | for (int i = NUM_RESOURCES; i--; ) |
|
|
317 | if (rs [i] == resval_undef) |
|
|
318 | rs [i] = 0; |
314 | |
319 | |
315 | #if ENABLE_PERL |
320 | #if ENABLE_PERL |
316 | if (!rs[Rs_perl_ext_1]) |
321 | if (!rs[Rs_perl_ext_1]) |
317 | rs[Rs_perl_ext_1] = "default"; |
322 | rs[Rs_perl_ext_1] = "default"; |
318 | |
323 | |
… | |
… | |
421 | /* this is how xterm implements reverseVideo */ |
426 | /* this is how xterm implements reverseVideo */ |
422 | if (OPTION (Opt_reverseVideo)) |
427 | if (OPTION (Opt_reverseVideo)) |
423 | { |
428 | { |
424 | if (!rs[Rs_color + Color_fg]) |
429 | if (!rs[Rs_color + Color_fg]) |
425 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
430 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
|
|
431 | |
426 | if (!rs[Rs_color + Color_bg]) |
432 | if (!rs[Rs_color + Color_bg]) |
427 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
433 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
428 | } |
434 | } |
429 | #endif |
435 | #endif |
430 | |
436 | |
… | |
… | |
655 | pix_colors = pix_colors_focused; |
661 | pix_colors = pix_colors_focused; |
656 | #endif |
662 | #endif |
657 | |
663 | |
658 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
664 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
659 | { |
665 | { |
|
|
666 | const char *name = rs[Rs_color + i]; |
|
|
667 | |
|
|
668 | if (!name) |
|
|
669 | continue; |
|
|
670 | |
660 | rxvt_color xcol; |
671 | rxvt_color xcol; |
661 | |
672 | |
662 | if (!rs[Rs_color + i]) |
673 | if (!set_color (xcol, name)) |
663 | continue; |
|
|
664 | |
|
|
665 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
|
|
666 | { |
674 | { |
667 | #ifndef XTERM_REVERSE_VIDEO |
675 | #ifndef XTERM_REVERSE_VIDEO |
668 | if (i < 2 && OPTION (Opt_reverseVideo)) |
676 | if (i < 2 && OPTION (Opt_reverseVideo)) |
669 | rs[Rs_color + i] = def_colorName[!i]; |
677 | name = def_colorName [1 - i]; |
670 | else |
678 | else |
671 | #endif |
679 | #endif |
672 | rs[Rs_color + i] = def_colorName[i]; |
680 | name = def_colorName [i]; |
673 | |
681 | |
674 | if (!rs[Rs_color + i]) |
682 | if (!name) |
675 | continue; |
683 | continue; |
676 | |
684 | |
677 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
685 | if (!set_color (xcol, name)) |
678 | { |
686 | { |
679 | switch (i) |
687 | switch (i) |
680 | { |
688 | { |
681 | case Color_fg: |
689 | case Color_fg: |
682 | case Color_bg: |
690 | case Color_bg: |
683 | /* fatal: need bg/fg color */ |
|
|
684 | rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); |
691 | rxvt_warn ("unable to get foreground/background colour, continuing.\n"); |
685 | /* NOTREACHED */ |
692 | name = ""; |
686 | break; |
693 | break; |
687 | #ifndef NO_CURSORCOLOR |
694 | #ifndef NO_CURSORCOLOR |
688 | case Color_cursor2: |
695 | case Color_cursor2: |
689 | xcol = pix_colors[Color_fg]; |
696 | #endif |
690 | break; |
|
|
691 | #endif /* ! NO_CURSORCOLOR */ |
|
|
692 | case Color_pointer_fg: |
697 | case Color_pointer_fg: |
693 | xcol = pix_colors[Color_fg]; |
698 | name = rs[Rs_color + Color_fg]; |
|
|
699 | xcol.set (this, name); |
694 | break; |
700 | break; |
695 | default: |
701 | default: |
696 | xcol = pix_colors[Color_bg]; /* None */ |
702 | name = rs[Rs_color + Color_bg]; |
|
|
703 | xcol.set (this, name); |
697 | break; |
704 | break; |
698 | } |
705 | } |
699 | } |
706 | } |
700 | } |
707 | } |
701 | |
708 | |
702 | pix_colors[i] = xcol; |
709 | pix_colors[i] = xcol; |
703 | SET_PIXCOLOR (i); |
710 | rs[Rs_color + i] = name; |
704 | } |
711 | } |
705 | |
|
|
706 | #ifdef OFF_FOCUS_FADING |
|
|
707 | if (rs[Rs_fade]) |
|
|
708 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
|
|
709 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
|
|
710 | #endif |
|
|
711 | |
712 | |
712 | if (depth <= 2) |
713 | if (depth <= 2) |
713 | { |
714 | { |
714 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
715 | if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg); |
715 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
716 | if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg); |
716 | if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; |
717 | if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg); |
717 | } |
718 | } |
718 | |
719 | |
719 | /* |
720 | /* |
720 | * get scrollBar shadow colors |
721 | * get scrollBar shadow colors |
721 | * |
722 | * |
722 | * The calculations of topShadow/bottomShadow values are adapted |
723 | * The calculations of topShadow/bottomShadow values are adapted |
723 | * from the fvwm window manager. |
724 | * from the fvwm window manager. |
724 | */ |
725 | */ |
725 | #ifdef KEEP_SCROLLCOLOR |
726 | #ifdef KEEP_SCROLLCOLOR |
726 | |
|
|
727 | if (depth <= 2) |
727 | if (depth <= 2) |
728 | { |
728 | { |
729 | /* Monochrome */ |
729 | /* Monochrome */ |
730 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
730 | alias_color (Color_scroll, Color_fg); |
731 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
731 | alias_color (Color_topShadow, Color_bg); |
732 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
732 | alias_color (Color_bottomShadow, Color_bg); |
733 | } |
733 | } |
734 | else |
734 | else |
735 | { |
735 | { |
736 | rxvt_color xcol[2]; |
736 | pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); |
737 | /* xcol[0] == white |
|
|
738 | * xcol[1] == top shadow |
|
|
739 | * xcol[2] == bot shadow */ |
|
|
740 | |
737 | |
741 | xcol[1] = pix_colors[Color_scroll]; |
738 | rgba cscroll; |
742 | xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); |
739 | pix_colors [Color_scroll].get (cscroll); |
743 | |
|
|
744 | rxvt_rgba c0, c1; |
|
|
745 | |
|
|
746 | xcol[0].get (this, c0); |
|
|
747 | xcol[1].get (this, c1); |
|
|
748 | |
|
|
749 | pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50); |
|
|
750 | |
740 | |
751 | /* topShadowColor */ |
741 | /* topShadowColor */ |
752 | if (!xcol[1].set (this, |
742 | if (!pix_colors[Color_topShadow].set (this, |
753 | rxvt_rgba ( |
743 | rgba ( |
754 | min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), |
744 | min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), |
755 | min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), |
745 | min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), |
756 | min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), |
746 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
757 | c1.a) // pa1 vs. pa0: arbitrary |
747 | cscroll.a) |
758 | )); |
748 | )) |
759 | xcol[1] = pix_colors[Color_White]; |
749 | alias_color (Color_topShadow, Color_White); |
760 | |
|
|
761 | pix_colors[Color_topShadow] = xcol[1]; |
|
|
762 | } |
750 | } |
763 | #endif /* KEEP_SCROLLCOLOR */ |
751 | #endif /* KEEP_SCROLLCOLOR */ |
|
|
752 | |
|
|
753 | #ifdef OFF_FOCUS_FADING |
|
|
754 | if (rs[Rs_fade]) |
|
|
755 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
|
|
756 | { |
|
|
757 | rgba c; |
|
|
758 | pix_colors [Color_fade].get (c); |
|
|
759 | pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c); |
|
|
760 | } |
|
|
761 | #endif |
764 | } |
762 | } |
765 | |
763 | |
766 | /*----------------------------------------------------------------------*/ |
764 | /*----------------------------------------------------------------------*/ |
767 | /* color aliases, fg/bg bright-bold */ |
765 | /* color aliases, fg/bg bright-bold */ |
768 | void |
766 | void |