| … | |
… | |
| 979 | if (isdigit (*color)) |
979 | if (isdigit (*color)) |
| 980 | { |
980 | { |
| 981 | i = atoi (color); |
981 | i = atoi (color); |
| 982 | |
982 | |
| 983 | if (i >= 8 && i <= 15) |
983 | if (i >= 8 && i <= 15) |
|
|
984 | { |
| 984 | { /* bright colors */ |
985 | /* bright colors */ |
| 985 | i -= 8; |
|
|
| 986 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
986 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; |
| 987 | goto done; |
987 | goto done; |
| 988 | } |
988 | } |
| 989 | |
989 | |
| 990 | if (i >= 0 && i <= 7) |
990 | if (i >= 0 && i <= 7) |
|
|
991 | { |
| 991 | { /* normal colors */ |
992 | /* normal colors */ |
| 992 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
993 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
| 993 | goto done; |
994 | goto done; |
| 994 | } |
995 | } |
| 995 | } |
996 | } |
| 996 | |
997 | |
| … | |
… | |
| 1001 | * so just keep gobbling up the colormap |
1002 | * so just keep gobbling up the colormap |
| 1002 | */ |
1003 | */ |
| 1003 | |
1004 | |
| 1004 | pix_colors_focused[idx] = xcol; |
1005 | pix_colors_focused[idx] = xcol; |
| 1005 | |
1006 | |
| 1006 | /* XSetWindowAttributes attr; */ |
|
|
| 1007 | /* Cursor cursor; */ |
|
|
| 1008 | done: |
1007 | done: |
| 1009 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
1008 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
| 1010 | |
1009 | |
| 1011 | update_fade_color (idx); |
1010 | update_fade_color (idx); |
| 1012 | recolour_cursor (); |
1011 | recolour_cursor (); |
| … | |
… | |
| 1036 | */ |
1035 | */ |
| 1037 | void |
1036 | void |
| 1038 | rxvt_term::set_colorfgbg () |
1037 | rxvt_term::set_colorfgbg () |
| 1039 | { |
1038 | { |
| 1040 | unsigned int i; |
1039 | unsigned int i; |
| 1041 | const char *xpmb = "\0"; |
1040 | const char *xpmb = ""; |
| 1042 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
1041 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
| 1043 | |
1042 | |
| 1044 | strcpy (fstr, "default"); |
1043 | strcpy (fstr, "default"); |
| 1045 | strcpy (bstr, "default"); |
1044 | strcpy (bstr, "default"); |
| 1046 | for (i = Color_Black; i <= Color_White; i++) |
1045 | for (i = Color_Black; i <= Color_White; i++) |
| … | |
… | |
| 1746 | } |
1745 | } |
| 1747 | |
1746 | |
| 1748 | #ifdef HAVE_BG_PIXMAP |
1747 | #ifdef HAVE_BG_PIXMAP |
| 1749 | # if TRACE_PIXMAPS |
1748 | # if TRACE_PIXMAPS |
| 1750 | # undef update_background |
1749 | # undef update_background |
| 1751 | int rxvt_term::trace_update_background (const char* file, int line) |
1750 | int rxvt_term::trace_update_background (const char *file, int line) |
| 1752 | { |
1751 | { |
| 1753 | fprintf (stderr, "%s:%d:update_background()\n", file, line); |
1752 | fprintf (stderr, "%s:%d:update_background()\n", file, line); |
| 1754 | update_background (); |
1753 | update_background (); |
| 1755 | } |
1754 | } |
| 1756 | # endif |
1755 | # endif |
|
|
1756 | |
| 1757 | int |
1757 | int |
| 1758 | rxvt_term::update_background () |
1758 | rxvt_term::update_background () |
| 1759 | { |
1759 | { |
| 1760 | bgPixmap.invalidate (); |
1760 | bgPixmap.invalidate (); |
| 1761 | |
1761 | |
