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.377 by root, Fri Dec 14 02:22:24 2007 UTC vs.
Revision 1.383 by root, Fri Dec 14 06:29:28 2007 UTC

… …
1041 } 1041 }
1042 1042
1043 display->flush (); 1043 display->flush ();
1044} 1044}
1045 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1046void 1047void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1048rxvt_term::refresh_check ()
1048{ 1049{
1049 make_current ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1050 if (want_refresh && !flush_ev.is_active ())
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1052
1053 display->flush ();
1055} 1054}
1056 1055
1057void 1056void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1057rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1058{
… …
1067void 1066void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1068{
1070 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1070 want_refresh = 1;
1071 refresh_check ();
1072} 1072}
1073#endif 1073#endif
1074 1074
1075#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1076void 1076void
… …
1078{ 1078{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1080 {
1081 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1082 want_refresh = 1; 1082 want_refresh = 1;
1083 refresh_check ();
1083 } 1084 }
1084 else 1085 else
1085 w.stop (); 1086 w.stop ();
1086} 1087}
1087#endif 1088#endif
1088 1089
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1091void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1093{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1096 {
1095 want_refresh = 1; 1097 want_refresh = 1;
1098 refresh_check ();
1099 }
1096 else 1100 else
1097 w.stop (); 1101 w.stop ();
1098} 1102}
1099#endif 1103#endif
1100 1104
… …
1104{ 1108{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1110 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1112 want_refresh = 1;
1113 refresh_check ();
1109 } 1114 }
1110 else 1115 else
1111 w.stop (); 1116 w.stop ();
1112} 1117}
1113#endif 1118#endif
1114 1119
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1121void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1123{
1119 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1125 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1126 want_refresh = 1;
1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1131 {
1128 else 1132 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1133 w.stop ();
1134 }
1130} 1135}
1131#endif 1136#endif
1132 1137
1133#if LINUX_YIELD_HACK 1138#if LINUX_YIELD_HACK
1134static struct event_handler 1139static struct event_handler
… …
1206 if (cmd_parse ()) 1211 if (cmd_parse ())
1207 break; 1212 break;
1208 1213
1209 if (revents & ev::WRITE) 1214 if (revents & ev::WRITE)
1210 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1211} 1218}
1212 1219
1213void 1220void
1214rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1215{ 1222{
… …
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1516 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1517 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1518 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1519 ev.xexpose.width, ev.xexpose.height, False);
1513 } 1520 }
1521
1514 want_refresh = 1; 1522 want_refresh = 1;
1515 } 1523 }
1516 else 1524 else
1517 { 1525 {
1518 XEvent unused_event; 1526 XEvent unused_event;
… …
1665 1673
1666 if (ev.type == KeyPress && hidden_pointer == 0) 1674 if (ev.type == KeyPress && hidden_pointer == 0)
1667 pointer_blank (); 1675 pointer_blank ();
1668 } 1676 }
1669#endif 1677#endif
1678
1679 refresh_check ();
1670} 1680}
1671 1681
1672void 1682void
1673rxvt_term::focus_in () 1683rxvt_term::focus_in ()
1674{ 1684{
… …
1787 update_background (); 1797 update_background ();
1788 } 1798 }
1789 break; 1799 break;
1790 } 1800 }
1791# endif 1801# endif
1802
1803 refresh_check ();
1792} 1804}
1793#endif 1805#endif
1794 1806
1795void 1807void
1796rxvt_term::button_press (XButtonEvent &ev) 1808rxvt_term::button_press (XButtonEvent &ev)

Diff Legend

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