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.339 by ayin, Fri Aug 3 14:03:28 2007 UTC vs.
Revision 1.364 by ayin, Mon Nov 12 14:53:13 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 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1311 1263
1312 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1313 button_number = 3; 1265 button_number = 3;
1314 else 1266 else
1315 { 1267 {
… …
1361 x + 1, 1313 x + 1,
1362 y + 1); 1314 y + 1);
1363#endif 1315#endif
1364 1316
1365 tt_printf ("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1367 (32 + x + 1), 1319 (32 + x + 1),
1368 (32 + y + 1)); 1320 (32 + y + 1));
1369} 1321}
1370 1322
1371/*{{{ process an X event */ 1323/*{{{ process an X event */
… …
1475 && ev.xfocus.mode != NotifyGrab) 1427 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1428 focus_out ();
1477 break; 1429 break;
1478 1430
1479 case ConfigureNotify: 1431 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */
1480 if (ev.xconfigure.window == parent[0]) 1435 if (ev.xconfigure.window == parent[0])
1481 { 1436 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1438 ;
1484 1439
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1441 {
1487 seen_resize = 1; 1442 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1496 } 1444 }
1497 1445 else
1446 {
1447#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 update_background ();
1450#endif
1451 }
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 check_our_parents ();
1503#endif
1504 } 1453 }
1505 break; 1454 break;
1506 1455
1507 case PropertyNotify: 1456 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1526 break; 1475 break;
1527 1476
1528 case MapNotify: 1477 case MapNotify:
1529 mapped = 1; 1478 mapped = 1;
1530#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1532#endif 1481#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534 break; 1483 break;
1535 1484
1536 case UnmapNotify: 1485 case UnmapNotify:
… …
1538#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1539 text_blink_ev.stop (); 1488 text_blink_ev.stop ();
1540#endif 1489#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1491 break;
1543
1544#ifdef ENABLE_TRANSPARENCY
1545 case ReparentNotify:
1546 rootwin_cb (ev);
1547 break;
1548#endif /* ENABLE_TRANSPARENCY */
1549 1492
1550 case GraphicsExpose: 1493 case GraphicsExpose:
1551 case Expose: 1494 case Expose:
1552 if (ev.xany.window == vt) 1495 if (ev.xany.window == vt)
1553 { 1496 {
1554 do 1497 do
1498 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1499 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1500 ev.xexpose.width, ev.xexpose.height, False);
1501 }
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1502 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1558 1503
1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560 1505
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1564 1510 }
1565 want_refresh = 1; 1511 want_refresh = 1;
1566 } 1512 }
1567 else 1513 else
1568 { 1514 {
1569 XEvent unused_event; 1515 XEvent unused_event;
… …
1576 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1577 { 1523 {
1578 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1579 scrollbar_show (0); 1525 scrollbar_show (0);
1580 } 1526 }
1581
1582#ifdef ENABLE_TRANSPARENCY
1583 if (am_transparent && ev.xany.window == parent[0])
1584 XClearWindow (dpy, ev.xany.window);
1585#endif
1586 } 1527 }
1587 break; 1528 break;
1588 1529
1589 case MotionNotify: 1530 case MotionNotify:
1590#ifdef POINTER_BLANK 1531#ifdef POINTER_BLANK
1591 if (hidden_pointer) 1532 if (hidden_pointer)
1592 pointer_unblank (); 1533 pointer_unblank ();
1593#endif 1534#endif
1535 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1536 || priv_modes & PrivMode_MouseAnyEvent)
1537 mouse_report (ev.xbutton);
1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1538 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595 break; 1539 break;
1596 1540
1597 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1598 { 1542 {
… …
1633 1577
1634 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1635 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1636 */ 1580 */
1637 if (!sel_scroll_ev.active) 1581 if (!sel_scroll_ev.active)
1638 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1639 1583
1640 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1641 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1642 */ 1586 */
1643 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
… …
1702 { 1646 {
1703 hidden_cursor = 0; 1647 hidden_cursor = 0;
1704 want_refresh = 1; 1648 want_refresh = 1;
1705 } 1649 }
1706 1650
1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1651 cursor_blink_ev.again ();
1708 } 1652 }
1709#endif 1653#endif
1710 1654
1711#if defined(POINTER_BLANK) 1655#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1656 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1740 XSetICFocus (Input_Context); 1684 XSetICFocus (Input_Context);
1741 } 1685 }
1742#endif 1686#endif
1743#if CURSOR_BLINK 1687#if CURSOR_BLINK
1744 if (option (Opt_cursorBlink)) 1688 if (option (Opt_cursorBlink))
1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1689 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1746#endif 1690#endif
1747#if OFF_FOCUS_FADING 1691#if OFF_FOCUS_FADING
1748 if (rs[Rs_fade]) 1692 if (rs[Rs_fade])
1749 { 1693 {
1750 pix_colors = pix_colors_focused; 1694 pix_colors = pix_colors_focused;
… …
1752 } 1696 }
1753#endif 1697#endif
1754#if ENABLE_FRILLS 1698#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell)) 1699 if (option (Opt_urgentOnBell))
1756 { 1700 {
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]); 1701 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1760 if (h != NULL)
1761 { 1702 {
1762 h->flags &= ~XUrgencyHint; 1703 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h); 1704 XSetWMHints (dpy, parent[0], h);
1764 } 1705 }
1765 } 1706 }
1766#endif 1707#endif
1767 } 1708 }
1768} 1709}
… …
1791 XUnsetICFocus (Input_Context); 1732 XUnsetICFocus (Input_Context);
1792#endif 1733#endif
1793#if CURSOR_BLINK 1734#if CURSOR_BLINK
1794 if (option (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1795 cursor_blink_ev.stop (); 1736 cursor_blink_ev.stop ();
1737
1796 hidden_cursor = 0; 1738 hidden_cursor = 0;
1797#endif 1739#endif
1798#if OFF_FOCUS_FADING 1740#if OFF_FOCUS_FADING
1799 if (rs[Rs_fade]) 1741 if (rs[Rs_fade])
1800 { 1742 {
… …
1834 case PropertyNotify: 1776 case PropertyNotify:
1835 /* 1777 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1778 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1779 * use the property to determine the pixmap. We use it later on.
1838 */ 1780 */
1839 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1781 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 return; 1783 {
1842 1784 bgPixmap.set_root_pixmap ();
1843 /* FALLTHROUGH */ 1785 update_background ();
1844 case ReparentNotify: 1786 }
1845 if (option (Opt_transparent))
1846 check_our_parents ();
1847 break; 1787 break;
1848 } 1788 }
1849# endif 1789# endif
1850} 1790}
1851#endif 1791#endif
… …
2035 upordown = 1; /* down */ 1975 upordown = 1; /* down */
2036 } 1976 }
2037 if (upordown) 1977 if (upordown)
2038 { 1978 {
2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2040 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1980 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 1981#endif
2042 if (scr_page (upordown < 0 ? UP : DN, 1)) 1982 if (scr_page (upordown < 0 ? UP : DN, 1))
2043 { 1983 {
2044 if (upordown < 0) 1984 if (upordown < 0)
2045 scrollBar.setUp (); 1985 scrollBar.setUp ();
… …
2208 { 2148 {
2209 mouse_slip_wheel_speed += v ? -1 : 1; 2149 mouse_slip_wheel_speed += v ? -1 : 1;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212 2152
2213 if (slip_wheel_ev.at < NOW) 2153 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2214 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2215
2216 slip_wheel_ev.start ();
2217 } 2154 }
2218 else 2155 else
2219 { 2156 {
2220# endif 2157# endif
2221 scr_page (v, i); 2158 scr_page (v, i);
… …
2289 2226
2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2227 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2291 { 2228 {
2292 refresh_count = 0; 2229 refresh_count = 0;
2293 2230
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2231 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2295 { 2232 {
2296 refreshnow = true; 2233 refreshnow = true;
2297 ch = NOCHAR; 2234 ch = NOCHAR;
2298 break; 2235 break;
2299 } 2236 }
… …
2806rxvt_term::process_csi_seq () 2743rxvt_term::process_csi_seq ()
2807{ 2744{
2808 unicode_t ch, priv, i; 2745 unicode_t ch, priv, i;
2809 unsigned int nargs, p; 2746 unsigned int nargs, p;
2810 int n, ndef; 2747 int n, ndef;
2811 int arg[ESC_ARGS]; 2748 int arg[ESC_ARGS] = { };
2812 2749
2813 memset (arg, 0, sizeof (arg));
2814 nargs = 0; 2750 nargs = 0;
2815 2751
2816 priv = 0; 2752 priv = 0;
2817 ch = cmd_getc (); 2753 ch = cmd_getc ();
2818 if (ch >= '<' && ch <= '?') 2754 if (ch >= '<' && ch <= '?')
… …
2867 { 2803 {
2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2804 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2805 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 // 2806 //
2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2807 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2808 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2873 // that we do not support xterm mouse reporting (should be 95 when we do). 2809 // versions.
2874 // 2810 //
2875 tt_printf ("\033[>%d;94;0c", 'U'); 2811 tt_printf ("\033[>%d;95;0c", 'U');
2876 } 2812 }
2877 break; 2813 break;
2878 case '?': 2814 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2815 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 2816 process_terminal_mode (ch, priv, nargs, arg);
… …
3431 break; 3367 break;
3432 case URxvt_Color_IT: 3368 case URxvt_Color_IT:
3433 process_color_seq (op, Color_IT, str, resp); 3369 process_color_seq (op, Color_IT, str, resp);
3434 break; 3370 break;
3435#endif 3371#endif
3436#if ENABLE_TRANSPARENCY && TINTING 3372#if ENABLE_TRANSPARENCY
3437 case URxvt_Color_tint: 3373 case URxvt_Color_tint:
3438 process_color_seq (op, Color_tint, str, resp); 3374 process_color_seq (op, Color_tint, str, resp);
3375 {
3376 bool changed = false;
3377 if (ISSET_PIXCOLOR (Color_tint))
3378 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3379 else
3380 changed = bgPixmap.unset_tint ();
3381 if (changed)
3382 update_background ();
3383 }
3439 3384
3440 check_our_parents ();
3441
3442 if (am_transparent)
3443 want_full_refresh = want_refresh = 1;
3444
3445 break; 3385 break;
3446#endif 3386#endif
3447 3387
3448#if XPM_BACKGROUND 3388#if BG_IMAGE_FROM_FILE
3449 case Rxvt_Pixmap: 3389 case Rxvt_Pixmap:
3450 { 3390 if (!strcmp (str, "?"))
3451 if (*str != ';')
3452 { 3391 {
3453 scale_pixmap (""); /* reset to default scaling */ 3392 char str[256];
3454 set_bgPixmap (str); /* change pixmap */ 3393
3455 scr_touch (true); 3394 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3395 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3396 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3397 process_xterm_seq (XTerm_title, str, CHAR_ST);
3456 } 3398 }
3457 3399 else
3400 {
3458 int changed = 0; 3401 int changed = 0;
3459 3402
3460 while ((str = strchr (str, ';')) != NULL) 3403 if (*str != ';')
3461 { 3404 {
3405 /* reset to default scaling :*/
3406 bgPixmap.unset_geometry ();
3407 if (bgPixmap.set_file (str)) /* change pixmap */
3408 changed++;
3409 str = strchr (str, ';');
3410 if (str == NULL)
3411 bgPixmap.set_defaultGeometry ();
3412 }
3413 while (str)
3414 {
3462 str++; 3415 str++;
3463 changed += scale_pixmap (str); 3416 if (bgPixmap.set_geometry (str))
3417 changed++;
3418 str = strchr (str, ';');
3464 } 3419 }
3465
3466 if (changed) 3420 if (changed)
3467 { 3421 update_background ();
3468 resize_pixmap ();
3469 scr_touch (true);
3470 } 3422 }
3471#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3472 if (option (Opt_transparent))
3473 check_our_parents ();
3474#endif
3475 }
3476 break; 3423 break;
3477#endif 3424#endif
3478 3425
3479 case Rxvt_restoreFG: 3426 case Rxvt_restoreFG:
3480 set_window_color (Color_fg, str); 3427 set_window_color (Color_fg, str);
… …
3604{ 3551{
3605 unsigned int i, j; 3552 unsigned int i, j;
3606 int state; 3553 int state;
3607 3554
3608 static const struct 3555 static const struct
3609 { 3556 {
3610 const int argval; 3557 const int argval;
3611 const unsigned long bit; 3558 const unsigned long bit;
3612 }
3613
3614 argtopriv[] = { 3559 } argtopriv[] = {
3615 { 1, PrivMode_aplCUR }, 3560 { 1, PrivMode_aplCUR },
3616 { 2, PrivMode_vt52 }, 3561 { 2, PrivMode_vt52 },
3617 { 3, PrivMode_132 }, 3562 { 3, PrivMode_132 },
3618 { 4, PrivMode_smoothScroll }, 3563 { 4, PrivMode_smoothScroll },
3619 { 5, PrivMode_rVideo }, 3564 { 5, PrivMode_rVideo },
… …
3636#ifndef NO_BACKSPACE_KEY 3581#ifndef NO_BACKSPACE_KEY
3637 { 67, PrivMode_BackSpace }, 3582 { 67, PrivMode_BackSpace },
3638#endif 3583#endif
3639 { 1000, PrivMode_MouseX11 }, 3584 { 1000, PrivMode_MouseX11 },
3640 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3585 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3641 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3586 { 1002, PrivMode_MouseBtnEvent },
3642 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3587 { 1003, PrivMode_MouseAnyEvent },
3643 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3588 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3644 { 1011, PrivMode_Keypress }, // rxvt extension 3589 { 1011, PrivMode_Keypress }, // rxvt extension
3645 // 1035 enable modifiers for alt, numlock NYI 3590 // 1035 enable modifiers for alt, numlock NYI
3646 // 1036 send ESC for meta keys NYI 3591 // 1036 send ESC for meta keys NYI
3647 // 1037 send DEL for keypad delete NYI 3592 // 1037 send DEL for keypad delete NYI
… …
3721 scr_autowrap (state); 3666 scr_autowrap (state);
3722 break; 3667 break;
3723 /* case 8: - auto repeat, can't do on a per window basis */ 3668 /* case 8: - auto repeat, can't do on a per window basis */
3724 case 9: /* X10 mouse reporting */ 3669 case 9: /* X10 mouse reporting */
3725 if (state) /* orthogonal */ 3670 if (state) /* orthogonal */
3726 priv_modes &= ~PrivMode_MouseX11; 3671 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3727 break; 3672 break;
3728#ifdef scrollBar_esc 3673#ifdef scrollBar_esc
3729 case scrollBar_esc: 3674 case scrollBar_esc:
3730 if (scrollbar_mapping (state)) 3675 if (scrollbar_mapping (state))
3731 { 3676 {
… …
3744 break; 3689 break;
3745 /* case 66: - application key pad */ 3690 /* case 66: - application key pad */
3746 /* case 67: - backspace key */ 3691 /* case 67: - backspace key */
3747 case 1000: /* X11 mouse reporting */ 3692 case 1000: /* X11 mouse reporting */
3748 if (state) /* orthogonal */ 3693 if (state) /* orthogonal */
3749 priv_modes &= ~PrivMode_MouseX10; 3694 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3750 break; 3695 break;
3751#if 0 3696#if 0
3752 case 1001: 3697 case 1001:
3753 break; /* X11 mouse highlighting */ 3698 break; /* X11 mouse highlighting */
3754#endif 3699#endif
3700 case 1002:
3701 case 1003:
3702 if (state) {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3705 vt_emask_mouse = PointerMotionMask;
3706 } else
3707 vt_emask_mouse = NoEventMask;
3708 vt_select_input ();
3709 break;
3755 case 1010: /* scroll to bottom on TTY output inhibit */ 3710 case 1010: /* scroll to bottom on TTY output inhibit */
3756 set_option (Opt_scrollTtyOutput, !state); 3711 set_option (Opt_scrollTtyOutput, !state);
3757 break; 3712 break;
3758 case 1011: /* scroll to bottom on key press */ 3713 case 1011: /* scroll to bottom on key press */
3759 set_option (Opt_scrollTtyKeypress, state); 3714 set_option (Opt_scrollTtyKeypress, state);
… …
3996 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3997 3952
3998 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
3999 v_buflen += len; 3954 v_buflen += len;
4000 3955
4001 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
4002} 3957}
4003 3958
4004void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4005{ 3960{
4006 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));
… …
4011 3966
4012 if (v_buflen == 0) 3967 if (v_buflen == 0)
4013 { 3968 {
4014 free (v_buffer); 3969 free (v_buffer);
4015 v_buffer = 0; 3970 v_buffer = 0;
4016 v_buflen = 0;
4017 3971
4018 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4019 return; 3973 return;
4020 } 3974 }
4021 3975
4022 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4023 } 3977 }
4024 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4025 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4026} 3980}
4027 3981
4028/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4029 3983

Diff Legend

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