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.258 by root, Thu Jan 12 03:32:56 2006 UTC

… …
1920#else 1920#else
1921 selection.rect = false; 1921 selection.rect = false;
1922#endif 1922#endif
1923 1923
1924 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1926 {
1927 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1929 else 1929 else
1930 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
… …
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_INC (color, minCOLOR, maxTermCOLOR))
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;
… …
3894 break; 3894 break;
3895 case XTerm_Color_pointer_bg: 3895 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3897 break; 3897 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE 3898#ifndef NO_BOLD_UNDERLINE_REVERSE
3899 case XTerm_Color_BD:
3900 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3901 break;
3902 case XTerm_Color_UL:
3903 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3904 break;
3905 case XTerm_Color_RV: 3899 case XTerm_Color_RV:
3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3900 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3901 break;
3902 case Rxvt_Color_BD:
3903 case URxvt_Color_BD:
3904 process_color_seq (op, Color_BD, str, resp);
3905 break;
3906 case Rxvt_Color_UL:
3907 case URxvt_Color_UL:
3908 process_color_seq (op, Color_UL, str, resp);
3907 break; 3909 break;
3908 case URxvt_Color_IT: 3910 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3910 break; 3912 break;
3911#endif 3913#endif
… …
3916 if (am_transparent) 3918 if (am_transparent)
3917 want_full_refresh = want_refresh = 1; 3919 want_full_refresh = want_refresh = 1;
3918 break; 3920 break;
3919#endif 3921#endif
3920 3922
3921 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3922 if (*str != ';') 3924 if (*str != ';')
3923 { 3925 {
3924#if XPM_BACKGROUND 3926#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3927 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3928 set_bgPixmap (str); /* change pixmap */
3927#endif
3928 scr_touch (true); 3929 scr_touch (true);
3930#endif
3929 } 3931 }
3932
3930 while ((str = strchr (str, ';')) != NULL) 3933 while ((str = strchr (str, ';')) != NULL)
3931 { 3934 {
3932 str++; 3935 str++;
3933#if XPM_BACKGROUND 3936#if XPM_BACKGROUND
3934 changed += scale_pixmap (str); 3937 changed += scale_pixmap (str);
… …
3937 3940
3938 if (changed) 3941 if (changed)
3939 { 3942 {
3940#ifdef XPM_BACKGROUND 3943#ifdef XPM_BACKGROUND
3941 resize_pixmap (); 3944 resize_pixmap ();
3942#endif
3943 scr_touch (true); 3945 scr_touch (true);
3946#endif
3944 } 3947 }
3945 break; 3948 break;
3946 3949
3947 case XTerm_restoreFG: 3950 case Rxvt_restoreFG:
3948 set_window_color (Color_fg, str); 3951 set_window_color (Color_fg, str);
3949 break; 3952 break;
3950 case XTerm_restoreBG: 3953 case Rxvt_restoreBG:
3951 set_window_color (Color_bg, str); 3954 set_window_color (Color_bg, str);
3952 break; 3955 break;
3953 3956
3954 case XTerm_logfile: 3957 case XTerm_logfile:
3955 // TODO, when secure mode? 3958 // TODO, when secure mode?
… …
3960 if (OPTION (Opt_insecure)) 3963 if (OPTION (Opt_insecure))
3961 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3962 break; 3965 break;
3963#endif 3966#endif
3964#if 0 3967#if 0
3965 case XTerm_dumpscreen: /* no error notices */ 3968 case Rxvt_dumpscreen: /* no error notices */
3966 { 3969 {
3967 int fd; 3970 int fd;
3968 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3969 { 3972 {
3970 scr_dump (fd); 3973 scr_dump (fd);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines