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.312 by root, Sat Mar 4 22:05:05 2006 UTC vs.
Revision 1.376 by root, Fri Dec 14 02:08:18 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,
500# if ISO_14755 499# if ISO_14755
501 iso14755_51 (0); 500 iso14755_51 (0);
502# endif 501# endif
503 return; 502 return;
504 } 503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
505 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
506 { 513 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
509# if ISO_14755 516# if ISO_14755
511# endif 518# endif
512 return; 519 return;
513 } 520 }
514 else 521 else
515 { 522 {
516# if ENABLE_OVERLAY 523# if ISO_14755
517 scr_overlay_off (); 524 scr_overlay_off ();
518# endif 525# endif
519 iso14755buf = 0; 526 iso14755buf = 0;
520 } 527 }
521 } 528 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
525 { 532 {
526 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 534# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 537# endif
531 } 538 }
532#endif 539#endif
533 540
534#ifdef PRINTPIPE 541#ifdef PRINTPIPE
535 if (keysym == XK_Print) 542 if (keysym == XK_Print)
536 { 543 {
537 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
538 return; 545 return;
540#endif 547#endif
541 548
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 550 {
544 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
545 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
546 switch (keysym) 584 switch (keysym)
547 { 585 {
548#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace: 587 case XK_BackSpace:
550 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
555 } 593 }
556 else 594 else
557 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
558 break; 596 break;
559#endif 597#endif
560#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete: 599 case XK_Delete:
572 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
573 break; 601 break;
574#endif 602#endif
575 case XK_Tab: 603 case XK_Tab:
576 if (shft) 604 if (shft)
577 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
587#endif 615#endif
588 newlen = 0; 616 newlen = 0;
589 } 617 }
590 break; 618 break;
591 619
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
622 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
624 break; 636 break;
625 637
626#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior: 639 case XK_Prior:
638 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
639 break; 641 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next: 642 case XK_Next:
651 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
652 break; 644 break;
653#endif 645#endif
654 case XK_KP_Enter: 646 case XK_KP_Enter:
655 /* allow shift to override */ 647 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
657 { 649 {
658 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
659 break; 651 break;
660 } 652 }
661 653
673 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
674 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
675 } 667 }
676 break; 668 break;
677 669
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
704 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */ 694 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
710 { 696 {
711 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
713 } 699 }
714 else 700 else
720 706
721 case XK_Find: 707 case XK_Find:
722 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
723 break; 709 break;
724 710
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert: 711 case XK_Insert:
736 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
737 break; 713 break;
738#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove: 715 case DXK_Remove:
743 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
744 break; 720 break;
745 case XK_Select: 721 case XK_Select:
746 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
747 break; 723 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End: 724 case XK_End:
759 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
760 break; 726 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home: 727 case XK_Home:
772 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
773 break; 729 break;
774 730
775#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
877 return; 833 return;
878 834
879 if (len <= 0) 835 if (len <= 0)
880 return; /* not mapped */ 836 return; /* not mapped */
881 837
882 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 839 if (view_start)
884 { 840 {
885 view_start = 0; 841 view_start = 0;
886 want_refresh = 1; 842 want_refresh = 1;
887 } 843 }
926#if ENABLE_FRILLS || ISO_14755 882#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 883 // ISO 14755 support
928 if (iso14755buf) 884 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 885 if (iso14755buf & ISO_14755_52)
930 { 886 {
931# if ENABLE_OVERLAY 887# if ISO_14755
932 scr_overlay_off (); 888 scr_overlay_off ();
933# endif 889# endif
934# if ISO_14755 890# if ISO_14755
935 // iso14755 part 5.2 handling: release time 891 // iso14755 part 5.2 handling: release time
936 // first: controls 892 // first: controls
959 915
960 return; 916 return;
961 } 917 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 919 {
964# if ENABLE_OVERLAY 920# if ISO_14755
965 scr_overlay_off (); 921 scr_overlay_off ();
966# endif 922# endif
967 if (iso14755buf & ISO_14755_51) 923 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 924 commit_iso14755 ();
969#if ISO_14755 925#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 927 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 929
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1027void 983void
1028rxvt_term::flush () 984rxvt_term::flush ()
1029{ 985{
1030 flush_ev.stop (); 986 flush_ev.stop ();
1031 987
1032#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
1034 { 990 {
1035 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 992 scr_touch (false);
1038 } 993 }
1039#endif 994#endif
1040 995
1041 if (want_refresh) 996 if (want_refresh)
1087 1042
1088 display->flush (); 1043 display->flush ();
1089} 1044}
1090 1045
1091void 1046void
1092rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1093{ 1048{
1094 make_current (); 1049 make_current ();
1095 1050
1096 display->flush (); 1051 display->flush ();
1097 1052
1098 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.is_active ())
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1100} 1055}
1101 1056
1102void 1057void
1103rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1104{ 1059{
1105 make_current (); 1060 make_current ();
1106 1061
1107 refresh_limit = 1;
1108 refresh_count = 0; 1062 refresh_count = 0;
1109 flush (); 1063 flush ();
1110} 1064}
1111 1065
1112#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1113void 1067void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1069{
1116 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1071 want_refresh = 1;
1118
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1072}
1121#endif 1073#endif
1122 1074
1123#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1124void 1076void
1125rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1078{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1080 {
1129 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1130 want_refresh = 1; 1082 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL);
1132 } 1083 }
1084 else
1085 w.stop ();
1133} 1086}
1134#endif 1087#endif
1135 1088
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1090void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1092{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1142 {
1143 want_refresh = 1; 1095 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
1145 } 1097 w.stop ();
1146} 1098}
1147#endif 1099#endif
1148 1100
1149#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1150void 1102void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1104{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1106 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1108 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1158 } 1109 }
1110 else
1111 w.stop ();
1159} 1112}
1160#endif 1113#endif
1161 1114
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1116void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1118{
1166 if (mouse_slip_wheel_speed == 0 1119 if (mouse_slip_wheel_speed == 0
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed)) 1121 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1122 {
1170 if (view_start == top_row || view_start == 0) 1123 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1172 1125
1173 want_refresh = 1; 1126 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1175 } 1127 }
1128 else
1129 w.stop ();
1176} 1130}
1177#endif 1131#endif
1178 1132
1179#if LINUX_YIELD_HACK 1133#if LINUX_YIELD_HACK
1180static struct event_handler 1134static struct event_handler
1181{ 1135{
1182 check_watcher yield_ev; 1136 ev::prepare yield_ev;
1183 1137
1184 void yield_cb (check_watcher &w) 1138 void yield_cb (ev::prepare &w, int revents)
1185 { 1139 {
1186 // this should really be sched_yield(), but the linux guys thought 1140 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1141 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1142 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1143 // allowed by the sus... as is returning ENOSYS.
1232 } 1186 }
1233 else 1187 else
1234 { 1188 {
1235 pty_ev.stop (); 1189 pty_ev.stop ();
1236 1190
1237 if (!OPTION (Opt_hold)) 1191 if (!option (Opt_hold))
1238 destroy (); 1192 destroy ();
1239 } 1193 }
1240 1194
1241 return false; 1195 return false;
1242} 1196}
1243 1197
1244void 1198void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1200{
1247 make_current (); 1201 make_current ();
1248 1202
1249 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1205 while (pty_fill ())
1252 if (cmd_parse ()) 1206 if (cmd_parse ())
1253 break; 1207 break;
1254 1208
1255 if (revents & EVENT_WRITE) 1209 if (revents & ev::WRITE)
1256 pty_write (); 1210 pty_write ();
1257} 1211}
1258 1212
1259void 1213void
1260rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1263 recolour_cursor (); 1217 recolour_cursor ();
1264 1218
1265#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1220 hidden_pointer = 0;
1267 1221
1268 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1270#endif 1224#endif
1271} 1225}
1272 1226
1273#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1274void 1228void
1275rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1276{ 1230{
1277 if (!OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1278 return; 1232 return;
1279 1233
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1235 XFlush (dpy);
1282 1236
1283 hidden_pointer = 1; 1237 hidden_pointer = 1;
1284} 1238}
1285 1239
1286void 1240void
1287rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1242{
1289 make_current (); 1243 make_current ();
1290 1244
1291 pointer_blank (); 1245 pointer_blank ();
1292} 1246}
1295void 1249void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1251{
1298 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1299 int x, y; 1253 int x, y;
1254 int code = 32;
1300 1255
1301 x = ev.x; 1256 x = Pixel2Col (ev.x);
1302 y = ev.y; 1257 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1258 if (ev.type == MotionNotify)
1259 {
1260 if (x == mouse_row && y == mouse_col)
1261 return;
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1304 1266
1305 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1306 button_number = 3; 1268 button_number = 3;
1307 else 1269 else
1308 { 1270 {
1354 x + 1, 1316 x + 1,
1355 y + 1); 1317 y + 1);
1356#endif 1318#endif
1357 1319
1358 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1360 (32 + x + 1), 1322 (32 + x + 1),
1361 (32 + y + 1)); 1323 (32 + y + 1));
1362} 1324}
1363 1325
1364/*{{{ process an X event */ 1326/*{{{ process an X event */
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1389 focus_out ();
1428 } 1390 }
1429#endif 1391#endif
1430 } 1392 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1393 break;
1436 1394
1437 /* 1395 /*
1438 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1397 * Here's my conclusion:
1458 break; 1416 break;
1459 } 1417 }
1460 break; 1418 break;
1461 1419
1462 case FocusIn: 1420 case FocusIn:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1424 focus_in ();
1464 break; 1425 break;
1465 1426
1466 case FocusOut: 1427 case FocusOut:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1431 focus_out ();
1468 break; 1432 break;
1469 1433
1470 case ConfigureNotify: 1434 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1471 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1472 { 1439 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1441 ;
1475 1442
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1444 {
1478 seen_resize = 1; 1445 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1447 }
1481 1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 update_background ();
1453#endif
1454 }
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1456 }
1489 break; 1457 break;
1490 1458
1491 case PropertyNotify: 1459 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1510 break; 1478 break;
1511 1479
1512 case MapNotify: 1480 case MapNotify:
1513 mapped = 1; 1481 mapped = 1;
1514#ifdef TEXT_BLINK 1482#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1483 text_blink_ev.start ();
1516#endif 1484#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1486 break;
1519 1487
1520 case UnmapNotify: 1488 case UnmapNotify:
1522#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1491 text_blink_ev.stop ();
1524#endif 1492#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1494 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1495
1534 case GraphicsExpose: 1496 case GraphicsExpose:
1535 case Expose: 1497 case Expose:
1536 if (ev.xany.window == vt) 1498 if (ev.xany.window == vt)
1537 { 1499 {
1538 do 1500 do
1501 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1504 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1506
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1508
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1548 1513 }
1549 want_refresh = 1; 1514 want_refresh = 1;
1550 } 1515 }
1551 else 1516 else
1552 { 1517 {
1553 XEvent unused_event; 1518 XEvent unused_event;
1560 if (isScrollbarWindow (ev.xany.window)) 1525 if (isScrollbarWindow (ev.xany.window))
1561 { 1526 {
1562 scrollBar.setIdle (); 1527 scrollBar.setIdle ();
1563 scrollbar_show (0); 1528 scrollbar_show (0);
1564 } 1529 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1530 }
1571 break; 1531 break;
1572 1532
1573 case MotionNotify: 1533 case MotionNotify:
1574#ifdef POINTER_BLANK 1534#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1535 if (hidden_pointer)
1576 pointer_unblank (); 1536 pointer_unblank ();
1577#endif 1537#endif
1538 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1539 || priv_modes & PrivMode_MouseAnyEvent)
1540 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1542 break;
1580 1543
1581 if (ev.xany.window == vt) 1544 if (ev.xany.window == vt)
1582 { 1545 {
1616 int dist; 1579 int dist;
1617 1580
1618 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1620 */ 1583 */
1621 if (!sel_scroll_ev.active) 1584 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1586
1624 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1626 */ 1589 */
1627 selection_save_x = ev.xbutton.x; 1590 selection_save_x = ev.xbutton.x;
1649 else 1612 else
1650 { 1613 {
1651 /* we are within the text window, so we 1614 /* we are within the text window, so we
1652 * shouldn't be scrolling 1615 * shouldn't be scrolling
1653 */ 1616 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1617 sel_scroll_ev.stop();
1656 } 1618 }
1657#endif 1619#endif
1658#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
1659 } 1621 }
1660#endif 1622#endif
1672 &ev.xbutton.x, &ev.xbutton.y, 1634 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1635 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1637 scrollbar_size ());
1676 want_refresh = 1; 1638 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1639 scrollbar_show (1);
1679 } 1640 }
1680 break; 1641 break;
1681 } 1642 }
1682 1643
1683#if defined(CURSOR_BLINK) 1644#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1645 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1646 {
1686 if (hidden_cursor) 1647 if (hidden_cursor)
1687 { 1648 {
1688 hidden_cursor = 0; 1649 hidden_cursor = 0;
1689 want_refresh = 1; 1650 want_refresh = 1;
1690 } 1651 }
1691 1652
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1653 cursor_blink_ev.again ();
1693 } 1654 }
1694#endif 1655#endif
1695 1656
1696#if defined(POINTER_BLANK) 1657#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1658 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1659 {
1699 if (ev.type == MotionNotify 1660 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1661 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1662 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1663 if (hidden_pointer)
1724 IMSetPosition (); 1685 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1686 XSetICFocus (Input_Context);
1726 } 1687 }
1727#endif 1688#endif
1728#if CURSOR_BLINK 1689#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1690 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1691 cursor_blink_ev.again ();
1731#endif 1692#endif
1732#if OFF_FOCUS_FADING 1693#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1694 if (rs[Rs_fade])
1734 { 1695 {
1735 pix_colors = pix_colors_focused; 1696 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1697 scr_recolour ();
1737 } 1698 }
1738#endif 1699#endif
1700#if ENABLE_FRILLS
1701 if (option (Opt_urgentOnBell))
1702 {
1703 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1704 {
1705 h->flags &= ~XUrgencyHint;
1706 XSetWMHints (dpy, parent[0], h);
1707 }
1708 }
1709#endif
1739 } 1710 }
1740} 1711}
1741 1712
1742void 1713void
1743rxvt_term::focus_out () 1714rxvt_term::focus_out ()
1751 1722
1752#if ENABLE_FRILLS || ISO_14755 1723#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1724 if (iso14755buf)
1754 { 1725 {
1755 iso14755buf = 0; 1726 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1727# if ISO_14755
1757 scr_overlay_off (); 1728 scr_overlay_off ();
1758# endif 1729# endif
1759 } 1730 }
1760#endif 1731#endif
1761#if USE_XIM 1732#if USE_XIM
1762 if (Input_Context != NULL) 1733 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1734 XUnsetICFocus (Input_Context);
1764#endif 1735#endif
1765#if CURSOR_BLINK 1736#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1737 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1738 cursor_blink_ev.stop ();
1739
1768 hidden_cursor = 0; 1740 hidden_cursor = 0;
1769#endif 1741#endif
1770#if OFF_FOCUS_FADING 1742#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1743 if (rs[Rs_fade])
1772 { 1744 {
1775 } 1747 }
1776#endif 1748#endif
1777 } 1749 }
1778} 1750}
1779 1751
1780#if TRANSPARENT 1752void
1753rxvt_term::update_fade_color (unsigned int idx)
1754{
1755#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade])
1757 {
1758 rgba c;
1759 pix_colors [Color_fade].get (c);
1760 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1761 }
1762#endif
1763}
1764
1765#if ENABLE_TRANSPARENCY || ENABLE_PERL
1781void 1766void
1782rxvt_term::rootwin_cb (XEvent &ev) 1767rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1768{
1784 make_current (); 1769 make_current ();
1785 1770
1771 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1772 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1773 return;
1774
1775# if ENABLE_TRANSPARENCY
1786 switch (ev.type) 1776 switch (ev.type)
1787 { 1777 {
1788 case PropertyNotify: 1778 case PropertyNotify:
1789 /* 1779 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1780 * if user used some Esetroot compatible prog to set the root bg,
1791 * use the property to determine the pixmap. We use it later on. 1781 * use the property to determine the pixmap. We use it later on.
1792 */ 1782 */
1793 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1783 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1784 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 return; 1785 {
1796 1786 bgPixmap.set_root_pixmap ();
1797 /* FALLTHROUGH */ 1787 update_background ();
1798 case ReparentNotify: 1788 }
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1;
1801 break; 1789 break;
1802 } 1790 }
1791# endif
1803} 1792}
1804#endif 1793#endif
1805 1794
1806void 1795void
1807rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
1862 mouse_report (ev); 1851 mouse_report (ev);
1863 } 1852 }
1864#else 1853#else
1865 MEvent.button = ev.button; 1854 MEvent.button = ev.button;
1866 mouse_report (ev); 1855 mouse_report (ev);
1867#endif /* MOUSE_REPORT_DOUBLECLICK */ 1856#endif /* MOUSE_REPORT_DOUBLECLICK */
1868 1857
1869 } 1858 }
1870 else 1859 else
1871 { 1860 {
1872 if (ev.button != MEvent.button) 1861 if (ev.button != MEvent.button)
1966 tt_printf ("\033[5~"); 1955 tt_printf ("\033[5~");
1967 break; 1956 break;
1968 } 1957 }
1969 } 1958 }
1970 else 1959 else
1971#endif /* NO_SCROLLBAR_REPORT */ 1960#endif /* NO_SCROLLBAR_REPORT */
1972 1961
1973 { 1962 {
1974 char upordown = 0; 1963 char upordown = 0;
1975 1964
1976 if (scrollBar.style == R_SB_NEXT) 1965 if (scrollBar.style == R_SB_NEXT)
1977 { 1966 {
1978 if (scrollbarnext_upButton (ev.y)) 1967 if (scrollbarnext_upButton (ev.y))
1979 upordown = -1; /* up */ 1968 upordown = -1; /* up */
1985 if (scrollbarrxvt_upButton (ev.y)) 1974 if (scrollbarrxvt_upButton (ev.y))
1986 upordown = -1; /* up */ 1975 upordown = -1; /* up */
1987 else if (scrollbarrxvt_dnButton (ev.y)) 1976 else if (scrollbarrxvt_dnButton (ev.y))
1988 upordown = 1; /* down */ 1977 upordown = 1; /* down */
1989 } 1978 }
1979
1990 if (upordown) 1980 if (upordown)
1991 { 1981 {
1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1983 if (!cont_scroll_ev.is_active ())
1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1984 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1994#endif 1985#endif
1995 if (scr_page (upordown < 0 ? UP : DN, 1)) 1986 if (scr_page (upordown < 0 ? UP : DN, 1))
1996 { 1987 {
1997 if (upordown < 0) 1988 if (upordown < 0)
1998 scrollBar.setUp (); 1989 scrollBar.setUp ();
2078 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
2079 scrollbar_show (0); 2070 scrollbar_show (0);
2080 } 2071 }
2081 2072
2082#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2083 if (sel_scroll_ev.active)
2084 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2085#endif 2075#endif
2086 2076
2087 if (ev.window == vt) 2077 if (ev.window == vt)
2088 { 2078 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2113 mouse_report (ev); 2103 mouse_report (ev);
2114 } 2104 }
2115#else /* MOUSE_REPORT_DOUBLECLICK */ 2105#else /* MOUSE_REPORT_DOUBLECLICK */
2116 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
2117 mouse_report (ev); 2107 mouse_report (ev);
2118#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
2119 return; 2109 return;
2120 } 2110 }
2121 2111
2122 /* 2112 /*
2123 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
2135 selection_make (ev.time); 2125 selection_make (ev.time);
2136 break; 2126 break;
2137 2127
2138 case Button2: 2128 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2131 break;
2142 2132
2143#ifdef MOUSE_WHEEL 2133#ifdef MOUSE_WHEEL
2144 case Button4: 2134 case Button4:
2145 case Button5: 2135 case Button5:
2149 2139
2150 v = ev.button == Button4 ? UP : DN; 2140 v = ev.button == Button4 ? UP : DN;
2151 2141
2152 if (ev.state & ShiftMask) 2142 if (ev.state & ShiftMask)
2153 i = 1; 2143 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2144 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2145 i = nrow - 1;
2156 else 2146 else
2157 i = 5; 2147 i = 5;
2158 2148
2159# ifdef MOUSE_SLIP_WHEELING 2149# ifdef MOUSE_SLIP_WHEELING
2161 { 2151 {
2162 mouse_slip_wheel_speed += v ? -1 : 1; 2152 mouse_slip_wheel_speed += v ? -1 : 1;
2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2165 2155
2166 if (slip_wheel_ev.at < NOW) 2156 if (!slip_wheel_ev.is_active ())
2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2157 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168
2169 slip_wheel_ev.start ();
2170 } 2158 }
2171 else 2159 else
2172 { 2160 {
2173# endif 2161# endif
2174 scr_page (v, i); 2162 scr_page (v, i);
2180 break; 2168 break;
2181#endif 2169#endif
2182 } 2170 }
2183 } 2171 }
2184} 2172}
2185
2186#ifdef TRANSPARENT
2187#if TINTING
2188/* taken from aterm-0.4.2 */
2189
2190typedef uint32_t RUINT32T;
2191
2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193{
2194 int sh_r, sh_g, sh_b;
2195 RUINT32T mask_r, mask_g, mask_b;
2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199 int i;
2200
2201 Visual *visual = term->visual;
2202
2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205 /* for convenience */
2206 mask_r = visual->red_mask;
2207 mask_g = visual->green_mask;
2208 mask_b = visual->blue_mask;
2209
2210 /* boring lookup table pre-initialization */
2211 switch (srcImage->bits_per_pixel) {
2212 case 15:
2213 if ((mask_r != 0x7c00) ||
2214 (mask_g != 0x03e0) ||
2215 (mask_b != 0x001f))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218 lookup_r = lookup;
2219 lookup_g = lookup+32;
2220 lookup_b = lookup+32+32;
2221 sh_r = 10;
2222 sh_g = 5;
2223 sh_b = 0;
2224 break;
2225 case 16:
2226 if ((mask_r != 0xf800) ||
2227 (mask_g != 0x07e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+64;
2234 sh_r = 11;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 24:
2239 if ((mask_r != 0xff0000) ||
2240 (mask_g != 0x00ff00) ||
2241 (mask_b != 0x0000ff))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244 lookup_r = lookup;
2245 lookup_g = lookup+256;
2246 lookup_b = lookup+256+256;
2247 sh_r = 16;
2248 sh_g = 8;
2249 sh_b = 0;
2250 break;
2251 case 32:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 default:
2265 return; /* we do not support this color depth */
2266 }
2267
2268 /* prepare limits for color transformation (each channel is handled separately) */
2269 if (shade < 0) {
2270 shade = -shade;
2271 if (shade < 0) shade = 0;
2272 if (shade > 100) shade = 100;
2273
2274 lower_lim_r = 65535-rm;
2275 lower_lim_g = 65535-gm;
2276 lower_lim_b = 65535-bm;
2277
2278 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283 } else {
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292 }
2293
2294 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296 {
2297 unsigned int tmp;
2298
2299 tmp = lower_lim_r;
2300 lower_lim_r = lower_lim_b;
2301 lower_lim_b = tmp;
2302
2303 tmp = upper_lim_r;
2304 upper_lim_r = upper_lim_b;
2305 upper_lim_b = tmp;
2306 }
2307
2308 /* fill our lookup tables */
2309 for (i = 0; i <= mask_r>>sh_r; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314 lookup_r[i] = (tmp/65535)<<sh_r;
2315 }
2316 for (i = 0; i <= mask_g>>sh_g; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321 lookup_g[i] = (tmp/65535)<<sh_g;
2322 }
2323 for (i = 0; i <= mask_b>>sh_b; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328 lookup_b[i] = (tmp/65535)<<sh_b;
2329 }
2330
2331 /* apply table to input image (replacing colors by newly calculated ones) */
2332 switch (srcImage->bits_per_pixel)
2333 {
2334 case 15:
2335 {
2336 unsigned short *p1, *pf, *p, *pl;
2337 p1 = (unsigned short *) srcImage->data;
2338 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339 while (p1 < pf)
2340 {
2341 p = p1;
2342 pl = p1 + srcImage->width;
2343 for (; p < pl; p++)
2344 {
2345 *p = lookup_r[(*p & 0x7c00)>>10] |
2346 lookup_g[(*p & 0x03e0)>> 5] |
2347 lookup_b[(*p & 0x001f)];
2348 }
2349 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 case 16:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0xf800)>>11] |
2365 lookup_g[(*p & 0x07e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 24:
2373 {
2374 unsigned char *p1, *pf, *p, *pl;
2375 p1 = (unsigned char *) srcImage->data;
2376 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width * 3;
2381 for (; p < pl; p += 3)
2382 {
2383 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385 p[2] = lookup_r[(p[2] & 0x0000ff)];
2386 }
2387 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 32:
2392 {
2393 RUINT32T *p1, *pf, *p, *pl;
2394 p1 = (RUINT32T *) srcImage->data;
2395 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0xff0000)>>16] |
2404 lookup_g[(*p & 0x00ff00)>> 8] |
2405 lookup_b[(*p & 0x0000ff)] |
2406 (*p & ~0xffffff);
2407 }
2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 }
2413
2414 free (lookup);
2415}
2416#endif
2417
2418/*
2419 * Check our parents are still who we think they are.
2420 * Do transparency updates if required
2421 */
2422int
2423rxvt_term::check_our_parents ()
2424{
2425 int i, pchanged, aformat, have_pixmap, rootdepth;
2426 unsigned long nitems, bytes_after;
2427 Atom atype;
2428 unsigned char *prop = NULL;
2429 Window root, oldp, *list;
2430 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (dpy, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (dpy, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2523 allowedxerror = -1;
2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (dpy, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (dpy, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2556
2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (dpy, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2568 XClearWindow (dpy, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2589 XFree (list);
2590
2591 if (parent[i] == display->root)
2592 {
2593 if (oldp != None)
2594 pchanged = 1;
2595
2596 break;
2597 }
2598
2599 if (oldp != parent[i])
2600 pchanged = 1;
2601 }
2602
2603 n = 0;
2604
2605 if (pchanged)
2606 for (; n < (unsigned int)i; n++)
2607 {
2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611 {
2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613 break;
2614 }
2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2618 {
2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621 am_transparent = 0;
2622 /* XXX: also turn off Opt_transparent? */
2623 }
2624 else
2625 {
2626 for (n = 0; n < (unsigned int)i; n++)
2627 {
2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629 XClearWindow (dpy, parent[n]);
2630 }
2631
2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 am_transparent = 1;
2634 }
2635
2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 parent[i] = None;
2638 }
2639
2640 if (scrollBar.win)
2641 {
2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643 scrollBar.setIdle ();
2644 scrollbar_show (0);
2645 }
2646
2647 if (am_transparent)
2648 {
2649 want_refresh = want_full_refresh = 1;
2650 if (am_pixmap_trans)
2651 flush ();
2652 }
2653
2654 return pchanged;
2655}
2656#endif
2657 2173
2658/*}}} */ 2174/*}}} */
2659 2175
2660bool 2176bool
2661rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
2710 if (ch == C0_LF) 2226 if (ch == C0_LF)
2711 nlines++; 2227 nlines++;
2712 2228
2713 refresh_count++; 2229 refresh_count++;
2714 2230
2715 if (!OPTION (Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2232 {
2718 refreshnow = true;
2719 refresh_count = 0; 2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2237 refreshnow = true;
2720 ch = NOCHAR; 2238 ch = NOCHAR;
2721 break; 2239 break;
2240 }
2722 } 2241 }
2723 2242
2724 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2726 { 2245 {
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2273 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2755 scr_add_lines (buf, str - buf, nlines); 2274 scr_add_lines (buf, str - buf, nlines);
2756 2275
2757 /* 2276 /*
2758 * If there have been a lot of new lines, then update the screen 2277 * If there have been a lot of new lines, then update the screen
2759 * What the heck I'll cheat and only refresh less than every page-full. 2278 * What the heck we'll cheat and only refresh less than every page-full.
2760 * the number of pages between refreshes is refresh_limit, which 2279 * if skipScroll is enabled.
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2280 */
2763 if (refreshnow) 2281 if (refreshnow)
2764 { 2282 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true; 2283 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2771 scr_refresh (); 2284 scr_refresh ();
2772 want_refresh = 1; 2285 want_refresh = 1;
2773 }
2774 } 2286 }
2775 2287
2776 } 2288 }
2777 else 2289 else
2778 { 2290 {
2927 { 2439 {
2928 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2929 break; /* done = 1 */ 2441 break; /* done = 1 */
2930 } 2442 }
2931 } 2443 }
2932 2444
2933 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2934 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2935 { 2447 {
2936 done = 1; 2448 done = 1;
2937 break; 2449 break;
2939 } 2451 }
2940 } 2452 }
2941 2453
2942 pclose_printer (fd); 2454 pclose_printer (fd);
2943} 2455}
2944#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2945/*}}} */ 2457/*}}} */
2946 2458
2947/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2948enum { 2460enum {
2949 C1_40 = 0x40, 2461 C1_40 = 0x40,
2999 process_dcs_seq (); 2511 process_dcs_seq ();
3000 break; 2512 break;
3001 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
3002 process_csi_seq (); 2514 process_csi_seq ();
3003 break; 2515 break;
3004 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
3005 process_osc_seq (); 2517 process_osc_seq ();
3006 break; 2518 break;
3007#endif 2519#endif
3008 } 2520 }
3009} 2521}
3235rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3236{ 2748{
3237 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3238 unsigned int nargs, p; 2750 unsigned int nargs, p;
3239 int n, ndef; 2751 int n, ndef;
3240 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3241 2753
3242 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3243 arg[--nargs] = 0;
3244 2755
3245 priv = 0; 2756 priv = 0;
3246 ch = cmd_getc (); 2757 ch = cmd_getc ();
3247 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3248 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3249 priv = ch; 2761 priv = ch;
3250 ch = cmd_getc (); 2762 ch = cmd_getc ();
3251 } 2763 }
3252 2764
3253 /* read any numerical arguments */ 2765 /* read any numerical arguments */
3292 switch (priv) 2804 switch (priv)
3293 { 2805 {
3294 case '>': 2806 case '>':
3295 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3296 { 2808 {
3297 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2809 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3298 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2810 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299 // 2811 //
3300 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2812 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2813 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3302 // that we do not support xterm mouse reporting (should be 95 when we do). 2814 // versions.
3303 // 2815 //
3304 tt_printf ("\033[>%d;94;0c", 'U'); 2816 tt_printf ("\033[>%d;95;0c", 'U');
3305 } 2817 }
3306 break; 2818 break;
3307 case '?': 2819 case '?':
3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3309 process_terminal_mode (ch, priv, nargs, arg); 2821 process_terminal_mode (ch, priv, nargs, arg);
3436 break; 2948 break;
3437 case 6: /* CPR requested */ 2949 case 6: /* CPR requested */
3438 scr_report_position (); 2950 scr_report_position ();
3439 break; 2951 break;
3440 case 7: /* unofficial extension */ 2952 case 7: /* unofficial extension */
3441 if (OPTION (Opt_insecure)) 2953 if (option (Opt_insecure))
3442 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2954 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3443 break; 2955 break;
3444 case 8: /* unofficial extension */ 2956 case 8: /* unofficial extension */
3445 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2957 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3446 break; 2958 break;
3610 break; 3122 break;
3611 case 20: /* report icon label */ 3123 case 20: /* report icon label */
3612 { 3124 {
3613 char *s; 3125 char *s;
3614 XGetIconName (dpy, parent[0], &s); 3126 XGetIconName (dpy, parent[0], &s);
3615 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3616 XFree (s); 3128 XFree (s);
3617 } 3129 }
3618 break; 3130 break;
3619 case 21: /* report window title */ 3131 case 21: /* report window title */
3620 { 3132 {
3621 char *s; 3133 char *s;
3622 XFetchName (dpy, parent[0], &s); 3134 XFetchName (dpy, parent[0], &s);
3623 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s); 3136 XFree (s);
3625 } 3137 }
3626 break; 3138 break;
3627 } 3139 }
3628} 3140}
3655 seen_esc = true; 3167 seen_esc = true;
3656 continue; 3168 continue;
3657 } 3169 }
3658 else if (ch == C0_BEL || ch == CHAR_ST) 3170 else if (ch == C0_BEL || ch == CHAR_ST)
3659 break; 3171 break;
3172 else if (ch == C0_SYN)
3173 ch = cmd_get8 ();
3660 else if (ch < 0x20) 3174 else if (ch < 0x20)
3661 return NULL; /* other control character - exit */ 3175 return NULL; /* other control character - exit */
3662 3176
3663 seen_esc = false; 3177 seen_esc = false;
3664 3178
3665 if (n >= STRING_MAX - 1) 3179 if (n >= STRING_MAX - 1)
3666 // stop at some sane length 3180 // stop at some sane length
3667 return NULL; 3181 return NULL;
3668 3182
3669 if (ch == C0_SYN)
3670 string[n++] = cmd_get8 ();
3671 else
3672 string[n++] = ch; 3183 string[n++] = ch;
3673 } 3184 }
3674 3185
3675 string[n++] = '\0'; 3186 string[n++] = '\0';
3676 3187
3677 ends_how = (ch == 0x5c ? C0_ESC : ch); 3188 ends_how = (ch == 0x5c ? C0_ESC : ch);
3756 int saveop = op; 3267 int saveop = op;
3757 3268
3758 dLocal (Display *, dpy); 3269 dLocal (Display *, dpy);
3759 3270
3760 assert (str != NULL); 3271 assert (str != NULL);
3761 3272
3762 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3273 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3763 return; 3274 return;
3764 3275
3765 switch (op) 3276 switch (op)
3766 { 3277 {
3861 break; 3372 break;
3862 case URxvt_Color_IT: 3373 case URxvt_Color_IT:
3863 process_color_seq (op, Color_IT, str, resp); 3374 process_color_seq (op, Color_IT, str, resp);
3864 break; 3375 break;
3865#endif 3376#endif
3866#if TRANSPARENT && TINTING 3377#if ENABLE_TRANSPARENCY
3867 case URxvt_Color_tint: 3378 case URxvt_Color_tint:
3868 process_color_seq (op, Color_tint, str, resp); 3379 process_color_seq (op, Color_tint, str, resp);
3380 {
3381 bool changed = false;
3382 if (ISSET_PIXCOLOR (Color_tint))
3383 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3384 else
3385 changed = bgPixmap.unset_tint ();
3386 if (changed)
3387 update_background ();
3388 }
3869 3389
3870 check_our_parents ();
3871
3872 if (am_transparent)
3873 want_full_refresh = want_refresh = 1;
3874
3875 break; 3390 break;
3876#endif 3391#endif
3877 3392
3393#if BG_IMAGE_FROM_FILE
3878 case Rxvt_Pixmap: 3394 case Rxvt_Pixmap:
3879 { 3395 if (!strcmp (str, "?"))
3880 if (*str != ';')
3881 { 3396 {
3882#if XPM_BACKGROUND 3397 char str[256];
3883 scale_pixmap (""); /* reset to default scaling */ 3398
3884 set_bgPixmap (str); /* change pixmap */ 3399 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3885 scr_touch (true); 3400 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3886#endif 3401 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3402 process_xterm_seq (XTerm_title, str, CHAR_ST);
3887 } 3403 }
3888 3404 else
3405 {
3889 int changed = 0; 3406 int changed = 0;
3890 3407
3891 while ((str = strchr (str, ';')) != NULL) 3408 if (*str != ';')
3892 { 3409 {
3410 /* reset to default scaling :*/
3411 bgPixmap.unset_geometry ();
3412 if (bgPixmap.set_file (str)) /* change pixmap */
3413 changed++;
3414 str = strchr (str, ';');
3415 if (str == NULL)
3416 bgPixmap.set_defaultGeometry ();
3417 }
3418 while (str)
3419 {
3893 str++; 3420 str++;
3894#if XPM_BACKGROUND 3421 if (bgPixmap.set_geometry (str))
3895 changed += scale_pixmap (str); 3422 changed++;
3896#endif 3423 str = strchr (str, ';');
3897 } 3424 }
3898
3899 if (changed) 3425 if (changed)
3900 { 3426 update_background ();
3901#ifdef XPM_BACKGROUND
3902 resize_pixmap ();
3903 scr_touch (true);
3904#endif
3905 } 3427 }
3906 }
3907 break; 3428 break;
3429#endif
3908 3430
3909 case Rxvt_restoreFG: 3431 case Rxvt_restoreFG:
3910 set_window_color (Color_fg, str); 3432 set_window_color (Color_fg, str);
3911 break; 3433 break;
3912 case Rxvt_restoreBG: 3434 case Rxvt_restoreBG:
3937 case URxvt_italicFont: 3459 case URxvt_italicFont:
3938 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3939#endif 3461#endif
3940 if (query) 3462 if (query)
3941 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3942 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3943 ? fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3944 resp); 3466 resp);
3945 else 3467 else
3946 { 3468 {
3947 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
3961 break; 3483 break;
3962 3484
3963#if !ENABLE_MINIMAL 3485#if !ENABLE_MINIMAL
3964 case URxvt_locale: 3486 case URxvt_locale:
3965 if (query) 3487 if (query)
3966 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3488 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3967 else 3489 else
3968 { 3490 {
3969 set_locale (str); 3491 set_locale (str);
3970 pty->set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
3971 init_xlocale (); 3493 init_xlocale ();
4034{ 3556{
4035 unsigned int i, j; 3557 unsigned int i, j;
4036 int state; 3558 int state;
4037 3559
4038 static const struct 3560 static const struct
4039 { 3561 {
4040 const int argval; 3562 const int argval;
4041 const unsigned long bit; 3563 const unsigned long bit;
4042 }
4043
4044 argtopriv[] = { 3564 } argtopriv[] = {
4045 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
4046 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
4047 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
4048 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
4049 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
4065 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4066#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4067 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4068#endif 3588#endif
4069 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4070 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4071 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4072 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4073 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4074 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4075 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4076 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4077 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
4112 scr_touch (true); 3631 scr_touch (true);
4113 break; 3632 break;
4114#endif 3633#endif
4115 case 1048: /* alternative cursor save */ 3634 case 1048: /* alternative cursor save */
4116 case 1049: 3635 case 1049:
4117 if (OPTION (Opt_secondaryScreen)) 3636 if (option (Opt_secondaryScreen))
4118 if (mode == 0) 3637 if (mode == 0)
4119 scr_cursor (RESTORE); 3638 scr_cursor (RESTORE);
4120 else if (mode == 1) 3639 else if (mode == 1)
4121 scr_cursor (SAVE); 3640 scr_cursor (SAVE);
4122 break; 3641 break;
4151 scr_autowrap (state); 3670 scr_autowrap (state);
4152 break; 3671 break;
4153 /* case 8: - auto repeat, can't do on a per window basis */ 3672 /* case 8: - auto repeat, can't do on a per window basis */
4154 case 9: /* X10 mouse reporting */ 3673 case 9: /* X10 mouse reporting */
4155 if (state) /* orthogonal */ 3674 if (state) /* orthogonal */
4156 priv_modes &= ~PrivMode_MouseX11; 3675 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4157 break; 3676 break;
4158#ifdef scrollBar_esc 3677#ifdef scrollBar_esc
4159 case scrollBar_esc: 3678 case scrollBar_esc:
4160 if (scrollbar_mapping (state)) 3679 if (scrollbar_mapping (state))
4161 { 3680 {
4174 break; 3693 break;
4175 /* case 66: - application key pad */ 3694 /* case 66: - application key pad */
4176 /* case 67: - backspace key */ 3695 /* case 67: - backspace key */
4177 case 1000: /* X11 mouse reporting */ 3696 case 1000: /* X11 mouse reporting */
4178 if (state) /* orthogonal */ 3697 if (state) /* orthogonal */
4179 priv_modes &= ~PrivMode_MouseX10; 3698 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4180 break; 3699 break;
4181#if 0
4182 case 1001: 3700 case 1002:
4183 break; /* X11 mouse highlighting */ 3701 case 1003:
4184#endif 3702 if (state)
3703 {
3704 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3705 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3706 vt_emask_mouse = PointerMotionMask;
3707 }
3708 else
3709 vt_emask_mouse = NoEventMask;
3710 vt_select_input ();
3711 break;
4185 case 1010: /* scroll to bottom on TTY output inhibit */ 3712 case 1010: /* scroll to bottom on TTY output inhibit */
4186 set_option (Opt_scrollTtyOutput, !state); 3713 set_option (Opt_scrollTtyOutput, !state);
4187 break; 3714 break;
4188 case 1011: /* scroll to bottom on key press */ 3715 case 1011: /* scroll to bottom on key press */
4189 set_option (Opt_scrollTtyKeypress, state); 3716 set_option (Opt_scrollTtyKeypress, state);
4190 break; 3717 break;
4191 case 1047: /* secondary screen w/ clearing last */ 3718 case 1047: /* secondary screen w/ clearing last */
4192 if (OPTION (Opt_secondaryScreen)) 3719 if (option (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY) 3720 if (current_screen != PRIMARY)
4194 scr_erase_screen (2); 3721 scr_erase_screen (2);
4195 scr_change_screen (state); 3722 scr_change_screen (state);
4196 break; 3723 break;
4197 case 1049: /* secondary screen w/ clearing first */ 3724 case 1049: /* secondary screen w/ clearing first */
4198 scr_change_screen (state); 3725 scr_change_screen (state);
4199 if (OPTION (Opt_secondaryScreen)) 3726 if (option (Opt_secondaryScreen))
4200 if (current_screen != PRIMARY) 3727 if (current_screen != PRIMARY)
4201 scr_erase_screen (2); 3728 scr_erase_screen (2);
4202 break; 3729 break;
4203 default: 3730 default:
4204 break; 3731 break;
4366rxvt_term::process_graphics () 3893rxvt_term::process_graphics ()
4367{ 3894{
4368 unicode_t ch, cmd = cmd_getc (); 3895 unicode_t ch, cmd = cmd_getc ();
4369 3896
4370 if (cmd == 'Q') 3897 if (cmd == 'Q')
3898 {
4371 { /* query graphics */ 3899 /* query graphics */
4372 tt_printf ("\033G0\012"); /* no graphics */ 3900 tt_printf ("\033G0\012"); /* no graphics */
4373 return; 3901 return;
4374 } 3902 }
4375 /* swallow other graphics sequences until terminating ':' */ 3903 /* swallow other graphics sequences until terminating ':' */
4376 do 3904 do
4426 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4427 3955
4428 memcpy (v_buffer + v_buflen, data, len); 3956 memcpy (v_buffer + v_buflen, data, len);
4429 v_buflen += len; 3957 v_buflen += len;
4430 3958
4431 pty_ev.set (EVENT_READ | EVENT_WRITE); 3959 pty_ev.set (ev::READ | ev::WRITE);
4432} 3960}
4433 3961
4434void rxvt_term::pty_write () 3962void rxvt_term::pty_write ()
4435{ 3963{
4436 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3964 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441 3969
4442 if (v_buflen == 0) 3970 if (v_buflen == 0)
4443 { 3971 {
4444 free (v_buffer); 3972 free (v_buffer);
4445 v_buffer = 0; 3973 v_buffer = 0;
4446 v_buflen = 0;
4447 3974
4448 pty_ev.set (EVENT_READ); 3975 pty_ev.set (ev::READ);
4449 return; 3976 return;
4450 } 3977 }
4451 3978
4452 memmove (v_buffer, v_buffer + written, v_buflen); 3979 memmove (v_buffer, v_buffer + written, v_buflen);
4453 } 3980 }
4454 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3981 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4455 pty_ev.set (EVENT_READ); 3982 pty_ev.set (ev::READ);
4456} 3983}
4457 3984
4458/*----------------------- end-of-file (C source) -----------------------*/ 3985/*----------------------- end-of-file (C source) -----------------------*/
4459 3986

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines