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.357 by sasha, Tue Sep 18 22:01:36 2007 UTC vs.
Revision 1.376 by root, Fri Dec 14 02:08:18 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) \
… …
1034 982
1035void 983void
1036rxvt_term::flush () 984rxvt_term::flush ()
1037{ 985{
1038 flush_ev.stop (); 986 flush_ev.stop ();
1039 987
1040#ifdef HAVE_BG_PIXMAP 988#ifdef HAVE_BG_PIXMAP
1041 if (bgPixmap.check_clearChanged ()) 989 if (bgPixmap.check_clearChanged ())
1042 { 990 {
1043 scr_clear (true); 991// scr_clear (true); This needs to be researched further!
1044 scr_touch (false); 992 scr_touch (false);
1045 } 993 }
1046#endif 994#endif
1047 995
1048 if (want_refresh) 996 if (want_refresh)
… …
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.is_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 }
1084 else
1085 w.stop ();
1139} 1086}
1140#endif 1087#endif
1141 1088
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1090void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1092{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1148 {
1149 want_refresh = 1; 1095 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
1151 } 1097 w.stop ();
1152} 1098}
1153#endif 1099#endif
1154 1100
1155#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1156void 1102void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1104{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1106 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1108 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1164 } 1109 }
1110 else
1111 w.stop ();
1165} 1112}
1166#endif 1113#endif
1167 1114
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1116void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1118{
1172 if (mouse_slip_wheel_speed == 0 1119 if (mouse_slip_wheel_speed == 0
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed)) 1121 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1122 {
1176 if (view_start == top_row || view_start == 0) 1123 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1178 1125
1179 want_refresh = 1; 1126 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1181 } 1127 }
1128 else
1129 w.stop ();
1182} 1130}
1183#endif 1131#endif
1184 1132
1185#if LINUX_YIELD_HACK 1133#if LINUX_YIELD_HACK
1186static struct event_handler 1134static struct event_handler
1187{ 1135{
1188 check_watcher yield_ev; 1136 ev::prepare yield_ev;
1189 1137
1190 void yield_cb (check_watcher &w) 1138 void yield_cb (ev::prepare &w, int revents)
1191 { 1139 {
1192 // this should really be sched_yield(), but the linux guys thought 1140 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1141 // 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 1142 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1143 // allowed by the sus... as is returning ENOSYS.
… …
1246 1194
1247 return false; 1195 return false;
1248} 1196}
1249 1197
1250void 1198void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1200{
1253 make_current (); 1201 make_current ();
1254 1202
1255 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1205 while (pty_fill ())
1258 if (cmd_parse ()) 1206 if (cmd_parse ())
1259 break; 1207 break;
1260 1208
1261 if (revents & EVENT_WRITE) 1209 if (revents & ev::WRITE)
1262 pty_write (); 1210 pty_write ();
1263} 1211}
1264 1212
1265void 1213void
1266rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
… …
1270 1218
1271#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1220 hidden_pointer = 0;
1273 1221
1274 if (option (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1276#endif 1224#endif
1277} 1225}
1278 1226
1279#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1280void 1228void
… …
1288 1236
1289 hidden_pointer = 1; 1237 hidden_pointer = 1;
1290} 1238}
1291 1239
1292void 1240void
1293rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1242{
1295 make_current (); 1243 make_current ();
1296 1244
1297 pointer_blank (); 1245 pointer_blank ();
1298} 1246}
… …
1301void 1249void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1251{
1304 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1305 int x, y; 1253 int x, y;
1254 int code = 32;
1306 1255
1307 x = ev.x; 1256 x = Pixel2Col (ev.x);
1308 y = ev.y; 1257 y = Pixel2Row (ev.y);
1309 pixel_position (&x, &y); 1258 if (ev.type == MotionNotify)
1259 {
1260 if (x == mouse_row && y == mouse_col)
1261 return;
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1310 1266
1311 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1312 button_number = 3; 1268 button_number = 3;
1313 else 1269 else
1314 { 1270 {
… …
1360 x + 1, 1316 x + 1,
1361 y + 1); 1317 y + 1);
1362#endif 1318#endif
1363 1319
1364 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1366 (32 + x + 1), 1322 (32 + x + 1),
1367 (32 + y + 1)); 1323 (32 + y + 1));
1368} 1324}
1369 1325
1370/*{{{ process an X event */ 1326/*{{{ process an X event */
… …
1522 break; 1478 break;
1523 1479
1524 case MapNotify: 1480 case MapNotify:
1525 mapped = 1; 1481 mapped = 1;
1526#ifdef TEXT_BLINK 1482#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1483 text_blink_ev.start ();
1528#endif 1484#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1486 break;
1531 1487
1532 case UnmapNotify: 1488 case UnmapNotify:
… …
1577 case MotionNotify: 1533 case MotionNotify:
1578#ifdef POINTER_BLANK 1534#ifdef POINTER_BLANK
1579 if (hidden_pointer) 1535 if (hidden_pointer)
1580 pointer_unblank (); 1536 pointer_unblank ();
1581#endif 1537#endif
1538 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1539 || priv_modes & PrivMode_MouseAnyEvent)
1540 mouse_report (ev.xbutton);
1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583 break; 1542 break;
1584 1543
1585 if (ev.xany.window == vt) 1544 if (ev.xany.window == vt)
1586 { 1545 {
… …
1620 int dist; 1579 int dist;
1621 1580
1622 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1623 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1624 */ 1583 */
1625 if (!sel_scroll_ev.active) 1584 if (!sel_scroll_ev.is_active ())
1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627 1586
1628 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1629 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1630 */ 1589 */
1631 selection_save_x = ev.xbutton.x; 1590 selection_save_x = ev.xbutton.x;
… …
1653 else 1612 else
1654 { 1613 {
1655 /* we are within the text window, so we 1614 /* we are within the text window, so we
1656 * shouldn't be scrolling 1615 * shouldn't be scrolling
1657 */ 1616 */
1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop(); 1617 sel_scroll_ev.stop();
1660 } 1618 }
1661#endif 1619#endif
1662#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
1663 } 1621 }
1664#endif 1622#endif
… …
1690 { 1648 {
1691 hidden_cursor = 0; 1649 hidden_cursor = 0;
1692 want_refresh = 1; 1650 want_refresh = 1;
1693 } 1651 }
1694 1652
1695 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1653 cursor_blink_ev.again ();
1696 } 1654 }
1697#endif 1655#endif
1698 1656
1699#if defined(POINTER_BLANK) 1657#if defined(POINTER_BLANK)
1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1658 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1728 XSetICFocus (Input_Context); 1686 XSetICFocus (Input_Context);
1729 } 1687 }
1730#endif 1688#endif
1731#if CURSOR_BLINK 1689#if CURSOR_BLINK
1732 if (option (Opt_cursorBlink)) 1690 if (option (Opt_cursorBlink))
1733 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1691 cursor_blink_ev.again ();
1734#endif 1692#endif
1735#if OFF_FOCUS_FADING 1693#if OFF_FOCUS_FADING
1736 if (rs[Rs_fade]) 1694 if (rs[Rs_fade])
1737 { 1695 {
1738 pix_colors = pix_colors_focused; 1696 pix_colors = pix_colors_focused;
… …
1776 XUnsetICFocus (Input_Context); 1734 XUnsetICFocus (Input_Context);
1777#endif 1735#endif
1778#if CURSOR_BLINK 1736#if CURSOR_BLINK
1779 if (option (Opt_cursorBlink)) 1737 if (option (Opt_cursorBlink))
1780 cursor_blink_ev.stop (); 1738 cursor_blink_ev.stop ();
1739
1781 hidden_cursor = 0; 1740 hidden_cursor = 0;
1782#endif 1741#endif
1783#if OFF_FOCUS_FADING 1742#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade]) 1743 if (rs[Rs_fade])
1785 { 1744 {
… …
1892 mouse_report (ev); 1851 mouse_report (ev);
1893 } 1852 }
1894#else 1853#else
1895 MEvent.button = ev.button; 1854 MEvent.button = ev.button;
1896 mouse_report (ev); 1855 mouse_report (ev);
1897#endif /* MOUSE_REPORT_DOUBLECLICK */ 1856#endif /* MOUSE_REPORT_DOUBLECLICK */
1898 1857
1899 } 1858 }
1900 else 1859 else
1901 { 1860 {
1902 if (ev.button != MEvent.button) 1861 if (ev.button != MEvent.button)
… …
1996 tt_printf ("\033[5~"); 1955 tt_printf ("\033[5~");
1997 break; 1956 break;
1998 } 1957 }
1999 } 1958 }
2000 else 1959 else
2001#endif /* NO_SCROLLBAR_REPORT */ 1960#endif /* NO_SCROLLBAR_REPORT */
2002 1961
2003 { 1962 {
2004 char upordown = 0; 1963 char upordown = 0;
2005 1964
2006 if (scrollBar.style == R_SB_NEXT) 1965 if (scrollBar.style == R_SB_NEXT)
2007 { 1966 {
2008 if (scrollbarnext_upButton (ev.y)) 1967 if (scrollbarnext_upButton (ev.y))
2009 upordown = -1; /* up */ 1968 upordown = -1; /* up */
… …
2015 if (scrollbarrxvt_upButton (ev.y)) 1974 if (scrollbarrxvt_upButton (ev.y))
2016 upordown = -1; /* up */ 1975 upordown = -1; /* up */
2017 else if (scrollbarrxvt_dnButton (ev.y)) 1976 else if (scrollbarrxvt_dnButton (ev.y))
2018 upordown = 1; /* down */ 1977 upordown = 1; /* down */
2019 } 1978 }
1979
2020 if (upordown) 1980 if (upordown)
2021 { 1981 {
2022#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1983 if (!cont_scroll_ev.is_active ())
2023 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1984 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2024#endif 1985#endif
2025 if (scr_page (upordown < 0 ? UP : DN, 1)) 1986 if (scr_page (upordown < 0 ? UP : DN, 1))
2026 { 1987 {
2027 if (upordown < 0) 1988 if (upordown < 0)
2028 scrollBar.setUp (); 1989 scrollBar.setUp ();
… …
2108 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
2109 scrollbar_show (0); 2070 scrollbar_show (0);
2110 } 2071 }
2111 2072
2112#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2113 if (sel_scroll_ev.active)
2114 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2115#endif 2075#endif
2116 2076
2117 if (ev.window == vt) 2077 if (ev.window == vt)
2118 { 2078 {
2119 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2143 mouse_report (ev); 2103 mouse_report (ev);
2144 } 2104 }
2145#else /* MOUSE_REPORT_DOUBLECLICK */ 2105#else /* MOUSE_REPORT_DOUBLECLICK */
2146 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
2147 mouse_report (ev); 2107 mouse_report (ev);
2148#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
2149 return; 2109 return;
2150 } 2110 }
2151 2111
2152 /* 2112 /*
2153 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
… …
2191 { 2151 {
2192 mouse_slip_wheel_speed += v ? -1 : 1; 2152 mouse_slip_wheel_speed += v ? -1 : 1;
2193 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2194 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2195 2155
2196 if (slip_wheel_ev.at < NOW) 2156 if (!slip_wheel_ev.is_active ())
2197 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2157 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2198
2199 slip_wheel_ev.start ();
2200 } 2158 }
2201 else 2159 else
2202 { 2160 {
2203# endif 2161# endif
2204 scr_page (v, i); 2162 scr_page (v, i);
… …
2272 2230
2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2274 { 2232 {
2275 refresh_count = 0; 2233 refresh_count = 0;
2276 2234
2277 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2278 { 2236 {
2279 refreshnow = true; 2237 refreshnow = true;
2280 ch = NOCHAR; 2238 ch = NOCHAR;
2281 break; 2239 break;
2282 } 2240 }
… …
2493 } 2451 }
2494 } 2452 }
2495 2453
2496 pclose_printer (fd); 2454 pclose_printer (fd);
2497} 2455}
2498#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2499/*}}} */ 2457/*}}} */
2500 2458
2501/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2502enum { 2460enum {
2503 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
2796 nargs = 0; 2754 nargs = 0;
2797 2755
2798 priv = 0; 2756 priv = 0;
2799 ch = cmd_getc (); 2757 ch = cmd_getc ();
2800 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
2801 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
2802 priv = ch; 2761 priv = ch;
2803 ch = cmd_getc (); 2762 ch = cmd_getc ();
2804 } 2763 }
2805 2764
2806 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
2849 { 2808 {
2850 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2809 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2851 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2810 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2852 // 2811 //
2853 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2812 // 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 2813 // 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). 2814 // versions.
2856 // 2815 //
2857 tt_printf ("\033[>%d;94;0c", 'U'); 2816 tt_printf ("\033[>%d;95;0c", 'U');
2858 } 2817 }
2859 break; 2818 break;
2860 case '?': 2819 case '?':
2861 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2862 process_terminal_mode (ch, priv, nargs, arg); 2821 process_terminal_mode (ch, priv, nargs, arg);
… …
3626 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
3627#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
3628 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
3629#endif 3588#endif
3630 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
3631 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
3632 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
3633 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
3636 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
3637 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
3638 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
… …
3712 scr_autowrap (state); 3670 scr_autowrap (state);
3713 break; 3671 break;
3714 /* case 8: - auto repeat, can't do on a per window basis */ 3672 /* case 8: - auto repeat, can't do on a per window basis */
3715 case 9: /* X10 mouse reporting */ 3673 case 9: /* X10 mouse reporting */
3716 if (state) /* orthogonal */ 3674 if (state) /* orthogonal */
3717 priv_modes &= ~PrivMode_MouseX11; 3675 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3718 break; 3676 break;
3719#ifdef scrollBar_esc 3677#ifdef scrollBar_esc
3720 case scrollBar_esc: 3678 case scrollBar_esc:
3721 if (scrollbar_mapping (state)) 3679 if (scrollbar_mapping (state))
3722 { 3680 {
… …
3735 break; 3693 break;
3736 /* case 66: - application key pad */ 3694 /* case 66: - application key pad */
3737 /* case 67: - backspace key */ 3695 /* case 67: - backspace key */
3738 case 1000: /* X11 mouse reporting */ 3696 case 1000: /* X11 mouse reporting */
3739 if (state) /* orthogonal */ 3697 if (state) /* orthogonal */
3740 priv_modes &= ~PrivMode_MouseX10; 3698 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741 break; 3699 break;
3742#if 0
3743 case 1001: 3700 case 1002:
3744 break; /* X11 mouse highlighting */ 3701 case 1003:
3745#endif 3702 if (state)
3703 {
3704 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3705 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3706 vt_emask_mouse = PointerMotionMask;
3707 }
3708 else
3709 vt_emask_mouse = NoEventMask;
3710 vt_select_input ();
3711 break;
3746 case 1010: /* scroll to bottom on TTY output inhibit */ 3712 case 1010: /* scroll to bottom on TTY output inhibit */
3747 set_option (Opt_scrollTtyOutput, !state); 3713 set_option (Opt_scrollTtyOutput, !state);
3748 break; 3714 break;
3749 case 1011: /* scroll to bottom on key press */ 3715 case 1011: /* scroll to bottom on key press */
3750 set_option (Opt_scrollTtyKeypress, state); 3716 set_option (Opt_scrollTtyKeypress, state);
… …
3927rxvt_term::process_graphics () 3893rxvt_term::process_graphics ()
3928{ 3894{
3929 unicode_t ch, cmd = cmd_getc (); 3895 unicode_t ch, cmd = cmd_getc ();
3930 3896
3931 if (cmd == 'Q') 3897 if (cmd == 'Q')
3898 {
3932 { /* query graphics */ 3899 /* query graphics */
3933 tt_printf ("\033G0\012"); /* no graphics */ 3900 tt_printf ("\033G0\012"); /* no graphics */
3934 return; 3901 return;
3935 } 3902 }
3936 /* swallow other graphics sequences until terminating ':' */ 3903 /* swallow other graphics sequences until terminating ':' */
3937 do 3904 do
… …
3987 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3988 3955
3989 memcpy (v_buffer + v_buflen, data, len); 3956 memcpy (v_buffer + v_buflen, data, len);
3990 v_buflen += len; 3957 v_buflen += len;
3991 3958
3992 pty_ev.set (EVENT_READ | EVENT_WRITE); 3959 pty_ev.set (ev::READ | ev::WRITE);
3993} 3960}
3994 3961
3995void rxvt_term::pty_write () 3962void rxvt_term::pty_write ()
3996{ 3963{
3997 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3964 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4003 if (v_buflen == 0) 3970 if (v_buflen == 0)
4004 { 3971 {
4005 free (v_buffer); 3972 free (v_buffer);
4006 v_buffer = 0; 3973 v_buffer = 0;
4007 3974
4008 pty_ev.set (EVENT_READ); 3975 pty_ev.set (ev::READ);
4009 return; 3976 return;
4010 } 3977 }
4011 3978
4012 memmove (v_buffer, v_buffer + written, v_buflen); 3979 memmove (v_buffer, v_buffer + written, v_buflen);
4013 } 3980 }
4014 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3981 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4015 pty_ev.set (EVENT_READ); 3982 pty_ev.set (ev::READ);
4016} 3983}
4017 3984
4018/*----------------------- end-of-file (C source) -----------------------*/ 3985/*----------------------- end-of-file (C source) -----------------------*/
4019 3986

Diff Legend

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