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.256 by root, Wed Jan 11 05:14:26 2006 UTC

… …
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
… …
1573 1571
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1575 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1576 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1577 1575
1578 scr_refresh (refresh_type); 1576 want_refresh = 1;
1579 } 1577 }
1580 else 1578 else
1581 { 1579 {
1582 XEvent unused_event; 1580 XEvent unused_event;
1583 1581
… …
1710 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1711 &ev.xbutton.x, &ev.xbutton.y, 1709 &ev.xbutton.x, &ev.xbutton.y,
1712 &unused_mask); 1710 &unused_mask);
1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714 scrollbar_size ()); 1712 scrollbar_size ());
1715 scr_refresh (refresh_type); 1713 want_refresh = 1;
1716 refresh_limit = 0; 1714 refresh_limit = 0;
1717 scrollbar_show (1); 1715 scrollbar_show (1);
1718 } 1716 }
1719 break; 1717 break;
1720 } 1718 }
… …
2216 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
2217 } 2215 }
2218 else 2216 else
2219 { 2217 {
2220# endif 2218# endif
2221# ifdef JUMP_MOUSE_WHEEL
2222 scr_page (v, i); 2219 scr_page (v, i);
2223 scr_refresh (SMOOTH_REFRESH);
2224 scrollbar_show (1); 2220 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 2221# ifdef MOUSE_SLIP_WHEELING
2234 } 2222 }
2235#endif 2223# endif
2236 } 2224 }
2237 break; 2225 break;
2238#endif 2226#endif
2239 } 2227 }
2240 } 2228 }
… …
2834 refresh_limit++; 2822 refresh_limit++;
2835 else 2823 else
2836 { 2824 {
2837 flag = true; 2825 flag = true;
2838 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2839 flush_ev.stop (); 2827 want_refresh = 1;
2840 } 2828 }
2841 } 2829 }
2842 2830
2843 } 2831 }
2844 else 2832 else
… …
3870 { 3858 {
3871 if ((name = strchr (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3872 break; 3860 break;
3873 3861
3874 *name++ = '\0'; 3862 *name++ = '\0';
3875 color = atoi (buf); 3863 color = atoi (buf) + minCOLOR;
3876 3864
3877 if (color < 0 || color >= TOTAL_COLORS) 3865 if (!IN_RANGE_EXC (color, minCOLOR, TOTAL_COLORS))
3878 break; 3866 break;
3879 3867
3880 if ((buf = strchr (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3881 *buf++ = '\0'; 3869 *buf++ = '\0';
3882 3870
3883 if (name[0] == '?' && !name[1]) 3871 if (name[0] == '?' && !name[1])
3884 { 3872 {
3885 unsigned short r, g, b; 3873 unsigned short r, g, b;
3886 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3874 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); 3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3888 } 3876 }
3889 else 3877 else
3890 set_window_color (color + minCOLOR, name); 3878 set_window_color (color, name);
3891 } 3879 }
3892 break; 3880 break;
3893 case XTerm_Color00: 3881 case XTerm_Color00:
3894 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3895 break; 3883 break;
3896 case XTerm_Color01: 3884 case XTerm_Color01:
3897 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3898 break; 3886 break;
3899#ifndef NO_CURSORCOLOR 3887#ifndef NO_CURSORCOLOR
3900 case XTerm_Color_cursor: 3888 case XTerm_Color_cursor:
3901 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3902 break; 3890 break;
… …
3934 if (*str != ';') 3922 if (*str != ';')
3935 { 3923 {
3936#if XPM_BACKGROUND 3924#if XPM_BACKGROUND
3937 scale_pixmap (""); /* reset to default scaling */ 3925 scale_pixmap (""); /* reset to default scaling */
3938 set_bgPixmap (str); /* change pixmap */ 3926 set_bgPixmap (str); /* change pixmap */
3939#endif
3940 scr_touch (true); 3927 scr_touch (true);
3928#endif
3941 } 3929 }
3930
3942 while ((str = strchr (str, ';')) != NULL) 3931 while ((str = strchr (str, ';')) != NULL)
3943 { 3932 {
3944 str++; 3933 str++;
3945#if XPM_BACKGROUND 3934#if XPM_BACKGROUND
3946 changed += scale_pixmap (str); 3935 changed += scale_pixmap (str);
… …
3949 3938
3950 if (changed) 3939 if (changed)
3951 { 3940 {
3952#ifdef XPM_BACKGROUND 3941#ifdef XPM_BACKGROUND
3953 resize_pixmap (); 3942 resize_pixmap ();
3954#endif
3955 scr_touch (true); 3943 scr_touch (true);
3944#endif
3956 } 3945 }
3957 break; 3946 break;
3958 3947
3959 case XTerm_restoreFG: 3948 case XTerm_restoreFG:
3960 set_window_color (Color_fg, str); 3949 set_window_color (Color_fg, str);
… …
4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4451const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463 4452
4464void 4453void
4465rxvt_term::tt_write (const char *data, unsigned int len) 4454rxvt_term::tt_write (const char *data, unsigned int len)
4466{ 4455{
4456 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457 return;
4458
4467 if (pty.pty < 0) 4459 if (pty.pty < 0)
4468 return; 4460 return;
4469 4461
4470 if (v_buflen == 0) 4462 if (v_buflen == 0)
4471 { 4463 {

Diff Legend

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