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.252 by root, Mon Jan 9 22:41:41 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;
… …
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)
… …
1573 1575
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1575 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1576 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, False);
1577 1579
1578 scr_refresh (refresh_type); 1580 want_refresh = 1;
1579 } 1581 }
1580 else 1582 else
1581 { 1583 {
1582 XEvent unused_event; 1584 XEvent unused_event;
1583 1585
… …
1710 &unused_root_x, &unused_root_y, 1712 &unused_root_x, &unused_root_y,
1711 &ev.xbutton.x, &ev.xbutton.y, 1713 &ev.xbutton.x, &ev.xbutton.y,
1712 &unused_mask); 1714 &unused_mask);
1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1715 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714 scrollbar_size ()); 1716 scrollbar_size ());
1715 scr_refresh (refresh_type); 1717 want_refresh = 1;
1716 refresh_limit = 0; 1718 refresh_limit = 0;
1717 scrollbar_show (1); 1719 scrollbar_show (1);
1718 } 1720 }
1719 break; 1721 break;
1720 } 1722 }
… …
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);
… …
2216 slip_wheel_ev.start (); 2218 slip_wheel_ev.start ();
2217 } 2219 }
2218 else 2220 else
2219 { 2221 {
2220# endif 2222# endif
2221# ifdef JUMP_MOUSE_WHEEL
2222 scr_page (v, i); 2223 scr_page (v, i);
2223 scr_refresh (SMOOTH_REFRESH);
2224 scrollbar_show (1); 2224 scrollbar_show (1);
2225# else
2226 while (i--)
2227 {
2228 scr_page (v, 1);
2229 scr_refresh (SMOOTH_REFRESH);
2230 scrollbar_show (1);
2231 }
2232# endif
2233# ifdef MOUSE_SLIP_WHEELING 2225# ifdef MOUSE_SLIP_WHEELING
2234 } 2226 }
2235#endif 2227# endif
2236 } 2228 }
2237 break; 2229 break;
2238#endif 2230#endif
2239 } 2231 }
2240 } 2232 }
… …
2834 refresh_limit++; 2826 refresh_limit++;
2835 else 2827 else
2836 { 2828 {
2837 flag = true; 2829 flag = true;
2838 scr_refresh (refresh_type); 2830 scr_refresh (refresh_type);
2839 flush_ev.stop (); 2831 want_refresh = 1;
2840 } 2832 }
2841 } 2833 }
2842 2834
2843 } 2835 }
2844 else 2836 else
… …
3870 { 3862 {
3871 if ((name = strchr (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3872 break; 3864 break;
3873 3865
3874 *name++ = '\0'; 3866 *name++ = '\0';
3875 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3876 3868
3877 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3878 break; 3870 break;
3879 3871
3880 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3881 *buf++ = '\0'; 3873 *buf++ = '\0';
3882 3874
3883 if (name[0] == '?' && !name[1]) 3875 if (name[0] == '?' && !name[1])
3884 { 3876 {
3885 unsigned short r, g, b; 3877 unsigned short r, g, b;
3886 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3878 pix_colors_focused[color].get (display, r, g, b);
3887 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);
3888 } 3880 }
3889 else 3881 else
3890 set_window_color (color + minCOLOR, name); 3882 set_window_color (color, name);
3891 } 3883 }
3892 break; 3884 break;
3893 case XTerm_Color00: 3885 case XTerm_Color00:
3894 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3886 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3895 break; 3887 break;
3896 case XTerm_Color01: 3888 case XTerm_Color01:
3897 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3889 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3898 break; 3890 break;
3899#ifndef NO_CURSORCOLOR 3891#ifndef NO_CURSORCOLOR
3900 case XTerm_Color_cursor: 3892 case XTerm_Color_cursor:
3901 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3893 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3902 break; 3894 break;
… …
3906 break; 3898 break;
3907 case XTerm_Color_pointer_bg: 3899 case XTerm_Color_pointer_bg:
3908 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);
3909 break; 3901 break;
3910#ifndef NO_BOLD_UNDERLINE_REVERSE 3902#ifndef NO_BOLD_UNDERLINE_REVERSE
3911 case XTerm_Color_BD:
3912 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3913 break;
3914 case XTerm_Color_UL:
3915 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3916 break;
3917 case XTerm_Color_RV: 3903 case XTerm_Color_RV:
3918 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);
3919 break; 3913 break;
3920 case URxvt_Color_IT: 3914 case URxvt_Color_IT:
3921 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3915 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3922 break; 3916 break;
3923#endif 3917#endif
… …
3928 if (am_transparent) 3922 if (am_transparent)
3929 want_full_refresh = want_refresh = 1; 3923 want_full_refresh = want_refresh = 1;
3930 break; 3924 break;
3931#endif 3925#endif
3932 3926
3933 case XTerm_Pixmap: 3927 case Rxvt_Pixmap:
3934 if (*str != ';') 3928 if (*str != ';')
3935 { 3929 {
3936#if XPM_BACKGROUND 3930#if XPM_BACKGROUND
3937 scale_pixmap (""); /* reset to default scaling */ 3931 scale_pixmap (""); /* reset to default scaling */
3938 set_bgPixmap (str); /* change pixmap */ 3932 set_bgPixmap (str); /* change pixmap */
3939#endif
3940 scr_touch (true); 3933 scr_touch (true);
3934#endif
3941 } 3935 }
3936
3942 while ((str = strchr (str, ';')) != NULL) 3937 while ((str = strchr (str, ';')) != NULL)
3943 { 3938 {
3944 str++; 3939 str++;
3945#if XPM_BACKGROUND 3940#if XPM_BACKGROUND
3946 changed += scale_pixmap (str); 3941 changed += scale_pixmap (str);
… …
3949 3944
3950 if (changed) 3945 if (changed)
3951 { 3946 {
3952#ifdef XPM_BACKGROUND 3947#ifdef XPM_BACKGROUND
3953 resize_pixmap (); 3948 resize_pixmap ();
3954#endif
3955 scr_touch (true); 3949 scr_touch (true);
3950#endif
3956 } 3951 }
3957 break; 3952 break;
3958 3953
3959 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3960 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3961 break; 3956 break;
3962 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3963 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3964 break; 3959 break;
3965 3960
3966 case XTerm_logfile: 3961 case XTerm_logfile:
3967 // TODO, when secure mode? 3962 // TODO, when secure mode?
… …
3972 if (OPTION (Opt_insecure)) 3967 if (OPTION (Opt_insecure))
3973 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3974 break; 3969 break;
3975#endif 3970#endif
3976#if 0 3971#if 0
3977 case XTerm_dumpscreen: /* no error notices */ 3972 case Rxvt_dumpscreen: /* no error notices */
3978 { 3973 {
3979 int fd; 3974 int fd;
3980 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)
3981 { 3976 {
3982 scr_dump (fd); 3977 scr_dump (fd);
… …
4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4457const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463 4458
4464void 4459void
4465rxvt_term::tt_write (const char *data, unsigned int len) 4460rxvt_term::tt_write (const char *data, unsigned int len)
4466{ 4461{
4462 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463 return;
4464
4467 if (pty.pty < 0) 4465 if (pty.pty < 0)
4468 return; 4466 return;
4469 4467
4470 if (v_buflen == 0) 4468 if (v_buflen == 0)
4471 { 4469 {

Diff Legend

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