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.261 by root, Fri Jan 13 15:42:50 2006 UTC vs.
Revision 1.265 by root, Mon Jan 16 08:29:57 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;
… …
1021} 1021}
1022 1022
1023void 1023void
1024rxvt_term::check_cb (check_watcher &w) 1024rxvt_term::check_cb (check_watcher &w)
1025{ 1025{
1026 SET_R (this); 1026 make_current ();
1027 SET_LOCALE (locale);
1028 1027
1029 display->flush (); 1028 display->flush ();
1030 1029
1031 if (want_refresh && !flush_ev.active) 1030 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1031 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1032}
1034 1033
1035void 1034void
1036rxvt_term::flush_cb (time_watcher &w) 1035rxvt_term::flush_cb (time_watcher &w)
1037{ 1036{
1038 SET_R (this); 1037 make_current ();
1039 SET_LOCALE (locale);
1040 1038
1041 refresh_limit = 1; 1039 refresh_limit = 1;
1042 refresh_count = 0; 1040 refresh_count = 0;
1043 flush (); 1041 flush ();
1044} 1042}
… …
1101{ 1099{
1102 if (mouse_slip_wheel_speed == 0 1100 if (mouse_slip_wheel_speed == 0
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1102 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1103 {
1106 if (view_start == nsaved || 1104 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1105 mouse_slip_wheel_speed = 0;
1109 1106
1110 refresh_type |= SMOOTH_REFRESH; 1107 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1108 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1173} 1170}
1174 1171
1175void 1172void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1173rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1174{
1178 SET_R (this); 1175 make_current ();
1179 SET_LOCALE (locale);
1180 1176
1181 if (revents & EVENT_READ) 1177 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1178 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1179 while (pty_fill ())
1184 if (cmd_parse ()) 1180 if (cmd_parse ())
… …
1216} 1212}
1217 1213
1218void 1214void
1219rxvt_term::pointer_cb (time_watcher &w) 1215rxvt_term::pointer_cb (time_watcher &w)
1220{ 1216{
1221 SET_R (this); 1217 make_current ();
1222 SET_LOCALE (locale);
1223 1218
1224 pointer_blank (); 1219 pointer_blank ();
1225} 1220}
1226#endif 1221#endif
1227 1222
… …
1306 1301
1307/*{{{ process an X event */ 1302/*{{{ process an X event */
1308void 1303void
1309rxvt_term::x_cb (XEvent &ev) 1304rxvt_term::x_cb (XEvent &ev)
1310{ 1305{
1306 make_current ();
1307
1311 dDisp; 1308 dDisp;
1312 1309
1313 SET_R (this);
1314 SET_LOCALE (locale);
1315
1316 if (ev.xany.window == vt 1310 if (ev.xany.window == vt
1311 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1312 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1313 return;
1319 1314
1320 // for XQueryPointer 1315 // for XQueryPointer
1321 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
… …
1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1622 break; 1617 break;
1623 1618
1624 if (ev.xany.window == vt) 1619 if (ev.xany.window == vt)
1625 { 1620 {
1621 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1622 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop 1623 ; // nop
1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1629 { 1625 {
1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1631 ; 1627 ;
… …
1823 1819
1824#if TRANSPARENT 1820#if TRANSPARENT
1825void 1821void
1826rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1823{
1828 SET_R (this); 1824 make_current ();
1829 SET_LOCALE (locale);
1830 1825
1831 switch (ev.type) 1826 switch (ev.type)
1832 { 1827 {
1833 case PropertyNotify: 1828 case PropertyNotify:
1834 /* 1829 /*

Diff Legend

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