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

Diff Legend

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