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.351 by ayin, Sun Sep 9 10:14:40 2007 UTC vs.
Revision 1.372 by root, Tue Dec 11 03:30:47 2007 UTC

… …
547#endif 547#endif
548 548
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 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
553 switch (keysym) 584 switch (keysym)
554 { 585 {
555#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
556 case XK_BackSpace: 587 case XK_BackSpace:
557 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
563 else 594 else
564 strcpy (kbuf, rs[Rs_backspace_key]); 595 strcpy (kbuf, rs[Rs_backspace_key]);
565 break; 596 break;
566#endif 597#endif
567#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Delete
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 {
573 strcpy (kbuf, "\033On");
574 break;
575 }
576 /* FALLTHROUGH */
577# endif
578 case XK_Delete: 599 case XK_Delete:
579 strcpy (kbuf, rs[Rs_delete_key]); 600 strcpy (kbuf, rs[Rs_delete_key]);
580 break; 601 break;
581#endif 602#endif
582 case XK_Tab: 603 case XK_Tab:
… …
594#endif 615#endif
595 newlen = 0; 616 newlen = 0;
596 } 617 }
597 break; 618 break;
598 619
599#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 {
606 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break;
609 }
610 else
611 /* translate to std. cursor key */
612 keysym = XK_Left + (keysym - XK_KP_Left);
613 /* FALLTHROUGH */
614#endif
615 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
616 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
617 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
618 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
619 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
629 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
630 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
631 break; 636 break;
632 637
633#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior
635 case XK_KP_Prior:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Oy");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Prior: 639 case XK_Prior:
645 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
646 break; 641 break;
647# ifdef XK_KP_Next
648 case XK_KP_Next:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033Os");
653 break;
654 }
655 /* FALLTHROUGH */
656# endif
657 case XK_Next: 642 case XK_Next:
658 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
659 break; 644 break;
660#endif 645#endif
661 case XK_KP_Enter: 646 case XK_KP_Enter:
662 /* allow shift to override */ 647 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
664 { 649 {
665 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
666 break; 651 break;
667 } 652 }
668 653
… …
680 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
681 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
682 } 667 }
683 break; 668 break;
684 669
685#ifdef XK_KP_Begin
686 case XK_KP_Begin:
687 strcpy (kbuf, "\033Ou");
688 break;
689
690#endif
691 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
692 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
693 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
694 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
695 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
711 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */ 694 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
717 { 696 {
718 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
720 } 699 }
721 else 700 else
… …
727 706
728 case XK_Find: 707 case XK_Find:
729 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
730 break; 709 break;
731 710
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
742 case XK_Insert: 711 case XK_Insert:
743 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
744 break; 713 break;
745#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
746 case DXK_Remove: 715 case DXK_Remove:
… …
750 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
751 break; 720 break;
752 case XK_Select: 721 case XK_Select:
753 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
754 break; 723 break;
755#ifdef XK_KP_End
756 case XK_KP_End:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Oq");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_End: 724 case XK_End:
766 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
767 break; 726 break;
768#ifdef XK_KP_Home
769 case XK_KP_Home:
770 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772 {
773 strcpy (kbuf, "\033Ow");
774 break;
775 }
776 /* FALLTHROUGH */
777#endif
778 case XK_Home: 727 case XK_Home:
779 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
780 break; 729 break;
781 730
782#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
1034void 983void
1035rxvt_term::flush () 984rxvt_term::flush ()
1036{ 985{
1037 flush_ev.stop (); 986 flush_ev.stop ();
1038 987
1039#ifdef ENABLE_TRANSPARENCY 988#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
1041 { 990 {
1042 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
1043 scr_clear ();
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 && !ev_is_active (&flush_ev))
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 }
1139} 1084}
1140#endif 1085#endif
1141 1086
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1088void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1090{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1148 {
1149 want_refresh = 1; 1093 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
1151 } 1095 w.stop ();
1152} 1096}
1153#endif 1097#endif
1154 1098
1155#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1156void 1100void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1102{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1104 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1106 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1164 } 1107 }
1108 else
1109 w.stop ();
1165} 1110}
1166#endif 1111#endif
1167 1112
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1114void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1116{
1172 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
1173 || 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)
1174 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1120 {
1176 if (view_start == top_row || view_start == 0) 1121 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0; 1122 mouse_slip_wheel_speed = 0;
1178 1123
1179 want_refresh = 1; 1124 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1181 } 1125 }
1126 else
1127 w.stop ();
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 */
… …
1474 && ev.xfocus.mode != NotifyGrab) 1428 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1429 focus_out ();
1476 break; 1430 break;
1477 1431
1478 case ConfigureNotify: 1432 case ConfigureNotify:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/ 1435 szHint.width, szHint.height); */
1482 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1483 { 1437 {
1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1439 ;
1486 1440
… …
1489 seen_resize = 1; 1443 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1445 }
1492 else 1446 else
1493 { 1447 {
1494#ifdef ENABLE_TRANSPARENCY 1448#ifdef HAVE_BG_PIXMAP
1495 if (option (Opt_transparent)) 1449 if (bgPixmap.window_position_sensitive ())
1496 update_background (); 1450 update_background ();
1497#endif 1451#endif
1498 } 1452 }
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 } 1454 }
… …
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 (TEXT_BLINK_INTERVAL);
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:
… …
1534#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1535 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1536#endif 1490#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1492 break;
1539
1540#ifdef ENABLE_TRANSPARENCY
1541 case ReparentNotify:
1542 rootwin_cb (ev);
1543 break;
1544#endif /* ENABLE_TRANSPARENCY */
1545 1493
1546 case GraphicsExpose: 1494 case GraphicsExpose:
1547 case Expose: 1495 case Expose:
1548 if (ev.xany.window == vt) 1496 if (ev.xany.window == vt)
1549 { 1497 {
1550 do 1498 do
1499 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1554 1504
1555 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1556 1506
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1558 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1559 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1560 1511 }
1561 want_refresh = 1; 1512 want_refresh = 1;
1562 } 1513 }
1563 else 1514 else
1564 { 1515 {
1565 XEvent unused_event; 1516 XEvent unused_event;
… …
1580 case MotionNotify: 1531 case MotionNotify:
1581#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1582 if (hidden_pointer) 1533 if (hidden_pointer)
1583 pointer_unblank (); 1534 pointer_unblank ();
1584#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);
1585 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1586 break; 1540 break;
1587 1541
1588 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1589 { 1543 {
… …
1623 int dist; 1577 int dist;
1624 1578
1625 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1626 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1627 */ 1581 */
1628 if (!sel_scroll_ev.active) 1582 if (!ev_is_active (&sel_scroll_ev))
1629 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1630 1584
1631 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1632 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1633 */ 1587 */
1634 selection_save_x = ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
… …
1656 else 1610 else
1657 { 1611 {
1658 /* we are within the text window, so we 1612 /* we are within the text window, so we
1659 * shouldn't be scrolling 1613 * shouldn't be scrolling
1660 */ 1614 */
1661 if (sel_scroll_ev.active) 1615 if (ev_is_active (&sel_scroll_ev))
1662 sel_scroll_ev.stop(); 1616 sel_scroll_ev.stop();
1663 } 1617 }
1664#endif 1618#endif
1665#ifdef MOUSE_THRESHOLD 1619#ifdef MOUSE_THRESHOLD
1666 } 1620 }
… …
1693 { 1647 {
1694 hidden_cursor = 0; 1648 hidden_cursor = 0;
1695 want_refresh = 1; 1649 want_refresh = 1;
1696 } 1650 }
1697 1651
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1652 cursor_blink_ev.again ();
1699 } 1653 }
1700#endif 1654#endif
1701 1655
1702#if defined(POINTER_BLANK) 1656#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1657 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1731 XSetICFocus (Input_Context); 1685 XSetICFocus (Input_Context);
1732 } 1686 }
1733#endif 1687#endif
1734#if CURSOR_BLINK 1688#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink)) 1689 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1737#endif 1691#endif
1738#if OFF_FOCUS_FADING 1692#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1693 if (rs[Rs_fade])
1740 { 1694 {
1741 pix_colors = pix_colors_focused; 1695 pix_colors = pix_colors_focused;
… …
1743 } 1697 }
1744#endif 1698#endif
1745#if ENABLE_FRILLS 1699#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell)) 1700 if (option (Opt_urgentOnBell))
1747 { 1701 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]); 1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1751 if (h != NULL)
1752 { 1703 {
1753 h->flags &= ~XUrgencyHint; 1704 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h); 1705 XSetWMHints (dpy, parent[0], h);
1755 } 1706 }
1756 } 1707 }
1757#endif 1708#endif
1758 } 1709 }
1759} 1710}
… …
1782 XUnsetICFocus (Input_Context); 1733 XUnsetICFocus (Input_Context);
1783#endif 1734#endif
1784#if CURSOR_BLINK 1735#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop (); 1737 cursor_blink_ev.stop ();
1738
1787 hidden_cursor = 0; 1739 hidden_cursor = 0;
1788#endif 1740#endif
1789#if OFF_FOCUS_FADING 1741#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1742 if (rs[Rs_fade])
1791 { 1743 {
… …
1898 mouse_report (ev); 1850 mouse_report (ev);
1899 } 1851 }
1900#else 1852#else
1901 MEvent.button = ev.button; 1853 MEvent.button = ev.button;
1902 mouse_report (ev); 1854 mouse_report (ev);
1903#endif /* MOUSE_REPORT_DOUBLECLICK */ 1855#endif /* MOUSE_REPORT_DOUBLECLICK */
1904 1856
1905 } 1857 }
1906 else 1858 else
1907 { 1859 {
1908 if (ev.button != MEvent.button) 1860 if (ev.button != MEvent.button)
… …
2002 tt_printf ("\033[5~"); 1954 tt_printf ("\033[5~");
2003 break; 1955 break;
2004 } 1956 }
2005 } 1957 }
2006 else 1958 else
2007#endif /* NO_SCROLLBAR_REPORT */ 1959#endif /* NO_SCROLLBAR_REPORT */
2008 1960
2009 { 1961 {
2010 char upordown = 0; 1962 char upordown = 0;
2011 1963
2012 if (scrollBar.style == R_SB_NEXT) 1964 if (scrollBar.style == R_SB_NEXT)
2013 { 1965 {
2014 if (scrollbarnext_upButton (ev.y)) 1966 if (scrollbarnext_upButton (ev.y))
2015 upordown = -1; /* up */ 1967 upordown = -1; /* up */
… …
2024 upordown = 1; /* down */ 1976 upordown = 1; /* down */
2025 } 1977 }
2026 if (upordown) 1978 if (upordown)
2027 { 1979 {
2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2029 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 1982#endif
2031 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
2032 { 1984 {
2033 if (upordown < 0) 1985 if (upordown < 0)
2034 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
2114 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
2115 scrollbar_show (0); 2067 scrollbar_show (0);
2116 } 2068 }
2117 2069
2118#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
2119 if (sel_scroll_ev.active) 2071 if (ev_is_active (&sel_scroll_ev))
2120 sel_scroll_ev.stop(); 2072 sel_scroll_ev.stop();
2121#endif 2073#endif
2122 2074
2123 if (ev.window == vt) 2075 if (ev.window == vt)
2124 { 2076 {
… …
2149 mouse_report (ev); 2101 mouse_report (ev);
2150 } 2102 }
2151#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
2152 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
2153 mouse_report (ev); 2105 mouse_report (ev);
2154#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
2155 return; 2107 return;
2156 } 2108 }
2157 2109
2158 /* 2110 /*
2159 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
… …
2197 { 2149 {
2198 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201 2153
2202 if (slip_wheel_ev.at < NOW) 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2203 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2204
2205 slip_wheel_ev.start ();
2206 } 2155 }
2207 else 2156 else
2208 { 2157 {
2209# endif 2158# endif
2210 scr_page (v, i); 2159 scr_page (v, i);
… …
2278 2227
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 { 2229 {
2281 refresh_count = 0; 2230 refresh_count = 0;
2282 2231
2283 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2232 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 { 2233 {
2285 refreshnow = true; 2234 refreshnow = true;
2286 ch = NOCHAR; 2235 ch = NOCHAR;
2287 break; 2236 break;
2288 } 2237 }
… …
2499 } 2448 }
2500 } 2449 }
2501 2450
2502 pclose_printer (fd); 2451 pclose_printer (fd);
2503} 2452}
2504#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
2505/*}}} */ 2454/*}}} */
2506 2455
2507/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
2508enum { 2457enum {
2509 C1_40 = 0x40, 2458 C1_40 = 0x40,
… …
2802 nargs = 0; 2751 nargs = 0;
2803 2752
2804 priv = 0; 2753 priv = 0;
2805 ch = cmd_getc (); 2754 ch = cmd_getc ();
2806 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
2756 {
2807 { /* '<' '=' '>' '?' */ 2757 /* '<' '=' '>' '?' */
2808 priv = ch; 2758 priv = ch;
2809 ch = cmd_getc (); 2759 ch = cmd_getc ();
2810 } 2760 }
2811 2761
2812 /* read any numerical arguments */ 2762 /* read any numerical arguments */
… …
2855 { 2805 {
2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2806 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2807 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858 // 2808 //
2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2809 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2810 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2861 // that we do not support xterm mouse reporting (should be 95 when we do). 2811 // versions.
2862 // 2812 //
2863 tt_printf ("\033[>%d;94;0c", 'U'); 2813 tt_printf ("\033[>%d;95;0c", 'U');
2864 } 2814 }
2865 break; 2815 break;
2866 case '?': 2816 case '?':
2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2868 process_terminal_mode (ch, priv, nargs, arg); 2818 process_terminal_mode (ch, priv, nargs, arg);
… …
3435 } 3385 }
3436 3386
3437 break; 3387 break;
3438#endif 3388#endif
3439 3389
3440#if XPM_BACKGROUND 3390#if BG_IMAGE_FROM_FILE
3441 case Rxvt_Pixmap: 3391 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3392 if (!strcmp (str, "?"))
3443 { 3393 {
3444 char str[256]; 3394 char str[256];
3445 3395
… …
3632 { 66, PrivMode_aplKP }, 3582 { 66, PrivMode_aplKP },
3633#ifndef NO_BACKSPACE_KEY 3583#ifndef NO_BACKSPACE_KEY
3634 { 67, PrivMode_BackSpace }, 3584 { 67, PrivMode_BackSpace },
3635#endif 3585#endif
3636 { 1000, PrivMode_MouseX11 }, 3586 { 1000, PrivMode_MouseX11 },
3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
3638 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
3639 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
3642 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
3643 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
3644 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
3718 scr_autowrap (state); 3667 scr_autowrap (state);
3719 break; 3668 break;
3720 /* case 8: - auto repeat, can't do on a per window basis */ 3669 /* case 8: - auto repeat, can't do on a per window basis */
3721 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
3722 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
3723 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3673 break;
3725#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
3726 case scrollBar_esc: 3675 case scrollBar_esc:
3727 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
3728 { 3677 {
… …
3741 break; 3690 break;
3742 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
3743 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
3744 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
3745 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
3746 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3696 break;
3748#if 0
3749 case 1001: 3697 case 1002:
3750 break; /* X11 mouse highlighting */ 3698 case 1003:
3751#endif 3699 if (state)
3700 {
3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3703 vt_emask_mouse = PointerMotionMask;
3704 }
3705 else
3706 vt_emask_mouse = NoEventMask;
3707 vt_select_input ();
3708 break;
3752 case 1010: /* scroll to bottom on TTY output inhibit */ 3709 case 1010: /* scroll to bottom on TTY output inhibit */
3753 set_option (Opt_scrollTtyOutput, !state); 3710 set_option (Opt_scrollTtyOutput, !state);
3754 break; 3711 break;
3755 case 1011: /* scroll to bottom on key press */ 3712 case 1011: /* scroll to bottom on key press */
3756 set_option (Opt_scrollTtyKeypress, state); 3713 set_option (Opt_scrollTtyKeypress, state);
… …
3933rxvt_term::process_graphics () 3890rxvt_term::process_graphics ()
3934{ 3891{
3935 unicode_t ch, cmd = cmd_getc (); 3892 unicode_t ch, cmd = cmd_getc ();
3936 3893
3937 if (cmd == 'Q') 3894 if (cmd == 'Q')
3895 {
3938 { /* query graphics */ 3896 /* query graphics */
3939 tt_printf ("\033G0\012"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
3940 return; 3898 return;
3941 } 3899 }
3942 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
3943 do 3901 do
… …
3993 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3994 3952
3995 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
3996 v_buflen += len; 3954 v_buflen += len;
3997 3955
3998 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
3999} 3957}
4000 3958
4001void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4002{ 3960{
4003 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));
… …
4008 3966
4009 if (v_buflen == 0) 3967 if (v_buflen == 0)
4010 { 3968 {
4011 free (v_buffer); 3969 free (v_buffer);
4012 v_buffer = 0; 3970 v_buffer = 0;
4013 v_buflen = 0;
4014 3971
4015 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4016 return; 3973 return;
4017 } 3974 }
4018 3975
4019 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 3977 }
4021 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4022 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4023} 3980}
4024 3981
4025/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4026 3983

Diff Legend

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