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.359 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.381 by root, Fri Dec 14 05:25:23 2007 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
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); This needs to be researched further! 991// scr_clear (true); This needs to be researched further!
1044 scr_touch (false); 992 scr_touch (false);
1045 } 993 }
… …
1093 } 1041 }
1094 1042
1095 display->flush (); 1043 display->flush ();
1096} 1044}
1097 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1098void 1047void
1099rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1100{ 1049{
1101 make_current ();
1102
1103 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active) 1050 if (want_refresh && !flush_ev.is_active ())
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1107} 1052}
1108 1053
1109void 1054void
1110rxvt_term::flush_cb (time_watcher &w) 1055rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1056{
1112 make_current (); 1057 make_current ();
1113 1058
1114 refresh_count = 0; 1059 refresh_count = 0;
1115 flush (); 1060 flush ();
1116} 1061}
1117 1062
1118#ifdef CURSOR_BLINK 1063#ifdef CURSOR_BLINK
1119void 1064void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1066{
1122 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1068 want_refresh = 1;
1124 1069 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1070}
1127#endif 1071#endif
1128 1072
1129#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1130void 1074void
1131rxvt_term::text_blink_cb (time_watcher &w) 1075rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1076{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1078 {
1135 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1136 want_refresh = 1; 1080 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1081 refresh_check ();
1138 } 1082 }
1083 else
1084 w.stop ();
1139} 1085}
1140#endif 1086#endif
1141 1087
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1089void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1091{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollbar_isUp () || scrollbar_isDn ())
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1148 { 1094 {
1149 want_refresh = 1; 1095 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1151 } 1097 }
1098 else
1099 w.stop ();
1152} 1100}
1153#endif 1101#endif
1154 1102
1155#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1156void 1104void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1106{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1108 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1110 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1164 } 1112 }
1113 else
1114 w.stop ();
1165} 1115}
1166#endif 1116#endif
1167 1117
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1119void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1121{
1172 if (mouse_slip_wheel_speed == 0 1122 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1123 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1124 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 refresh_check ();
1126 }
1127
1128 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1129 {
1130 mouse_slip_wheel_speed = 0;
1131 w.stop ();
1181 } 1132 }
1182} 1133}
1183#endif 1134#endif
1184 1135
1185#if LINUX_YIELD_HACK 1136#if LINUX_YIELD_HACK
1186static struct event_handler 1137static struct event_handler
1187{ 1138{
1188 check_watcher yield_ev; 1139 ev::prepare yield_ev;
1189 1140
1190 void yield_cb (check_watcher &w) 1141 void yield_cb (ev::prepare &w, int revents)
1191 { 1142 {
1192 // this should really be sched_yield(), but the linux guys thought 1143 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1144 // 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 1145 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1146 // allowed by the sus... as is returning ENOSYS.
… …
1246 1197
1247 return false; 1198 return false;
1248} 1199}
1249 1200
1250void 1201void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1202rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1203{
1253 make_current (); 1204 make_current ();
1254 1205
1255 if (revents & EVENT_READ) 1206 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1207 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1208 while (pty_fill ())
1258 if (cmd_parse ()) 1209 if (cmd_parse ())
1259 break; 1210 break;
1260 1211
1261 if (revents & EVENT_WRITE) 1212 if (revents & ev::WRITE)
1262 pty_write (); 1213 pty_write ();
1263} 1214}
1264 1215
1265void 1216void
1266rxvt_term::pointer_unblank () 1217rxvt_term::pointer_unblank ()
… …
1270 1221
1271#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1223 hidden_pointer = 0;
1273 1224
1274 if (option (Opt_pointerBlank)) 1225 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1226 pointer_ev.start (pointerBlankDelay);
1276#endif 1227#endif
1277} 1228}
1278 1229
1279#ifdef POINTER_BLANK 1230#ifdef POINTER_BLANK
1280void 1231void
… …
1288 1239
1289 hidden_pointer = 1; 1240 hidden_pointer = 1;
1290} 1241}
1291 1242
1292void 1243void
1293rxvt_term::pointer_cb (time_watcher &w) 1244rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1245{
1295 make_current (); 1246 make_current ();
1296 1247
1297 pointer_blank (); 1248 pointer_blank ();
1298} 1249}
… …
1301void 1252void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1253rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1254{
1304 int button_number, key_state = 0; 1255 int button_number, key_state = 0;
1305 int x, y; 1256 int x, y;
1257 int code = 32;
1306 1258
1307 x = Pixel2Col (ev.x); 1259 x = Pixel2Col (ev.x);
1308 y = Pixel2Row (ev.y); 1260 y = Pixel2Row (ev.y);
1261 if (ev.type == MotionNotify)
1262 {
1263 if (x == mouse_row && y == mouse_col)
1264 return;
1265 mouse_row = x;
1266 mouse_col = y;
1267 code += 32;
1268 }
1309 1269
1310 if (MEvent.button == AnyButton) 1270 if (MEvent.button == AnyButton)
1311 button_number = 3; 1271 button_number = 3;
1312 else 1272 else
1313 { 1273 {
… …
1359 x + 1, 1319 x + 1,
1360 y + 1); 1320 y + 1);
1361#endif 1321#endif
1362 1322
1363 tt_printf ("\033[M%c%c%c", 1323 tt_printf ("\033[M%c%c%c",
1364 (32 + button_number + key_state), 1324 (code + button_number + key_state),
1365 (32 + x + 1), 1325 (32 + x + 1),
1366 (32 + y + 1)); 1326 (32 + y + 1));
1367} 1327}
1368 1328
1369/*{{{ process an X event */ 1329/*{{{ process an X event */
… …
1521 break; 1481 break;
1522 1482
1523 case MapNotify: 1483 case MapNotify:
1524 mapped = 1; 1484 mapped = 1;
1525#ifdef TEXT_BLINK 1485#ifdef TEXT_BLINK
1526 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1486 text_blink_ev.start ();
1527#endif 1487#endif
1528 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1529 break; 1489 break;
1530 1490
1531 case UnmapNotify: 1491 case UnmapNotify:
… …
1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 { 1513 {
1554 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1555 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1556 } 1516 }
1517
1557 want_refresh = 1; 1518 want_refresh = 1;
1558 } 1519 }
1559 else 1520 else
1560 { 1521 {
1561 XEvent unused_event; 1522 XEvent unused_event;
… …
1576 case MotionNotify: 1537 case MotionNotify:
1577#ifdef POINTER_BLANK 1538#ifdef POINTER_BLANK
1578 if (hidden_pointer) 1539 if (hidden_pointer)
1579 pointer_unblank (); 1540 pointer_unblank ();
1580#endif 1541#endif
1542 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1543 || priv_modes & PrivMode_MouseAnyEvent)
1544 mouse_report (ev.xbutton);
1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1582 break; 1546 break;
1583 1547
1584 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1585 { 1549 {
… …
1619 int dist; 1583 int dist;
1620 1584
1621 /* don't clobber the current delay if we are 1585 /* don't clobber the current delay if we are
1622 * already in the middle of scrolling. 1586 * already in the middle of scrolling.
1623 */ 1587 */
1624 if (!sel_scroll_ev.active) 1588 if (!sel_scroll_ev.is_active ())
1625 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1589 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1626 1590
1627 /* save the event params so we can highlight 1591 /* save the event params so we can highlight
1628 * the selection in the pending-scroll loop 1592 * the selection in the pending-scroll loop
1629 */ 1593 */
1630 selection_save_x = ev.xbutton.x; 1594 selection_save_x = ev.xbutton.x;
… …
1652 else 1616 else
1653 { 1617 {
1654 /* we are within the text window, so we 1618 /* we are within the text window, so we
1655 * shouldn't be scrolling 1619 * shouldn't be scrolling
1656 */ 1620 */
1657 if (sel_scroll_ev.active)
1658 sel_scroll_ev.stop(); 1621 sel_scroll_ev.stop();
1659 } 1622 }
1660#endif 1623#endif
1661#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1662 } 1625 }
1663#endif 1626#endif
… …
1689 { 1652 {
1690 hidden_cursor = 0; 1653 hidden_cursor = 0;
1691 want_refresh = 1; 1654 want_refresh = 1;
1692 } 1655 }
1693 1656
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1657 cursor_blink_ev.again ();
1695 } 1658 }
1696#endif 1659#endif
1697 1660
1698#if defined(POINTER_BLANK) 1661#if defined(POINTER_BLANK)
1699 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1662 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1706 1669
1707 if (ev.type == KeyPress && hidden_pointer == 0) 1670 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank (); 1671 pointer_blank ();
1709 } 1672 }
1710#endif 1673#endif
1674
1675 refresh_check ();
1711} 1676}
1712 1677
1713void 1678void
1714rxvt_term::focus_in () 1679rxvt_term::focus_in ()
1715{ 1680{
… …
1727 XSetICFocus (Input_Context); 1692 XSetICFocus (Input_Context);
1728 } 1693 }
1729#endif 1694#endif
1730#if CURSOR_BLINK 1695#if CURSOR_BLINK
1731 if (option (Opt_cursorBlink)) 1696 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1697 cursor_blink_ev.again ();
1733#endif 1698#endif
1734#if OFF_FOCUS_FADING 1699#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1700 if (rs[Rs_fade])
1736 { 1701 {
1737 pix_colors = pix_colors_focused; 1702 pix_colors = pix_colors_focused;
… …
1775 XUnsetICFocus (Input_Context); 1740 XUnsetICFocus (Input_Context);
1776#endif 1741#endif
1777#if CURSOR_BLINK 1742#if CURSOR_BLINK
1778 if (option (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1779 cursor_blink_ev.stop (); 1744 cursor_blink_ev.stop ();
1745
1780 hidden_cursor = 0; 1746 hidden_cursor = 0;
1781#endif 1747#endif
1782#if OFF_FOCUS_FADING 1748#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade]) 1749 if (rs[Rs_fade])
1784 { 1750 {
… …
1827 update_background (); 1793 update_background ();
1828 } 1794 }
1829 break; 1795 break;
1830 } 1796 }
1831# endif 1797# endif
1798
1799 refresh_check ();
1832} 1800}
1833#endif 1801#endif
1834 1802
1835void 1803void
1836rxvt_term::button_press (XButtonEvent &ev) 1804rxvt_term::button_press (XButtonEvent &ev)
… …
1891 mouse_report (ev); 1859 mouse_report (ev);
1892 } 1860 }
1893#else 1861#else
1894 MEvent.button = ev.button; 1862 MEvent.button = ev.button;
1895 mouse_report (ev); 1863 mouse_report (ev);
1896#endif /* MOUSE_REPORT_DOUBLECLICK */ 1864#endif /* MOUSE_REPORT_DOUBLECLICK */
1897 1865
1898 } 1866 }
1899 else 1867 else
1900 { 1868 {
1901 if (ev.button != MEvent.button) 1869 if (ev.button != MEvent.button)
… …
1995 tt_printf ("\033[5~"); 1963 tt_printf ("\033[5~");
1996 break; 1964 break;
1997 } 1965 }
1998 } 1966 }
1999 else 1967 else
2000#endif /* NO_SCROLLBAR_REPORT */ 1968#endif /* NO_SCROLLBAR_REPORT */
2001 1969
2002 { 1970 {
2003 char upordown = 0; 1971 char upordown = 0;
2004 1972
2005 if (scrollBar.style == R_SB_NEXT) 1973 if (scrollBar.style == R_SB_NEXT)
2006 { 1974 {
2007 if (scrollbarnext_upButton (ev.y)) 1975 if (scrollbarnext_upButton (ev.y))
2008 upordown = -1; /* up */ 1976 upordown = -1; /* up */
… …
2014 if (scrollbarrxvt_upButton (ev.y)) 1982 if (scrollbarrxvt_upButton (ev.y))
2015 upordown = -1; /* up */ 1983 upordown = -1; /* up */
2016 else if (scrollbarrxvt_dnButton (ev.y)) 1984 else if (scrollbarrxvt_dnButton (ev.y))
2017 upordown = 1; /* down */ 1985 upordown = 1; /* down */
2018 } 1986 }
1987
2019 if (upordown) 1988 if (upordown)
2020 { 1989 {
2021#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1990#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1991 if (!cont_scroll_ev.is_active ())
2022 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1992 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2023#endif 1993#endif
2024 if (scr_page (upordown < 0 ? UP : DN, 1)) 1994 if (scr_page (upordown < 0 ? UP : DN, 1))
2025 { 1995 {
2026 if (upordown < 0) 1996 if (upordown < 0)
2027 scrollBar.setUp (); 1997 scrollBar.setUp ();
… …
2107 scrollBar.setIdle (); 2077 scrollBar.setIdle ();
2108 scrollbar_show (0); 2078 scrollbar_show (0);
2109 } 2079 }
2110 2080
2111#ifdef SELECTION_SCROLLING 2081#ifdef SELECTION_SCROLLING
2112 if (sel_scroll_ev.active)
2113 sel_scroll_ev.stop(); 2082 sel_scroll_ev.stop();
2114#endif 2083#endif
2115 2084
2116 if (ev.window == vt) 2085 if (ev.window == vt)
2117 { 2086 {
2118 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2087 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2142 mouse_report (ev); 2111 mouse_report (ev);
2143 } 2112 }
2144#else /* MOUSE_REPORT_DOUBLECLICK */ 2113#else /* MOUSE_REPORT_DOUBLECLICK */
2145 MEvent.button = AnyButton; 2114 MEvent.button = AnyButton;
2146 mouse_report (ev); 2115 mouse_report (ev);
2147#endif /* MOUSE_REPORT_DOUBLECLICK */ 2116#endif /* MOUSE_REPORT_DOUBLECLICK */
2148 return; 2117 return;
2149 } 2118 }
2150 2119
2151 /* 2120 /*
2152 * dumb hack to compensate for the failure of click-and-drag 2121 * dumb hack to compensate for the failure of click-and-drag
… …
2190 { 2159 {
2191 mouse_slip_wheel_speed += v ? -1 : 1; 2160 mouse_slip_wheel_speed += v ? -1 : 1;
2192 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2161 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2193 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2162 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2194 2163
2195 if (slip_wheel_ev.at < NOW) 2164 if (!slip_wheel_ev.is_active ())
2196 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2165 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2197
2198 slip_wheel_ev.start ();
2199 } 2166 }
2200 else 2167 else
2201 { 2168 {
2202# endif 2169# endif
2203 scr_page (v, i); 2170 scr_page (v, i);
… …
2271 2238
2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2239 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2273 { 2240 {
2274 refresh_count = 0; 2241 refresh_count = 0;
2275 2242
2276 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2243 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2277 { 2244 {
2278 refreshnow = true; 2245 refreshnow = true;
2279 ch = NOCHAR; 2246 ch = NOCHAR;
2280 break; 2247 break;
2281 } 2248 }
… …
2341 } 2308 }
2342 2309
2343 ch = NOCHAR; 2310 ch = NOCHAR;
2344 } 2311 }
2345 } 2312 }
2313
2314 refresh_check ();
2346 2315
2347 return flag; 2316 return flag;
2348} 2317}
2349 2318
2350// read the next character 2319// read the next character
… …
2492 } 2461 }
2493 } 2462 }
2494 2463
2495 pclose_printer (fd); 2464 pclose_printer (fd);
2496} 2465}
2497#endif /* PRINTPIPE */ 2466#endif /* PRINTPIPE */
2498/*}}} */ 2467/*}}} */
2499 2468
2500/* *INDENT-OFF* */ 2469/* *INDENT-OFF* */
2501enum { 2470enum {
2502 C1_40 = 0x40, 2471 C1_40 = 0x40,
… …
2795 nargs = 0; 2764 nargs = 0;
2796 2765
2797 priv = 0; 2766 priv = 0;
2798 ch = cmd_getc (); 2767 ch = cmd_getc ();
2799 if (ch >= '<' && ch <= '?') 2768 if (ch >= '<' && ch <= '?')
2769 {
2800 { /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' */
2801 priv = ch; 2771 priv = ch;
2802 ch = cmd_getc (); 2772 ch = cmd_getc ();
2803 } 2773 }
2804 2774
2805 /* read any numerical arguments */ 2775 /* read any numerical arguments */
… …
2848 { 2818 {
2849 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2819 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2850 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2820 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2851 // 2821 //
2852 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2822 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2853 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2823 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2854 // that we do not support xterm mouse reporting (should be 95 when we do). 2824 // versions.
2855 // 2825 //
2856 tt_printf ("\033[>%d;94;0c", 'U'); 2826 tt_printf ("\033[>%d;95;0c", 'U');
2857 } 2827 }
2858 break; 2828 break;
2859 case '?': 2829 case '?':
2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2830 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2861 process_terminal_mode (ch, priv, nargs, arg); 2831 process_terminal_mode (ch, priv, nargs, arg);
… …
3625 { 66, PrivMode_aplKP }, 3595 { 66, PrivMode_aplKP },
3626#ifndef NO_BACKSPACE_KEY 3596#ifndef NO_BACKSPACE_KEY
3627 { 67, PrivMode_BackSpace }, 3597 { 67, PrivMode_BackSpace },
3628#endif 3598#endif
3629 { 1000, PrivMode_MouseX11 }, 3599 { 1000, PrivMode_MouseX11 },
3630 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3600 { 1002, PrivMode_MouseBtnEvent },
3631 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3601 { 1003, PrivMode_MouseAnyEvent },
3632 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3633 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3602 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3634 { 1011, PrivMode_Keypress }, // rxvt extension 3603 { 1011, PrivMode_Keypress }, // rxvt extension
3635 // 1035 enable modifiers for alt, numlock NYI 3604 // 1035 enable modifiers for alt, numlock NYI
3636 // 1036 send ESC for meta keys NYI 3605 // 1036 send ESC for meta keys NYI
3637 // 1037 send DEL for keypad delete NYI 3606 // 1037 send DEL for keypad delete NYI
… …
3711 scr_autowrap (state); 3680 scr_autowrap (state);
3712 break; 3681 break;
3713 /* case 8: - auto repeat, can't do on a per window basis */ 3682 /* case 8: - auto repeat, can't do on a per window basis */
3714 case 9: /* X10 mouse reporting */ 3683 case 9: /* X10 mouse reporting */
3715 if (state) /* orthogonal */ 3684 if (state) /* orthogonal */
3716 priv_modes &= ~PrivMode_MouseX11; 3685 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3717 break; 3686 break;
3718#ifdef scrollBar_esc 3687#ifdef scrollBar_esc
3719 case scrollBar_esc: 3688 case scrollBar_esc:
3720 if (scrollbar_mapping (state)) 3689 if (scrollbar_mapping (state))
3721 { 3690 {
… …
3734 break; 3703 break;
3735 /* case 66: - application key pad */ 3704 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 3705 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 3706 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 3707 if (state) /* orthogonal */
3739 priv_modes &= ~PrivMode_MouseX10; 3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3740 break; 3709 break;
3741#if 0
3742 case 1001: 3710 case 1002:
3743 break; /* X11 mouse highlighting */ 3711 case 1003:
3744#endif 3712 if (state)
3713 {
3714 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3715 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3716 vt_emask_mouse = PointerMotionMask;
3717 }
3718 else
3719 vt_emask_mouse = NoEventMask;
3720 vt_select_input ();
3721 break;
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 3722 case 1010: /* scroll to bottom on TTY output inhibit */
3746 set_option (Opt_scrollTtyOutput, !state); 3723 set_option (Opt_scrollTtyOutput, !state);
3747 break; 3724 break;
3748 case 1011: /* scroll to bottom on key press */ 3725 case 1011: /* scroll to bottom on key press */
3749 set_option (Opt_scrollTtyKeypress, state); 3726 set_option (Opt_scrollTtyKeypress, state);
… …
3926rxvt_term::process_graphics () 3903rxvt_term::process_graphics ()
3927{ 3904{
3928 unicode_t ch, cmd = cmd_getc (); 3905 unicode_t ch, cmd = cmd_getc ();
3929 3906
3930 if (cmd == 'Q') 3907 if (cmd == 'Q')
3908 {
3931 { /* query graphics */ 3909 /* query graphics */
3932 tt_printf ("\033G0\012"); /* no graphics */ 3910 tt_printf ("\033G0\012"); /* no graphics */
3933 return; 3911 return;
3934 } 3912 }
3935 /* swallow other graphics sequences until terminating ':' */ 3913 /* swallow other graphics sequences until terminating ':' */
3936 do 3914 do
… …
3986 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3964 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3987 3965
3988 memcpy (v_buffer + v_buflen, data, len); 3966 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len; 3967 v_buflen += len;
3990 3968
3991 pty_ev.set (EVENT_READ | EVENT_WRITE); 3969 pty_ev.set (ev::READ | ev::WRITE);
3992} 3970}
3993 3971
3994void rxvt_term::pty_write () 3972void rxvt_term::pty_write ()
3995{ 3973{
3996 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3974 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4002 if (v_buflen == 0) 3980 if (v_buflen == 0)
4003 { 3981 {
4004 free (v_buffer); 3982 free (v_buffer);
4005 v_buffer = 0; 3983 v_buffer = 0;
4006 3984
4007 pty_ev.set (EVENT_READ); 3985 pty_ev.set (ev::READ);
4008 return; 3986 return;
4009 } 3987 }
4010 3988
4011 memmove (v_buffer, v_buffer + written, v_buflen); 3989 memmove (v_buffer, v_buffer + written, v_buflen);
4012 } 3990 }
4013 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3991 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4014 pty_ev.set (EVENT_READ); 3992 pty_ev.set (ev::READ);
4015} 3993}
4016 3994
4017/*----------------------- end-of-file (C source) -----------------------*/ 3995/*----------------------- end-of-file (C source) -----------------------*/
4018 3996

Diff Legend

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