… | |
… | |
597 | sb_w = 0; |
597 | sb_w = 0; |
598 | window_vt_x = window_vt_y = int_bwidth; |
598 | window_vt_x = window_vt_y = int_bwidth; |
599 | |
599 | |
600 | if (scrollBar.state) |
600 | if (scrollBar.state) |
601 | { |
601 | { |
602 | sb_w = scrollbar_TotalWidth (); |
602 | sb_w = scrollBar.total_width (); |
603 | szHint.base_width += sb_w; |
603 | szHint.base_width += sb_w; |
604 | |
604 | |
605 | if (!option (Opt_scrollBar_right)) |
605 | if (!option (Opt_scrollBar_right)) |
606 | window_vt_x += sb_w; |
606 | window_vt_x += sb_w; |
607 | } |
607 | } |
… | |
… | |
801 | void |
801 | void |
802 | rxvt_term::set_window_color (int idx, const char *color) |
802 | rxvt_term::set_window_color (int idx, const char *color) |
803 | { |
803 | { |
804 | #ifdef XTERM_COLOR_CHANGE |
804 | #ifdef XTERM_COLOR_CHANGE |
805 | rxvt_color xcol; |
805 | rxvt_color xcol; |
806 | int i; |
|
|
807 | |
806 | |
808 | if (color == NULL || *color == '\0') |
807 | if (color == NULL || *color == '\0') |
809 | return; |
808 | return; |
810 | |
809 | |
811 | color = strdup (color); |
810 | color = strdup (color); |
… | |
… | |
813 | rs[Rs_color + idx] = color; |
812 | rs[Rs_color + idx] = color; |
814 | |
813 | |
815 | /* handle color aliases */ |
814 | /* handle color aliases */ |
816 | if (isdigit (*color)) |
815 | if (isdigit (*color)) |
817 | { |
816 | { |
818 | i = atoi (color); |
817 | int i = atoi (color); |
819 | |
818 | |
820 | if (i >= 8 && i <= 15) |
819 | if (i >= 8 && i <= 15) |
821 | { |
820 | { |
822 | /* bright colors */ |
821 | /* bright colors */ |
823 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; |
822 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; |
… | |
… | |
986 | { |
985 | { |
987 | if (scrollBar.state) |
986 | if (scrollBar.state) |
988 | { |
987 | { |
989 | XMoveResizeWindow (dpy, scrollBar.win, |
988 | XMoveResizeWindow (dpy, scrollBar.win, |
990 | window_sb_x, 0, |
989 | window_sb_x, 0, |
991 | scrollbar_TotalWidth (), szHint.height); |
990 | scrollBar.total_width (), szHint.height); |
992 | resize_scrollbar (); |
991 | resize_scrollbar (); |
993 | } |
992 | } |
994 | |
993 | |
995 | XMoveResizeWindow (dpy, vt, |
994 | XMoveResizeWindow (dpy, vt, |
996 | window_vt_x, window_vt_y, |
995 | window_vt_x, window_vt_y, |