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.358 by sasha, Tue Sep 18 22:27:41 2007 UTC vs.
Revision 1.363 by root, Sun Nov 11 04:08:00 2007 UTC

… …
596 newlen = 0; 596 newlen = 0;
597 } 597 }
598 break; 598 break;
599 599
600#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
601 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
602 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if (kp) 605 if (kp)
606 { 606 {
607 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break; 609 break;
… …
1034 1034
1035void 1035void
1036rxvt_term::flush () 1036rxvt_term::flush ()
1037{ 1037{
1038 flush_ev.stop (); 1038 flush_ev.stop ();
1039 1039
1040#ifdef HAVE_BG_PIXMAP 1040#ifdef HAVE_BG_PIXMAP
1041 if (bgPixmap.check_clearChanged ()) 1041 if (bgPixmap.check_clearChanged ())
1042 { 1042 {
1043// scr_clear (true); This needs to be researched further! 1043// scr_clear (true); This needs to be researched further!
1044 scr_touch (false); 1044 scr_touch (false);
1045 } 1045 }
… …
1094 1094
1095 display->flush (); 1095 display->flush ();
1096} 1096}
1097 1097
1098void 1098void
1099rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::prepare_cb (ev::prepare &w, int revents)
1100{ 1100{
1101 make_current (); 1101 make_current ();
1102 1102
1103 display->flush (); 1103 display->flush ();
1104 1104
1105 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1107} 1107}
1108 1108
1109void 1109void
1110rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1111{
1112 make_current (); 1112 make_current ();
1113 1113
1114 refresh_count = 0; 1114 refresh_count = 0;
1115 flush (); 1115 flush ();
1116} 1116}
1117 1117
1118#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
1119void 1119void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1121{
1122 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1123 want_refresh = 1;
1124
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1124}
1127#endif 1125#endif
1128 1126
1129#ifdef TEXT_BLINK 1127#ifdef TEXT_BLINK
1130void 1128void
1131rxvt_term::text_blink_cb (time_watcher &w) 1129rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1130{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1131 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1132 {
1135 hidden_text = !hidden_text; 1133 hidden_text = !hidden_text;
1136 want_refresh = 1; 1134 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL);
1138 } 1135 }
1139} 1136}
1140#endif 1137#endif
1141 1138
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1140void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1142{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1148 {
1149 want_refresh = 1; 1145 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1146 else
1151 } 1147 w.stop ();
1152} 1148}
1153#endif 1149#endif
1154 1150
1155#ifdef SELECTION_SCROLLING 1151#ifdef SELECTION_SCROLLING
1156void 1152void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1154{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1155 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1156 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1157 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1158 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1164 } 1159 }
1160 else
1161 w.stop ();
1165} 1162}
1166#endif 1163#endif
1167 1164
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1166void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1168{
1172 if (mouse_slip_wheel_speed == 0 1169 if (mouse_slip_wheel_speed == 0
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed)) 1171 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1172 {
1176 if (view_start == top_row || view_start == 0) 1173 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0; 1174 mouse_slip_wheel_speed = 0;
1178 1175
1179 want_refresh = 1; 1176 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1181 } 1177 }
1178 else
1179 w.stop ();
1182} 1180}
1183#endif 1181#endif
1184 1182
1185#if LINUX_YIELD_HACK 1183#if LINUX_YIELD_HACK
1186static struct event_handler 1184static struct event_handler
1187{ 1185{
1188 check_watcher yield_ev; 1186 ev::prepare yield_ev;
1189 1187
1190 void yield_cb (check_watcher &w) 1188 void yield_cb (ev::prepare &w, int revents)
1191 { 1189 {
1192 // this should really be sched_yield(), but the linux guys thought 1190 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1191 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is 1192 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1193 // allowed by the sus... as is returning ENOSYS.
… …
1246 1244
1247 return false; 1245 return false;
1248} 1246}
1249 1247
1250void 1248void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1249rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1250{
1253 make_current (); 1251 make_current ();
1254 1252
1255 if (revents & EVENT_READ) 1253 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1254 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1255 while (pty_fill ())
1258 if (cmd_parse ()) 1256 if (cmd_parse ())
1259 break; 1257 break;
1260 1258
1261 if (revents & EVENT_WRITE) 1259 if (revents & ev::WRITE)
1262 pty_write (); 1260 pty_write ();
1263} 1261}
1264 1262
1265void 1263void
1266rxvt_term::pointer_unblank () 1264rxvt_term::pointer_unblank ()
… …
1270 1268
1271#ifdef POINTER_BLANK 1269#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1270 hidden_pointer = 0;
1273 1271
1274 if (option (Opt_pointerBlank)) 1272 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1273 pointer_ev.start (pointerBlankDelay);
1276#endif 1274#endif
1277} 1275}
1278 1276
1279#ifdef POINTER_BLANK 1277#ifdef POINTER_BLANK
1280void 1278void
… …
1288 1286
1289 hidden_pointer = 1; 1287 hidden_pointer = 1;
1290} 1288}
1291 1289
1292void 1290void
1293rxvt_term::pointer_cb (time_watcher &w) 1291rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1292{
1295 make_current (); 1293 make_current ();
1296 1294
1297 pointer_blank (); 1295 pointer_blank ();
1298} 1296}
… …
1301void 1299void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1300rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1301{
1304 int button_number, key_state = 0; 1302 int button_number, key_state = 0;
1305 int x, y; 1303 int x, y;
1304 int code = 32;
1306 1305
1307 x = ev.x; 1306 x = Pixel2Col (ev.x);
1308 y = ev.y; 1307 y = Pixel2Row (ev.y);
1309 pixel_position (&x, &y); 1308 if (ev.type == MotionNotify) {
1309 if (x == mouse_row && y == mouse_col)
1310 return;
1311 mouse_row = x;
1312 mouse_col = y;
1313 code += 32;
1314 }
1310 1315
1311 if (MEvent.button == AnyButton) 1316 if (MEvent.button == AnyButton)
1312 button_number = 3; 1317 button_number = 3;
1313 else 1318 else
1314 { 1319 {
… …
1360 x + 1, 1365 x + 1,
1361 y + 1); 1366 y + 1);
1362#endif 1367#endif
1363 1368
1364 tt_printf ("\033[M%c%c%c", 1369 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1370 (code + button_number + key_state),
1366 (32 + x + 1), 1371 (32 + x + 1),
1367 (32 + y + 1)); 1372 (32 + y + 1));
1368} 1373}
1369 1374
1370/*{{{ process an X event */ 1375/*{{{ process an X event */
… …
1522 break; 1527 break;
1523 1528
1524 case MapNotify: 1529 case MapNotify:
1525 mapped = 1; 1530 mapped = 1;
1526#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1532 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1528#endif 1533#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1535 break;
1531 1536
1532 case UnmapNotify: 1537 case UnmapNotify:
… …
1577 case MotionNotify: 1582 case MotionNotify:
1578#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
1579 if (hidden_pointer) 1584 if (hidden_pointer)
1580 pointer_unblank (); 1585 pointer_unblank ();
1581#endif 1586#endif
1587 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1588 || priv_modes & PrivMode_MouseAnyEvent)
1589 mouse_report (ev.xbutton);
1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583 break; 1591 break;
1584 1592
1585 if (ev.xany.window == vt) 1593 if (ev.xany.window == vt)
1586 { 1594 {
… …
1621 1629
1622 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1623 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
1624 */ 1632 */
1625 if (!sel_scroll_ev.active) 1633 if (!sel_scroll_ev.active)
1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627 1635
1628 /* save the event params so we can highlight 1636 /* save the event params so we can highlight
1629 * the selection in the pending-scroll loop 1637 * the selection in the pending-scroll loop
1630 */ 1638 */
1631 selection_save_x = ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
… …
1690 { 1698 {
1691 hidden_cursor = 0; 1699 hidden_cursor = 0;
1692 want_refresh = 1; 1700 want_refresh = 1;
1693 } 1701 }
1694 1702
1695 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1703 cursor_blink_ev.again ();
1696 } 1704 }
1697#endif 1705#endif
1698 1706
1699#if defined(POINTER_BLANK) 1707#if defined(POINTER_BLANK)
1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1728 XSetICFocus (Input_Context); 1736 XSetICFocus (Input_Context);
1729 } 1737 }
1730#endif 1738#endif
1731#if CURSOR_BLINK 1739#if CURSOR_BLINK
1732 if (option (Opt_cursorBlink)) 1740 if (option (Opt_cursorBlink))
1733 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1734#endif 1742#endif
1735#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1736 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1737 { 1745 {
1738 pix_colors = pix_colors_focused; 1746 pix_colors = pix_colors_focused;
… …
1776 XUnsetICFocus (Input_Context); 1784 XUnsetICFocus (Input_Context);
1777#endif 1785#endif
1778#if CURSOR_BLINK 1786#if CURSOR_BLINK
1779 if (option (Opt_cursorBlink)) 1787 if (option (Opt_cursorBlink))
1780 cursor_blink_ev.stop (); 1788 cursor_blink_ev.stop ();
1789
1781 hidden_cursor = 0; 1790 hidden_cursor = 0;
1782#endif 1791#endif
1783#if OFF_FOCUS_FADING 1792#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade]) 1793 if (rs[Rs_fade])
1785 { 1794 {
… …
2018 upordown = 1; /* down */ 2027 upordown = 1; /* down */
2019 } 2028 }
2020 if (upordown) 2029 if (upordown)
2021 { 2030 {
2022#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2023 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2024#endif 2033#endif
2025 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
2026 { 2035 {
2027 if (upordown < 0) 2036 if (upordown < 0)
2028 scrollBar.setUp (); 2037 scrollBar.setUp ();
… …
2191 { 2200 {
2192 mouse_slip_wheel_speed += v ? -1 : 1; 2201 mouse_slip_wheel_speed += v ? -1 : 1;
2193 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2194 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2195 2204
2196 if (slip_wheel_ev.at < NOW) 2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2197 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2198
2199 slip_wheel_ev.start ();
2200 } 2206 }
2201 else 2207 else
2202 { 2208 {
2203# endif 2209# endif
2204 scr_page (v, i); 2210 scr_page (v, i);
… …
2272 2278
2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2274 { 2280 {
2275 refresh_count = 0; 2281 refresh_count = 0;
2276 2282
2277 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2278 { 2284 {
2279 refreshnow = true; 2285 refreshnow = true;
2280 ch = NOCHAR; 2286 ch = NOCHAR;
2281 break; 2287 break;
2282 } 2288 }
… …
2849 { 2855 {
2850 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2851 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2852 // 2858 //
2853 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2854 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2855 // that we do not support xterm mouse reporting (should be 95 when we do). 2861 // versions.
2856 // 2862 //
2857 tt_printf ("\033[>%d;94;0c", 'U'); 2863 tt_printf ("\033[>%d;95;0c", 'U');
2858 } 2864 }
2859 break; 2865 break;
2860 case '?': 2866 case '?':
2861 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2862 process_terminal_mode (ch, priv, nargs, arg); 2868 process_terminal_mode (ch, priv, nargs, arg);
… …
3627#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
3628 { 67, PrivMode_BackSpace }, 3634 { 67, PrivMode_BackSpace },
3629#endif 3635#endif
3630 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
3631 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3632 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3638 { 1002, PrivMode_MouseBtnEvent },
3633 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3639 { 1003, PrivMode_MouseAnyEvent },
3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
3636 // 1035 enable modifiers for alt, numlock NYI 3642 // 1035 enable modifiers for alt, numlock NYI
3637 // 1036 send ESC for meta keys NYI 3643 // 1036 send ESC for meta keys NYI
3638 // 1037 send DEL for keypad delete NYI 3644 // 1037 send DEL for keypad delete NYI
… …
3712 scr_autowrap (state); 3718 scr_autowrap (state);
3713 break; 3719 break;
3714 /* case 8: - auto repeat, can't do on a per window basis */ 3720 /* case 8: - auto repeat, can't do on a per window basis */
3715 case 9: /* X10 mouse reporting */ 3721 case 9: /* X10 mouse reporting */
3716 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
3717 priv_modes &= ~PrivMode_MouseX11; 3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3718 break; 3724 break;
3719#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
3720 case scrollBar_esc: 3726 case scrollBar_esc:
3721 if (scrollbar_mapping (state)) 3727 if (scrollbar_mapping (state))
3722 { 3728 {
… …
3735 break; 3741 break;
3736 /* case 66: - application key pad */ 3742 /* case 66: - application key pad */
3737 /* case 67: - backspace key */ 3743 /* case 67: - backspace key */
3738 case 1000: /* X11 mouse reporting */ 3744 case 1000: /* X11 mouse reporting */
3739 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
3740 priv_modes &= ~PrivMode_MouseX10; 3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741 break; 3747 break;
3742#if 0 3748#if 0
3743 case 1001: 3749 case 1001:
3744 break; /* X11 mouse highlighting */ 3750 break; /* X11 mouse highlighting */
3745#endif 3751#endif
3752 case 1002:
3753 case 1003:
3754 if (state) {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 vt_emask_mouse = PointerMotionMask;
3758 } else
3759 vt_emask_mouse = NoEventMask;
3760 vt_select_input ();
3761 break;
3746 case 1010: /* scroll to bottom on TTY output inhibit */ 3762 case 1010: /* scroll to bottom on TTY output inhibit */
3747 set_option (Opt_scrollTtyOutput, !state); 3763 set_option (Opt_scrollTtyOutput, !state);
3748 break; 3764 break;
3749 case 1011: /* scroll to bottom on key press */ 3765 case 1011: /* scroll to bottom on key press */
3750 set_option (Opt_scrollTtyKeypress, state); 3766 set_option (Opt_scrollTtyKeypress, state);
… …
3987 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3988 4004
3989 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
3990 v_buflen += len; 4006 v_buflen += len;
3991 4007
3992 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
3993} 4009}
3994 4010
3995void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
3996{ 4012{
3997 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4003 if (v_buflen == 0) 4019 if (v_buflen == 0)
4004 { 4020 {
4005 free (v_buffer); 4021 free (v_buffer);
4006 v_buffer = 0; 4022 v_buffer = 0;
4007 4023
4008 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4009 return; 4025 return;
4010 } 4026 }
4011 4027
4012 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4013 } 4029 }
4014 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4015 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4016} 4032}
4017 4033
4018/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4019 4035

Diff Legend

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