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.313 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.380 by root, Fri Dec 14 02:33:03 2007 UTC

25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
94 XK_ISO_Left_Tab, 0x21e6, 94 XK_ISO_Left_Tab, 0x21e6,
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,
100 XK_ISO_Lock, 0x21eb, 99 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,
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 (scr_changeview (view_start - mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1120 want_refresh = 1;
1168 : scr_page (UP, mouse_slip_wheel_speed)) 1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1169 { 1123 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1172 1125 w.stop ();
1173 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1175 } 1126 }
1176} 1127}
1177#endif 1128#endif
1178 1129
1179#if LINUX_YIELD_HACK 1130#if LINUX_YIELD_HACK
1180static struct event_handler 1131static struct event_handler
1181{ 1132{
1182 check_watcher yield_ev; 1133 ev::prepare yield_ev;
1183 1134
1184 void yield_cb (check_watcher &w) 1135 void yield_cb (ev::prepare &w, int revents)
1185 { 1136 {
1186 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1138 // 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 1139 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1232 } 1183 }
1233 else 1184 else
1234 { 1185 {
1235 pty_ev.stop (); 1186 pty_ev.stop ();
1236 1187
1237 if (!OPTION (Opt_hold)) 1188 if (!option (Opt_hold))
1238 destroy (); 1189 destroy ();
1239 } 1190 }
1240 1191
1241 return false; 1192 return false;
1242} 1193}
1243 1194
1244void 1195void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1197{
1247 make_current (); 1198 make_current ();
1248 1199
1249 if (revents & EVENT_READ) 1200 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1202 while (pty_fill ())
1252 if (cmd_parse ()) 1203 if (cmd_parse ())
1253 break; 1204 break;
1254 1205
1255 if (revents & EVENT_WRITE) 1206 if (revents & ev::WRITE)
1256 pty_write (); 1207 pty_write ();
1257} 1208}
1258 1209
1259void 1210void
1260rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1263 recolour_cursor (); 1214 recolour_cursor ();
1264 1215
1265#ifdef POINTER_BLANK 1216#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1217 hidden_pointer = 0;
1267 1218
1268 if (OPTION (Opt_pointerBlank)) 1219 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1220 pointer_ev.start (pointerBlankDelay);
1270#endif 1221#endif
1271} 1222}
1272 1223
1273#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1274void 1225void
1275rxvt_term::pointer_blank () 1226rxvt_term::pointer_blank ()
1276{ 1227{
1277 if (!OPTION (Opt_pointerBlank)) 1228 if (!option (Opt_pointerBlank))
1278 return; 1229 return;
1279 1230
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1231 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1232 XFlush (dpy);
1282 1233
1283 hidden_pointer = 1; 1234 hidden_pointer = 1;
1284} 1235}
1285 1236
1286void 1237void
1287rxvt_term::pointer_cb (time_watcher &w) 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1239{
1289 make_current (); 1240 make_current ();
1290 1241
1291 pointer_blank (); 1242 pointer_blank ();
1292} 1243}
1295void 1246void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1248{
1298 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1299 int x, y; 1250 int x, y;
1251 int code = 32;
1300 1252
1301 x = ev.x; 1253 x = Pixel2Col (ev.x);
1302 y = ev.y; 1254 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1255 if (ev.type == MotionNotify)
1256 {
1257 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1304 1263
1305 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1306 button_number = 3; 1265 button_number = 3;
1307 else 1266 else
1308 { 1267 {
1354 x + 1, 1313 x + 1,
1355 y + 1); 1314 y + 1);
1356#endif 1315#endif
1357 1316
1358 tt_printf ("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1360 (32 + x + 1), 1319 (32 + x + 1),
1361 (32 + y + 1)); 1320 (32 + y + 1));
1362} 1321}
1363 1322
1364/*{{{ process an X event */ 1323/*{{{ process an X event */
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1385 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1386 focus_out ();
1428 } 1387 }
1429#endif 1388#endif
1430 } 1389 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1390 break;
1436 1391
1437 /* 1392 /*
1438 * XXX: this is not the _current_ arrangement 1393 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1394 * Here's my conclusion:
1458 break; 1413 break;
1459 } 1414 }
1460 break; 1415 break;
1461 1416
1462 case FocusIn: 1417 case FocusIn:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1421 focus_in ();
1464 break; 1422 break;
1465 1423
1466 case FocusOut: 1424 case FocusOut:
1425 if (ev.xfocus.detail != NotifyInferior
1426 && ev.xfocus.detail != NotifyPointer
1427 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1428 focus_out ();
1468 break; 1429 break;
1469 1430
1470 case ConfigureNotify: 1431 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */
1471 if (ev.xconfigure.window == parent[0]) 1435 if (ev.xconfigure.window == parent[0])
1472 { 1436 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1438 ;
1475 1439
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1441 {
1478 seen_resize = 1; 1442 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1444 }
1481 1445 else
1446 {
1447#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 update_background ();
1450#endif
1451 }
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1452 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 } 1453 }
1489 break; 1454 break;
1490 1455
1491 case PropertyNotify: 1456 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1510 break; 1475 break;
1511 1476
1512 case MapNotify: 1477 case MapNotify:
1513 mapped = 1; 1478 mapped = 1;
1514#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start ();
1516#endif 1481#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1483 break;
1519 1484
1520 case UnmapNotify: 1485 case UnmapNotify:
1522#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1488 text_blink_ev.stop ();
1524#endif 1489#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1491 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1492
1534 case GraphicsExpose: 1493 case GraphicsExpose:
1535 case Expose: 1494 case Expose:
1536 if (ev.xany.window == vt) 1495 if (ev.xany.window == vt)
1537 { 1496 {
1538 do 1497 do
1498 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1499 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1500 ev.xexpose.width, ev.xexpose.height, False);
1501 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1502 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1503
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1505
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1548 1510 }
1549 want_refresh = 1; 1511 want_refresh = 1;
1550 } 1512 }
1551 else 1513 else
1552 { 1514 {
1553 XEvent unused_event; 1515 XEvent unused_event;
1560 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1561 { 1523 {
1562 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1563 scrollbar_show (0); 1525 scrollbar_show (0);
1564 } 1526 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1527 }
1571 break; 1528 break;
1572 1529
1573 case MotionNotify: 1530 case MotionNotify:
1574#ifdef POINTER_BLANK 1531#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1532 if (hidden_pointer)
1576 pointer_unblank (); 1533 pointer_unblank ();
1577#endif 1534#endif
1535 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1536 || priv_modes & PrivMode_MouseAnyEvent)
1537 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1538 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1539 break;
1580 1540
1581 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1582 { 1542 {
1616 int dist; 1576 int dist;
1617 1577
1618 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1620 */ 1580 */
1621 if (!sel_scroll_ev.active) 1581 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1583
1624 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1626 */ 1586 */
1627 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1649 else 1609 else
1650 { 1610 {
1651 /* we are within the text window, so we 1611 /* we are within the text window, so we
1652 * shouldn't be scrolling 1612 * shouldn't be scrolling
1653 */ 1613 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1614 sel_scroll_ev.stop();
1656 } 1615 }
1657#endif 1616#endif
1658#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1659 } 1618 }
1660#endif 1619#endif
1672 &ev.xbutton.x, &ev.xbutton.y, 1631 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1632 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1634 scrollbar_size ());
1676 want_refresh = 1; 1635 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1636 scrollbar_show (1);
1679 } 1637 }
1680 break; 1638 break;
1681 } 1639 }
1682 1640
1683#if defined(CURSOR_BLINK) 1641#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1642 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1643 {
1686 if (hidden_cursor) 1644 if (hidden_cursor)
1687 { 1645 {
1688 hidden_cursor = 0; 1646 hidden_cursor = 0;
1689 want_refresh = 1; 1647 want_refresh = 1;
1690 } 1648 }
1691 1649
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1650 cursor_blink_ev.again ();
1693 } 1651 }
1694#endif 1652#endif
1695 1653
1696#if defined(POINTER_BLANK) 1654#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1655 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1656 {
1699 if (ev.type == MotionNotify 1657 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1658 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1659 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1660 if (hidden_pointer)
1724 IMSetPosition (); 1682 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1683 XSetICFocus (Input_Context);
1726 } 1684 }
1727#endif 1685#endif
1728#if CURSOR_BLINK 1686#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1687 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1731#endif 1689#endif
1732#if OFF_FOCUS_FADING 1690#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1691 if (rs[Rs_fade])
1734 { 1692 {
1735 pix_colors = pix_colors_focused; 1693 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1694 scr_recolour ();
1737 } 1695 }
1738#endif 1696#endif
1697#if ENABLE_FRILLS
1698 if (option (Opt_urgentOnBell))
1699 {
1700 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1701 {
1702 h->flags &= ~XUrgencyHint;
1703 XSetWMHints (dpy, parent[0], h);
1704 }
1705 }
1706#endif
1739 } 1707 }
1740} 1708}
1741 1709
1742void 1710void
1743rxvt_term::focus_out () 1711rxvt_term::focus_out ()
1751 1719
1752#if ENABLE_FRILLS || ISO_14755 1720#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1721 if (iso14755buf)
1754 { 1722 {
1755 iso14755buf = 0; 1723 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1724# if ISO_14755
1757 scr_overlay_off (); 1725 scr_overlay_off ();
1758# endif 1726# endif
1759 } 1727 }
1760#endif 1728#endif
1761#if USE_XIM 1729#if USE_XIM
1762 if (Input_Context != NULL) 1730 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1731 XUnsetICFocus (Input_Context);
1764#endif 1732#endif
1765#if CURSOR_BLINK 1733#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1734 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1735 cursor_blink_ev.stop ();
1736
1768 hidden_cursor = 0; 1737 hidden_cursor = 0;
1769#endif 1738#endif
1770#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1772 { 1741 {
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1757 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 } 1758 }
1790#endif 1759#endif
1791} 1760}
1792 1761
1793#if TRANSPARENT 1762#if ENABLE_TRANSPARENCY || ENABLE_PERL
1794void 1763void
1795rxvt_term::rootwin_cb (XEvent &ev) 1764rxvt_term::rootwin_cb (XEvent &ev)
1796{ 1765{
1797 make_current (); 1766 make_current ();
1798 1767
1768 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1769 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1770 return;
1771
1772# if ENABLE_TRANSPARENCY
1799 switch (ev.type) 1773 switch (ev.type)
1800 { 1774 {
1801 case PropertyNotify: 1775 case PropertyNotify:
1802 /* 1776 /*
1803 * if user used some Esetroot compatible prog to set the root bg, 1777 * if user used some Esetroot compatible prog to set the root bg,
1804 * use the property to determine the pixmap. We use it later on. 1778 * use the property to determine the pixmap. We use it later on.
1805 */ 1779 */
1806 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1780 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1807 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1781 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1808 return; 1782 {
1809 1783 bgPixmap.set_root_pixmap ();
1810 /* FALLTHROUGH */ 1784 update_background ();
1811 case ReparentNotify: 1785 }
1812 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1813 want_refresh = want_full_refresh = 1;
1814 break; 1786 break;
1815 } 1787 }
1788# endif
1816} 1789}
1817#endif 1790#endif
1818 1791
1819void 1792void
1820rxvt_term::button_press (XButtonEvent &ev) 1793rxvt_term::button_press (XButtonEvent &ev)
1875 mouse_report (ev); 1848 mouse_report (ev);
1876 } 1849 }
1877#else 1850#else
1878 MEvent.button = ev.button; 1851 MEvent.button = ev.button;
1879 mouse_report (ev); 1852 mouse_report (ev);
1880#endif /* MOUSE_REPORT_DOUBLECLICK */ 1853#endif /* MOUSE_REPORT_DOUBLECLICK */
1881 1854
1882 } 1855 }
1883 else 1856 else
1884 { 1857 {
1885 if (ev.button != MEvent.button) 1858 if (ev.button != MEvent.button)
1979 tt_printf ("\033[5~"); 1952 tt_printf ("\033[5~");
1980 break; 1953 break;
1981 } 1954 }
1982 } 1955 }
1983 else 1956 else
1984#endif /* NO_SCROLLBAR_REPORT */ 1957#endif /* NO_SCROLLBAR_REPORT */
1985 1958
1986 { 1959 {
1987 char upordown = 0; 1960 char upordown = 0;
1988 1961
1989 if (scrollBar.style == R_SB_NEXT) 1962 if (scrollBar.style == R_SB_NEXT)
1990 { 1963 {
1991 if (scrollbarnext_upButton (ev.y)) 1964 if (scrollbarnext_upButton (ev.y))
1992 upordown = -1; /* up */ 1965 upordown = -1; /* up */
1998 if (scrollbarrxvt_upButton (ev.y)) 1971 if (scrollbarrxvt_upButton (ev.y))
1999 upordown = -1; /* up */ 1972 upordown = -1; /* up */
2000 else if (scrollbarrxvt_dnButton (ev.y)) 1973 else if (scrollbarrxvt_dnButton (ev.y))
2001 upordown = 1; /* down */ 1974 upordown = 1; /* down */
2002 } 1975 }
1976
2003 if (upordown) 1977 if (upordown)
2004 { 1978 {
2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1980 if (!cont_scroll_ev.is_active ())
2006 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2007#endif 1982#endif
2008 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
2009 { 1984 {
2010 if (upordown < 0) 1985 if (upordown < 0)
2011 scrollBar.setUp (); 1986 scrollBar.setUp ();
2091 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
2092 scrollbar_show (0); 2067 scrollbar_show (0);
2093 } 2068 }
2094 2069
2095#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
2096 if (sel_scroll_ev.active)
2097 sel_scroll_ev.stop(); 2071 sel_scroll_ev.stop();
2098#endif 2072#endif
2099 2073
2100 if (ev.window == vt) 2074 if (ev.window == vt)
2101 { 2075 {
2102 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2076 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2126 mouse_report (ev); 2100 mouse_report (ev);
2127 } 2101 }
2128#else /* MOUSE_REPORT_DOUBLECLICK */ 2102#else /* MOUSE_REPORT_DOUBLECLICK */
2129 MEvent.button = AnyButton; 2103 MEvent.button = AnyButton;
2130 mouse_report (ev); 2104 mouse_report (ev);
2131#endif /* MOUSE_REPORT_DOUBLECLICK */ 2105#endif /* MOUSE_REPORT_DOUBLECLICK */
2132 return; 2106 return;
2133 } 2107 }
2134 2108
2135 /* 2109 /*
2136 * dumb hack to compensate for the failure of click-and-drag 2110 * dumb hack to compensate for the failure of click-and-drag
2148 selection_make (ev.time); 2122 selection_make (ev.time);
2149 break; 2123 break;
2150 2124
2151 case Button2: 2125 case Button2:
2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2126 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2127 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2154 break; 2128 break;
2155 2129
2156#ifdef MOUSE_WHEEL 2130#ifdef MOUSE_WHEEL
2157 case Button4: 2131 case Button4:
2158 case Button5: 2132 case Button5:
2162 2136
2163 v = ev.button == Button4 ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
2164 2138
2165 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
2166 i = 1; 2140 i = 1;
2167 else if (OPTION (Opt_mouseWheelScrollPage)) 2141 else if (option (Opt_mouseWheelScrollPage))
2168 i = nrow - 1; 2142 i = nrow - 1;
2169 else 2143 else
2170 i = 5; 2144 i = 5;
2171 2145
2172# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
2174 { 2148 {
2175 mouse_slip_wheel_speed += v ? -1 : 1; 2149 mouse_slip_wheel_speed += v ? -1 : 1;
2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2178 2152
2179 if (slip_wheel_ev.at < NOW) 2153 if (!slip_wheel_ev.is_active ())
2180 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2181
2182 slip_wheel_ev.start ();
2183 } 2155 }
2184 else 2156 else
2185 { 2157 {
2186# endif 2158# endif
2187 scr_page (v, i); 2159 scr_page (v, i);
2193 break; 2165 break;
2194#endif 2166#endif
2195 } 2167 }
2196 } 2168 }
2197} 2169}
2198
2199#ifdef TRANSPARENT
2200#if TINTING
2201/* taken from aterm-0.4.2 */
2202
2203typedef uint32_t RUINT32T;
2204
2205void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2206{
2207 int sh_r, sh_g, sh_b;
2208 RUINT32T mask_r, mask_g, mask_b;
2209 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2210 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2211 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2212 int i;
2213
2214 Visual *visual = term->visual;
2215
2216 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2217
2218 /* for convenience */
2219 mask_r = visual->red_mask;
2220 mask_g = visual->green_mask;
2221 mask_b = visual->blue_mask;
2222
2223 /* boring lookup table pre-initialization */
2224 switch (srcImage->bits_per_pixel) {
2225 case 15:
2226 if ((mask_r != 0x7c00) ||
2227 (mask_g != 0x03e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+32;
2234 sh_r = 10;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 16:
2239 if ((mask_r != 0xf800) ||
2240 (mask_g != 0x07e0) ||
2241 (mask_b != 0x001f))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2244 lookup_r = lookup;
2245 lookup_g = lookup+32;
2246 lookup_b = lookup+32+64;
2247 sh_r = 11;
2248 sh_g = 5;
2249 sh_b = 0;
2250 break;
2251 case 24:
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 case 32:
2265 if ((mask_r != 0xff0000) ||
2266 (mask_g != 0x00ff00) ||
2267 (mask_b != 0x0000ff))
2268 return;
2269 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2270 lookup_r = lookup;
2271 lookup_g = lookup+256;
2272 lookup_b = lookup+256+256;
2273 sh_r = 16;
2274 sh_g = 8;
2275 sh_b = 0;
2276 break;
2277 default:
2278 return; /* we do not support this color depth */
2279 }
2280
2281 /* prepare limits for color transformation (each channel is handled separately) */
2282 if (shade < 0) {
2283 shade = -shade;
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = 65535-rm;
2288 lower_lim_g = 65535-gm;
2289 lower_lim_b = 65535-bm;
2290
2291 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2292 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2293 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2294
2295 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2296 } else {
2297 if (shade < 0) shade = 0;
2298 if (shade > 100) shade = 100;
2299
2300 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2301
2302 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2303 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2304 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2305 }
2306
2307 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2308 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2309 {
2310 unsigned int tmp;
2311
2312 tmp = lower_lim_r;
2313 lower_lim_r = lower_lim_b;
2314 lower_lim_b = tmp;
2315
2316 tmp = upper_lim_r;
2317 upper_lim_r = upper_lim_b;
2318 upper_lim_b = tmp;
2319 }
2320
2321 /* fill our lookup tables */
2322 for (i = 0; i <= mask_r>>sh_r; i++)
2323 {
2324 RUINT32T tmp;
2325 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2326 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2327 lookup_r[i] = (tmp/65535)<<sh_r;
2328 }
2329 for (i = 0; i <= mask_g>>sh_g; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2333 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2334 lookup_g[i] = (tmp/65535)<<sh_g;
2335 }
2336 for (i = 0; i <= mask_b>>sh_b; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2340 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2341 lookup_b[i] = (tmp/65535)<<sh_b;
2342 }
2343
2344 /* apply table to input image (replacing colors by newly calculated ones) */
2345 switch (srcImage->bits_per_pixel)
2346 {
2347 case 15:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0x7c00)>>10] |
2359 lookup_g[(*p & 0x03e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 16:
2367 {
2368 unsigned short *p1, *pf, *p, *pl;
2369 p1 = (unsigned short *) srcImage->data;
2370 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width;
2375 for (; p < pl; p++)
2376 {
2377 *p = lookup_r[(*p & 0xf800)>>11] |
2378 lookup_g[(*p & 0x07e0)>> 5] |
2379 lookup_b[(*p & 0x001f)];
2380 }
2381 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 24:
2386 {
2387 unsigned char *p1, *pf, *p, *pl;
2388 p1 = (unsigned char *) srcImage->data;
2389 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390 while (p1 < pf)
2391 {
2392 p = p1;
2393 pl = p1 + srcImage->width * 3;
2394 for (; p < pl; p += 3)
2395 {
2396 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2397 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2398 p[2] = lookup_r[(p[2] & 0x0000ff)];
2399 }
2400 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2401 }
2402 break;
2403 }
2404 case 32:
2405 {
2406 RUINT32T *p1, *pf, *p, *pl;
2407 p1 = (RUINT32T *) srcImage->data;
2408 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2409
2410 while (p1 < pf)
2411 {
2412 p = p1;
2413 pl = p1 + srcImage->width;
2414 for (; p < pl; p++)
2415 {
2416 *p = lookup_r[(*p & 0xff0000)>>16] |
2417 lookup_g[(*p & 0x00ff00)>> 8] |
2418 lookup_b[(*p & 0x0000ff)] |
2419 (*p & ~0xffffff);
2420 }
2421 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 }
2426
2427 free (lookup);
2428}
2429#endif
2430
2431/*
2432 * Check our parents are still who we think they are.
2433 * Do transparency updates if required
2434 */
2435int
2436rxvt_term::check_our_parents ()
2437{
2438 int i, pchanged, aformat, have_pixmap, rootdepth;
2439 unsigned long nitems, bytes_after;
2440 Atom atype;
2441 unsigned char *prop = NULL;
2442 Window root, oldp, *list;
2443 Pixmap rootpixmap = None;
2444 XWindowAttributes wattr, wrootattr;
2445
2446 pchanged = 0;
2447
2448 if (!OPTION (Opt_transparent))
2449 return pchanged; /* Don't try any more */
2450
2451 XGetWindowAttributes (dpy, display->root, &wrootattr);
2452 rootdepth = wrootattr.depth;
2453
2454 XGetWindowAttributes (dpy, parent[0], &wattr);
2455
2456 if (rootdepth != wattr.depth)
2457 {
2458 if (am_transparent)
2459 {
2460 pchanged = 1;
2461 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2462 am_transparent = am_pixmap_trans = 0;
2463 }
2464
2465 return pchanged; /* Don't try any more */
2466 }
2467
2468 /* Get all X ops out of the queue so that our information is up-to-date. */
2469 XSync (dpy, False);
2470
2471 /*
2472 * Make the frame window set by the window manager have
2473 * the root background. Some window managers put multiple nested frame
2474 * windows for each client, so we have to take care about that.
2475 */
2476 i = (xa[XA_XROOTPMAP_ID]
2477 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2478 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2479 &nitems, &bytes_after, &prop) == Success);
2480
2481 if (!i || prop == NULL)
2482 i = (xa[XA_ESETROOT_PMAP_ID]
2483 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL
2488#if TINTING
2489 || !ISSET_PIXCOLOR (Color_tint)
2490#endif
2491 )
2492 have_pixmap = 0;
2493 else
2494 {
2495 have_pixmap = 1;
2496 rootpixmap = *(Pixmap *)prop;
2497 XFree (prop);
2498 }
2499
2500 if (have_pixmap)
2501 {
2502 /*
2503 * Copy display->root pixmap transparency
2504 */
2505 int sx, sy, nx, ny;
2506 unsigned int nw, nh;
2507 Window cr;
2508 XImage *image;
2509 GC gc;
2510 XGCValues gcvalue;
2511
2512 XTranslateCoordinates (dpy, parent[0], display->root,
2513 0, 0, &sx, &sy, &cr);
2514 nw = (unsigned int)szHint.width;
2515 nh = (unsigned int)szHint.height;
2516 nx = ny = 0;
2517
2518 if (sx < 0)
2519 {
2520 nw += sx;
2521 nx = -sx;
2522 sx = 0;
2523 }
2524
2525 if (sy < 0)
2526 {
2527 nh += sy;
2528 ny = -sy;
2529 sy = 0;
2530 }
2531
2532 min_it (nw, (unsigned int) (wrootattr.width - sx));
2533 min_it (nh, (unsigned int) (wrootattr.height - sy));
2534
2535 XSync (dpy, False);
2536 allowedxerror = -1;
2537 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2538
2539 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2540 /* XXX: may need a delay here? */
2541 allowedxerror = 0;
2542
2543 if (image == NULL)
2544 {
2545 if (am_transparent && am_pixmap_trans)
2546 {
2547 pchanged = 1;
2548 if (pixmap != None)
2549 {
2550 XFreePixmap (dpy, pixmap);
2551 pixmap = None;
2552 }
2553 }
2554
2555 am_pixmap_trans = 0;
2556 }
2557 else
2558 {
2559 if (pixmap != None)
2560 XFreePixmap (dpy, pixmap);
2561
2562#if TINTING
2563 if (ISSET_PIXCOLOR (Color_tint))
2564 {
2565 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2566
2567 rgba c;
2568 pix_colors_focused [Color_tint].get (c);
2569
2570 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2571 }
2572#endif
2573
2574 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2575 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2576 XPutImage (dpy, pixmap, gc, image, 0, 0,
2577 nx, ny, image->width, image->height);
2578 XFreeGC (dpy, gc);
2579 XDestroyImage (image);
2580 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2581 XClearWindow (dpy, parent[0]);
2582
2583 if (!am_transparent || !am_pixmap_trans)
2584 pchanged = 1;
2585
2586 am_transparent = am_pixmap_trans = 1;
2587 }
2588 }
2589
2590 if (am_pixmap_trans)
2591 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2592 else
2593 {
2594 unsigned int n;
2595 /*
2596 * InheritPixmap transparency
2597 */
2598 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2599 {
2600 oldp = parent[i];
2601 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2602 XFree (list);
2603
2604 if (parent[i] == display->root)
2605 {
2606 if (oldp != None)
2607 pchanged = 1;
2608
2609 break;
2610 }
2611
2612 if (oldp != parent[i])
2613 pchanged = 1;
2614 }
2615
2616 n = 0;
2617
2618 if (pchanged)
2619 for (; n < (unsigned int)i; n++)
2620 {
2621 XGetWindowAttributes (dpy, parent[n], &wattr);
2622
2623 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2624 {
2625 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2626 break;
2627 }
2628 }
2629
2630 if (n > (sizeof (parent) / sizeof (parent[0])))
2631 {
2632 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2633 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2634 am_transparent = 0;
2635 /* XXX: also turn off Opt_transparent? */
2636 }
2637 else
2638 {
2639 for (n = 0; n < (unsigned int)i; n++)
2640 {
2641 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2642 XClearWindow (dpy, parent[n]);
2643 }
2644
2645 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2646 am_transparent = 1;
2647 }
2648
2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2650 parent[i] = None;
2651 }
2652
2653 if (scrollBar.win)
2654 {
2655 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2656 scrollBar.setIdle ();
2657 scrollbar_show (0);
2658 }
2659
2660 if (am_transparent)
2661 {
2662 want_refresh = want_full_refresh = 1;
2663 if (am_pixmap_trans)
2664 flush ();
2665 }
2666
2667 return pchanged;
2668}
2669#endif
2670 2170
2671/*}}} */ 2171/*}}} */
2672 2172
2673bool 2173bool
2674rxvt_term::cmd_parse () 2174rxvt_term::cmd_parse ()
2723 if (ch == C0_LF) 2223 if (ch == C0_LF)
2724 nlines++; 2224 nlines++;
2725 2225
2726 refresh_count++; 2226 refresh_count++;
2727 2227
2728 if (!OPTION (Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2729 || (refresh_count >= refresh_limit * (nrow - 1)))
2730 { 2229 {
2731 refreshnow = true;
2732 refresh_count = 0; 2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 {
2234 refreshnow = true;
2733 ch = NOCHAR; 2235 ch = NOCHAR;
2734 break; 2236 break;
2237 }
2735 } 2238 }
2736 2239
2737 // scr_add_lines only works for nlines <= nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2738 if (nlines >= nrow - 1) 2241 if (nlines >= nrow - 1)
2739 { 2242 {
2767 && 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))))
2768 scr_add_lines (buf, str - buf, nlines); 2271 scr_add_lines (buf, str - buf, nlines);
2769 2272
2770 /* 2273 /*
2771 * 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
2772 * 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.
2773 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2774 * is incremented here because we must be doing flat-out scrolling.
2775 */ 2277 */
2776 if (refreshnow) 2278 if (refreshnow)
2777 { 2279 {
2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2779 refresh_limit++;
2780 else
2781 {
2782 flag = true; 2280 flag = true;
2783 //TODO: due to popular request, implement "skipscroll" option here
2784 scr_refresh (); 2281 scr_refresh ();
2785 want_refresh = 1; 2282 want_refresh = 1;
2786 }
2787 } 2283 }
2788 2284
2789 } 2285 }
2790 else 2286 else
2791 { 2287 {
2940 { 2436 {
2941 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
2942 break; /* done = 1 */ 2438 break; /* done = 1 */
2943 } 2439 }
2944 } 2440 }
2945 2441
2946 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
2947 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
2948 { 2444 {
2949 done = 1; 2445 done = 1;
2950 break; 2446 break;
2952 } 2448 }
2953 } 2449 }
2954 2450
2955 pclose_printer (fd); 2451 pclose_printer (fd);
2956} 2452}
2957#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
2958/*}}} */ 2454/*}}} */
2959 2455
2960/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
2961enum { 2457enum {
2962 C1_40 = 0x40, 2458 C1_40 = 0x40,
3012 process_dcs_seq (); 2508 process_dcs_seq ();
3013 break; 2509 break;
3014 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
3015 process_csi_seq (); 2511 process_csi_seq ();
3016 break; 2512 break;
3017 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
3018 process_osc_seq (); 2514 process_osc_seq ();
3019 break; 2515 break;
3020#endif 2516#endif
3021 } 2517 }
3022} 2518}
3248rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
3249{ 2745{
3250 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
3251 unsigned int nargs, p; 2747 unsigned int nargs, p;
3252 int n, ndef; 2748 int n, ndef;
3253 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
3254 2750
3255 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
3256 arg[--nargs] = 0;
3257 2752
3258 priv = 0; 2753 priv = 0;
3259 ch = cmd_getc (); 2754 ch = cmd_getc ();
3260 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
2756 {
3261 { /* '<' '=' '>' '?' */ 2757 /* '<' '=' '>' '?' */
3262 priv = ch; 2758 priv = ch;
3263 ch = cmd_getc (); 2759 ch = cmd_getc ();
3264 } 2760 }
3265 2761
3266 /* read any numerical arguments */ 2762 /* read any numerical arguments */
3305 switch (priv) 2801 switch (priv)
3306 { 2802 {
3307 case '>': 2803 case '>':
3308 if (ch == CSI_DA) /* secondary device attributes */ 2804 if (ch == CSI_DA) /* secondary device attributes */
3309 { 2805 {
3310 // 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,
3311 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2807 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3312 // 2808 //
3313 // 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
3314 // 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
3315 // that we do not support xterm mouse reporting (should be 95 when we do). 2811 // versions.
3316 // 2812 //
3317 tt_printf ("\033[>%d;94;0c", 'U'); 2813 tt_printf ("\033[>%d;95;0c", 'U');
3318 } 2814 }
3319 break; 2815 break;
3320 case '?': 2816 case '?':
3321 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3322 process_terminal_mode (ch, priv, nargs, arg); 2818 process_terminal_mode (ch, priv, nargs, arg);
3449 break; 2945 break;
3450 case 6: /* CPR requested */ 2946 case 6: /* CPR requested */
3451 scr_report_position (); 2947 scr_report_position ();
3452 break; 2948 break;
3453 case 7: /* unofficial extension */ 2949 case 7: /* unofficial extension */
3454 if (OPTION (Opt_insecure)) 2950 if (option (Opt_insecure))
3455 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2951 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3456 break; 2952 break;
3457 case 8: /* unofficial extension */ 2953 case 8: /* unofficial extension */
3458 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2954 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3459 break; 2955 break;
3623 break; 3119 break;
3624 case 20: /* report icon label */ 3120 case 20: /* report icon label */
3625 { 3121 {
3626 char *s; 3122 char *s;
3627 XGetIconName (dpy, parent[0], &s); 3123 XGetIconName (dpy, parent[0], &s);
3628 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3124 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3125 XFree (s);
3630 } 3126 }
3631 break; 3127 break;
3632 case 21: /* report window title */ 3128 case 21: /* report window title */
3633 { 3129 {
3634 char *s; 3130 char *s;
3635 XFetchName (dpy, parent[0], &s); 3131 XFetchName (dpy, parent[0], &s);
3636 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3132 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s); 3133 XFree (s);
3638 } 3134 }
3639 break; 3135 break;
3640 } 3136 }
3641} 3137}
3668 seen_esc = true; 3164 seen_esc = true;
3669 continue; 3165 continue;
3670 } 3166 }
3671 else if (ch == C0_BEL || ch == CHAR_ST) 3167 else if (ch == C0_BEL || ch == CHAR_ST)
3672 break; 3168 break;
3169 else if (ch == C0_SYN)
3170 ch = cmd_get8 ();
3673 else if (ch < 0x20) 3171 else if (ch < 0x20)
3674 return NULL; /* other control character - exit */ 3172 return NULL; /* other control character - exit */
3675 3173
3676 seen_esc = false; 3174 seen_esc = false;
3677 3175
3678 if (n >= STRING_MAX - 1) 3176 if (n >= STRING_MAX - 1)
3679 // stop at some sane length 3177 // stop at some sane length
3680 return NULL; 3178 return NULL;
3681 3179
3682 if (ch == C0_SYN)
3683 string[n++] = cmd_get8 ();
3684 else
3685 string[n++] = ch; 3180 string[n++] = ch;
3686 } 3181 }
3687 3182
3688 string[n++] = '\0'; 3183 string[n++] = '\0';
3689 3184
3690 ends_how = (ch == 0x5c ? C0_ESC : ch); 3185 ends_how = (ch == 0x5c ? C0_ESC : ch);
3769 int saveop = op; 3264 int saveop = op;
3770 3265
3771 dLocal (Display *, dpy); 3266 dLocal (Display *, dpy);
3772 3267
3773 assert (str != NULL); 3268 assert (str != NULL);
3774 3269
3775 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)))
3776 return; 3271 return;
3777 3272
3778 switch (op) 3273 switch (op)
3779 { 3274 {
3874 break; 3369 break;
3875 case URxvt_Color_IT: 3370 case URxvt_Color_IT:
3876 process_color_seq (op, Color_IT, str, resp); 3371 process_color_seq (op, Color_IT, str, resp);
3877 break; 3372 break;
3878#endif 3373#endif
3879#if TRANSPARENT && TINTING 3374#if ENABLE_TRANSPARENCY
3880 case URxvt_Color_tint: 3375 case URxvt_Color_tint:
3881 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 }
3882 3386
3883 check_our_parents ();
3884
3885 if (am_transparent)
3886 want_full_refresh = want_refresh = 1;
3887
3888 break; 3387 break;
3889#endif 3388#endif
3890 3389
3390#if BG_IMAGE_FROM_FILE
3891 case Rxvt_Pixmap: 3391 case Rxvt_Pixmap:
3892 { 3392 if (!strcmp (str, "?"))
3893 if (*str != ';')
3894 { 3393 {
3895#if XPM_BACKGROUND 3394 char str[256];
3896 scale_pixmap (""); /* reset to default scaling */ 3395
3897 set_bgPixmap (str); /* change pixmap */ 3396 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3898 scr_touch (true); 3397 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3899#endif 3398 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3399 process_xterm_seq (XTerm_title, str, CHAR_ST);
3900 } 3400 }
3901 3401 else
3402 {
3902 int changed = 0; 3403 int changed = 0;
3903 3404
3904 while ((str = strchr (str, ';')) != NULL) 3405 if (*str != ';')
3905 { 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 {
3906 str++; 3417 str++;
3907#if XPM_BACKGROUND 3418 if (bgPixmap.set_geometry (str))
3908 changed += scale_pixmap (str); 3419 changed++;
3909#endif 3420 str = strchr (str, ';');
3910 } 3421 }
3911
3912 if (changed) 3422 if (changed)
3913 { 3423 update_background ();
3914#ifdef XPM_BACKGROUND
3915 resize_pixmap ();
3916 scr_touch (true);
3917#endif
3918 } 3424 }
3919 }
3920 break; 3425 break;
3426#endif
3921 3427
3922 case Rxvt_restoreFG: 3428 case Rxvt_restoreFG:
3923 set_window_color (Color_fg, str); 3429 set_window_color (Color_fg, str);
3924 break; 3430 break;
3925 case Rxvt_restoreBG: 3431 case Rxvt_restoreBG:
3950 case URxvt_italicFont: 3456 case URxvt_italicFont:
3951 case URxvt_boldItalicFont: 3457 case URxvt_boldItalicFont:
3952#endif 3458#endif
3953 if (query) 3459 if (query)
3954 tt_printf ("\33]%d;%-.250s%c", saveop, 3460 tt_printf ("\33]%d;%-.250s%c", saveop,
3955 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3461 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3956 ? fontset[op - URxvt_font]->fontdesc : "", 3462 ? fontset[op - URxvt_font]->fontdesc : "",
3957 resp); 3463 resp);
3958 else 3464 else
3959 { 3465 {
3960 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3466 const char *&res = rs[Rs_font + (op - URxvt_font)];
3974 break; 3480 break;
3975 3481
3976#if !ENABLE_MINIMAL 3482#if !ENABLE_MINIMAL
3977 case URxvt_locale: 3483 case URxvt_locale:
3978 if (query) 3484 if (query)
3979 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3485 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3980 else 3486 else
3981 { 3487 {
3982 set_locale (str); 3488 set_locale (str);
3983 pty->set_utf8_mode (enc_utf8); 3489 pty->set_utf8_mode (enc_utf8);
3984 init_xlocale (); 3490 init_xlocale ();
4047{ 3553{
4048 unsigned int i, j; 3554 unsigned int i, j;
4049 int state; 3555 int state;
4050 3556
4051 static const struct 3557 static const struct
4052 { 3558 {
4053 const int argval; 3559 const int argval;
4054 const unsigned long bit; 3560 const unsigned long bit;
4055 }
4056
4057 argtopriv[] = { 3561 } argtopriv[] = {
4058 { 1, PrivMode_aplCUR }, 3562 { 1, PrivMode_aplCUR },
4059 { 2, PrivMode_vt52 }, 3563 { 2, PrivMode_vt52 },
4060 { 3, PrivMode_132 }, 3564 { 3, PrivMode_132 },
4061 { 4, PrivMode_smoothScroll }, 3565 { 4, PrivMode_smoothScroll },
4062 { 5, PrivMode_rVideo }, 3566 { 5, PrivMode_rVideo },
4078 { 66, PrivMode_aplKP }, 3582 { 66, PrivMode_aplKP },
4079#ifndef NO_BACKSPACE_KEY 3583#ifndef NO_BACKSPACE_KEY
4080 { 67, PrivMode_BackSpace }, 3584 { 67, PrivMode_BackSpace },
4081#endif 3585#endif
4082 { 1000, PrivMode_MouseX11 }, 3586 { 1000, PrivMode_MouseX11 },
4083 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
4084 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
4085 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4086 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4087 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
4088 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
4089 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
4090 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
4125 scr_touch (true); 3628 scr_touch (true);
4126 break; 3629 break;
4127#endif 3630#endif
4128 case 1048: /* alternative cursor save */ 3631 case 1048: /* alternative cursor save */
4129 case 1049: 3632 case 1049:
4130 if (OPTION (Opt_secondaryScreen)) 3633 if (option (Opt_secondaryScreen))
4131 if (mode == 0) 3634 if (mode == 0)
4132 scr_cursor (RESTORE); 3635 scr_cursor (RESTORE);
4133 else if (mode == 1) 3636 else if (mode == 1)
4134 scr_cursor (SAVE); 3637 scr_cursor (SAVE);
4135 break; 3638 break;
4164 scr_autowrap (state); 3667 scr_autowrap (state);
4165 break; 3668 break;
4166 /* 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 */
4167 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
4168 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
4169 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4170 break; 3673 break;
4171#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
4172 case scrollBar_esc: 3675 case scrollBar_esc:
4173 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
4174 { 3677 {
4187 break; 3690 break;
4188 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
4189 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
4190 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
4191 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4192 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4193 break; 3696 break;
4194#if 0
4195 case 1001: 3697 case 1002:
4196 break; /* X11 mouse highlighting */ 3698 case 1003:
4197#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;
4198 case 1010: /* scroll to bottom on TTY output inhibit */ 3709 case 1010: /* scroll to bottom on TTY output inhibit */
4199 set_option (Opt_scrollTtyOutput, !state); 3710 set_option (Opt_scrollTtyOutput, !state);
4200 break; 3711 break;
4201 case 1011: /* scroll to bottom on key press */ 3712 case 1011: /* scroll to bottom on key press */
4202 set_option (Opt_scrollTtyKeypress, state); 3713 set_option (Opt_scrollTtyKeypress, state);
4203 break; 3714 break;
4204 case 1047: /* secondary screen w/ clearing last */ 3715 case 1047: /* secondary screen w/ clearing last */
4205 if (OPTION (Opt_secondaryScreen)) 3716 if (option (Opt_secondaryScreen))
4206 if (current_screen != PRIMARY) 3717 if (current_screen != PRIMARY)
4207 scr_erase_screen (2); 3718 scr_erase_screen (2);
4208 scr_change_screen (state); 3719 scr_change_screen (state);
4209 break; 3720 break;
4210 case 1049: /* secondary screen w/ clearing first */ 3721 case 1049: /* secondary screen w/ clearing first */
4211 scr_change_screen (state); 3722 scr_change_screen (state);
4212 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4213 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4214 scr_erase_screen (2); 3725 scr_erase_screen (2);
4215 break; 3726 break;
4216 default: 3727 default:
4217 break; 3728 break;
4379rxvt_term::process_graphics () 3890rxvt_term::process_graphics ()
4380{ 3891{
4381 unicode_t ch, cmd = cmd_getc (); 3892 unicode_t ch, cmd = cmd_getc ();
4382 3893
4383 if (cmd == 'Q') 3894 if (cmd == 'Q')
3895 {
4384 { /* query graphics */ 3896 /* query graphics */
4385 tt_printf ("\033G0\012"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
4386 return; 3898 return;
4387 } 3899 }
4388 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
4389 do 3901 do
4439 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4440 3952
4441 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
4442 v_buflen += len; 3954 v_buflen += len;
4443 3955
4444 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
4445} 3957}
4446 3958
4447void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4448{ 3960{
4449 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));
4454 3966
4455 if (v_buflen == 0) 3967 if (v_buflen == 0)
4456 { 3968 {
4457 free (v_buffer); 3969 free (v_buffer);
4458 v_buffer = 0; 3970 v_buffer = 0;
4459 v_buflen = 0;
4460 3971
4461 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4462 return; 3973 return;
4463 } 3974 }
4464 3975
4465 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4466 } 3977 }
4467 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4468 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4469} 3980}
4470 3981
4471/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4472 3983

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines