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.256 by root, Wed Jan 11 05:14:26 2006 UTC vs.
Revision 1.262 by root, Sun Jan 15 06:02:40 2006 UTC

… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 148 return;
149 149
150 for (;;) 150 for (;;)
151 { 151 {
152 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
153 153
154 text_t t = l.t[x]; 154 text_t t = l.t[x];
155 155
156 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
157 { 157 {
… …
972 972
973 if (want_refresh) 973 if (want_refresh)
974 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 976 {
977 int row = -view_start; 977 int row = view_start;
978 int end_row = row + nrow; 978 int end_row = row + nrow;
979 979
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 980 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 981 --row;
982 982
983 do 983 do
984 { 984 {
985 int start_row = row; 985 int start_row = row;
… …
1101{ 1101{
1102 if (mouse_slip_wheel_speed == 0 1102 if (mouse_slip_wheel_speed == 0
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1104 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1105 {
1106 if (view_start == nsaved || 1106 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1107 mouse_slip_wheel_speed = 0;
1109 1108
1110 refresh_type |= SMOOTH_REFRESH; 1109 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1110 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1311 dDisp; 1310 dDisp;
1312 1311
1313 SET_R (this); 1312 SET_R (this);
1314 SET_LOCALE (locale); 1313 SET_LOCALE (locale);
1315 1314
1315 if (ev.xany.window == vt
1316 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 return;
1318
1319 // for XQueryPointer
1316 Window unused_root, unused_child; 1320 Window unused_root, unused_child;
1317 int unused_root_x, unused_root_y; 1321 int unused_root_x, unused_root_y;
1318 unsigned int unused_mask; 1322 unsigned int unused_mask;
1319 1323
1320 switch (ev.type) 1324 switch (ev.type)
… …
1920#else 1924#else
1921 selection.rect = false; 1925 selection.rect = false;
1922#endif 1926#endif
1923 1927
1924 /* allow shift+left click to extend selection */ 1928 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1929 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1930 {
1927 if (MEvent.button == Button1 && clickintime) 1931 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1932 selection_rotate (ev.x, ev.y);
1929 else 1933 else
1930 selection_extend (ev.x, ev.y, 1); 1934 selection_extend (ev.x, ev.y, 1);
… …
3860 break; 3864 break;
3861 3865
3862 *name++ = '\0'; 3866 *name++ = '\0';
3863 color = atoi (buf) + minCOLOR; 3867 color = atoi (buf) + minCOLOR;
3864 3868
3865 if (!IN_RANGE_EXC (color, minCOLOR, TOTAL_COLORS)) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3866 break; 3870 break;
3867 3871
3868 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3873 *buf++ = '\0';
3870 3874
… …
3894 break; 3898 break;
3895 case XTerm_Color_pointer_bg: 3899 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3900 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3897 break; 3901 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE 3902#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: 3903 case XTerm_Color_RV:
3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3904 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3905 break;
3906 case Rxvt_Color_BD:
3907 case URxvt_Color_BD:
3908 process_color_seq (op, Color_BD, str, resp);
3909 break;
3910 case Rxvt_Color_UL:
3911 case URxvt_Color_UL:
3912 process_color_seq (op, Color_UL, str, resp);
3907 break; 3913 break;
3908 case URxvt_Color_IT: 3914 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3915 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3910 break; 3916 break;
3911#endif 3917#endif
… …
3916 if (am_transparent) 3922 if (am_transparent)
3917 want_full_refresh = want_refresh = 1; 3923 want_full_refresh = want_refresh = 1;
3918 break; 3924 break;
3919#endif 3925#endif
3920 3926
3921 case XTerm_Pixmap: 3927 case Rxvt_Pixmap:
3922 if (*str != ';') 3928 if (*str != ';')
3923 { 3929 {
3924#if XPM_BACKGROUND 3930#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3931 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3932 set_bgPixmap (str); /* change pixmap */
… …
3943 scr_touch (true); 3949 scr_touch (true);
3944#endif 3950#endif
3945 } 3951 }
3946 break; 3952 break;
3947 3953
3948 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3949 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3950 break; 3956 break;
3951 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3952 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3953 break; 3959 break;
3954 3960
3955 case XTerm_logfile: 3961 case XTerm_logfile:
3956 // TODO, when secure mode? 3962 // TODO, when secure mode?
… …
3961 if (OPTION (Opt_insecure)) 3967 if (OPTION (Opt_insecure))
3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3963 break; 3969 break;
3964#endif 3970#endif
3965#if 0 3971#if 0
3966 case XTerm_dumpscreen: /* no error notices */ 3972 case Rxvt_dumpscreen: /* no error notices */
3967 { 3973 {
3968 int fd; 3974 int fd;
3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3970 { 3976 {
3971 scr_dump (fd); 3977 scr_dump (fd);

Diff Legend

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