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.267 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.269 by root, Tue Jan 17 12:22:59 2006 UTC

… …
1006 while (l->is_longer () && row < end_row); 1006 while (l->is_longer () && row < end_row);
1007 } 1007 }
1008 while (row < end_row); 1008 while (row < end_row);
1009 } 1009 }
1010 1010
1011 scr_refresh (refresh_type); 1011 scr_refresh ();
1012 scrollbar_show (1); 1012 scrollbar_show (1);
1013#ifdef USE_XIM 1013#ifdef USE_XIM
1014 IMSendSpot (); 1014 IMSendSpot ();
1015#endif 1015#endif
1016 } 1016 }
… …
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1069{ 1069{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 { 1072 {
1073 refresh_type |= SMOOTH_REFRESH;
1074 want_refresh = 1; 1073 want_refresh = 1;
1075 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1076 } 1075 }
1077} 1076}
1078#endif 1077#endif
… …
1082rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1083{ 1082{
1084 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1085 { 1084 {
1086 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1087 refresh_type |= SMOOTH_REFRESH;
1088 want_refresh = 1; 1086 want_refresh = 1;
1089 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1090 } 1088 }
1091} 1089}
1092#endif 1090#endif
… …
1100 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1101 { 1099 {
1102 if (view_start == top_row || view_start == 0) 1100 if (view_start == top_row || view_start == 0)
1103 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1104 1102
1105 refresh_type |= SMOOTH_REFRESH;
1106 want_refresh = 1; 1103 want_refresh = 1;
1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1108 } 1105 }
1109} 1106}
1110#endif 1107#endif
… …
1140 1137
1141 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1142 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1143 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1144 1141
1145 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1146 1143
1147 if (r > 0) 1144 if (r > 0)
1148 { 1145 {
1149 cmdbuf_endp += r; 1146 cmdbuf_endp += r;
1150 return true; 1147 return true;
… …
2100 2097
2101 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
2102 { 2099 {
2103 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
2104 scrollbar_show (0); 2101 scrollbar_show (0);
2105#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2106 refresh_type &= ~SMOOTH_REFRESH;
2107#endif
2108 } 2102 }
2109 2103
2110#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
2111 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
2112 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
… …
2798 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2799 refresh_limit++; 2793 refresh_limit++;
2800 else 2794 else
2801 { 2795 {
2802 flag = true; 2796 flag = true;
2803 scr_refresh (refresh_type); 2797 scr_refresh ();
2804 want_refresh = 1; 2798 want_refresh = 1;
2805 } 2799 }
2806 } 2800 }
2807 2801
2808 } 2802 }
… …
3975 if (query) 3969 if (query)
3976 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3977 else 3971 else
3978 { 3972 {
3979 set_locale (str); 3973 set_locale (str);
3980 pty.set_utf8_mode (enc_utf8); 3974 pty->set_utf8_mode (enc_utf8);
3981 init_xlocale (); 3975 init_xlocale ();
3982 } 3976 }
3983 break; 3977 break;
3984 3978
3985 case URxvt_view_up: 3979 case URxvt_view_up:
… …
4417rxvt_term::tt_write (const char *data, unsigned int len) 4411rxvt_term::tt_write (const char *data, unsigned int len)
4418{ 4412{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return; 4414 return;
4421 4415
4422 if (pty.pty < 0) 4416 if (pty->pty < 0)
4423 return; 4417 return;
4424 4418
4425 if (v_buflen == 0) 4419 if (v_buflen == 0)
4426 { 4420 {
4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4421 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4428 4422
4429 if ((unsigned int)written == len) 4423 if ((unsigned int)written == len)
4430 return; 4424 return;
4431 4425
4432 data += written; 4426 data += written;
… …
4441 pty_ev.set (EVENT_READ | EVENT_WRITE); 4435 pty_ev.set (EVENT_READ | EVENT_WRITE);
4442} 4436}
4443 4437
4444void rxvt_term::pty_write () 4438void rxvt_term::pty_write ()
4445{ 4439{
4446 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4440 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4447 4441
4448 if (written > 0) 4442 if (written > 0)
4449 { 4443 {
4450 v_buflen -= written; 4444 v_buflen -= written;
4451 4445

Diff Legend

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