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.254 by root, Wed Jan 11 02:13:56 2006 UTC vs.
Revision 1.263 by root, Sun Jan 15 16:48:17 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 {
… …
443 scr_move_to (0, 1); 443 scr_move_to (0, 1);
444 return; 444 return;
445 } 445 }
446 else if (keysym == XK_End) 446 else if (keysym == XK_End)
447 { 447 {
448 scr_move_to (1, 0); 448 scr_move_to (1, 1);
449 return; 449 return;
450 } 450 }
451 } 451 }
452#endif 452#endif
453 } 453 }
… …
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;
986 line_t *l; 986 line_t *l;
987 987
988 do 988 do
989 { 989 {
990 l = &ROW (row); 990 l = &ROW (row++);
991 991
992 if (l->f & LINE_FILTERED) 992 if (!(l->f & LINE_FILTERED))
993 row++;
994 else
995 { 993 {
996 // line not filtered, mark it as filtered 994 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED; 995 l->f |= LINE_FILTERED;
998 while (l->is_longer ()) 996 while (l->is_longer ())
999 { 997 {
1000 l = &ROW (++row); 998 l = &ROW (row++);
1001 l->f |= LINE_FILTERED; 999 l->f |= LINE_FILTERED;
1002 } 1000 }
1003 1001
1004 // and filter it 1002 // and filter it
1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
… …
1007 break; 1005 break;
1008 } 1006 }
1009 } 1007 }
1010 while (l->is_longer () && row < end_row); 1008 while (l->is_longer () && row < end_row);
1011 } 1009 }
1012 while (++row < end_row); 1010 while (row < end_row);
1013 } 1011 }
1014 1012
1015 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
1016 scrollbar_show (1); 1014 scrollbar_show (1);
1017#ifdef USE_XIM 1015#ifdef USE_XIM
… …
1103{ 1101{
1104 if (mouse_slip_wheel_speed == 0 1102 if (mouse_slip_wheel_speed == 0
1105 || 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)
1106 : scr_page (UP, mouse_slip_wheel_speed)) 1104 : scr_page (UP, mouse_slip_wheel_speed))
1107 { 1105 {
1108 if (view_start == nsaved || 1106 if (view_start == top_row || view_start == 0)
1109 view_start == 0)
1110 mouse_slip_wheel_speed = 0; 1107 mouse_slip_wheel_speed = 0;
1111 1108
1112 refresh_type |= SMOOTH_REFRESH; 1109 refresh_type |= SMOOTH_REFRESH;
1113 want_refresh = 1; 1110 want_refresh = 1;
1114 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1313 dDisp; 1310 dDisp;
1314 1311
1315 SET_R (this); 1312 SET_R (this);
1316 SET_LOCALE (locale); 1313 SET_LOCALE (locale);
1317 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
1318 Window unused_root, unused_child; 1320 Window unused_root, unused_child;
1319 int unused_root_x, unused_root_y; 1321 int unused_root_x, unused_root_y;
1320 unsigned int unused_mask; 1322 unsigned int unused_mask;
1321 1323
1322 switch (ev.type) 1324 switch (ev.type)
… …
1922#else 1924#else
1923 selection.rect = false; 1925 selection.rect = false;
1924#endif 1926#endif
1925 1927
1926 /* allow shift+left click to extend selection */ 1928 /* allow shift+left click to extend selection */
1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1929 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928 { 1930 {
1929 if (MEvent.button == Button1 && clickintime) 1931 if (MEvent.button == Button1 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1932 selection_rotate (ev.x, ev.y);
1931 else 1933 else
1932 selection_extend (ev.x, ev.y, 1); 1934 selection_extend (ev.x, ev.y, 1);
… …
3860 { 3862 {
3861 if ((name = strchr (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3862 break; 3864 break;
3863 3865
3864 *name++ = '\0'; 3866 *name++ = '\0';
3865 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3866 3868
3867 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3868 break; 3870 break;
3869 3871
3870 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3871 *buf++ = '\0'; 3873 *buf++ = '\0';
3872 3874
3873 if (name[0] == '?' && !name[1]) 3875 if (name[0] == '?' && !name[1])
3874 { 3876 {
3875 unsigned short r, g, b; 3877 unsigned short r, g, b;
3876 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3878 pix_colors_focused[color].get (display, r, g, b);
3877 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3879 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3878 } 3880 }
3879 else 3881 else
3880 set_window_color (color + minCOLOR, name); 3882 set_window_color (color, name);
3881 } 3883 }
3882 break; 3884 break;
3883 case XTerm_Color00: 3885 case XTerm_Color00:
3884 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3886 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3885 break; 3887 break;
3886 case XTerm_Color01: 3888 case XTerm_Color01:
3887 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3889 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3888 break; 3890 break;
3889#ifndef NO_CURSORCOLOR 3891#ifndef NO_CURSORCOLOR
3890 case XTerm_Color_cursor: 3892 case XTerm_Color_cursor:
3891 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3893 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3892 break; 3894 break;
… …
3896 break; 3898 break;
3897 case XTerm_Color_pointer_bg: 3899 case XTerm_Color_pointer_bg:
3898 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);
3899 break; 3901 break;
3900#ifndef NO_BOLD_UNDERLINE_REVERSE 3902#ifndef NO_BOLD_UNDERLINE_REVERSE
3901 case XTerm_Color_BD:
3902 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3903 break;
3904 case XTerm_Color_UL:
3905 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3906 break;
3907 case XTerm_Color_RV: 3903 case XTerm_Color_RV:
3908 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);
3909 break; 3913 break;
3910 case URxvt_Color_IT: 3914 case URxvt_Color_IT:
3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3915 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3912 break; 3916 break;
3913#endif 3917#endif
… …
3918 if (am_transparent) 3922 if (am_transparent)
3919 want_full_refresh = want_refresh = 1; 3923 want_full_refresh = want_refresh = 1;
3920 break; 3924 break;
3921#endif 3925#endif
3922 3926
3923 case XTerm_Pixmap: 3927 case Rxvt_Pixmap:
3924 if (*str != ';') 3928 if (*str != ';')
3925 { 3929 {
3926#if XPM_BACKGROUND 3930#if XPM_BACKGROUND
3927 scale_pixmap (""); /* reset to default scaling */ 3931 scale_pixmap (""); /* reset to default scaling */
3928 set_bgPixmap (str); /* change pixmap */ 3932 set_bgPixmap (str); /* change pixmap */
3929#endif
3930 scr_touch (true); 3933 scr_touch (true);
3934#endif
3931 } 3935 }
3936
3932 while ((str = strchr (str, ';')) != NULL) 3937 while ((str = strchr (str, ';')) != NULL)
3933 { 3938 {
3934 str++; 3939 str++;
3935#if XPM_BACKGROUND 3940#if XPM_BACKGROUND
3936 changed += scale_pixmap (str); 3941 changed += scale_pixmap (str);
… …
3939 3944
3940 if (changed) 3945 if (changed)
3941 { 3946 {
3942#ifdef XPM_BACKGROUND 3947#ifdef XPM_BACKGROUND
3943 resize_pixmap (); 3948 resize_pixmap ();
3944#endif
3945 scr_touch (true); 3949 scr_touch (true);
3950#endif
3946 } 3951 }
3947 break; 3952 break;
3948 3953
3949 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3950 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3951 break; 3956 break;
3952 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3953 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3954 break; 3959 break;
3955 3960
3956 case XTerm_logfile: 3961 case XTerm_logfile:
3957 // TODO, when secure mode? 3962 // TODO, when secure mode?
… …
3962 if (OPTION (Opt_insecure)) 3967 if (OPTION (Opt_insecure))
3963 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3964 break; 3969 break;
3965#endif 3970#endif
3966#if 0 3971#if 0
3967 case XTerm_dumpscreen: /* no error notices */ 3972 case Rxvt_dumpscreen: /* no error notices */
3968 { 3973 {
3969 int fd; 3974 int fd;
3970 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)
3971 { 3976 {
3972 scr_dump (fd); 3977 scr_dump (fd);

Diff Legend

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