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.361 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.364 by ayin, Mon Nov 12 14:53:13 2007 UTC

… …
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 550 {
551 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
554 switch (keysym) 584 switch (keysym)
555 { 585 {
556#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace: 587 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
564 else 594 else
565 strcpy (kbuf, rs[Rs_backspace_key]); 595 strcpy (kbuf, rs[Rs_backspace_key]);
566 break; 596 break;
567#endif 597#endif
568#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete: 599 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]); 600 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 601 break;
582#endif 602#endif
583 case XK_Tab: 603 case XK_Tab:
… …
595#endif 615#endif
596 newlen = 0; 616 newlen = 0;
597 } 617 }
598 break; 618 break;
599 619
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 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)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
630 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
632 break; 636 break;
633 637
634#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if (kp)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior: 639 case XK_Prior:
646 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
647 break; 641 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if (kp)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next: 642 case XK_Next:
659 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
660 break; 644 break;
661#endif 645#endif
662 case XK_KP_Enter: 646 case XK_KP_Enter:
… …
681 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
682 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
683 } 667 }
684 break; 668 break;
685 669
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
728 706
729 case XK_Find: 707 case XK_Find:
730 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
731 break; 709 break;
732 710
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert: 711 case XK_Insert:
744 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
745 break; 713 break;
746#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove: 715 case DXK_Remove:
… …
751 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
752 break; 720 break;
753 case XK_Select: 721 case XK_Select:
754 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
755 break; 723 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End: 724 case XK_End:
767 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
768 break; 726 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if (kp)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home: 727 case XK_Home:
780 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
781 break; 729 break;
782 730
783#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
1094 1042
1095 display->flush (); 1043 display->flush ();
1096} 1044}
1097 1045
1098void 1046void
1099rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1100{ 1048{
1101 make_current (); 1049 make_current ();
1102 1050
1103 display->flush (); 1051 display->flush ();
1104 1052
1105 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1107} 1055}
1108 1056
1109void 1057void
1110rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1059{
1112 make_current (); 1060 make_current ();
1113 1061
1114 refresh_count = 0; 1062 refresh_count = 0;
1115 flush (); 1063 flush ();
1116} 1064}
1117 1065
1118#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1119void 1067void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1069{
1122 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1071 want_refresh = 1;
1124
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1072}
1127#endif 1073#endif
1128 1074
1129#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1130void 1076void
1131rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1078{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1080 {
1135 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1136 want_refresh = 1; 1082 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL);
1138 } 1083 }
1139} 1084}
1140#endif 1085#endif
1141 1086
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1088void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1090{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1148 {
1149 want_refresh = 1; 1093 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
1151 } 1095 w.stop ();
1152} 1096}
1153#endif 1097#endif
1154 1098
1155#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1156void 1100void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1102{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1104 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1106 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1164 } 1107 }
1108 else
1109 w.stop ();
1165} 1110}
1166#endif 1111#endif
1167 1112
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1114void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1116{
1172 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1120 {
1176 if (view_start == top_row || view_start == 0) 1121 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0; 1122 mouse_slip_wheel_speed = 0;
1178 1123
1179 want_refresh = 1; 1124 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1181 } 1125 }
1126 else
1127 w.stop ();
1182} 1128}
1183#endif 1129#endif
1184 1130
1185#if LINUX_YIELD_HACK 1131#if LINUX_YIELD_HACK
1186static struct event_handler 1132static struct event_handler
1187{ 1133{
1188 check_watcher yield_ev; 1134 ev::prepare yield_ev;
1189 1135
1190 void yield_cb (check_watcher &w) 1136 void yield_cb (ev::prepare &w, int revents)
1191 { 1137 {
1192 // this should really be sched_yield(), but the linux guys thought 1138 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1139 // 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 1140 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1141 // allowed by the sus... as is returning ENOSYS.
… …
1246 1192
1247 return false; 1193 return false;
1248} 1194}
1249 1195
1250void 1196void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1198{
1253 make_current (); 1199 make_current ();
1254 1200
1255 if (revents & EVENT_READ) 1201 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1203 while (pty_fill ())
1258 if (cmd_parse ()) 1204 if (cmd_parse ())
1259 break; 1205 break;
1260 1206
1261 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1262 pty_write (); 1208 pty_write ();
1263} 1209}
1264 1210
1265void 1211void
1266rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
… …
1270 1216
1271#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1218 hidden_pointer = 0;
1273 1219
1274 if (option (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1276#endif 1222#endif
1277} 1223}
1278 1224
1279#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1280void 1226void
… …
1288 1234
1289 hidden_pointer = 1; 1235 hidden_pointer = 1;
1290} 1236}
1291 1237
1292void 1238void
1293rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1240{
1295 make_current (); 1241 make_current ();
1296 1242
1297 pointer_blank (); 1243 pointer_blank ();
1298} 1244}
… …
1529 break; 1475 break;
1530 1476
1531 case MapNotify: 1477 case MapNotify:
1532 mapped = 1; 1478 mapped = 1;
1533#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1534 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1535#endif 1481#endif
1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1537 break; 1483 break;
1538 1484
1539 case UnmapNotify: 1485 case UnmapNotify:
… …
1631 1577
1632 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1633 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1634 */ 1580 */
1635 if (!sel_scroll_ev.active) 1581 if (!sel_scroll_ev.active)
1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1637 1583
1638 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1639 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1640 */ 1586 */
1641 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
… …
1700 { 1646 {
1701 hidden_cursor = 0; 1647 hidden_cursor = 0;
1702 want_refresh = 1; 1648 want_refresh = 1;
1703 } 1649 }
1704 1650
1705 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1651 cursor_blink_ev.again ();
1706 } 1652 }
1707#endif 1653#endif
1708 1654
1709#if defined(POINTER_BLANK) 1655#if defined(POINTER_BLANK)
1710 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1656 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1738 XSetICFocus (Input_Context); 1684 XSetICFocus (Input_Context);
1739 } 1685 }
1740#endif 1686#endif
1741#if CURSOR_BLINK 1687#if CURSOR_BLINK
1742 if (option (Opt_cursorBlink)) 1688 if (option (Opt_cursorBlink))
1743 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1689 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1744#endif 1690#endif
1745#if OFF_FOCUS_FADING 1691#if OFF_FOCUS_FADING
1746 if (rs[Rs_fade]) 1692 if (rs[Rs_fade])
1747 { 1693 {
1748 pix_colors = pix_colors_focused; 1694 pix_colors = pix_colors_focused;
… …
1786 XUnsetICFocus (Input_Context); 1732 XUnsetICFocus (Input_Context);
1787#endif 1733#endif
1788#if CURSOR_BLINK 1734#if CURSOR_BLINK
1789 if (option (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1736 cursor_blink_ev.stop ();
1737
1791 hidden_cursor = 0; 1738 hidden_cursor = 0;
1792#endif 1739#endif
1793#if OFF_FOCUS_FADING 1740#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1741 if (rs[Rs_fade])
1795 { 1742 {
… …
2028 upordown = 1; /* down */ 1975 upordown = 1; /* down */
2029 } 1976 }
2030 if (upordown) 1977 if (upordown)
2031 { 1978 {
2032#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2033 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1980 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2034#endif 1981#endif
2035 if (scr_page (upordown < 0 ? UP : DN, 1)) 1982 if (scr_page (upordown < 0 ? UP : DN, 1))
2036 { 1983 {
2037 if (upordown < 0) 1984 if (upordown < 0)
2038 scrollBar.setUp (); 1985 scrollBar.setUp ();
… …
2201 { 2148 {
2202 mouse_slip_wheel_speed += v ? -1 : 1; 2149 mouse_slip_wheel_speed += v ? -1 : 1;
2203 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2204 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2205 2152
2206 if (slip_wheel_ev.at < NOW) 2153 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2207 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2208
2209 slip_wheel_ev.start ();
2210 } 2154 }
2211 else 2155 else
2212 { 2156 {
2213# endif 2157# endif
2214 scr_page (v, i); 2158 scr_page (v, i);
… …
2282 2226
2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2227 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2284 { 2228 {
2285 refresh_count = 0; 2229 refresh_count = 0;
2286 2230
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2231 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2288 { 2232 {
2289 refreshnow = true; 2233 refreshnow = true;
2290 ch = NOCHAR; 2234 ch = NOCHAR;
2291 break; 2235 break;
2292 } 2236 }
… …
4007 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4008 3952
4009 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
4010 v_buflen += len; 3954 v_buflen += len;
4011 3955
4012 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
4013} 3957}
4014 3958
4015void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4016{ 3960{
4017 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3961 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4023 if (v_buflen == 0) 3967 if (v_buflen == 0)
4024 { 3968 {
4025 free (v_buffer); 3969 free (v_buffer);
4026 v_buffer = 0; 3970 v_buffer = 0;
4027 3971
4028 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4029 return; 3973 return;
4030 } 3974 }
4031 3975
4032 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4033 } 3977 }
4034 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4035 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4036} 3980}
4037 3981
4038/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4039 3983

Diff Legend

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