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.328 by ayin, Mon Jun 11 17:40:15 2007 UTC vs.
Revision 1.374 by root, Tue Dec 11 18:00:06 2007 UTC

… …
95 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
97 97
98 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
519# endif 518# endif
520 return; 519 return;
521 } 520 }
522 else 521 else
523 { 522 {
524# if ENABLE_OVERLAY 523# if ISO_14755
525 scr_overlay_off (); 524 scr_overlay_off ();
526# endif 525# endif
527 iso14755buf = 0; 526 iso14755buf = 0;
528 } 527 }
529 } 528 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
533 { 532 {
534 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 534# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 537# endif
539 } 538 }
540#endif 539#endif
541 540
542#ifdef PRINTPIPE 541#ifdef PRINTPIPE
543 if (keysym == XK_Print) 542 if (keysym == XK_Print)
544 { 543 {
545 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
546 return; 545 return;
… …
548#endif 547#endif
549 548
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 550 {
552 { 551 {
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)
… …
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
563 } 593 }
564 else 594 else
565 strcpy (kbuf, key_backspace); 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_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete: 599 case XK_Delete:
580 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 601 break;
582#endif 602#endif
583 case XK_Tab: 603 case XK_Tab:
584 if (shft) 604 if (shft)
585 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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:
663 /* allow shift to override */ 647 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
665 { 649 {
666 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
667 break; 651 break;
668 } 652 }
669 653
… …
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");
… …
712 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */ 694 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
718 { 696 {
719 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
721 } 699 }
722 else 700 else
… …
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_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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) \
… …
934#if ENABLE_FRILLS || ISO_14755 882#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 883 // ISO 14755 support
936 if (iso14755buf) 884 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 885 if (iso14755buf & ISO_14755_52)
938 { 886 {
939# if ENABLE_OVERLAY 887# if ISO_14755
940 scr_overlay_off (); 888 scr_overlay_off ();
941# endif 889# endif
942# if ISO_14755 890# if ISO_14755
943 // iso14755 part 5.2 handling: release time 891 // iso14755 part 5.2 handling: release time
944 // first: controls 892 // first: controls
… …
967 915
968 return; 916 return;
969 } 917 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 919 {
972# if ENABLE_OVERLAY 920# if ISO_14755
973 scr_overlay_off (); 921 scr_overlay_off ();
974# endif 922# endif
975 if (iso14755buf & ISO_14755_51) 923 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 924 commit_iso14755 ();
977#if ISO_14755 925#if ISO_14755
… …
1035void 983void
1036rxvt_term::flush () 984rxvt_term::flush ()
1037{ 985{
1038 flush_ev.stop (); 986 flush_ev.stop ();
1039 987
1040#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
1042 { 990 {
1043 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 992 scr_touch (false);
1046 } 993 }
1047#endif 994#endif
1048 995
1049 if (want_refresh) 996 if (want_refresh)
… …
1095 1042
1096 display->flush (); 1043 display->flush ();
1097} 1044}
1098 1045
1099void 1046void
1100rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1101{ 1048{
1102 make_current (); 1049 make_current ();
1103 1050
1104 display->flush (); 1051 display->flush ();
1105 1052
1106 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !ev_is_active (&flush_ev))
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1108} 1055}
1109 1056
1110void 1057void
1111rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1059{
1113 make_current (); 1060 make_current ();
1114 1061
1115 refresh_limit = 1;
1116 refresh_count = 0; 1062 refresh_count = 0;
1117 flush (); 1063 flush ();
1118} 1064}
1119 1065
1120#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1121void 1067void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1069{
1124 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1071 want_refresh = 1;
1126
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1072}
1129#endif 1073#endif
1130 1074
1131#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1132void 1076void
1133rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1078{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1080 {
1137 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1138 want_refresh = 1; 1082 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL);
1140 } 1083 }
1141} 1084}
1142#endif 1085#endif
1143 1086
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1088void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1090{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1150 {
1151 want_refresh = 1; 1093 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
1153 } 1095 w.stop ();
1154} 1096}
1155#endif 1097#endif
1156 1098
1157#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1158void 1100void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1102{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1104 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1106 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1166 } 1107 }
1108 else
1109 w.stop ();
1167} 1110}
1168#endif 1111#endif
1169 1112
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1114void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1116{
1174 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
1175 || 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)
1176 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1120 {
1178 if (view_start == top_row || view_start == 0) 1121 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0; 1122 mouse_slip_wheel_speed = 0;
1180 1123
1181 want_refresh = 1; 1124 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1183 } 1125 }
1126 else
1127 w.stop ();
1184} 1128}
1185#endif 1129#endif
1186 1130
1187#if LINUX_YIELD_HACK 1131#if LINUX_YIELD_HACK
1188static struct event_handler 1132static struct event_handler
1189{ 1133{
1190 check_watcher yield_ev; 1134 ev::prepare yield_ev;
1191 1135
1192 void yield_cb (check_watcher &w) 1136 void yield_cb (ev::prepare &w, int revents)
1193 { 1137 {
1194 // this should really be sched_yield(), but the linux guys thought 1138 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1139 // that giving a process calling sched_yield () less cpu time than
1196 // 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
1197 // allowed by the sus... as is returning ENOSYS. 1141 // allowed by the sus... as is returning ENOSYS.
… …
1243 pty_ev.stop (); 1187 pty_ev.stop ();
1244 1188
1245 if (!option (Opt_hold)) 1189 if (!option (Opt_hold))
1246 destroy (); 1190 destroy ();
1247 } 1191 }
1248 1192
1249 return false; 1193 return false;
1250} 1194}
1251 1195
1252void 1196void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1198{
1255 make_current (); 1199 make_current ();
1256 1200
1257 if (revents & EVENT_READ) 1201 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1203 while (pty_fill ())
1260 if (cmd_parse ()) 1204 if (cmd_parse ())
1261 break; 1205 break;
1262 1206
1263 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1264 pty_write (); 1208 pty_write ();
1265} 1209}
1266 1210
1267void 1211void
1268rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
… …
1272 1216
1273#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1218 hidden_pointer = 0;
1275 1219
1276 if (option (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1278#endif 1222#endif
1279} 1223}
1280 1224
1281#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1282void 1226void
… …
1290 1234
1291 hidden_pointer = 1; 1235 hidden_pointer = 1;
1292} 1236}
1293 1237
1294void 1238void
1295rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1240{
1297 make_current (); 1241 make_current ();
1298 1242
1299 pointer_blank (); 1243 pointer_blank ();
1300} 1244}
… …
1303void 1247void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1249{
1306 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1307 int x, y; 1251 int x, y;
1252 int code = 32;
1308 1253
1309 x = ev.x; 1254 x = Pixel2Col (ev.x);
1310 y = ev.y; 1255 y = Pixel2Row (ev.y);
1311 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 }
1312 1264
1313 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
1314 button_number = 3; 1266 button_number = 3;
1315 else 1267 else
1316 { 1268 {
… …
1362 x + 1, 1314 x + 1,
1363 y + 1); 1315 y + 1);
1364#endif 1316#endif
1365 1317
1366 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1319 (code + button_number + key_state),
1368 (32 + x + 1), 1320 (32 + x + 1),
1369 (32 + y + 1)); 1321 (32 + y + 1));
1370} 1322}
1371 1323
1372/*{{{ process an X event */ 1324/*{{{ process an X event */
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1386 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1387 focus_out ();
1436 } 1388 }
1437#endif 1389#endif
1438 } 1390 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1391 break;
1444 1392
1445 /* 1393 /*
1446 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1428 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1429 focus_out ();
1482 break; 1430 break;
1483 1431
1484 case ConfigureNotify: 1432 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1485 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1486 { 1437 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1439 ;
1489 1440
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1442 {
1492 seen_resize = 1; 1443 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1501 } 1445 }
1502 1446 else
1447 {
1448#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ())
1450 update_background ();
1451#endif
1452 }
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1454 }
1510 break; 1455 break;
1511 1456
1512 case PropertyNotify: 1457 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1531 break; 1476 break;
1532 1477
1533 case MapNotify: 1478 case MapNotify:
1534 mapped = 1; 1479 mapped = 1;
1535#ifdef TEXT_BLINK 1480#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1481 text_blink_ev.start ();
1537#endif 1482#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1484 break;
1540 1485
1541 case UnmapNotify: 1486 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1545#endif 1490#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1492 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1493
1555 case GraphicsExpose: 1494 case GraphicsExpose:
1556 case Expose: 1495 case Expose:
1557 if (ev.xany.window == vt) 1496 if (ev.xany.window == vt)
1558 { 1497 {
1559 do 1498 do
1499 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1504
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1506
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1569 1511 }
1570 want_refresh = 1; 1512 want_refresh = 1;
1571 } 1513 }
1572 else 1514 else
1573 { 1515 {
1574 XEvent unused_event; 1516 XEvent unused_event;
… …
1581 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1582 { 1524 {
1583 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1584 scrollbar_show (0); 1526 scrollbar_show (0);
1585 } 1527 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1528 }
1592 break; 1529 break;
1593 1530
1594 case MotionNotify: 1531 case MotionNotify:
1595#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1533 if (hidden_pointer)
1597 pointer_unblank (); 1534 pointer_unblank ();
1598#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);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1540 break;
1601 1541
1602 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1603 { 1543 {
… …
1637 int dist; 1577 int dist;
1638 1578
1639 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1641 */ 1581 */
1642 if (!sel_scroll_ev.active) 1582 if (!ev_is_active (&sel_scroll_ev))
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1584
1645 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1647 */ 1587 */
1648 selection_save_x = ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
… …
1670 else 1610 else
1671 { 1611 {
1672 /* we are within the text window, so we 1612 /* we are within the text window, so we
1673 * shouldn't be scrolling 1613 * shouldn't be scrolling
1674 */ 1614 */
1675 if (sel_scroll_ev.active) 1615 if (ev_is_active (&sel_scroll_ev))
1676 sel_scroll_ev.stop(); 1616 sel_scroll_ev.stop();
1677 } 1617 }
1678#endif 1618#endif
1679#ifdef MOUSE_THRESHOLD 1619#ifdef MOUSE_THRESHOLD
1680 } 1620 }
… …
1693 &ev.xbutton.x, &ev.xbutton.y, 1633 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1634 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1636 scrollbar_size ());
1697 want_refresh = 1; 1637 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1638 scrollbar_show (1);
1700 } 1639 }
1701 break; 1640 break;
1702 } 1641 }
1703 1642
… …
1708 { 1647 {
1709 hidden_cursor = 0; 1648 hidden_cursor = 0;
1710 want_refresh = 1; 1649 want_refresh = 1;
1711 } 1650 }
1712 1651
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1652 cursor_blink_ev.again ();
1714 } 1653 }
1715#endif 1654#endif
1716 1655
1717#if defined(POINTER_BLANK) 1656#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1657 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1746 XSetICFocus (Input_Context); 1685 XSetICFocus (Input_Context);
1747 } 1686 }
1748#endif 1687#endif
1749#if CURSOR_BLINK 1688#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1689 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1752#endif 1691#endif
1753#if OFF_FOCUS_FADING 1692#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1693 if (rs[Rs_fade])
1755 { 1694 {
1756 pix_colors = pix_colors_focused; 1695 pix_colors = pix_colors_focused;
… …
1758 } 1697 }
1759#endif 1698#endif
1760#if ENABLE_FRILLS 1699#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1700 if (option (Opt_urgentOnBell))
1762 { 1701 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]); 1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1766 if (h != NULL)
1767 { 1703 {
1768 h->flags &= ~XUrgencyHint; 1704 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h); 1705 XSetWMHints (dpy, parent[0], h);
1770 } 1706 }
1771 } 1707 }
1772#endif 1708#endif
1773 } 1709 }
1774} 1710}
… …
1785 1721
1786#if ENABLE_FRILLS || ISO_14755 1722#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1723 if (iso14755buf)
1788 { 1724 {
1789 iso14755buf = 0; 1725 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1726# if ISO_14755
1791 scr_overlay_off (); 1727 scr_overlay_off ();
1792# endif 1728# endif
1793 } 1729 }
1794#endif 1730#endif
1795#if USE_XIM 1731#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1733 XUnsetICFocus (Input_Context);
1798#endif 1734#endif
1799#if CURSOR_BLINK 1735#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1737 cursor_blink_ev.stop ();
1738
1802 hidden_cursor = 0; 1739 hidden_cursor = 0;
1803#endif 1740#endif
1804#if OFF_FOCUS_FADING 1741#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1742 if (rs[Rs_fade])
1806 { 1743 {
… …
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1759 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1760 }
1824#endif 1761#endif
1825} 1762}
1826 1763
1827#if TRANSPARENT || ENABLE_PERL 1764#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1765void
1829rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1767{
1831 make_current (); 1768 make_current ();
1832 1769
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1770 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1771 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1772 return;
1836 1773
1837# if TRANSPARENT 1774# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1775 switch (ev.type)
1839 { 1776 {
1840 case PropertyNotify: 1777 case PropertyNotify:
1841 /* 1778 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1779 * if user used some Esetroot compatible prog to set the root bg,
1843 * use the property to determine the pixmap. We use it later on. 1780 * use the property to determine the pixmap. We use it later on.
1844 */ 1781 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1784 {
1848 1785 bgPixmap.set_root_pixmap ();
1849 /* FALLTHROUGH */ 1786 update_background ();
1850 case ReparentNotify: 1787 }
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1788 break;
1854 } 1789 }
1855# endif 1790# endif
1856} 1791}
1857#endif 1792#endif
… …
1915 mouse_report (ev); 1850 mouse_report (ev);
1916 } 1851 }
1917#else 1852#else
1918 MEvent.button = ev.button; 1853 MEvent.button = ev.button;
1919 mouse_report (ev); 1854 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1855#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1856
1922 } 1857 }
1923 else 1858 else
1924 { 1859 {
1925 if (ev.button != MEvent.button) 1860 if (ev.button != MEvent.button)
… …
2019 tt_printf ("\033[5~"); 1954 tt_printf ("\033[5~");
2020 break; 1955 break;
2021 } 1956 }
2022 } 1957 }
2023 else 1958 else
2024#endif /* NO_SCROLLBAR_REPORT */ 1959#endif /* NO_SCROLLBAR_REPORT */
2025 1960
2026 { 1961 {
2027 char upordown = 0; 1962 char upordown = 0;
2028 1963
2029 if (scrollBar.style == R_SB_NEXT) 1964 if (scrollBar.style == R_SB_NEXT)
2030 { 1965 {
2031 if (scrollbarnext_upButton (ev.y)) 1966 if (scrollbarnext_upButton (ev.y))
2032 upordown = -1; /* up */ 1967 upordown = -1; /* up */
… …
2041 upordown = 1; /* down */ 1976 upordown = 1; /* down */
2042 } 1977 }
2043 if (upordown) 1978 if (upordown)
2044 { 1979 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 1982#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
2049 { 1984 {
2050 if (upordown < 0) 1985 if (upordown < 0)
2051 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
2131 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
2132 scrollbar_show (0); 2067 scrollbar_show (0);
2133 } 2068 }
2134 2069
2135#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active) 2071 if (ev_is_active (&sel_scroll_ev))
2137 sel_scroll_ev.stop(); 2072 sel_scroll_ev.stop();
2138#endif 2073#endif
2139 2074
2140 if (ev.window == vt) 2075 if (ev.window == vt)
2141 { 2076 {
… …
2166 mouse_report (ev); 2101 mouse_report (ev);
2167 } 2102 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
2170 mouse_report (ev); 2105 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2107 return;
2173 } 2108 }
2174 2109
2175 /* 2110 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
… …
2214 { 2149 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2153
2219 if (slip_wheel_ev.at < NOW) 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2221
2222 slip_wheel_ev.start ();
2223 } 2155 }
2224 else 2156 else
2225 { 2157 {
2226# endif 2158# endif
2227 scr_page (v, i); 2159 scr_page (v, i);
… …
2291 if (ch == C0_LF) 2223 if (ch == C0_LF)
2292 nlines++; 2224 nlines++;
2293 2225
2294 refresh_count++; 2226 refresh_count++;
2295 2227
2296 if (!option (Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2298 { 2229 {
2299 refreshnow = true;
2300 refresh_count = 0; 2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 {
2234 refreshnow = true;
2301 ch = NOCHAR; 2235 ch = NOCHAR;
2302 break; 2236 break;
2237 }
2303 } 2238 }
2304 2239
2305 // scr_add_lines only works for nlines <= nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2306 if (nlines >= nrow - 1) 2241 if (nlines >= nrow - 1)
2307 { 2242 {
… …
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2336 scr_add_lines (buf, str - buf, nlines); 2271 scr_add_lines (buf, str - buf, nlines);
2337 2272
2338 /* 2273 /*
2339 * If there have been a lot of new lines, then update the screen 2274 * If there have been a lot of new lines, then update the screen
2340 * What the heck I'll cheat and only refresh less than every page-full. 2275 * What the heck we'll cheat and only refresh less than every page-full.
2341 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2342 * is incremented here because we must be doing flat-out scrolling.
2343 */ 2277 */
2344 if (refreshnow) 2278 if (refreshnow)
2345 { 2279 {
2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347 refresh_limit++;
2348 else
2349 {
2350 flag = true; 2280 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2352 scr_refresh (); 2281 scr_refresh ();
2353 want_refresh = 1; 2282 want_refresh = 1;
2354 }
2355 } 2283 }
2356 2284
2357 } 2285 }
2358 else 2286 else
2359 { 2287 {
… …
2508 { 2436 {
2509 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
2510 break; /* done = 1 */ 2438 break; /* done = 1 */
2511 } 2439 }
2512 } 2440 }
2513 2441
2514 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
2515 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
2516 { 2444 {
2517 done = 1; 2445 done = 1;
2518 break; 2446 break;
… …
2520 } 2448 }
2521 } 2449 }
2522 2450
2523 pclose_printer (fd); 2451 pclose_printer (fd);
2524} 2452}
2525#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
2526/*}}} */ 2454/*}}} */
2527 2455
2528/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
2529enum { 2457enum {
2530 C1_40 = 0x40, 2458 C1_40 = 0x40,
… …
2580 process_dcs_seq (); 2508 process_dcs_seq ();
2581 break; 2509 break;
2582 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
2583 process_csi_seq (); 2511 process_csi_seq ();
2584 break; 2512 break;
2585 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
2586 process_osc_seq (); 2514 process_osc_seq ();
2587 break; 2515 break;
2588#endif 2516#endif
2589 } 2517 }
2590} 2518}
… …
2816rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
2817{ 2745{
2818 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
2819 unsigned int nargs, p; 2747 unsigned int nargs, p;
2820 int n, ndef; 2748 int n, ndef;
2821 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
2822 2750
2823 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
2824 arg[--nargs] = 0;
2825 2752
2826 priv = 0; 2753 priv = 0;
2827 ch = cmd_getc (); 2754 ch = cmd_getc ();
2828 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
2756 {
2829 { /* '<' '=' '>' '?' */ 2757 /* '<' '=' '>' '?' */
2830 priv = ch; 2758 priv = ch;
2831 ch = cmd_getc (); 2759 ch = cmd_getc ();
2832 } 2760 }
2833 2761
2834 /* read any numerical arguments */ 2762 /* read any numerical arguments */
… …
2873 switch (priv) 2801 switch (priv)
2874 { 2802 {
2875 case '>': 2803 case '>':
2876 if (ch == CSI_DA) /* secondary device attributes */ 2804 if (ch == CSI_DA) /* secondary device attributes */
2877 { 2805 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2806 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2807 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 // 2808 //
2881 // 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
2882 // 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
2883 // that we do not support xterm mouse reporting (should be 95 when we do). 2811 // versions.
2884 // 2812 //
2885 tt_printf ("\033[>%d;94;0c", 'U'); 2813 tt_printf ("\033[>%d;95;0c", 'U');
2886 } 2814 }
2887 break; 2815 break;
2888 case '?': 2816 case '?':
2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2890 process_terminal_mode (ch, priv, nargs, arg); 2818 process_terminal_mode (ch, priv, nargs, arg);
… …
3336 int saveop = op; 3264 int saveop = op;
3337 3265
3338 dLocal (Display *, dpy); 3266 dLocal (Display *, dpy);
3339 3267
3340 assert (str != NULL); 3268 assert (str != NULL);
3341 3269
3342 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3270 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3343 return; 3271 return;
3344 3272
3345 switch (op) 3273 switch (op)
3346 { 3274 {
… …
3441 break; 3369 break;
3442 case URxvt_Color_IT: 3370 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp); 3371 process_color_seq (op, Color_IT, str, resp);
3444 break; 3372 break;
3445#endif 3373#endif
3446#if TRANSPARENT && TINTING 3374#if ENABLE_TRANSPARENCY
3447 case URxvt_Color_tint: 3375 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp); 3376 process_color_seq (op, Color_tint, str, resp);
3377 {
3378 bool changed = false;
3379 if (ISSET_PIXCOLOR (Color_tint))
3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3381 else
3382 changed = bgPixmap.unset_tint ();
3383 if (changed)
3384 update_background ();
3385 }
3449 3386
3450 check_our_parents ();
3451
3452 if (am_transparent)
3453 want_full_refresh = want_refresh = 1;
3454
3455 break; 3387 break;
3456#endif 3388#endif
3457 3389
3390#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3391 case Rxvt_Pixmap:
3459 { 3392 if (!strcmp (str, "?"))
3460 if (*str != ';')
3461 { 3393 {
3462#if XPM_BACKGROUND 3394 char str[256];
3463 scale_pixmap (""); /* reset to default scaling */ 3395
3464 set_bgPixmap (str); /* change pixmap */ 3396 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3465 scr_touch (true); 3397 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3466#endif 3398 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3399 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 } 3400 }
3468 3401 else
3402 {
3469 int changed = 0; 3403 int changed = 0;
3470 3404
3471 while ((str = strchr (str, ';')) != NULL) 3405 if (*str != ';')
3472 { 3406 {
3407 /* reset to default scaling :*/
3408 bgPixmap.unset_geometry ();
3409 if (bgPixmap.set_file (str)) /* change pixmap */
3410 changed++;
3411 str = strchr (str, ';');
3412 if (str == NULL)
3413 bgPixmap.set_defaultGeometry ();
3414 }
3415 while (str)
3416 {
3473 str++; 3417 str++;
3474#if XPM_BACKGROUND 3418 if (bgPixmap.set_geometry (str))
3475 changed += scale_pixmap (str); 3419 changed++;
3476#endif 3420 str = strchr (str, ';');
3477 } 3421 }
3478
3479 if (changed) 3422 if (changed)
3480 { 3423 update_background ();
3481#ifdef XPM_BACKGROUND
3482 resize_pixmap ();
3483 scr_touch (true);
3484#endif
3485 } 3424 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE) 3425 break;
3487 if (option(Opt_transparent))
3488 check_our_parents ();
3489#endif 3426#endif
3490
3491 }
3492 break;
3493 3427
3494 case Rxvt_restoreFG: 3428 case Rxvt_restoreFG:
3495 set_window_color (Color_fg, str); 3429 set_window_color (Color_fg, str);
3496 break; 3430 break;
3497 case Rxvt_restoreBG: 3431 case Rxvt_restoreBG:
… …
3619{ 3553{
3620 unsigned int i, j; 3554 unsigned int i, j;
3621 int state; 3555 int state;
3622 3556
3623 static const struct 3557 static const struct
3624 { 3558 {
3625 const int argval; 3559 const int argval;
3626 const unsigned long bit; 3560 const unsigned long bit;
3627 }
3628
3629 argtopriv[] = { 3561 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, 3562 { 1, PrivMode_aplCUR },
3631 { 2, PrivMode_vt52 }, 3563 { 2, PrivMode_vt52 },
3632 { 3, PrivMode_132 }, 3564 { 3, PrivMode_132 },
3633 { 4, PrivMode_smoothScroll }, 3565 { 4, PrivMode_smoothScroll },
3634 { 5, PrivMode_rVideo }, 3566 { 5, PrivMode_rVideo },
… …
3650 { 66, PrivMode_aplKP }, 3582 { 66, PrivMode_aplKP },
3651#ifndef NO_BACKSPACE_KEY 3583#ifndef NO_BACKSPACE_KEY
3652 { 67, PrivMode_BackSpace }, 3584 { 67, PrivMode_BackSpace },
3653#endif 3585#endif
3654 { 1000, PrivMode_MouseX11 }, 3586 { 1000, PrivMode_MouseX11 },
3655 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
3656 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
3657 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3658 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3659 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
3660 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
3661 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
3662 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
3736 scr_autowrap (state); 3667 scr_autowrap (state);
3737 break; 3668 break;
3738 /* 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 */
3739 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
3740 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
3741 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3742 break; 3673 break;
3743#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
3744 case scrollBar_esc: 3675 case scrollBar_esc:
3745 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
3746 { 3677 {
… …
3759 break; 3690 break;
3760 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
3761 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
3762 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
3763 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
3764 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3765 break; 3696 break;
3766#if 0
3767 case 1001: 3697 case 1002:
3768 break; /* X11 mouse highlighting */ 3698 case 1003:
3769#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;
3770 case 1010: /* scroll to bottom on TTY output inhibit */ 3709 case 1010: /* scroll to bottom on TTY output inhibit */
3771 set_option (Opt_scrollTtyOutput, !state); 3710 set_option (Opt_scrollTtyOutput, !state);
3772 break; 3711 break;
3773 case 1011: /* scroll to bottom on key press */ 3712 case 1011: /* scroll to bottom on key press */
3774 set_option (Opt_scrollTtyKeypress, state); 3713 set_option (Opt_scrollTtyKeypress, state);
… …
3951rxvt_term::process_graphics () 3890rxvt_term::process_graphics ()
3952{ 3891{
3953 unicode_t ch, cmd = cmd_getc (); 3892 unicode_t ch, cmd = cmd_getc ();
3954 3893
3955 if (cmd == 'Q') 3894 if (cmd == 'Q')
3895 {
3956 { /* query graphics */ 3896 /* query graphics */
3957 tt_printf ("\033G0\012"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
3958 return; 3898 return;
3959 } 3899 }
3960 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
3961 do 3901 do
… …
4011 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4012 3952
4013 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
4014 v_buflen += len; 3954 v_buflen += len;
4015 3955
4016 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
4017} 3957}
4018 3958
4019void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4020{ 3960{
4021 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));
… …
4026 3966
4027 if (v_buflen == 0) 3967 if (v_buflen == 0)
4028 { 3968 {
4029 free (v_buffer); 3969 free (v_buffer);
4030 v_buffer = 0; 3970 v_buffer = 0;
4031 v_buflen = 0;
4032 3971
4033 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4034 return; 3973 return;
4035 } 3974 }
4036 3975
4037 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4038 } 3977 }
4039 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4040 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4041} 3980}
4042 3981
4043/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4044 3983

Diff Legend

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