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.344 by root, Fri Aug 10 23:52:12 2007 UTC vs.
Revision 1.371 by ayin, Wed Dec 5 08:46:30 2007 UTC

… …
95 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
97 97
98 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
548#endif 547#endif
549 548
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 550 {
552 { 551 {
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)
… …
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
563 } 593 }
564 else 594 else
565 strcpy (kbuf, key_backspace); 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_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete: 599 case XK_Delete:
580 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 601 break;
582#endif 602#endif
583 case XK_Tab: 603 case XK_Tab:
584 if (shft) 604 if (shft)
585 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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:
663 /* allow shift to override */ 647 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
665 { 649 {
666 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
667 break; 651 break;
668 } 652 }
669 653
… …
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");
… …
712 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */ 694 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
718 { 696 {
719 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
721 } 699 }
722 else 700 else
… …
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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) \
… …
1035void 983void
1036rxvt_term::flush () 984rxvt_term::flush ()
1037{ 985{
1038 flush_ev.stop (); 986 flush_ev.stop ();
1039 987
1040#ifdef ENABLE_TRANSPARENCY 988#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
1042 { 990 {
1043 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 992 scr_touch (false);
1046 } 993 }
1047#endif 994#endif
1048 995
1049 if (want_refresh) 996 if (want_refresh)
… …
1095 1042
1096 display->flush (); 1043 display->flush ();
1097} 1044}
1098 1045
1099void 1046void
1100rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1101{ 1048{
1102 make_current (); 1049 make_current ();
1103 1050
1104 display->flush (); 1051 display->flush ();
1105 1052
1106 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1108} 1055}
1109 1056
1110void 1057void
1111rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1059{
1113 make_current (); 1060 make_current ();
1114 1061
1115 refresh_count = 0; 1062 refresh_count = 0;
1116 flush (); 1063 flush ();
1117} 1064}
1118 1065
1119#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1120void 1067void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1069{
1123 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1071 want_refresh = 1;
1125
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1072}
1128#endif 1073#endif
1129 1074
1130#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1131void 1076void
1132rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1078{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1080 {
1136 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1137 want_refresh = 1; 1082 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL);
1139 } 1083 }
1140} 1084}
1141#endif 1085#endif
1142 1086
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1088void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1090{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1149 {
1150 want_refresh = 1; 1093 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
1152 } 1095 w.stop ();
1153} 1096}
1154#endif 1097#endif
1155 1098
1156#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1157void 1100void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1102{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1104 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1106 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1165 } 1107 }
1108 else
1109 w.stop ();
1166} 1110}
1167#endif 1111#endif
1168 1112
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1114void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1116{
1173 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
1174 || 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)
1175 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1120 {
1177 if (view_start == top_row || view_start == 0) 1121 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0; 1122 mouse_slip_wheel_speed = 0;
1179 1123
1180 want_refresh = 1; 1124 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1182 } 1125 }
1126 else
1127 w.stop ();
1183} 1128}
1184#endif 1129#endif
1185 1130
1186#if LINUX_YIELD_HACK 1131#if LINUX_YIELD_HACK
1187static struct event_handler 1132static struct event_handler
1188{ 1133{
1189 check_watcher yield_ev; 1134 ev::prepare yield_ev;
1190 1135
1191 void yield_cb (check_watcher &w) 1136 void yield_cb (ev::prepare &w, int revents)
1192 { 1137 {
1193 // this should really be sched_yield(), but the linux guys thought 1138 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1139 // that giving a process calling sched_yield () less cpu time than
1195 // 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
1196 // allowed by the sus... as is returning ENOSYS. 1141 // allowed by the sus... as is returning ENOSYS.
… …
1247 1192
1248 return false; 1193 return false;
1249} 1194}
1250 1195
1251void 1196void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1198{
1254 make_current (); 1199 make_current ();
1255 1200
1256 if (revents & EVENT_READ) 1201 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1203 while (pty_fill ())
1259 if (cmd_parse ()) 1204 if (cmd_parse ())
1260 break; 1205 break;
1261 1206
1262 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1263 pty_write (); 1208 pty_write ();
1264} 1209}
1265 1210
1266void 1211void
1267rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
… …
1271 1216
1272#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1218 hidden_pointer = 0;
1274 1219
1275 if (option (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1277#endif 1222#endif
1278} 1223}
1279 1224
1280#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1281void 1226void
… …
1289 1234
1290 hidden_pointer = 1; 1235 hidden_pointer = 1;
1291} 1236}
1292 1237
1293void 1238void
1294rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1240{
1296 make_current (); 1241 make_current ();
1297 1242
1298 pointer_blank (); 1243 pointer_blank ();
1299} 1244}
… …
1302void 1247void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1249{
1305 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1306 int x, y; 1251 int x, y;
1252 int code = 32;
1307 1253
1308 x = ev.x; 1254 x = Pixel2Col (ev.x);
1309 y = ev.y; 1255 y = Pixel2Row (ev.y);
1310 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260 mouse_row = x;
1261 mouse_col = y;
1262 code += 32;
1263 }
1311 1264
1312 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
1313 button_number = 3; 1266 button_number = 3;
1314 else 1267 else
1315 { 1268 {
… …
1361 x + 1, 1314 x + 1,
1362 y + 1); 1315 y + 1);
1363#endif 1316#endif
1364 1317
1365 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1319 (code + button_number + key_state),
1367 (32 + x + 1), 1320 (32 + x + 1),
1368 (32 + y + 1)); 1321 (32 + y + 1));
1369} 1322}
1370 1323
1371/*{{{ process an X event */ 1324/*{{{ process an X event */
… …
1475 && ev.xfocus.mode != NotifyGrab) 1428 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1429 focus_out ();
1477 break; 1430 break;
1478 1431
1479 case ConfigureNotify: 1432 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1480 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1481 { 1437 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1439 ;
1484 1440
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1442 {
1487 seen_resize = 1; 1443 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 bgPixmap.render_background ();
1494 scr_touch (true);
1495 }
1496#endif
1497 } 1445 }
1498 1446 else
1447 {
1448#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ())
1450 update_background ();
1451#endif
1452 }
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1502 if (option (Opt_transparent))
1503 bgPixmap.render_background ();
1504#endif
1505 } 1454 }
1506 break; 1455 break;
1507 1456
1508 case PropertyNotify: 1457 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1527 break; 1476 break;
1528 1477
1529 case MapNotify: 1478 case MapNotify:
1530 mapped = 1; 1479 mapped = 1;
1531#ifdef TEXT_BLINK 1480#ifdef TEXT_BLINK
1532 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1481 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1533#endif 1482#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break; 1484 break;
1536 1485
1537 case UnmapNotify: 1486 case UnmapNotify:
… …
1539#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1540 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1541#endif 1490#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break; 1492 break;
1544
1545#ifdef ENABLE_TRANSPARENCY
1546 case ReparentNotify:
1547 rootwin_cb (ev);
1548 break;
1549#endif /* ENABLE_TRANSPARENCY */
1550 1493
1551 case GraphicsExpose: 1494 case GraphicsExpose:
1552 case Expose: 1495 case Expose:
1553 if (ev.xany.window == vt) 1496 if (ev.xany.window == vt)
1554 { 1497 {
1555 do 1498 do
1499 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559 1504
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561 1506
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1565 1511 }
1566 want_refresh = 1; 1512 want_refresh = 1;
1567 } 1513 }
1568 else 1514 else
1569 { 1515 {
1570 XEvent unused_event; 1516 XEvent unused_event;
… …
1577 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1578 { 1524 {
1579 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1580 scrollbar_show (0); 1526 scrollbar_show (0);
1581 } 1527 }
1582
1583#ifdef ENABLE_TRANSPARENCY
1584 if (am_transparent && ev.xany.window == parent[0])
1585 XClearWindow (dpy, ev.xany.window);
1586#endif
1587 } 1528 }
1588 break; 1529 break;
1589 1530
1590 case MotionNotify: 1531 case MotionNotify:
1591#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1592 if (hidden_pointer) 1533 if (hidden_pointer)
1593 pointer_unblank (); 1534 pointer_unblank ();
1594#endif 1535#endif
1536 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1537 || priv_modes & PrivMode_MouseAnyEvent)
1538 mouse_report (ev.xbutton);
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1540 break;
1597 1541
1598 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1599 { 1543 {
… …
1634 1578
1635 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1636 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1637 */ 1581 */
1638 if (!sel_scroll_ev.active) 1582 if (!sel_scroll_ev.active)
1639 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1640 1584
1641 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1642 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1643 */ 1587 */
1644 selection_save_x = ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
… …
1703 { 1647 {
1704 hidden_cursor = 0; 1648 hidden_cursor = 0;
1705 want_refresh = 1; 1649 want_refresh = 1;
1706 } 1650 }
1707 1651
1708 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1652 cursor_blink_ev.again ();
1709 } 1653 }
1710#endif 1654#endif
1711 1655
1712#if defined(POINTER_BLANK) 1656#if defined(POINTER_BLANK)
1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1657 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1741 XSetICFocus (Input_Context); 1685 XSetICFocus (Input_Context);
1742 } 1686 }
1743#endif 1687#endif
1744#if CURSOR_BLINK 1688#if CURSOR_BLINK
1745 if (option (Opt_cursorBlink)) 1689 if (option (Opt_cursorBlink))
1746 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1747#endif 1691#endif
1748#if OFF_FOCUS_FADING 1692#if OFF_FOCUS_FADING
1749 if (rs[Rs_fade]) 1693 if (rs[Rs_fade])
1750 { 1694 {
1751 pix_colors = pix_colors_focused; 1695 pix_colors = pix_colors_focused;
… …
1753 } 1697 }
1754#endif 1698#endif
1755#if ENABLE_FRILLS 1699#if ENABLE_FRILLS
1756 if (option (Opt_urgentOnBell)) 1700 if (option (Opt_urgentOnBell))
1757 { 1701 {
1758 XWMHints *h;
1759
1760 h = XGetWMHints(dpy, parent[0]); 1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1761 if (h != NULL)
1762 { 1703 {
1763 h->flags &= ~XUrgencyHint; 1704 h->flags &= ~XUrgencyHint;
1764 XSetWMHints(dpy, parent[0], h); 1705 XSetWMHints (dpy, parent[0], h);
1765 } 1706 }
1766 } 1707 }
1767#endif 1708#endif
1768 } 1709 }
1769} 1710}
… …
1792 XUnsetICFocus (Input_Context); 1733 XUnsetICFocus (Input_Context);
1793#endif 1734#endif
1794#if CURSOR_BLINK 1735#if CURSOR_BLINK
1795 if (option (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1796 cursor_blink_ev.stop (); 1737 cursor_blink_ev.stop ();
1738
1797 hidden_cursor = 0; 1739 hidden_cursor = 0;
1798#endif 1740#endif
1799#if OFF_FOCUS_FADING 1741#if OFF_FOCUS_FADING
1800 if (rs[Rs_fade]) 1742 if (rs[Rs_fade])
1801 { 1743 {
… …
1839 */ 1781 */
1840 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1841 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1842 { 1784 {
1843 bgPixmap.set_root_pixmap (); 1785 bgPixmap.set_root_pixmap ();
1844 bgPixmap.render_background (); 1786 update_background ();
1845 } 1787 }
1846 break; 1788 break;
1847 } 1789 }
1848# endif 1790# endif
1849} 1791}
… …
1908 mouse_report (ev); 1850 mouse_report (ev);
1909 } 1851 }
1910#else 1852#else
1911 MEvent.button = ev.button; 1853 MEvent.button = ev.button;
1912 mouse_report (ev); 1854 mouse_report (ev);
1913#endif /* MOUSE_REPORT_DOUBLECLICK */ 1855#endif /* MOUSE_REPORT_DOUBLECLICK */
1914 1856
1915 } 1857 }
1916 else 1858 else
1917 { 1859 {
1918 if (ev.button != MEvent.button) 1860 if (ev.button != MEvent.button)
… …
2012 tt_printf ("\033[5~"); 1954 tt_printf ("\033[5~");
2013 break; 1955 break;
2014 } 1956 }
2015 } 1957 }
2016 else 1958 else
2017#endif /* NO_SCROLLBAR_REPORT */ 1959#endif /* NO_SCROLLBAR_REPORT */
2018 1960
2019 { 1961 {
2020 char upordown = 0; 1962 char upordown = 0;
2021 1963
2022 if (scrollBar.style == R_SB_NEXT) 1964 if (scrollBar.style == R_SB_NEXT)
2023 { 1965 {
2024 if (scrollbarnext_upButton (ev.y)) 1966 if (scrollbarnext_upButton (ev.y))
2025 upordown = -1; /* up */ 1967 upordown = -1; /* up */
… …
2034 upordown = 1; /* down */ 1976 upordown = 1; /* down */
2035 } 1977 }
2036 if (upordown) 1978 if (upordown)
2037 { 1979 {
2038#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2039 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2040#endif 1982#endif
2041 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
2042 { 1984 {
2043 if (upordown < 0) 1985 if (upordown < 0)
2044 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
2159 mouse_report (ev); 2101 mouse_report (ev);
2160 } 2102 }
2161#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
2162 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
2163 mouse_report (ev); 2105 mouse_report (ev);
2164#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
2165 return; 2107 return;
2166 } 2108 }
2167 2109
2168 /* 2110 /*
2169 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
… …
2207 { 2149 {
2208 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2211 2153
2212 if (slip_wheel_ev.at < NOW) 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2214
2215 slip_wheel_ev.start ();
2216 } 2155 }
2217 else 2156 else
2218 { 2157 {
2219# endif 2158# endif
2220 scr_page (v, i); 2159 scr_page (v, i);
… …
2288 2227
2289 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2290 { 2229 {
2291 refresh_count = 0; 2230 refresh_count = 0;
2292 2231
2293 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2232 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2294 { 2233 {
2295 refreshnow = true; 2234 refreshnow = true;
2296 ch = NOCHAR; 2235 ch = NOCHAR;
2297 break; 2236 break;
2298 } 2237 }
… …
2509 } 2448 }
2510 } 2449 }
2511 2450
2512 pclose_printer (fd); 2451 pclose_printer (fd);
2513} 2452}
2514#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
2515/*}}} */ 2454/*}}} */
2516 2455
2517/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
2518enum { 2457enum {
2519 C1_40 = 0x40, 2458 C1_40 = 0x40,
… …
2805rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
2806{ 2745{
2807 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
2808 unsigned int nargs, p; 2747 unsigned int nargs, p;
2809 int n, ndef; 2748 int n, ndef;
2810 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
2811 2750
2812 memset (arg, 0, sizeof (arg));
2813 nargs = 0; 2751 nargs = 0;
2814 2752
2815 priv = 0; 2753 priv = 0;
2816 ch = cmd_getc (); 2754 ch = cmd_getc ();
2817 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
2756 {
2818 { /* '<' '=' '>' '?' */ 2757 /* '<' '=' '>' '?' */
2819 priv = ch; 2758 priv = ch;
2820 ch = cmd_getc (); 2759 ch = cmd_getc ();
2821 } 2760 }
2822 2761
2823 /* read any numerical arguments */ 2762 /* read any numerical arguments */
… …
2866 { 2805 {
2867 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2806 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2868 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2807 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2869 // 2808 //
2870 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2809 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2871 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2810 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2872 // that we do not support xterm mouse reporting (should be 95 when we do). 2811 // versions.
2873 // 2812 //
2874 tt_printf ("\033[>%d;94;0c", 'U'); 2813 tt_printf ("\033[>%d;95;0c", 'U');
2875 } 2814 }
2876 break; 2815 break;
2877 case '?': 2816 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 2818 process_terminal_mode (ch, priv, nargs, arg);
… …
3440 if (ISSET_PIXCOLOR (Color_tint)) 3379 if (ISSET_PIXCOLOR (Color_tint))
3441 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3442 else 3381 else
3443 changed = bgPixmap.unset_tint (); 3382 changed = bgPixmap.unset_tint ();
3444 if (changed) 3383 if (changed)
3445 {
3446 bgPixmap.render_background (); 3384 update_background ();
3447 if (am_transparent)
3448 want_full_refresh = want_refresh = 1;
3449 } 3385 }
3450 }
3451 3386
3452 break; 3387 break;
3453#endif 3388#endif
3454 3389
3455#if XPM_BACKGROUND 3390#if BG_IMAGE_FROM_FILE
3456 case Rxvt_Pixmap: 3391 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?")) 3392 if (!strcmp (str, "?"))
3458 { 3393 {
3459 char str[256]; 3394 char str[256];
3460 3395
… …
3483 if (bgPixmap.set_geometry (str)) 3418 if (bgPixmap.set_geometry (str))
3484 changed++; 3419 changed++;
3485 str = strchr (str, ';'); 3420 str = strchr (str, ';');
3486 } 3421 }
3487 if (changed) 3422 if (changed)
3488 {
3489 bgPixmap.render_background (); 3423 update_background ();
3490 scr_touch (true);
3491 }
3492 } 3424 }
3493 break; 3425 break;
3494#endif 3426#endif
3495 3427
3496 case Rxvt_restoreFG: 3428 case Rxvt_restoreFG:
… …
3650 { 66, PrivMode_aplKP }, 3582 { 66, PrivMode_aplKP },
3651#ifndef NO_BACKSPACE_KEY 3583#ifndef NO_BACKSPACE_KEY
3652 { 67, PrivMode_BackSpace }, 3584 { 67, PrivMode_BackSpace },
3653#endif 3585#endif
3654 { 1000, PrivMode_MouseX11 }, 3586 { 1000, PrivMode_MouseX11 },
3655 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
3656 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
3657 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3658 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3659 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
3660 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
3661 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
3662 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
3736 scr_autowrap (state); 3667 scr_autowrap (state);
3737 break; 3668 break;
3738 /* case 8: - auto repeat, can't do on a per window basis */ 3669 /* case 8: - auto repeat, can't do on a per window basis */
3739 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
3740 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
3741 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3742 break; 3673 break;
3743#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
3744 case scrollBar_esc: 3675 case scrollBar_esc:
3745 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
3746 { 3677 {
… …
3759 break; 3690 break;
3760 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
3761 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
3762 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
3763 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
3764 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3765 break; 3696 break;
3766#if 0
3767 case 1001: 3697 case 1002:
3768 break; /* X11 mouse highlighting */ 3698 case 1003:
3769#endif 3699 if (state)
3700 {
3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3703 vt_emask_mouse = PointerMotionMask;
3704 }
3705 else
3706 vt_emask_mouse = NoEventMask;
3707 vt_select_input ();
3708 break;
3770 case 1010: /* scroll to bottom on TTY output inhibit */ 3709 case 1010: /* scroll to bottom on TTY output inhibit */
3771 set_option (Opt_scrollTtyOutput, !state); 3710 set_option (Opt_scrollTtyOutput, !state);
3772 break; 3711 break;
3773 case 1011: /* scroll to bottom on key press */ 3712 case 1011: /* scroll to bottom on key press */
3774 set_option (Opt_scrollTtyKeypress, state); 3713 set_option (Opt_scrollTtyKeypress, state);
… …
3951rxvt_term::process_graphics () 3890rxvt_term::process_graphics ()
3952{ 3891{
3953 unicode_t ch, cmd = cmd_getc (); 3892 unicode_t ch, cmd = cmd_getc ();
3954 3893
3955 if (cmd == 'Q') 3894 if (cmd == 'Q')
3895 {
3956 { /* query graphics */ 3896 /* query graphics */
3957 tt_printf ("\033G0\012"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
3958 return; 3898 return;
3959 } 3899 }
3960 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
3961 do 3901 do
… …
4011 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4012 3952
4013 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
4014 v_buflen += len; 3954 v_buflen += len;
4015 3955
4016 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
4017} 3957}
4018 3958
4019void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4020{ 3960{
4021 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));
… …
4026 3966
4027 if (v_buflen == 0) 3967 if (v_buflen == 0)
4028 { 3968 {
4029 free (v_buffer); 3969 free (v_buffer);
4030 v_buffer = 0; 3970 v_buffer = 0;
4031 v_buflen = 0;
4032 3971
4033 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4034 return; 3973 return;
4035 } 3974 }
4036 3975
4037 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4038 } 3977 }
4039 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4040 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4041} 3980}
4042 3981
4043/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4044 3983

Diff Legend

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