ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.255 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.256 by root, Wed Jan 11 05:14:26 2006 UTC

3858 { 3858 {
3859 if ((name = strchr (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3860 break; 3860 break;
3861 3861
3862 *name++ = '\0'; 3862 *name++ = '\0';
3863 color = atoi (buf); 3863 color = atoi (buf) + minCOLOR;
3864 3864
3865 if (color < 0 || color >= TOTAL_COLORS) 3865 if (!IN_RANGE_EXC (color, minCOLOR, TOTAL_COLORS))
3866 break; 3866 break;
3867 3867
3868 if ((buf = strchr (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3869 *buf++ = '\0';
3870 3870
3871 if (name[0] == '?' && !name[1]) 3871 if (name[0] == '?' && !name[1])
3872 { 3872 {
3873 unsigned short r, g, b; 3873 unsigned short r, g, b;
3874 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3874 pix_colors_focused[color].get (display, r, g, b);
3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3876 } 3876 }
3877 else 3877 else
3878 set_window_color (color + minCOLOR, name); 3878 set_window_color (color, name);
3879 } 3879 }
3880 break; 3880 break;
3881 case XTerm_Color00: 3881 case XTerm_Color00:
3882 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3883 break; 3883 break;
3884 case XTerm_Color01: 3884 case XTerm_Color01:
3885 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3886 break; 3886 break;
3887#ifndef NO_CURSORCOLOR 3887#ifndef NO_CURSORCOLOR
3888 case XTerm_Color_cursor: 3888 case XTerm_Color_cursor:
3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3890 break; 3890 break;
3922 if (*str != ';') 3922 if (*str != ';')
3923 { 3923 {
3924#if XPM_BACKGROUND 3924#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3925 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3926 set_bgPixmap (str); /* change pixmap */
3927#endif
3928 scr_touch (true); 3927 scr_touch (true);
3928#endif
3929 } 3929 }
3930
3930 while ((str = strchr (str, ';')) != NULL) 3931 while ((str = strchr (str, ';')) != NULL)
3931 { 3932 {
3932 str++; 3933 str++;
3933#if XPM_BACKGROUND 3934#if XPM_BACKGROUND
3934 changed += scale_pixmap (str); 3935 changed += scale_pixmap (str);
3937 3938
3938 if (changed) 3939 if (changed)
3939 { 3940 {
3940#ifdef XPM_BACKGROUND 3941#ifdef XPM_BACKGROUND
3941 resize_pixmap (); 3942 resize_pixmap ();
3942#endif
3943 scr_touch (true); 3943 scr_touch (true);
3944#endif
3944 } 3945 }
3945 break; 3946 break;
3946 3947
3947 case XTerm_restoreFG: 3948 case XTerm_restoreFG:
3948 set_window_color (Color_fg, str); 3949 set_window_color (Color_fg, str);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines