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.319 by ayin, Fri Feb 16 21:46:05 2007 UTC vs.
Revision 1.382 by root, Fri Dec 14 06:04:56 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)
… …
1086 } 1041 }
1087 1042
1088 display->flush (); 1043 display->flush ();
1089} 1044}
1090 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1091void 1047void
1092rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1049{
1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1052
1053 display->flush ();
1054}
1055
1056void
1057rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1058{
1094 make_current (); 1059 make_current ();
1095 1060
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1061 refresh_count = 0;
1109 flush (); 1062 flush ();
1110} 1063}
1111 1064
1112#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1113void 1066void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1068{
1116 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1070 want_refresh = 1;
1118 1071 refresh_check ();
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); 1083 refresh_check ();
1132 } 1084 }
1085 else
1086 w.stop ();
1133} 1087}
1134#endif 1088#endif
1135 1089
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1091void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1093{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1142 { 1096 {
1143 want_refresh = 1; 1097 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1145 } 1099 }
1100 else
1101 w.stop ();
1146} 1102}
1147#endif 1103#endif
1148 1104
1149#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1150void 1106void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1108{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1110 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1112 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1158 } 1114 }
1115 else
1116 w.stop ();
1159} 1117}
1160#endif 1118#endif
1161 1119
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1121void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1123{
1166 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1125 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1126 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1175 } 1134 }
1176} 1135}
1177#endif 1136#endif
1178 1137
1179#if LINUX_YIELD_HACK 1138#if LINUX_YIELD_HACK
1180static struct event_handler 1139static struct event_handler
1181{ 1140{
1182 check_watcher yield_ev; 1141 ev::prepare yield_ev;
1183 1142
1184 void yield_cb (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1185 { 1144 {
1186 // this should really be sched_yield(), but the linux guys thought 1145 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1146 // 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 1147 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1148 // allowed by the sus... as is returning ENOSYS.
… …
1232 } 1191 }
1233 else 1192 else
1234 { 1193 {
1235 pty_ev.stop (); 1194 pty_ev.stop ();
1236 1195
1237 if (!OPTION (Opt_hold)) 1196 if (!option (Opt_hold))
1238 destroy (); 1197 destroy ();
1239 } 1198 }
1240 1199
1241 return false; 1200 return false;
1242} 1201}
1243 1202
1244void 1203void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1205{
1247 make_current (); 1206 make_current ();
1248 1207
1249 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1210 while (pty_fill ())
1252 if (cmd_parse ()) 1211 if (cmd_parse ())
1253 break; 1212 break;
1254 1213
1255 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1256 pty_write (); 1215 pty_write ();
1257} 1216}
1258 1217
1259void 1218void
1260rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
… …
1263 recolour_cursor (); 1222 recolour_cursor ();
1264 1223
1265#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1225 hidden_pointer = 0;
1267 1226
1268 if (OPTION (Opt_pointerBlank)) 1227 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1228 pointer_ev.start (pointerBlankDelay);
1270#endif 1229#endif
1271} 1230}
1272 1231
1273#ifdef POINTER_BLANK 1232#ifdef POINTER_BLANK
1274void 1233void
1275rxvt_term::pointer_blank () 1234rxvt_term::pointer_blank ()
1276{ 1235{
1277 if (!OPTION (Opt_pointerBlank)) 1236 if (!option (Opt_pointerBlank))
1278 return; 1237 return;
1279 1238
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1239 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1240 XFlush (dpy);
1282 1241
1283 hidden_pointer = 1; 1242 hidden_pointer = 1;
1284} 1243}
1285 1244
1286void 1245void
1287rxvt_term::pointer_cb (time_watcher &w) 1246rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1247{
1289 make_current (); 1248 make_current ();
1290 1249
1291 pointer_blank (); 1250 pointer_blank ();
1292} 1251}
… …
1295void 1254void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1255rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1256{
1298 int button_number, key_state = 0; 1257 int button_number, key_state = 0;
1299 int x, y; 1258 int x, y;
1259 int code = 32;
1300 1260
1301 x = ev.x; 1261 x = Pixel2Col (ev.x);
1302 y = ev.y; 1262 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1263 if (ev.type == MotionNotify)
1264 {
1265 if (x == mouse_row && y == mouse_col)
1266 return;
1267 mouse_row = x;
1268 mouse_col = y;
1269 code += 32;
1270 }
1304 1271
1305 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
1306 button_number = 3; 1273 button_number = 3;
1307 else 1274 else
1308 { 1275 {
… …
1354 x + 1, 1321 x + 1,
1355 y + 1); 1322 y + 1);
1356#endif 1323#endif
1357 1324
1358 tt_printf ("\033[M%c%c%c", 1325 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1326 (code + button_number + key_state),
1360 (32 + x + 1), 1327 (32 + x + 1),
1361 (32 + y + 1)); 1328 (32 + y + 1));
1362} 1329}
1363 1330
1364/*{{{ process an X event */ 1331/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1394 focus_out ();
1428 } 1395 }
1429#endif 1396#endif
1430 } 1397 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1398 break;
1436 1399
1437 /* 1400 /*
1438 * XXX: this is not the _current_ arrangement 1401 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1402 * Here's my conclusion:
… …
1458 break; 1421 break;
1459 } 1422 }
1460 break; 1423 break;
1461 1424
1462 case FocusIn: 1425 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1429 focus_in ();
1465 break; 1430 break;
1466 1431
1467 case FocusOut: 1432 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1469 focus_out (); 1436 focus_out ();
1470 break; 1437 break;
1471 1438
1472 case ConfigureNotify: 1439 case ConfigureNotify:
1440 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height); */
1473 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1474 { 1444 {
1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1476 ; 1446 ;
1477 1447
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 { 1449 {
1480 seen_resize = 1; 1450 seen_resize = 1;
1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1482 } 1452 }
1483 1453 else
1454 {
1455#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ())
1457 update_background ();
1458#endif
1459 }
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1460 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT
1487 if (OPTION (Opt_transparent))
1488 check_our_parents ();
1489#endif
1490 } 1461 }
1491 break; 1462 break;
1492 1463
1493 case PropertyNotify: 1464 case PropertyNotify:
1494 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1465 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1512 break; 1483 break;
1513 1484
1514 case MapNotify: 1485 case MapNotify:
1515 mapped = 1; 1486 mapped = 1;
1516#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1517 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1488 text_blink_ev.start ();
1518#endif 1489#endif
1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break; 1491 break;
1521 1492
1522 case UnmapNotify: 1493 case UnmapNotify:
… …
1524#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1525 text_blink_ev.stop (); 1496 text_blink_ev.stop ();
1526#endif 1497#endif
1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 break; 1499 break;
1529
1530#ifdef TRANSPARENT
1531 case ReparentNotify:
1532 rootwin_cb (ev);
1533 break;
1534#endif /* TRANSPARENT */
1535 1500
1536 case GraphicsExpose: 1501 case GraphicsExpose:
1537 case Expose: 1502 case Expose:
1538 if (ev.xany.window == vt) 1503 if (ev.xany.window == vt)
1539 { 1504 {
1540 do 1505 do
1506 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1507 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1508 ev.xexpose.width, ev.xexpose.height, False);
1509 }
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1510 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1544 1511
1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1512 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1546 1513
1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1514 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1515 {
1548 scr_expose (ev.xexpose.x, ev.xexpose.y, 1516 scr_expose (ev.xexpose.x, ev.xexpose.y,
1549 ev.xexpose.width, ev.xexpose.height, False); 1517 ev.xexpose.width, ev.xexpose.height, False);
1518 }
1550 1519
1551 want_refresh = 1; 1520 want_refresh = 1;
1552 } 1521 }
1553 else 1522 else
1554 { 1523 {
… …
1562 if (isScrollbarWindow (ev.xany.window)) 1531 if (isScrollbarWindow (ev.xany.window))
1563 { 1532 {
1564 scrollBar.setIdle (); 1533 scrollBar.setIdle ();
1565 scrollbar_show (0); 1534 scrollbar_show (0);
1566 } 1535 }
1567
1568#ifdef TRANSPARENT
1569 if (am_transparent && ev.xany.window == parent[0])
1570 XClearWindow (dpy, ev.xany.window);
1571#endif
1572 } 1536 }
1573 break; 1537 break;
1574 1538
1575 case MotionNotify: 1539 case MotionNotify:
1576#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
1577 if (hidden_pointer) 1541 if (hidden_pointer)
1578 pointer_unblank (); 1542 pointer_unblank ();
1579#endif 1543#endif
1544 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1545 || priv_modes & PrivMode_MouseAnyEvent)
1546 mouse_report (ev.xbutton);
1580 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1581 break; 1548 break;
1582 1549
1583 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1584 { 1551 {
… …
1618 int dist; 1585 int dist;
1619 1586
1620 /* don't clobber the current delay if we are 1587 /* don't clobber the current delay if we are
1621 * already in the middle of scrolling. 1588 * already in the middle of scrolling.
1622 */ 1589 */
1623 if (!sel_scroll_ev.active) 1590 if (!sel_scroll_ev.is_active ())
1624 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1591 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1625 1592
1626 /* save the event params so we can highlight 1593 /* save the event params so we can highlight
1627 * the selection in the pending-scroll loop 1594 * the selection in the pending-scroll loop
1628 */ 1595 */
1629 selection_save_x = ev.xbutton.x; 1596 selection_save_x = ev.xbutton.x;
… …
1651 else 1618 else
1652 { 1619 {
1653 /* we are within the text window, so we 1620 /* we are within the text window, so we
1654 * shouldn't be scrolling 1621 * shouldn't be scrolling
1655 */ 1622 */
1656 if (sel_scroll_ev.active)
1657 sel_scroll_ev.stop(); 1623 sel_scroll_ev.stop();
1658 } 1624 }
1659#endif 1625#endif
1660#ifdef MOUSE_THRESHOLD 1626#ifdef MOUSE_THRESHOLD
1661 } 1627 }
1662#endif 1628#endif
… …
1674 &ev.xbutton.x, &ev.xbutton.y, 1640 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1641 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1677 scrollbar_size ()); 1643 scrollbar_size ());
1678 want_refresh = 1; 1644 want_refresh = 1;
1679 refresh_limit = 0;
1680 scrollbar_show (1); 1645 scrollbar_show (1);
1681 } 1646 }
1682 break; 1647 break;
1683 } 1648 }
1684 1649
1685#if defined(CURSOR_BLINK) 1650#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1651 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1687 { 1652 {
1688 if (hidden_cursor) 1653 if (hidden_cursor)
1689 { 1654 {
1690 hidden_cursor = 0; 1655 hidden_cursor = 0;
1691 want_refresh = 1; 1656 want_refresh = 1;
1692 } 1657 }
1693 1658
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1659 cursor_blink_ev.again ();
1695 } 1660 }
1696#endif 1661#endif
1697 1662
1698#if defined(POINTER_BLANK) 1663#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1664 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 { 1665 {
1701 if (ev.type == MotionNotify 1666 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress 1667 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease) 1668 || ev.type == ButtonRelease)
1704 if (hidden_pointer) 1669 if (hidden_pointer)
… …
1706 1671
1707 if (ev.type == KeyPress && hidden_pointer == 0) 1672 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank (); 1673 pointer_blank ();
1709 } 1674 }
1710#endif 1675#endif
1676
1677 refresh_check ();
1711} 1678}
1712 1679
1713void 1680void
1714rxvt_term::focus_in () 1681rxvt_term::focus_in ()
1715{ 1682{
… …
1726 IMSetPosition (); 1693 IMSetPosition ();
1727 XSetICFocus (Input_Context); 1694 XSetICFocus (Input_Context);
1728 } 1695 }
1729#endif 1696#endif
1730#if CURSOR_BLINK 1697#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink)) 1698 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1699 cursor_blink_ev.again ();
1733#endif 1700#endif
1734#if OFF_FOCUS_FADING 1701#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1702 if (rs[Rs_fade])
1736 { 1703 {
1737 pix_colors = pix_colors_focused; 1704 pix_colors = pix_colors_focused;
1738 scr_recolour (); 1705 scr_recolour ();
1739 } 1706 }
1740#endif 1707#endif
1708#if ENABLE_FRILLS
1709 if (option (Opt_urgentOnBell))
1710 {
1711 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1712 {
1713 h->flags &= ~XUrgencyHint;
1714 XSetWMHints (dpy, parent[0], h);
1715 }
1716 }
1717#endif
1741 } 1718 }
1742} 1719}
1743 1720
1744void 1721void
1745rxvt_term::focus_out () 1722rxvt_term::focus_out ()
… …
1753 1730
1754#if ENABLE_FRILLS || ISO_14755 1731#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf) 1732 if (iso14755buf)
1756 { 1733 {
1757 iso14755buf = 0; 1734 iso14755buf = 0;
1758# if ENABLE_OVERLAY 1735# if ISO_14755
1759 scr_overlay_off (); 1736 scr_overlay_off ();
1760# endif 1737# endif
1761 } 1738 }
1762#endif 1739#endif
1763#if USE_XIM 1740#if USE_XIM
1764 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context); 1742 XUnsetICFocus (Input_Context);
1766#endif 1743#endif
1767#if CURSOR_BLINK 1744#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1745 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1746 cursor_blink_ev.stop ();
1747
1770 hidden_cursor = 0; 1748 hidden_cursor = 0;
1771#endif 1749#endif
1772#if OFF_FOCUS_FADING 1750#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1751 if (rs[Rs_fade])
1774 { 1752 {
… …
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1768 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 } 1769 }
1792#endif 1770#endif
1793} 1771}
1794 1772
1795#if TRANSPARENT || ENABLE_PERL 1773#if ENABLE_TRANSPARENCY || ENABLE_PERL
1796void 1774void
1797rxvt_term::rootwin_cb (XEvent &ev) 1775rxvt_term::rootwin_cb (XEvent &ev)
1798{ 1776{
1799 make_current (); 1777 make_current ();
1800 1778
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1779 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1780 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return; 1781 return;
1804 1782
1805# if TRANSPARENT 1783# if ENABLE_TRANSPARENCY
1806 switch (ev.type) 1784 switch (ev.type)
1807 { 1785 {
1808 case PropertyNotify: 1786 case PropertyNotify:
1809 /* 1787 /*
1810 * if user used some Esetroot compatible prog to set the root bg, 1788 * if user used some Esetroot compatible prog to set the root bg,
1811 * use the property to determine the pixmap. We use it later on. 1789 * use the property to determine the pixmap. We use it later on.
1812 */ 1790 */
1813 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1791 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1792 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 return; 1793 {
1816 1794 bgPixmap.set_root_pixmap ();
1817 /* FALLTHROUGH */ 1795 update_background ();
1818 case ReparentNotify: 1796 }
1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1820 want_refresh = want_full_refresh = 1;
1821 break; 1797 break;
1822 } 1798 }
1823# endif 1799# endif
1800
1801 refresh_check ();
1824} 1802}
1825#endif 1803#endif
1826 1804
1827void 1805void
1828rxvt_term::button_press (XButtonEvent &ev) 1806rxvt_term::button_press (XButtonEvent &ev)
… …
1883 mouse_report (ev); 1861 mouse_report (ev);
1884 } 1862 }
1885#else 1863#else
1886 MEvent.button = ev.button; 1864 MEvent.button = ev.button;
1887 mouse_report (ev); 1865 mouse_report (ev);
1888#endif /* MOUSE_REPORT_DOUBLECLICK */ 1866#endif /* MOUSE_REPORT_DOUBLECLICK */
1889 1867
1890 } 1868 }
1891 else 1869 else
1892 { 1870 {
1893 if (ev.button != MEvent.button) 1871 if (ev.button != MEvent.button)
… …
1987 tt_printf ("\033[5~"); 1965 tt_printf ("\033[5~");
1988 break; 1966 break;
1989 } 1967 }
1990 } 1968 }
1991 else 1969 else
1992#endif /* NO_SCROLLBAR_REPORT */ 1970#endif /* NO_SCROLLBAR_REPORT */
1993 1971
1994 { 1972 {
1995 char upordown = 0; 1973 char upordown = 0;
1996 1974
1997 if (scrollBar.style == R_SB_NEXT) 1975 if (scrollBar.style == R_SB_NEXT)
1998 { 1976 {
1999 if (scrollbarnext_upButton (ev.y)) 1977 if (scrollbarnext_upButton (ev.y))
2000 upordown = -1; /* up */ 1978 upordown = -1; /* up */
… …
2006 if (scrollbarrxvt_upButton (ev.y)) 1984 if (scrollbarrxvt_upButton (ev.y))
2007 upordown = -1; /* up */ 1985 upordown = -1; /* up */
2008 else if (scrollbarrxvt_dnButton (ev.y)) 1986 else if (scrollbarrxvt_dnButton (ev.y))
2009 upordown = 1; /* down */ 1987 upordown = 1; /* down */
2010 } 1988 }
1989
2011 if (upordown) 1990 if (upordown)
2012 { 1991 {
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1993 if (!cont_scroll_ev.is_active ())
2014 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1994 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2015#endif 1995#endif
2016 if (scr_page (upordown < 0 ? UP : DN, 1)) 1996 if (scr_page (upordown < 0 ? UP : DN, 1))
2017 { 1997 {
2018 if (upordown < 0) 1998 if (upordown < 0)
2019 scrollBar.setUp (); 1999 scrollBar.setUp ();
… …
2099 scrollBar.setIdle (); 2079 scrollBar.setIdle ();
2100 scrollbar_show (0); 2080 scrollbar_show (0);
2101 } 2081 }
2102 2082
2103#ifdef SELECTION_SCROLLING 2083#ifdef SELECTION_SCROLLING
2104 if (sel_scroll_ev.active)
2105 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
2106#endif 2085#endif
2107 2086
2108 if (ev.window == vt) 2087 if (ev.window == vt)
2109 { 2088 {
2110 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2134 mouse_report (ev); 2113 mouse_report (ev);
2135 } 2114 }
2136#else /* MOUSE_REPORT_DOUBLECLICK */ 2115#else /* MOUSE_REPORT_DOUBLECLICK */
2137 MEvent.button = AnyButton; 2116 MEvent.button = AnyButton;
2138 mouse_report (ev); 2117 mouse_report (ev);
2139#endif /* MOUSE_REPORT_DOUBLECLICK */ 2118#endif /* MOUSE_REPORT_DOUBLECLICK */
2140 return; 2119 return;
2141 } 2120 }
2142 2121
2143 /* 2122 /*
2144 * dumb hack to compensate for the failure of click-and-drag 2123 * dumb hack to compensate for the failure of click-and-drag
… …
2170 2149
2171 v = ev.button == Button4 ? UP : DN; 2150 v = ev.button == Button4 ? UP : DN;
2172 2151
2173 if (ev.state & ShiftMask) 2152 if (ev.state & ShiftMask)
2174 i = 1; 2153 i = 1;
2175 else if (OPTION (Opt_mouseWheelScrollPage)) 2154 else if (option (Opt_mouseWheelScrollPage))
2176 i = nrow - 1; 2155 i = nrow - 1;
2177 else 2156 else
2178 i = 5; 2157 i = 5;
2179 2158
2180# ifdef MOUSE_SLIP_WHEELING 2159# ifdef MOUSE_SLIP_WHEELING
… …
2182 { 2161 {
2183 mouse_slip_wheel_speed += v ? -1 : 1; 2162 mouse_slip_wheel_speed += v ? -1 : 1;
2184 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2185 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2186 2165
2187 if (slip_wheel_ev.at < NOW) 2166 if (!slip_wheel_ev.is_active ())
2188 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2167 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2189
2190 slip_wheel_ev.start ();
2191 } 2168 }
2192 else 2169 else
2193 { 2170 {
2194# endif 2171# endif
2195 scr_page (v, i); 2172 scr_page (v, i);
… …
2201 break; 2178 break;
2202#endif 2179#endif
2203 } 2180 }
2204 } 2181 }
2205} 2182}
2206
2207#ifdef TRANSPARENT
2208#if TINTING
2209/* taken from aterm-0.4.2 */
2210
2211typedef uint32_t RUINT32T;
2212
2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2214{
2215 int sh_r, sh_g, sh_b;
2216 RUINT32T mask_r, mask_g, mask_b;
2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2220 int i;
2221
2222 Visual *visual = term->visual;
2223
2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2225
2226 /* for convenience */
2227 mask_r = visual->red_mask;
2228 mask_g = visual->green_mask;
2229 mask_b = visual->blue_mask;
2230
2231 /* boring lookup table pre-initialization */
2232 switch (srcImage->bits_per_pixel) {
2233 case 15:
2234 if ((mask_r != 0x7c00) ||
2235 (mask_g != 0x03e0) ||
2236 (mask_b != 0x001f))
2237 return;
2238 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2239 lookup_r = lookup;
2240 lookup_g = lookup+32;
2241 lookup_b = lookup+32+32;
2242 sh_r = 10;
2243 sh_g = 5;
2244 sh_b = 0;
2245 break;
2246 case 16:
2247 if ((mask_r != 0xf800) ||
2248 (mask_g != 0x07e0) ||
2249 (mask_b != 0x001f))
2250 return;
2251 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2252 lookup_r = lookup;
2253 lookup_g = lookup+32;
2254 lookup_b = lookup+32+64;
2255 sh_r = 11;
2256 sh_g = 5;
2257 sh_b = 0;
2258 break;
2259 case 24:
2260 if ((mask_r != 0xff0000) ||
2261 (mask_g != 0x00ff00) ||
2262 (mask_b != 0x0000ff))
2263 return;
2264 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2265 lookup_r = lookup;
2266 lookup_g = lookup+256;
2267 lookup_b = lookup+256+256;
2268 sh_r = 16;
2269 sh_g = 8;
2270 sh_b = 0;
2271 break;
2272 case 32:
2273 if ((mask_r != 0xff0000) ||
2274 (mask_g != 0x00ff00) ||
2275 (mask_b != 0x0000ff))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2278 lookup_r = lookup;
2279 lookup_g = lookup+256;
2280 lookup_b = lookup+256+256;
2281 sh_r = 16;
2282 sh_g = 8;
2283 sh_b = 0;
2284 break;
2285 default:
2286 return; /* we do not support this color depth */
2287 }
2288
2289 /* prepare limits for color transformation (each channel is handled separately) */
2290 if (shade < 0) {
2291 shade = -shade;
2292 if (shade < 0) shade = 0;
2293 if (shade > 100) shade = 100;
2294
2295 lower_lim_r = 65535-rm;
2296 lower_lim_g = 65535-gm;
2297 lower_lim_b = 65535-bm;
2298
2299 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2300 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2301 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2302
2303 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2304 } else {
2305 if (shade < 0) shade = 0;
2306 if (shade > 100) shade = 100;
2307
2308 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2309
2310 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2311 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2312 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2313 }
2314
2315 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2316 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2317 {
2318 unsigned int tmp;
2319
2320 tmp = lower_lim_r;
2321 lower_lim_r = lower_lim_b;
2322 lower_lim_b = tmp;
2323
2324 tmp = upper_lim_r;
2325 upper_lim_r = upper_lim_b;
2326 upper_lim_b = tmp;
2327 }
2328
2329 /* fill our lookup tables */
2330 for (i = 0; i <= mask_r>>sh_r; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2334 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2335 lookup_r[i] = (tmp/65535)<<sh_r;
2336 }
2337 for (i = 0; i <= mask_g>>sh_g; i++)
2338 {
2339 RUINT32T tmp;
2340 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2341 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2342 lookup_g[i] = (tmp/65535)<<sh_g;
2343 }
2344 for (i = 0; i <= mask_b>>sh_b; i++)
2345 {
2346 RUINT32T tmp;
2347 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2348 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2349 lookup_b[i] = (tmp/65535)<<sh_b;
2350 }
2351
2352 /* apply table to input image (replacing colors by newly calculated ones) */
2353 switch (srcImage->bits_per_pixel)
2354 {
2355 case 15:
2356 {
2357 unsigned short *p1, *pf, *p, *pl;
2358 p1 = (unsigned short *) srcImage->data;
2359 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2360 while (p1 < pf)
2361 {
2362 p = p1;
2363 pl = p1 + srcImage->width;
2364 for (; p < pl; p++)
2365 {
2366 *p = lookup_r[(*p & 0x7c00)>>10] |
2367 lookup_g[(*p & 0x03e0)>> 5] |
2368 lookup_b[(*p & 0x001f)];
2369 }
2370 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2371 }
2372 break;
2373 }
2374 case 16:
2375 {
2376 unsigned short *p1, *pf, *p, *pl;
2377 p1 = (unsigned short *) srcImage->data;
2378 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2379 while (p1 < pf)
2380 {
2381 p = p1;
2382 pl = p1 + srcImage->width;
2383 for (; p < pl; p++)
2384 {
2385 *p = lookup_r[(*p & 0xf800)>>11] |
2386 lookup_g[(*p & 0x07e0)>> 5] |
2387 lookup_b[(*p & 0x001f)];
2388 }
2389 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2390 }
2391 break;
2392 }
2393 case 24:
2394 {
2395 unsigned char *p1, *pf, *p, *pl;
2396 p1 = (unsigned char *) srcImage->data;
2397 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width * 3;
2402 for (; p < pl; p += 3)
2403 {
2404 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2405 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2406 p[2] = lookup_r[(p[2] & 0x0000ff)];
2407 }
2408 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 case 32:
2413 {
2414 RUINT32T *p1, *pf, *p, *pl;
2415 p1 = (RUINT32T *) srcImage->data;
2416 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2417
2418 while (p1 < pf)
2419 {
2420 p = p1;
2421 pl = p1 + srcImage->width;
2422 for (; p < pl; p++)
2423 {
2424 *p = lookup_r[(*p & 0xff0000)>>16] |
2425 lookup_g[(*p & 0x00ff00)>> 8] |
2426 lookup_b[(*p & 0x0000ff)] |
2427 (*p & ~0xffffff);
2428 }
2429 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2430 }
2431 break;
2432 }
2433 }
2434
2435 free (lookup);
2436}
2437#endif
2438
2439/*
2440 * Check our parents are still who we think they are.
2441 * Do transparency updates if required
2442 */
2443int
2444rxvt_term::check_our_parents ()
2445{
2446 int i, pchanged, aformat, have_pixmap, rootdepth;
2447 unsigned long nitems, bytes_after;
2448 Atom atype;
2449 unsigned char *prop = NULL;
2450 Window root, oldp, *list;
2451 Pixmap rootpixmap = None;
2452 XWindowAttributes wattr, wrootattr;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (dpy, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !ISSET_PIXCOLOR (Color_tint)
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (dpy, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (dpy, False);
2544 allowedxerror = -1;
2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (dpy, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (dpy, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2574
2575 rgba c;
2576 pix_colors_focused [Color_tint].get (c);
2577
2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2585 nx, ny, image->width, image->height);
2586 XFreeGC (dpy, gc);
2587 XDestroyImage (image);
2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2589 XClearWindow (dpy, parent[0]);
2590
2591 if (!am_transparent || !am_pixmap_trans)
2592 pchanged = 1;
2593
2594 am_transparent = am_pixmap_trans = 1;
2595 }
2596 }
2597
2598 if (am_pixmap_trans)
2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2600 else
2601 {
2602 unsigned int n;
2603 /*
2604 * InheritPixmap transparency
2605 */
2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2607 {
2608 oldp = parent[i];
2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2610 XFree (list);
2611
2612 if (parent[i] == display->root)
2613 {
2614 if (oldp != None)
2615 pchanged = 1;
2616
2617 break;
2618 }
2619
2620 if (oldp != parent[i])
2621 pchanged = 1;
2622 }
2623
2624 n = 0;
2625
2626 if (pchanged)
2627 for (; n < (unsigned int)i; n++)
2628 {
2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2630
2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632 {
2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634 break;
2635 }
2636 }
2637
2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2639 {
2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2642 am_transparent = 0;
2643 /* XXX: also turn off Opt_transparent? */
2644 }
2645 else
2646 {
2647 for (n = 0; n < (unsigned int)i; n++)
2648 {
2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2650 XClearWindow (dpy, parent[n]);
2651 }
2652
2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2654 am_transparent = 1;
2655 }
2656
2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2658 parent[i] = None;
2659 }
2660
2661 if (scrollBar.win)
2662 {
2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2664 scrollBar.setIdle ();
2665 scrollbar_show (0);
2666 }
2667
2668 if (am_transparent)
2669 {
2670 want_refresh = want_full_refresh = 1;
2671 if (am_pixmap_trans)
2672 flush ();
2673 }
2674
2675 return pchanged;
2676}
2677#endif
2678 2183
2679/*}}} */ 2184/*}}} */
2680 2185
2681bool 2186bool
2682rxvt_term::cmd_parse () 2187rxvt_term::cmd_parse ()
… …
2731 if (ch == C0_LF) 2236 if (ch == C0_LF)
2732 nlines++; 2237 nlines++;
2733 2238
2734 refresh_count++; 2239 refresh_count++;
2735 2240
2736 if (!OPTION (Opt_jumpScroll) 2241 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2737 || (refresh_count >= refresh_limit * (nrow - 1)))
2738 { 2242 {
2739 refreshnow = true;
2740 refresh_count = 0; 2243 refresh_count = 0;
2244
2245 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2246 {
2247 refreshnow = true;
2741 ch = NOCHAR; 2248 ch = NOCHAR;
2742 break; 2249 break;
2250 }
2743 } 2251 }
2744 2252
2745 // scr_add_lines only works for nlines <= nrow - 1. 2253 // scr_add_lines only works for nlines <= nrow - 1.
2746 if (nlines >= nrow - 1) 2254 if (nlines >= nrow - 1)
2747 { 2255 {
… …
2775 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2283 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2776 scr_add_lines (buf, str - buf, nlines); 2284 scr_add_lines (buf, str - buf, nlines);
2777 2285
2778 /* 2286 /*
2779 * If there have been a lot of new lines, then update the screen 2287 * If there have been a lot of new lines, then update the screen
2780 * What the heck I'll cheat and only refresh less than every page-full. 2288 * What the heck we'll cheat and only refresh less than every page-full.
2781 * the number of pages between refreshes is refresh_limit, which 2289 * if skipScroll is enabled.
2782 * is incremented here because we must be doing flat-out scrolling.
2783 */ 2290 */
2784 if (refreshnow) 2291 if (refreshnow)
2785 { 2292 {
2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2787 refresh_limit++;
2788 else
2789 {
2790 flag = true; 2293 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2792 scr_refresh (); 2294 scr_refresh ();
2793 want_refresh = 1; 2295 want_refresh = 1;
2794 }
2795 } 2296 }
2796 2297
2797 } 2298 }
2798 else 2299 else
2799 { 2300 {
… …
2809 } 2310 }
2810 2311
2811 ch = NOCHAR; 2312 ch = NOCHAR;
2812 } 2313 }
2813 } 2314 }
2315
2316 refresh_check ();
2814 2317
2815 return flag; 2318 return flag;
2816} 2319}
2817 2320
2818// read the next character 2321// read the next character
… …
2948 { 2451 {
2949 if ((buf[len++] = cmd_getc ()) == 'i') 2452 if ((buf[len++] = cmd_getc ()) == 'i')
2950 break; /* done = 1 */ 2453 break; /* done = 1 */
2951 } 2454 }
2952 } 2455 }
2953 2456
2954 for (i = 0; i < len; i++) 2457 for (i = 0; i < len; i++)
2955 if (putc (buf[i], fd) == EOF) 2458 if (putc (buf[i], fd) == EOF)
2956 { 2459 {
2957 done = 1; 2460 done = 1;
2958 break; 2461 break;
… …
2960 } 2463 }
2961 } 2464 }
2962 2465
2963 pclose_printer (fd); 2466 pclose_printer (fd);
2964} 2467}
2965#endif /* PRINTPIPE */ 2468#endif /* PRINTPIPE */
2966/*}}} */ 2469/*}}} */
2967 2470
2968/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
2969enum { 2472enum {
2970 C1_40 = 0x40, 2473 C1_40 = 0x40,
… …
3020 process_dcs_seq (); 2523 process_dcs_seq ();
3021 break; 2524 break;
3022 case 0x9b: /* CSI */ 2525 case 0x9b: /* CSI */
3023 process_csi_seq (); 2526 process_csi_seq ();
3024 break; 2527 break;
3025 case 0x9d: /* CSI */ 2528 case 0x9d: /* OSC */
3026 process_osc_seq (); 2529 process_osc_seq ();
3027 break; 2530 break;
3028#endif 2531#endif
3029 } 2532 }
3030} 2533}
… …
3256rxvt_term::process_csi_seq () 2759rxvt_term::process_csi_seq ()
3257{ 2760{
3258 unicode_t ch, priv, i; 2761 unicode_t ch, priv, i;
3259 unsigned int nargs, p; 2762 unsigned int nargs, p;
3260 int n, ndef; 2763 int n, ndef;
3261 int arg[ESC_ARGS]; 2764 int arg[ESC_ARGS] = { };
3262 2765
3263 for (nargs = ESC_ARGS; nargs > 0;) 2766 nargs = 0;
3264 arg[--nargs] = 0;
3265 2767
3266 priv = 0; 2768 priv = 0;
3267 ch = cmd_getc (); 2769 ch = cmd_getc ();
3268 if (ch >= '<' && ch <= '?') 2770 if (ch >= '<' && ch <= '?')
2771 {
3269 { /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' */
3270 priv = ch; 2773 priv = ch;
3271 ch = cmd_getc (); 2774 ch = cmd_getc ();
3272 } 2775 }
3273 2776
3274 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
3313 switch (priv) 2816 switch (priv)
3314 { 2817 {
3315 case '>': 2818 case '>':
3316 if (ch == CSI_DA) /* secondary device attributes */ 2819 if (ch == CSI_DA) /* secondary device attributes */
3317 { 2820 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2821 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2822 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 // 2823 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2824 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2825 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3323 // that we do not support xterm mouse reporting (should be 95 when we do). 2826 // versions.
3324 // 2827 //
3325 tt_printf ("\033[>%d;94;0c", 'U'); 2828 tt_printf ("\033[>%d;95;0c", 'U');
3326 } 2829 }
3327 break; 2830 break;
3328 case '?': 2831 case '?':
3329 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3330 process_terminal_mode (ch, priv, nargs, arg); 2833 process_terminal_mode (ch, priv, nargs, arg);
… …
3457 break; 2960 break;
3458 case 6: /* CPR requested */ 2961 case 6: /* CPR requested */
3459 scr_report_position (); 2962 scr_report_position ();
3460 break; 2963 break;
3461 case 7: /* unofficial extension */ 2964 case 7: /* unofficial extension */
3462 if (OPTION (Opt_insecure)) 2965 if (option (Opt_insecure))
3463 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2966 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3464 break; 2967 break;
3465 case 8: /* unofficial extension */ 2968 case 8: /* unofficial extension */
3466 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2969 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3467 break; 2970 break;
… …
3631 break; 3134 break;
3632 case 20: /* report icon label */ 3135 case 20: /* report icon label */
3633 { 3136 {
3634 char *s; 3137 char *s;
3635 XGetIconName (dpy, parent[0], &s); 3138 XGetIconName (dpy, parent[0], &s);
3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3139 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s); 3140 XFree (s);
3638 } 3141 }
3639 break; 3142 break;
3640 case 21: /* report window title */ 3143 case 21: /* report window title */
3641 { 3144 {
3642 char *s; 3145 char *s;
3643 XFetchName (dpy, parent[0], &s); 3146 XFetchName (dpy, parent[0], &s);
3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3147 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3148 XFree (s);
3646 } 3149 }
3647 break; 3150 break;
3648 } 3151 }
3649} 3152}
… …
3776 int saveop = op; 3279 int saveop = op;
3777 3280
3778 dLocal (Display *, dpy); 3281 dLocal (Display *, dpy);
3779 3282
3780 assert (str != NULL); 3283 assert (str != NULL);
3781 3284
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3285 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return; 3286 return;
3784 3287
3785 switch (op) 3288 switch (op)
3786 { 3289 {
… …
3881 break; 3384 break;
3882 case URxvt_Color_IT: 3385 case URxvt_Color_IT:
3883 process_color_seq (op, Color_IT, str, resp); 3386 process_color_seq (op, Color_IT, str, resp);
3884 break; 3387 break;
3885#endif 3388#endif
3886#if TRANSPARENT && TINTING 3389#if ENABLE_TRANSPARENCY
3887 case URxvt_Color_tint: 3390 case URxvt_Color_tint:
3888 process_color_seq (op, Color_tint, str, resp); 3391 process_color_seq (op, Color_tint, str, resp);
3392 {
3393 bool changed = false;
3394 if (ISSET_PIXCOLOR (Color_tint))
3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3396 else
3397 changed = bgPixmap.unset_tint ();
3398 if (changed)
3399 update_background ();
3400 }
3889 3401
3890 check_our_parents ();
3891
3892 if (am_transparent)
3893 want_full_refresh = want_refresh = 1;
3894
3895 break; 3402 break;
3896#endif 3403#endif
3897 3404
3405#if BG_IMAGE_FROM_FILE
3898 case Rxvt_Pixmap: 3406 case Rxvt_Pixmap:
3899 { 3407 if (!strcmp (str, "?"))
3900 if (*str != ';')
3901 { 3408 {
3902#if XPM_BACKGROUND 3409 char str[256];
3903 scale_pixmap (""); /* reset to default scaling */ 3410
3904 set_bgPixmap (str); /* change pixmap */ 3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3905 scr_touch (true); 3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3906#endif 3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3414 process_xterm_seq (XTerm_title, str, CHAR_ST);
3907 } 3415 }
3908 3416 else
3417 {
3909 int changed = 0; 3418 int changed = 0;
3910 3419
3911 while ((str = strchr (str, ';')) != NULL) 3420 if (*str != ';')
3912 { 3421 {
3422 /* reset to default scaling :*/
3423 bgPixmap.unset_geometry ();
3424 if (bgPixmap.set_file (str)) /* change pixmap */
3425 changed++;
3426 str = strchr (str, ';');
3427 if (str == NULL)
3428 bgPixmap.set_defaultGeometry ();
3429 }
3430 while (str)
3431 {
3913 str++; 3432 str++;
3914#if XPM_BACKGROUND 3433 if (bgPixmap.set_geometry (str))
3915 changed += scale_pixmap (str); 3434 changed++;
3916#endif 3435 str = strchr (str, ';');
3917 } 3436 }
3918
3919 if (changed) 3437 if (changed)
3920 { 3438 update_background ();
3921#ifdef XPM_BACKGROUND
3922 resize_pixmap ();
3923 scr_touch (true);
3924#endif
3925 } 3439 }
3926 }
3927 break; 3440 break;
3441#endif
3928 3442
3929 case Rxvt_restoreFG: 3443 case Rxvt_restoreFG:
3930 set_window_color (Color_fg, str); 3444 set_window_color (Color_fg, str);
3931 break; 3445 break;
3932 case Rxvt_restoreBG: 3446 case Rxvt_restoreBG:
… …
3957 case URxvt_italicFont: 3471 case URxvt_italicFont:
3958 case URxvt_boldItalicFont: 3472 case URxvt_boldItalicFont:
3959#endif 3473#endif
3960 if (query) 3474 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", saveop, 3475 tt_printf ("\33]%d;%-.250s%c", saveop,
3962 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3476 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3963 ? fontset[op - URxvt_font]->fontdesc : "", 3477 ? fontset[op - URxvt_font]->fontdesc : "",
3964 resp); 3478 resp);
3965 else 3479 else
3966 { 3480 {
3967 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3481 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3981 break; 3495 break;
3982 3496
3983#if !ENABLE_MINIMAL 3497#if !ENABLE_MINIMAL
3984 case URxvt_locale: 3498 case URxvt_locale:
3985 if (query) 3499 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3500 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3987 else 3501 else
3988 { 3502 {
3989 set_locale (str); 3503 set_locale (str);
3990 pty->set_utf8_mode (enc_utf8); 3504 pty->set_utf8_mode (enc_utf8);
3991 init_xlocale (); 3505 init_xlocale ();
… …
4054{ 3568{
4055 unsigned int i, j; 3569 unsigned int i, j;
4056 int state; 3570 int state;
4057 3571
4058 static const struct 3572 static const struct
4059 { 3573 {
4060 const int argval; 3574 const int argval;
4061 const unsigned long bit; 3575 const unsigned long bit;
4062 }
4063
4064 argtopriv[] = { 3576 } argtopriv[] = {
4065 { 1, PrivMode_aplCUR }, 3577 { 1, PrivMode_aplCUR },
4066 { 2, PrivMode_vt52 }, 3578 { 2, PrivMode_vt52 },
4067 { 3, PrivMode_132 }, 3579 { 3, PrivMode_132 },
4068 { 4, PrivMode_smoothScroll }, 3580 { 4, PrivMode_smoothScroll },
4069 { 5, PrivMode_rVideo }, 3581 { 5, PrivMode_rVideo },
… …
4085 { 66, PrivMode_aplKP }, 3597 { 66, PrivMode_aplKP },
4086#ifndef NO_BACKSPACE_KEY 3598#ifndef NO_BACKSPACE_KEY
4087 { 67, PrivMode_BackSpace }, 3599 { 67, PrivMode_BackSpace },
4088#endif 3600#endif
4089 { 1000, PrivMode_MouseX11 }, 3601 { 1000, PrivMode_MouseX11 },
4090 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3602 { 1002, PrivMode_MouseBtnEvent },
4091 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3603 { 1003, PrivMode_MouseAnyEvent },
4092 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4093 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4094 { 1011, PrivMode_Keypress }, // rxvt extension 3605 { 1011, PrivMode_Keypress }, // rxvt extension
4095 // 1035 enable modifiers for alt, numlock NYI 3606 // 1035 enable modifiers for alt, numlock NYI
4096 // 1036 send ESC for meta keys NYI 3607 // 1036 send ESC for meta keys NYI
4097 // 1037 send DEL for keypad delete NYI 3608 // 1037 send DEL for keypad delete NYI
… …
4132 scr_touch (true); 3643 scr_touch (true);
4133 break; 3644 break;
4134#endif 3645#endif
4135 case 1048: /* alternative cursor save */ 3646 case 1048: /* alternative cursor save */
4136 case 1049: 3647 case 1049:
4137 if (OPTION (Opt_secondaryScreen)) 3648 if (option (Opt_secondaryScreen))
4138 if (mode == 0) 3649 if (mode == 0)
4139 scr_cursor (RESTORE); 3650 scr_cursor (RESTORE);
4140 else if (mode == 1) 3651 else if (mode == 1)
4141 scr_cursor (SAVE); 3652 scr_cursor (SAVE);
4142 break; 3653 break;
… …
4171 scr_autowrap (state); 3682 scr_autowrap (state);
4172 break; 3683 break;
4173 /* case 8: - auto repeat, can't do on a per window basis */ 3684 /* case 8: - auto repeat, can't do on a per window basis */
4174 case 9: /* X10 mouse reporting */ 3685 case 9: /* X10 mouse reporting */
4175 if (state) /* orthogonal */ 3686 if (state) /* orthogonal */
4176 priv_modes &= ~PrivMode_MouseX11; 3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4177 break; 3688 break;
4178#ifdef scrollBar_esc 3689#ifdef scrollBar_esc
4179 case scrollBar_esc: 3690 case scrollBar_esc:
4180 if (scrollbar_mapping (state)) 3691 if (scrollbar_mapping (state))
4181 { 3692 {
… …
4194 break; 3705 break;
4195 /* case 66: - application key pad */ 3706 /* case 66: - application key pad */
4196 /* case 67: - backspace key */ 3707 /* case 67: - backspace key */
4197 case 1000: /* X11 mouse reporting */ 3708 case 1000: /* X11 mouse reporting */
4198 if (state) /* orthogonal */ 3709 if (state) /* orthogonal */
4199 priv_modes &= ~PrivMode_MouseX10; 3710 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4200 break; 3711 break;
4201#if 0
4202 case 1001: 3712 case 1002:
4203 break; /* X11 mouse highlighting */ 3713 case 1003:
4204#endif 3714 if (state)
3715 {
3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3717 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3718 vt_emask_mouse = PointerMotionMask;
3719 }
3720 else
3721 vt_emask_mouse = NoEventMask;
3722 vt_select_input ();
3723 break;
4205 case 1010: /* scroll to bottom on TTY output inhibit */ 3724 case 1010: /* scroll to bottom on TTY output inhibit */
4206 set_option (Opt_scrollTtyOutput, !state); 3725 set_option (Opt_scrollTtyOutput, !state);
4207 break; 3726 break;
4208 case 1011: /* scroll to bottom on key press */ 3727 case 1011: /* scroll to bottom on key press */
4209 set_option (Opt_scrollTtyKeypress, state); 3728 set_option (Opt_scrollTtyKeypress, state);
4210 break; 3729 break;
4211 case 1047: /* secondary screen w/ clearing last */ 3730 case 1047: /* secondary screen w/ clearing last */
4212 if (OPTION (Opt_secondaryScreen)) 3731 if (option (Opt_secondaryScreen))
4213 if (current_screen != PRIMARY) 3732 if (current_screen != PRIMARY)
4214 scr_erase_screen (2); 3733 scr_erase_screen (2);
4215 scr_change_screen (state); 3734 scr_change_screen (state);
4216 break; 3735 break;
4217 case 1049: /* secondary screen w/ clearing first */ 3736 case 1049: /* secondary screen w/ clearing first */
4218 scr_change_screen (state); 3737 scr_change_screen (state);
4219 if (OPTION (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
4220 if (current_screen != PRIMARY) 3739 if (current_screen != PRIMARY)
4221 scr_erase_screen (2); 3740 scr_erase_screen (2);
4222 break; 3741 break;
4223 default: 3742 default:
4224 break; 3743 break;
… …
4386rxvt_term::process_graphics () 3905rxvt_term::process_graphics ()
4387{ 3906{
4388 unicode_t ch, cmd = cmd_getc (); 3907 unicode_t ch, cmd = cmd_getc ();
4389 3908
4390 if (cmd == 'Q') 3909 if (cmd == 'Q')
3910 {
4391 { /* query graphics */ 3911 /* query graphics */
4392 tt_printf ("\033G0\012"); /* no graphics */ 3912 tt_printf ("\033G0\012"); /* no graphics */
4393 return; 3913 return;
4394 } 3914 }
4395 /* swallow other graphics sequences until terminating ':' */ 3915 /* swallow other graphics sequences until terminating ':' */
4396 do 3916 do
… …
4446 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3966 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4447 3967
4448 memcpy (v_buffer + v_buflen, data, len); 3968 memcpy (v_buffer + v_buflen, data, len);
4449 v_buflen += len; 3969 v_buflen += len;
4450 3970
4451 pty_ev.set (EVENT_READ | EVENT_WRITE); 3971 pty_ev.set (ev::READ | ev::WRITE);
4452} 3972}
4453 3973
4454void rxvt_term::pty_write () 3974void rxvt_term::pty_write ()
4455{ 3975{
4456 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3976 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4461 3981
4462 if (v_buflen == 0) 3982 if (v_buflen == 0)
4463 { 3983 {
4464 free (v_buffer); 3984 free (v_buffer);
4465 v_buffer = 0; 3985 v_buffer = 0;
4466 v_buflen = 0;
4467 3986
4468 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4469 return; 3988 return;
4470 } 3989 }
4471 3990
4472 memmove (v_buffer, v_buffer + written, v_buflen); 3991 memmove (v_buffer, v_buffer + written, v_buflen);
4473 } 3992 }
4474 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3993 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4475 pty_ev.set (EVENT_READ); 3994 pty_ev.set (ev::READ);
4476} 3995}
4477 3996
4478/*----------------------- end-of-file (C source) -----------------------*/ 3997/*----------------------- end-of-file (C source) -----------------------*/
4479 3998

Diff Legend

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