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.346 by root, Wed Aug 15 06:48:16 2007 UTC vs.
Revision 1.364 by ayin, Mon Nov 12 14:53:13 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)
… …
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
562 } 593 }
563 else 594 else
564 strcpy (kbuf, key_backspace); 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_Prior
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, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
580 break; 601 break;
581#endif 602#endif
582 case XK_Tab: 603 case XK_Tab:
583 if (shft) 604 if (shft)
584 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
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 && !flush_ev.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 }
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 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1310 1263
1311 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1312 button_number = 3; 1265 button_number = 3;
1313 else 1266 else
1314 { 1267 {
… …
1360 x + 1, 1313 x + 1,
1361 y + 1); 1314 y + 1);
1362#endif 1315#endif
1363 1316
1364 tt_printf ("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1366 (32 + x + 1), 1319 (32 + x + 1),
1367 (32 + y + 1)); 1320 (32 + y + 1));
1368} 1321}
1369 1322
1370/*{{{ process an X event */ 1323/*{{{ process an X event */
… …
1474 && ev.xfocus.mode != NotifyGrab) 1427 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1428 focus_out ();
1476 break; 1429 break;
1477 1430
1478 case ConfigureNotify: 1431 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */
1479 if (ev.xconfigure.window == parent[0]) 1435 if (ev.xconfigure.window == parent[0])
1480 { 1436 {
1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1482 ; 1438 ;
1483 1439
1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1485 { 1441 {
1486 seen_resize = 1; 1442 seen_resize = 1;
1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488#ifdef XPM_BACKGROUND
1489 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1490 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1491 {
1492 bgPixmap.render ();
1493 scr_touch (true);
1494 }
1495#endif
1496 } 1444 }
1497 1445 else
1446 {
1447#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 update_background ();
1450#endif
1451 }
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 bgPixmap.render ();
1503#endif
1504 } 1453 }
1505 break; 1454 break;
1506 1455
1507 case PropertyNotify: 1456 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1526 break; 1475 break;
1527 1476
1528 case MapNotify: 1477 case MapNotify:
1529 mapped = 1; 1478 mapped = 1;
1530#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1532#endif 1481#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534 break; 1483 break;
1535 1484
1536 case UnmapNotify: 1485 case UnmapNotify:
… …
1538#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1539 text_blink_ev.stop (); 1488 text_blink_ev.stop ();
1540#endif 1489#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1491 break;
1543
1544#ifdef ENABLE_TRANSPARENCY
1545 case ReparentNotify:
1546 rootwin_cb (ev);
1547 break;
1548#endif /* ENABLE_TRANSPARENCY */
1549 1492
1550 case GraphicsExpose: 1493 case GraphicsExpose:
1551 case Expose: 1494 case Expose:
1552 if (ev.xany.window == vt) 1495 if (ev.xany.window == vt)
1553 { 1496 {
1554 do 1497 do
1498 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1499 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1500 ev.xexpose.width, ev.xexpose.height, False);
1501 }
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1502 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1558 1503
1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560 1505
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1564 1510 }
1565 want_refresh = 1; 1511 want_refresh = 1;
1566 } 1512 }
1567 else 1513 else
1568 { 1514 {
1569 XEvent unused_event; 1515 XEvent unused_event;
… …
1584 case MotionNotify: 1530 case MotionNotify:
1585#ifdef POINTER_BLANK 1531#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1532 if (hidden_pointer)
1587 pointer_unblank (); 1533 pointer_unblank ();
1588#endif 1534#endif
1535 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1536 || priv_modes & PrivMode_MouseAnyEvent)
1537 mouse_report (ev.xbutton);
1589 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1538 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1590 break; 1539 break;
1591 1540
1592 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1593 { 1542 {
… …
1628 1577
1629 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1630 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1631 */ 1580 */
1632 if (!sel_scroll_ev.active) 1581 if (!sel_scroll_ev.active)
1633 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1634 1583
1635 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1636 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1637 */ 1586 */
1638 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
… …
1697 { 1646 {
1698 hidden_cursor = 0; 1647 hidden_cursor = 0;
1699 want_refresh = 1; 1648 want_refresh = 1;
1700 } 1649 }
1701 1650
1702 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1651 cursor_blink_ev.again ();
1703 } 1652 }
1704#endif 1653#endif
1705 1654
1706#if defined(POINTER_BLANK) 1655#if defined(POINTER_BLANK)
1707 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1656 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1735 XSetICFocus (Input_Context); 1684 XSetICFocus (Input_Context);
1736 } 1685 }
1737#endif 1686#endif
1738#if CURSOR_BLINK 1687#if CURSOR_BLINK
1739 if (option (Opt_cursorBlink)) 1688 if (option (Opt_cursorBlink))
1740 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1689 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1741#endif 1690#endif
1742#if OFF_FOCUS_FADING 1691#if OFF_FOCUS_FADING
1743 if (rs[Rs_fade]) 1692 if (rs[Rs_fade])
1744 { 1693 {
1745 pix_colors = pix_colors_focused; 1694 pix_colors = pix_colors_focused;
… …
1747 } 1696 }
1748#endif 1697#endif
1749#if ENABLE_FRILLS 1698#if ENABLE_FRILLS
1750 if (option (Opt_urgentOnBell)) 1699 if (option (Opt_urgentOnBell))
1751 { 1700 {
1752 XWMHints *h;
1753
1754 h = XGetWMHints(dpy, parent[0]); 1701 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1755 if (h != NULL)
1756 { 1702 {
1757 h->flags &= ~XUrgencyHint; 1703 h->flags &= ~XUrgencyHint;
1758 XSetWMHints(dpy, parent[0], h); 1704 XSetWMHints (dpy, parent[0], h);
1759 } 1705 }
1760 } 1706 }
1761#endif 1707#endif
1762 } 1708 }
1763} 1709}
… …
1786 XUnsetICFocus (Input_Context); 1732 XUnsetICFocus (Input_Context);
1787#endif 1733#endif
1788#if CURSOR_BLINK 1734#if CURSOR_BLINK
1789 if (option (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1736 cursor_blink_ev.stop ();
1737
1791 hidden_cursor = 0; 1738 hidden_cursor = 0;
1792#endif 1739#endif
1793#if OFF_FOCUS_FADING 1740#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1741 if (rs[Rs_fade])
1795 { 1742 {
… …
1833 */ 1780 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1781 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1783 {
1837 bgPixmap.set_root_pixmap (); 1784 bgPixmap.set_root_pixmap ();
1838 bgPixmap.render (); 1785 update_background ();
1839 } 1786 }
1840 break; 1787 break;
1841 } 1788 }
1842# endif 1789# endif
1843} 1790}
… …
2028 upordown = 1; /* down */ 1975 upordown = 1; /* down */
2029 } 1976 }
2030 if (upordown) 1977 if (upordown)
2031 { 1978 {
2032#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2033 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1980 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2034#endif 1981#endif
2035 if (scr_page (upordown < 0 ? UP : DN, 1)) 1982 if (scr_page (upordown < 0 ? UP : DN, 1))
2036 { 1983 {
2037 if (upordown < 0) 1984 if (upordown < 0)
2038 scrollBar.setUp (); 1985 scrollBar.setUp ();
… …
2201 { 2148 {
2202 mouse_slip_wheel_speed += v ? -1 : 1; 2149 mouse_slip_wheel_speed += v ? -1 : 1;
2203 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2204 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2205 2152
2206 if (slip_wheel_ev.at < NOW) 2153 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2207 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2208
2209 slip_wheel_ev.start ();
2210 } 2154 }
2211 else 2155 else
2212 { 2156 {
2213# endif 2157# endif
2214 scr_page (v, i); 2158 scr_page (v, i);
… …
2282 2226
2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2227 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2284 { 2228 {
2285 refresh_count = 0; 2229 refresh_count = 0;
2286 2230
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2231 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2288 { 2232 {
2289 refreshnow = true; 2233 refreshnow = true;
2290 ch = NOCHAR; 2234 ch = NOCHAR;
2291 break; 2235 break;
2292 } 2236 }
… …
2799rxvt_term::process_csi_seq () 2743rxvt_term::process_csi_seq ()
2800{ 2744{
2801 unicode_t ch, priv, i; 2745 unicode_t ch, priv, i;
2802 unsigned int nargs, p; 2746 unsigned int nargs, p;
2803 int n, ndef; 2747 int n, ndef;
2804 int arg[ESC_ARGS]; 2748 int arg[ESC_ARGS] = { };
2805 2749
2806 memset (arg, 0, sizeof (arg));
2807 nargs = 0; 2750 nargs = 0;
2808 2751
2809 priv = 0; 2752 priv = 0;
2810 ch = cmd_getc (); 2753 ch = cmd_getc ();
2811 if (ch >= '<' && ch <= '?') 2754 if (ch >= '<' && ch <= '?')
… …
2860 { 2803 {
2861 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2804 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2862 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2805 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2863 // 2806 //
2864 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2807 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2865 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2808 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2866 // that we do not support xterm mouse reporting (should be 95 when we do). 2809 // versions.
2867 // 2810 //
2868 tt_printf ("\033[>%d;94;0c", 'U'); 2811 tt_printf ("\033[>%d;95;0c", 'U');
2869 } 2812 }
2870 break; 2813 break;
2871 case '?': 2814 case '?':
2872 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2815 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2873 process_terminal_mode (ch, priv, nargs, arg); 2816 process_terminal_mode (ch, priv, nargs, arg);
… …
3434 if (ISSET_PIXCOLOR (Color_tint)) 3377 if (ISSET_PIXCOLOR (Color_tint))
3435 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3378 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3436 else 3379 else
3437 changed = bgPixmap.unset_tint (); 3380 changed = bgPixmap.unset_tint ();
3438 if (changed) 3381 if (changed)
3439 bgPixmap.render (); 3382 update_background ();
3440 } 3383 }
3441 3384
3442 break; 3385 break;
3443#endif 3386#endif
3444 3387
3445#if XPM_BACKGROUND 3388#if BG_IMAGE_FROM_FILE
3446 case Rxvt_Pixmap: 3389 case Rxvt_Pixmap:
3447 if (!strcmp (str, "?")) 3390 if (!strcmp (str, "?"))
3448 { 3391 {
3449 char str[256]; 3392 char str[256];
3450 3393
… …
3473 if (bgPixmap.set_geometry (str)) 3416 if (bgPixmap.set_geometry (str))
3474 changed++; 3417 changed++;
3475 str = strchr (str, ';'); 3418 str = strchr (str, ';');
3476 } 3419 }
3477 if (changed) 3420 if (changed)
3478 { 3421 update_background ();
3479 bgPixmap.render ();
3480 scr_touch (true);
3481 }
3482 } 3422 }
3483 break; 3423 break;
3484#endif 3424#endif
3485 3425
3486 case Rxvt_restoreFG: 3426 case Rxvt_restoreFG:
… …
3641#ifndef NO_BACKSPACE_KEY 3581#ifndef NO_BACKSPACE_KEY
3642 { 67, PrivMode_BackSpace }, 3582 { 67, PrivMode_BackSpace },
3643#endif 3583#endif
3644 { 1000, PrivMode_MouseX11 }, 3584 { 1000, PrivMode_MouseX11 },
3645 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3585 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3646 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3586 { 1002, PrivMode_MouseBtnEvent },
3647 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3587 { 1003, PrivMode_MouseAnyEvent },
3648 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3588 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3649 { 1011, PrivMode_Keypress }, // rxvt extension 3589 { 1011, PrivMode_Keypress }, // rxvt extension
3650 // 1035 enable modifiers for alt, numlock NYI 3590 // 1035 enable modifiers for alt, numlock NYI
3651 // 1036 send ESC for meta keys NYI 3591 // 1036 send ESC for meta keys NYI
3652 // 1037 send DEL for keypad delete NYI 3592 // 1037 send DEL for keypad delete NYI
… …
3726 scr_autowrap (state); 3666 scr_autowrap (state);
3727 break; 3667 break;
3728 /* case 8: - auto repeat, can't do on a per window basis */ 3668 /* case 8: - auto repeat, can't do on a per window basis */
3729 case 9: /* X10 mouse reporting */ 3669 case 9: /* X10 mouse reporting */
3730 if (state) /* orthogonal */ 3670 if (state) /* orthogonal */
3731 priv_modes &= ~PrivMode_MouseX11; 3671 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3732 break; 3672 break;
3733#ifdef scrollBar_esc 3673#ifdef scrollBar_esc
3734 case scrollBar_esc: 3674 case scrollBar_esc:
3735 if (scrollbar_mapping (state)) 3675 if (scrollbar_mapping (state))
3736 { 3676 {
… …
3749 break; 3689 break;
3750 /* case 66: - application key pad */ 3690 /* case 66: - application key pad */
3751 /* case 67: - backspace key */ 3691 /* case 67: - backspace key */
3752 case 1000: /* X11 mouse reporting */ 3692 case 1000: /* X11 mouse reporting */
3753 if (state) /* orthogonal */ 3693 if (state) /* orthogonal */
3754 priv_modes &= ~PrivMode_MouseX10; 3694 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3755 break; 3695 break;
3756#if 0 3696#if 0
3757 case 1001: 3697 case 1001:
3758 break; /* X11 mouse highlighting */ 3698 break; /* X11 mouse highlighting */
3759#endif 3699#endif
3700 case 1002:
3701 case 1003:
3702 if (state) {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3705 vt_emask_mouse = PointerMotionMask;
3706 } else
3707 vt_emask_mouse = NoEventMask;
3708 vt_select_input ();
3709 break;
3760 case 1010: /* scroll to bottom on TTY output inhibit */ 3710 case 1010: /* scroll to bottom on TTY output inhibit */
3761 set_option (Opt_scrollTtyOutput, !state); 3711 set_option (Opt_scrollTtyOutput, !state);
3762 break; 3712 break;
3763 case 1011: /* scroll to bottom on key press */ 3713 case 1011: /* scroll to bottom on key press */
3764 set_option (Opt_scrollTtyKeypress, state); 3714 set_option (Opt_scrollTtyKeypress, state);
… …
4001 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4002 3952
4003 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
4004 v_buflen += len; 3954 v_buflen += len;
4005 3955
4006 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
4007} 3957}
4008 3958
4009void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4010{ 3960{
4011 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));
… …
4016 3966
4017 if (v_buflen == 0) 3967 if (v_buflen == 0)
4018 { 3968 {
4019 free (v_buffer); 3969 free (v_buffer);
4020 v_buffer = 0; 3970 v_buffer = 0;
4021 v_buflen = 0;
4022 3971
4023 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4024 return; 3973 return;
4025 } 3974 }
4026 3975
4027 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4028 } 3977 }
4029 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4030 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4031} 3980}
4032 3981
4033/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4034 3983

Diff Legend

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