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.375 by root, Tue Dec 11 21:10:46 2007 UTC vs.
Revision 1.384 by ayin, Tue Dec 18 13:07:55 2007 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
198 r & RS_Uline ? " uline" : "", 198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 199 r & RS_Careful ? " careful" : "");
200 200
201 int width = wcswidth (fname, wcslen (fname)); 201 int width = wcswidth (fname, wcslen (fname));
202 202
203 max_it (width, 8+5); // for char + hey 203 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 204 max_it (width, strlen (attr));
205 205
206 if (y >= 0) 206 if (y >= 0)
207 { 207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
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 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1052
1051 display->flush (); 1053 display->flush ();
1052
1053 if (want_refresh && !ev_is_active (&flush_ev))
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
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;
… …
1579 int dist; 1587 int dist;
1580 1588
1581 /* don't clobber the current delay if we are 1589 /* don't clobber the current delay if we are
1582 * already in the middle of scrolling. 1590 * already in the middle of scrolling.
1583 */ 1591 */
1584 if (!ev_is_active (&sel_scroll_ev)) 1592 if (!sel_scroll_ev.is_active ())
1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1593 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1586 1594
1587 /* save the event params so we can highlight 1595 /* save the event params so we can highlight
1588 * the selection in the pending-scroll loop 1596 * the selection in the pending-scroll loop
1589 */ 1597 */
… …
1612 else 1620 else
1613 { 1621 {
1614 /* we are within the text window, so we 1622 /* we are within the text window, so we
1615 * shouldn't be scrolling 1623 * shouldn't be scrolling
1616 */ 1624 */
1617 if (ev_is_active (&sel_scroll_ev))
1618 sel_scroll_ev.stop(); 1625 sel_scroll_ev.stop();
1619 } 1626 }
1620#endif 1627#endif
1621#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1622 } 1629 }
1623#endif 1630#endif
… …
1666 1673
1667 if (ev.type == KeyPress && hidden_pointer == 0) 1674 if (ev.type == KeyPress && hidden_pointer == 0)
1668 pointer_blank (); 1675 pointer_blank ();
1669 } 1676 }
1670#endif 1677#endif
1678
1679 refresh_check ();
1671} 1680}
1672 1681
1673void 1682void
1674rxvt_term::focus_in () 1683rxvt_term::focus_in ()
1675{ 1684{
… …
1788 update_background (); 1797 update_background ();
1789 } 1798 }
1790 break; 1799 break;
1791 } 1800 }
1792# endif 1801# endif
1802
1803 refresh_check ();
1793} 1804}
1794#endif 1805#endif
1795 1806
1796void 1807void
1797rxvt_term::button_press (XButtonEvent &ev) 1808rxvt_term::button_press (XButtonEvent &ev)
… …
1975 if (scrollbarrxvt_upButton (ev.y)) 1986 if (scrollbarrxvt_upButton (ev.y))
1976 upordown = -1; /* up */ 1987 upordown = -1; /* up */
1977 else if (scrollbarrxvt_dnButton (ev.y)) 1988 else if (scrollbarrxvt_dnButton (ev.y))
1978 upordown = 1; /* down */ 1989 upordown = 1; /* down */
1979 } 1990 }
1991
1980 if (upordown) 1992 if (upordown)
1981 { 1993 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1994#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1995 if (!cont_scroll_ev.is_active ())
1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1996 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1984#endif 1997#endif
1985 if (scr_page (upordown < 0 ? UP : DN, 1)) 1998 if (scr_page (upordown < 0 ? UP : DN, 1))
1986 { 1999 {
1987 if (upordown < 0) 2000 if (upordown < 0)
1988 scrollBar.setUp (); 2001 scrollBar.setUp ();
… …
2068 scrollBar.setIdle (); 2081 scrollBar.setIdle ();
2069 scrollbar_show (0); 2082 scrollbar_show (0);
2070 } 2083 }
2071 2084
2072#ifdef SELECTION_SCROLLING 2085#ifdef SELECTION_SCROLLING
2073 if (ev_is_active (&sel_scroll_ev))
2074 sel_scroll_ev.stop(); 2086 sel_scroll_ev.stop();
2075#endif 2087#endif
2076 2088
2077 if (ev.window == vt) 2089 if (ev.window == vt)
2078 { 2090 {
2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2091 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2151 { 2163 {
2152 mouse_slip_wheel_speed += v ? -1 : 1; 2164 mouse_slip_wheel_speed += v ? -1 : 1;
2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2165 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2166 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2155 2167
2168 if (!slip_wheel_ev.is_active ())
2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2169 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2157 } 2170 }
2158 else 2171 else
2159 { 2172 {
2160# endif 2173# endif
2161 scr_page (v, i); 2174 scr_page (v, i);

Diff Legend

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