… | |
… | |
43 | const char *const def_colorName[] = |
43 | const char *const def_colorName[] = |
44 | { |
44 | { |
45 | COLOR_FOREGROUND, |
45 | COLOR_FOREGROUND, |
46 | COLOR_BACKGROUND, |
46 | COLOR_BACKGROUND, |
47 | /* low-intensity colors */ |
47 | /* low-intensity colors */ |
48 | "Black", /* 0: black (#000000) */ |
48 | "rgb:00/00/00", // 0: black (Black) |
49 | "Red3", /* 1: red (#CD0000) */ |
49 | "rgb:cd/00/00", // 1: red (Red3) |
50 | "Green3", /* 2: green (#00CD00) */ |
50 | "rgb:00/cd/00", // 2: green (Green3) |
51 | "Yellow3", /* 3: yellow (#CDCD00) */ |
51 | "rgb:cd/cd/00", // 3: ywlloe (Yellow3) |
52 | "Blue3", /* 4: blue (#0000CD) */ |
52 | "rgb:00/00/cd", // 4: blue (Blue3) |
53 | "Magenta3", /* 5: magenta (#CD00CD) */ |
53 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
54 | "Cyan3", /* 6: cyan (#00CDCD) */ |
54 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
55 | # ifdef XTERM_COLORS |
55 | # ifdef XTERM_COLORS |
56 | "Grey90", /* 7: white (#E5E5E5) */ |
56 | "rgb:e5/e5/e5", // 7: white (Grey90) |
57 | # else |
57 | # else |
58 | "AntiqueWhite", /* 7: white (#FAEBD7) */ |
58 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
59 | # endif |
59 | # endif |
60 | /* high-intensity colors */ |
60 | /* high-intensity colors */ |
61 | # ifdef XTERM_COLORS |
61 | # ifdef XTERM_COLORS |
62 | "Grey30", /* 8: bright black (#4D4D4D) */ |
62 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
63 | # else |
63 | # else |
64 | "Grey25", /* 8: bright black (#404040) */ |
64 | "rgb:40/40/40", // 8: bright black (Grey25) |
65 | # endif |
65 | # endif |
66 | "Red", /* 1/9: bright red (#FF0000) */ |
66 | "rgb:ff/00/00", // 1/9: bright red (Reed) |
67 | "Green", /* 2/10: bright green (#00FF00) */ |
67 | "rgb:00/ff/00", // 2/10: bright green (Green) |
68 | "Yellow", /* 3/11: bright yellow (#FFFF00) */ |
68 | "rgb:ff/ff/00", // 3/11: bright yellow (Yellow) |
69 | "Blue", /* 4/12: bright blue (#0000FF) */ |
69 | "rgb:00/00/ff", // 4/12: bright blue (Blue) |
70 | "Magenta", /* 5/13: bright magenta (#FF00FF) */ |
70 | "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) |
71 | "Cyan", /* 6/14: bright cyan (#00FFFF) */ |
71 | "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) |
72 | "White", /* 7/15: bright white (#FFFFFF) */ |
72 | "rgb:ff/ff/ff", // 7/15: bright white (White) |
73 | |
73 | |
74 | // 88 xterm colours |
74 | // 88 xterm colours |
75 | "rgb:00/00/00", |
75 | "rgb:00/00/00", |
76 | "rgb:00/00/8b", |
76 | "rgb:00/00/8b", |
77 | "rgb:00/00/cd", |
77 | "rgb:00/00/cd", |
… | |
… | |
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 |
174 | #if OFF_FOCUS_FADING |
175 | "black", |
175 | "rgb:00/00/00", |
176 | #endif |
176 | #endif |
177 | }; |
177 | }; |
178 | |
178 | |
179 | bool |
179 | bool |
180 | rxvt_term::init_vars () |
180 | rxvt_term::init_vars () |
… | |
… | |
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 | xa = display->xa; |
|
|
303 | |
|
|
304 | #if XFT |
|
|
305 | if (rs[Rs_depth]) |
|
|
306 | set (display, strtol (rs[Rs_depth], 0, 0)); |
|
|
307 | else |
|
|
308 | #endif |
|
|
309 | set (display); |
|
|
310 | |
302 | extract_resources (); |
311 | extract_resources (); |
303 | |
312 | |
304 | free (r_argv); |
313 | free (r_argv); |
305 | |
314 | |
306 | #if ENABLE_PERL |
315 | #if ENABLE_PERL |
… | |
… | |
313 | { |
322 | { |
314 | rxvt_perl.init (this); |
323 | rxvt_perl.init (this); |
315 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
324 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
316 | } |
325 | } |
317 | #endif |
326 | #endif |
318 | |
|
|
319 | xa = display->xa; |
|
|
320 | |
|
|
321 | #if ENABLE_FRILLS |
|
|
322 | if (rs[Rs_depth]) |
|
|
323 | set (display, strtol (rs[Rs_depth], 0, 0)); |
|
|
324 | else |
|
|
325 | #endif |
|
|
326 | set (display); |
|
|
327 | |
327 | |
328 | /* |
328 | /* |
329 | * set any defaults not already set |
329 | * set any defaults not already set |
330 | */ |
330 | */ |
331 | if (cmd_argv && cmd_argv[0]) |
331 | if (cmd_argv && cmd_argv[0]) |
… | |
… | |
482 | val = rxvt_network_display (rs[Rs_display_name]); |
482 | val = rxvt_network_display (rs[Rs_display_name]); |
483 | rs[Rs_display_name] = (const char *)val; |
483 | rs[Rs_display_name] = (const char *)val; |
484 | |
484 | |
485 | if (val == NULL) |
485 | if (val == NULL) |
486 | #endif /* DISPLAY_IS_IP */ |
486 | #endif /* DISPLAY_IS_IP */ |
487 | val = XDisplayString (display->display); |
487 | val = XDisplayString (xdisp); |
488 | |
488 | |
489 | if (rs[Rs_display_name] == NULL) |
489 | if (rs[Rs_display_name] == NULL) |
490 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
490 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
491 | |
491 | |
492 | i = strlen (val); |
492 | i = strlen (val); |
… | |
… | |
660 | rxvt_color xcol; |
660 | rxvt_color xcol; |
661 | |
661 | |
662 | if (!rs[Rs_color + i]) |
662 | if (!rs[Rs_color + i]) |
663 | continue; |
663 | continue; |
664 | |
664 | |
665 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
665 | if (!set_color (xcol, rs[Rs_color + i])) |
666 | { |
666 | { |
667 | #ifndef XTERM_REVERSE_VIDEO |
667 | #ifndef XTERM_REVERSE_VIDEO |
668 | if (i < 2 && OPTION (Opt_reverseVideo)) |
668 | if (i < 2 && OPTION (Opt_reverseVideo)) |
669 | rs[Rs_color + i] = def_colorName[!i]; |
669 | rs[Rs_color + i] = def_colorName[!i]; |
670 | else |
670 | else |
… | |
… | |
672 | rs[Rs_color + i] = def_colorName[i]; |
672 | rs[Rs_color + i] = def_colorName[i]; |
673 | |
673 | |
674 | if (!rs[Rs_color + i]) |
674 | if (!rs[Rs_color + i]) |
675 | continue; |
675 | continue; |
676 | |
676 | |
677 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
677 | if (!set_color (xcol, rs[Rs_color + i])) |
678 | { |
678 | { |
679 | switch (i) |
679 | switch (i) |
680 | { |
680 | { |
681 | case Color_fg: |
681 | case Color_fg: |
682 | case Color_bg: |
682 | case Color_bg: |
683 | /* fatal: need bg/fg color */ |
683 | /* fatal: need bg/fg color */ |
684 | rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); |
684 | rxvt_warn ("unable to get foreground/background colour, continuing.\n"); |
685 | /* NOTREACHED */ |
|
|
686 | break; |
685 | break; |
687 | #ifndef NO_CURSORCOLOR |
686 | #ifndef NO_CURSORCOLOR |
688 | case Color_cursor2: |
687 | case Color_cursor2: |
689 | xcol = pix_colors[Color_fg]; |
688 | xcol = pix_colors[Color_fg]; |
690 | break; |
689 | break; |
… | |
… | |
704 | } |
703 | } |
705 | |
704 | |
706 | #ifdef OFF_FOCUS_FADING |
705 | #ifdef OFF_FOCUS_FADING |
707 | if (rs[Rs_fade]) |
706 | if (rs[Rs_fade]) |
708 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
707 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
|
|
708 | { |
|
|
709 | rxvt_rgba c; |
|
|
710 | pix_colors[Color_fade].get (this, c); |
709 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
711 | pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c); |
|
|
712 | } |
710 | #endif |
713 | #endif |
711 | |
714 | |
712 | if (depth <= 2) |
715 | if (depth <= 2) |
713 | { |
716 | { |
714 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
717 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
… | |
… | |
737 | /* xcol[0] == white |
740 | /* xcol[0] == white |
738 | * xcol[1] == top shadow |
741 | * xcol[1] == top shadow |
739 | * xcol[2] == bot shadow */ |
742 | * xcol[2] == bot shadow */ |
740 | |
743 | |
741 | xcol[1] = pix_colors[Color_scroll]; |
744 | xcol[1] = pix_colors[Color_scroll]; |
742 | xcol[0].set (this, 65535, 65535, 65535); |
745 | xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); |
743 | |
746 | |
744 | unsigned short pr1, pg1, pb1, pr0, pg0, pb0; |
747 | rxvt_rgba c0, c1; |
745 | |
748 | |
746 | xcol[0].get (this, pr0, pg0, pb0); |
749 | xcol[0].get (this, c0); |
747 | xcol[1].get (this, pr1, pg1, pb1); |
750 | xcol[1].get (this, c1); |
748 | |
751 | |
749 | pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50); |
752 | xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]); |
750 | |
753 | |
751 | /* topShadowColor */ |
754 | /* topShadowColor */ |
752 | if (!xcol[1].set (this, |
755 | if (!xcol[1].set (this, |
|
|
756 | rxvt_rgba ( |
753 | min (pr0, max (pr0 / 5, pr1) * 7 / 5), |
757 | min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), |
754 | min (pg0, max (pg0 / 5, pg1) * 7 / 5), |
758 | min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), |
755 | min (pb0, max (pb0 / 5, pb1) * 7 / 5))) |
759 | min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), |
|
|
760 | c1.a) // pa1 vs. pa0: arbitrary |
|
|
761 | )); |
756 | xcol[1] = pix_colors[Color_White]; |
762 | xcol[1] = pix_colors[Color_White]; |
757 | |
763 | |
758 | pix_colors[Color_topShadow] = xcol[1]; |
764 | pix_colors[Color_topShadow] = xcol[1]; |
759 | } |
765 | } |
760 | #endif /* KEEP_SCROLLCOLOR */ |
766 | #endif /* KEEP_SCROLLCOLOR */ |
… | |
… | |
804 | |
810 | |
805 | if (rsmod |
811 | if (rsmod |
806 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
812 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
807 | requestedmeta = rsmod[3] - '0'; |
813 | requestedmeta = rsmod[3] - '0'; |
808 | |
814 | |
809 | map = XGetModifierMapping (display->display); |
815 | map = XGetModifierMapping (xdisp); |
810 | kc = map->modifiermap; |
816 | kc = map->modifiermap; |
811 | |
817 | |
812 | for (i = 1; i < 6; i++) |
818 | for (i = 1; i < 6; i++) |
813 | { |
819 | { |
814 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
820 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
… | |
… | |
816 | for (j = map->max_keypermod; j--; k++) |
822 | for (j = map->max_keypermod; j--; k++) |
817 | { |
823 | { |
818 | if (kc[k] == 0) |
824 | if (kc[k] == 0) |
819 | break; |
825 | break; |
820 | |
826 | |
821 | switch (XKeycodeToKeysym (display->display, kc[k], 0)) |
827 | switch (XKeycodeToKeysym (xdisp, kc[k], 0)) |
822 | { |
828 | { |
823 | case XK_Num_Lock: |
829 | case XK_Num_Lock: |
824 | ModNumLockMask = modmasks[i - 1]; |
830 | ModNumLockMask = modmasks[i - 1]; |
825 | continue; |
831 | continue; |
826 | |
832 | |
… | |
… | |
900 | if (OPTION (Opt_borderLess)) |
906 | if (OPTION (Opt_borderLess)) |
901 | { |
907 | { |
902 | if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) |
908 | if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) |
903 | { |
909 | { |
904 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
910 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
905 | attributes.override_redirect = TRUE; |
911 | attributes.override_redirect = true; |
906 | mwmhints.flags = 0; |
912 | mwmhints.flags = 0; |
907 | } |
913 | } |
908 | else |
914 | else |
909 | { |
915 | { |
910 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
916 | mwmhints.flags = MWM_HINTS_DECORATIONS; |