| … | |
… | |
| 691 | |
691 | |
| 692 | if (scrollBar.state) |
692 | if (scrollBar.state) |
| 693 | { |
693 | { |
| 694 | sb_w = scrollbar_TotalWidth (); |
694 | sb_w = scrollbar_TotalWidth (); |
| 695 | szHint.base_width += sb_w; |
695 | szHint.base_width += sb_w; |
|
|
696 | |
| 696 | if (!OPTION (Opt_scrollBar_right)) |
697 | if (!OPTION (Opt_scrollBar_right)) |
| 697 | window_vt_x += sb_w; |
698 | window_vt_x += sb_w; |
| 698 | } |
699 | } |
| 699 | |
700 | |
| 700 | szHint.width_inc = fwidth; |
701 | szHint.width_inc = fwidth; |
| … | |
… | |
| 931 | |
932 | |
| 932 | #if OFF_FOCUS_FADING |
933 | #if OFF_FOCUS_FADING |
| 933 | if (rs[Rs_fade]) |
934 | if (rs[Rs_fade]) |
| 934 | { |
935 | { |
| 935 | rgba c; |
936 | rgba c; |
| 936 | pix_colors [Color_fade].get (this, c); |
937 | pix_colors [Color_fade].get (c); |
| 937 | pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); |
938 | pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); |
| 938 | } |
939 | } |
| 939 | #endif |
940 | #endif |
| 940 | |
941 | |
| 941 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
942 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
| … | |
… | |
| 949 | #endif /* XTERM_COLOR_CHANGE */ |
950 | #endif /* XTERM_COLOR_CHANGE */ |
| 950 | |
951 | |
| 951 | void |
952 | void |
| 952 | rxvt_term::recolour_cursor () |
953 | rxvt_term::recolour_cursor () |
| 953 | { |
954 | { |
| 954 | XColor xcol[2]; |
955 | XColor fg, bg; |
| 955 | |
956 | |
| 956 | xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) |
957 | (ISSET_PIXCOLOR (Color_pointer_fg) |
| 957 | ? pix_colors_focused[Color_pointer_fg] |
958 | ? pix_colors_focused[Color_pointer_fg] |
| 958 | : pix_colors_focused[Color_fg]; |
959 | : pix_colors_focused[Color_fg]).get (fg); |
|
|
960 | |
| 959 | xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) |
961 | (ISSET_PIXCOLOR (Color_pointer_bg) |
| 960 | ? pix_colors_focused[Color_pointer_bg] |
962 | ? pix_colors_focused[Color_pointer_bg] |
| 961 | : pix_colors_focused[Color_bg]; |
963 | : pix_colors_focused[Color_bg]).get (bg); |
| 962 | |
964 | |
| 963 | XQueryColors (xdisp, cmap, xcol, 2); |
|
|
| 964 | XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); |
965 | XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); |
| 965 | } |
966 | } |
| 966 | |
967 | |
| 967 | /*----------------------------------------------------------------------*/ |
968 | /*----------------------------------------------------------------------*/ |
| 968 | /* |
969 | /* |
| 969 | * find if fg/bg matches any of the normal (low-intensity) colors |
970 | * find if fg/bg matches any of the normal (low-intensity) colors |
