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.321 by root, Tue May 1 21:30:01 2007 UTC vs.
Revision 1.385 by root, Mon Dec 24 06:51:37 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.
… …
95 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
97 97
98 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
199 r & RS_Uline ? " uline" : "", 198 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 199 r & RS_Careful ? " careful" : "");
201 200
202 int width = wcswidth (fname, wcslen (fname)); 201 int width = wcswidth (fname, wcslen (fname));
203 202
204 max_it (width, 8+5); // for char + hey 203 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 204 max_it (width, strlen (attr));
206 205
207 if (y >= 0) 206 if (y >= 0)
208 { 207 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
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) \
… …
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.
… …
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 ();
1216
1217 refresh_check ();
1257} 1218}
1258 1219
1259void 1220void
1260rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1261{ 1222{
… …
1264 1225
1265#ifdef POINTER_BLANK 1226#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1227 hidden_pointer = 0;
1267 1228
1268 if (option (Opt_pointerBlank)) 1229 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1230 pointer_ev.start (pointerBlankDelay);
1270#endif 1231#endif
1271} 1232}
1272 1233
1273#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1274void 1235void
… …
1282 1243
1283 hidden_pointer = 1; 1244 hidden_pointer = 1;
1284} 1245}
1285 1246
1286void 1247void
1287rxvt_term::pointer_cb (time_watcher &w) 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1249{
1289 make_current (); 1250 make_current ();
1290 1251
1291 pointer_blank (); 1252 pointer_blank ();
1292} 1253}
… …
1295void 1256void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1258{
1298 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
1299 int x, y; 1260 int x, y;
1261 int code = 32;
1300 1262
1301 x = ev.x; 1263 x = Pixel2Col (ev.x);
1302 y = ev.y; 1264 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1265 if (ev.type == MotionNotify)
1266 {
1267 if (x == mouse_row && y == mouse_col)
1268 return;
1269 mouse_row = x;
1270 mouse_col = y;
1271 code += 32;
1272 }
1304 1273
1305 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
1306 button_number = 3; 1275 button_number = 3;
1307 else 1276 else
1308 { 1277 {
… …
1354 x + 1, 1323 x + 1,
1355 y + 1); 1324 y + 1);
1356#endif 1325#endif
1357 1326
1358 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1328 (code + button_number + key_state),
1360 (32 + x + 1), 1329 (32 + x + 1),
1361 (32 + y + 1)); 1330 (32 + y + 1));
1362} 1331}
1363 1332
1364/*{{{ process an X event */ 1333/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1395 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1396 focus_out ();
1428 } 1397 }
1429#endif 1398#endif
1430 } 1399 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1400 break;
1436 1401
1437 /* 1402 /*
1438 * XXX: this is not the _current_ arrangement 1403 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1404 * Here's my conclusion:
… …
1472 && ev.xfocus.mode != NotifyGrab) 1437 && ev.xfocus.mode != NotifyGrab)
1473 focus_out (); 1438 focus_out ();
1474 break; 1439 break;
1475 1440
1476 case ConfigureNotify: 1441 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */
1477 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1478 { 1446 {
1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1480 ; 1448 ;
1481 1449
1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1483 { 1451 {
1484 seen_resize = 1; 1452 seen_resize = 1;
1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1486 } 1454 }
1455 else
1456 {
1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ())
1459 update_background ();
1460#endif
1461 }
1487 1462
1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489
1490#ifdef TRANSPARENT
1491 if (option (Opt_transparent))
1492 check_our_parents ();
1493#endif
1494 } 1464 }
1495 break; 1465 break;
1496 1466
1497 case PropertyNotify: 1467 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1468 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1516 break; 1486 break;
1517 1487
1518 case MapNotify: 1488 case MapNotify:
1519 mapped = 1; 1489 mapped = 1;
1520#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1521 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1491 text_blink_ev.start ();
1522#endif 1492#endif
1523 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1524 break; 1494 break;
1525 1495
1526 case UnmapNotify: 1496 case UnmapNotify:
… …
1528#ifdef TEXT_BLINK 1498#ifdef TEXT_BLINK
1529 text_blink_ev.stop (); 1499 text_blink_ev.stop ();
1530#endif 1500#endif
1531 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1501 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 break; 1502 break;
1533
1534#ifdef TRANSPARENT
1535 case ReparentNotify:
1536 rootwin_cb (ev);
1537 break;
1538#endif /* TRANSPARENT */
1539 1503
1540 case GraphicsExpose: 1504 case GraphicsExpose:
1541 case Expose: 1505 case Expose:
1542 if (ev.xany.window == vt) 1506 if (ev.xany.window == vt)
1543 { 1507 {
1544 do 1508 do
1509 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1510 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1511 ev.xexpose.width, ev.xexpose.height, False);
1512 }
1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1513 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1548 1514
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1516
1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1518 {
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1521 }
1554 1522
1555 want_refresh = 1; 1523 want_refresh = 1;
1556 } 1524 }
1557 else 1525 else
1558 { 1526 {
… …
1566 if (isScrollbarWindow (ev.xany.window)) 1534 if (isScrollbarWindow (ev.xany.window))
1567 { 1535 {
1568 scrollBar.setIdle (); 1536 scrollBar.setIdle ();
1569 scrollbar_show (0); 1537 scrollbar_show (0);
1570 } 1538 }
1571
1572#ifdef TRANSPARENT
1573 if (am_transparent && ev.xany.window == parent[0])
1574 XClearWindow (dpy, ev.xany.window);
1575#endif
1576 } 1539 }
1577 break; 1540 break;
1578 1541
1579 case MotionNotify: 1542 case MotionNotify:
1580#ifdef POINTER_BLANK 1543#ifdef POINTER_BLANK
1581 if (hidden_pointer) 1544 if (hidden_pointer)
1582 pointer_unblank (); 1545 pointer_unblank ();
1583#endif 1546#endif
1547 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1548 || priv_modes & PrivMode_MouseAnyEvent)
1549 mouse_report (ev.xbutton);
1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1585 break; 1551 break;
1586 1552
1587 if (ev.xany.window == vt) 1553 if (ev.xany.window == vt)
1588 { 1554 {
… …
1622 int dist; 1588 int dist;
1623 1589
1624 /* don't clobber the current delay if we are 1590 /* don't clobber the current delay if we are
1625 * already in the middle of scrolling. 1591 * already in the middle of scrolling.
1626 */ 1592 */
1627 if (!sel_scroll_ev.active) 1593 if (!sel_scroll_ev.is_active ())
1628 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1594 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1629 1595
1630 /* save the event params so we can highlight 1596 /* save the event params so we can highlight
1631 * the selection in the pending-scroll loop 1597 * the selection in the pending-scroll loop
1632 */ 1598 */
1633 selection_save_x = ev.xbutton.x; 1599 selection_save_x = ev.xbutton.x;
… …
1655 else 1621 else
1656 { 1622 {
1657 /* we are within the text window, so we 1623 /* we are within the text window, so we
1658 * shouldn't be scrolling 1624 * shouldn't be scrolling
1659 */ 1625 */
1660 if (sel_scroll_ev.active)
1661 sel_scroll_ev.stop(); 1626 sel_scroll_ev.stop();
1662 } 1627 }
1663#endif 1628#endif
1664#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1665 } 1630 }
1666#endif 1631#endif
… …
1678 &ev.xbutton.x, &ev.xbutton.y, 1643 &ev.xbutton.x, &ev.xbutton.y,
1679 &unused_mask); 1644 &unused_mask);
1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1681 scrollbar_size ()); 1646 scrollbar_size ());
1682 want_refresh = 1; 1647 want_refresh = 1;
1683 refresh_limit = 0;
1684 scrollbar_show (1); 1648 scrollbar_show (1);
1685 } 1649 }
1686 break; 1650 break;
1687 } 1651 }
1688 1652
… …
1693 { 1657 {
1694 hidden_cursor = 0; 1658 hidden_cursor = 0;
1695 want_refresh = 1; 1659 want_refresh = 1;
1696 } 1660 }
1697 1661
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1662 cursor_blink_ev.again ();
1699 } 1663 }
1700#endif 1664#endif
1701 1665
1702#if defined(POINTER_BLANK) 1666#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1667 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1710 1674
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1675 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1676 pointer_blank ();
1713 } 1677 }
1714#endif 1678#endif
1679
1680 refresh_check ();
1715} 1681}
1716 1682
1717void 1683void
1718rxvt_term::focus_in () 1684rxvt_term::focus_in ()
1719{ 1685{
… …
1731 XSetICFocus (Input_Context); 1697 XSetICFocus (Input_Context);
1732 } 1698 }
1733#endif 1699#endif
1734#if CURSOR_BLINK 1700#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink)) 1701 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1702 cursor_blink_ev.again ();
1737#endif 1703#endif
1738#if OFF_FOCUS_FADING 1704#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1705 if (rs[Rs_fade])
1740 { 1706 {
1741 pix_colors = pix_colors_focused; 1707 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1708 scr_recolour ();
1743 } 1709 }
1744#endif 1710#endif
1711#if ENABLE_FRILLS
1712 if (option (Opt_urgentOnBell))
1713 {
1714 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1715 {
1716 h->flags &= ~XUrgencyHint;
1717 XSetWMHints (dpy, parent[0], h);
1718 }
1719 }
1720#endif
1745 } 1721 }
1746} 1722}
1747 1723
1748void 1724void
1749rxvt_term::focus_out () 1725rxvt_term::focus_out ()
… …
1757 1733
1758#if ENABLE_FRILLS || ISO_14755 1734#if ENABLE_FRILLS || ISO_14755
1759 if (iso14755buf) 1735 if (iso14755buf)
1760 { 1736 {
1761 iso14755buf = 0; 1737 iso14755buf = 0;
1762# if ENABLE_OVERLAY 1738# if ISO_14755
1763 scr_overlay_off (); 1739 scr_overlay_off ();
1764# endif 1740# endif
1765 } 1741 }
1766#endif 1742#endif
1767#if USE_XIM 1743#if USE_XIM
… …
1769 XUnsetICFocus (Input_Context); 1745 XUnsetICFocus (Input_Context);
1770#endif 1746#endif
1771#if CURSOR_BLINK 1747#if CURSOR_BLINK
1772 if (option (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1773 cursor_blink_ev.stop (); 1749 cursor_blink_ev.stop ();
1750
1774 hidden_cursor = 0; 1751 hidden_cursor = 0;
1775#endif 1752#endif
1776#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1778 { 1755 {
… …
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1771 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 } 1772 }
1796#endif 1773#endif
1797} 1774}
1798 1775
1799#if TRANSPARENT || ENABLE_PERL 1776#if ENABLE_TRANSPARENCY || ENABLE_PERL
1800void 1777void
1801rxvt_term::rootwin_cb (XEvent &ev) 1778rxvt_term::rootwin_cb (XEvent &ev)
1802{ 1779{
1803 make_current (); 1780 make_current ();
1804 1781
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1782 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1783 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return; 1784 return;
1808 1785
1809# if TRANSPARENT 1786# if ENABLE_TRANSPARENCY
1810 switch (ev.type) 1787 switch (ev.type)
1811 { 1788 {
1812 case PropertyNotify: 1789 case PropertyNotify:
1813 /* 1790 /*
1814 * if user used some Esetroot compatible prog to set the root bg, 1791 * if user used some Esetroot compatible prog to set the root bg,
1815 * use the property to determine the pixmap. We use it later on. 1792 * use the property to determine the pixmap. We use it later on.
1816 */ 1793 */
1817 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1794 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1795 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1819 return; 1796 {
1797 bgPixmap.set_root_pixmap ();
1798 update_background ();
1799 }
1820 1800
1821 /* FALLTHROUGH */
1822 case ReparentNotify:
1823 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1824 want_refresh = want_full_refresh = 1;
1825 break; 1801 break;
1826 } 1802 }
1827# endif 1803# endif
1804
1805 refresh_check ();
1828} 1806}
1829#endif 1807#endif
1830 1808
1831void 1809void
1832rxvt_term::button_press (XButtonEvent &ev) 1810rxvt_term::button_press (XButtonEvent &ev)
… …
1887 mouse_report (ev); 1865 mouse_report (ev);
1888 } 1866 }
1889#else 1867#else
1890 MEvent.button = ev.button; 1868 MEvent.button = ev.button;
1891 mouse_report (ev); 1869 mouse_report (ev);
1892#endif /* MOUSE_REPORT_DOUBLECLICK */ 1870#endif /* MOUSE_REPORT_DOUBLECLICK */
1893 1871
1894 } 1872 }
1895 else 1873 else
1896 { 1874 {
1897 if (ev.button != MEvent.button) 1875 if (ev.button != MEvent.button)
… …
1991 tt_printf ("\033[5~"); 1969 tt_printf ("\033[5~");
1992 break; 1970 break;
1993 } 1971 }
1994 } 1972 }
1995 else 1973 else
1996#endif /* NO_SCROLLBAR_REPORT */ 1974#endif /* NO_SCROLLBAR_REPORT */
1997 1975
1998 { 1976 {
1999 char upordown = 0; 1977 char upordown = 0;
2000 1978
2001 if (scrollBar.style == R_SB_NEXT) 1979 if (scrollBar.style == R_SB_NEXT)
2002 { 1980 {
2003 if (scrollbarnext_upButton (ev.y)) 1981 if (scrollbarnext_upButton (ev.y))
2004 upordown = -1; /* up */ 1982 upordown = -1; /* up */
… …
2010 if (scrollbarrxvt_upButton (ev.y)) 1988 if (scrollbarrxvt_upButton (ev.y))
2011 upordown = -1; /* up */ 1989 upordown = -1; /* up */
2012 else if (scrollbarrxvt_dnButton (ev.y)) 1990 else if (scrollbarrxvt_dnButton (ev.y))
2013 upordown = 1; /* down */ 1991 upordown = 1; /* down */
2014 } 1992 }
1993
2015 if (upordown) 1994 if (upordown)
2016 { 1995 {
2017#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1997 if (!cont_scroll_ev.is_active ())
2018 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1998 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2019#endif 1999#endif
2020 if (scr_page (upordown < 0 ? UP : DN, 1)) 2000 if (scr_page (upordown < 0 ? UP : DN, 1))
2021 { 2001 {
2022 if (upordown < 0) 2002 if (upordown < 0)
2023 scrollBar.setUp (); 2003 scrollBar.setUp ();
… …
2103 scrollBar.setIdle (); 2083 scrollBar.setIdle ();
2104 scrollbar_show (0); 2084 scrollbar_show (0);
2105 } 2085 }
2106 2086
2107#ifdef SELECTION_SCROLLING 2087#ifdef SELECTION_SCROLLING
2108 if (sel_scroll_ev.active)
2109 sel_scroll_ev.stop(); 2088 sel_scroll_ev.stop();
2110#endif 2089#endif
2111 2090
2112 if (ev.window == vt) 2091 if (ev.window == vt)
2113 { 2092 {
2114 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2093 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2138 mouse_report (ev); 2117 mouse_report (ev);
2139 } 2118 }
2140#else /* MOUSE_REPORT_DOUBLECLICK */ 2119#else /* MOUSE_REPORT_DOUBLECLICK */
2141 MEvent.button = AnyButton; 2120 MEvent.button = AnyButton;
2142 mouse_report (ev); 2121 mouse_report (ev);
2143#endif /* MOUSE_REPORT_DOUBLECLICK */ 2122#endif /* MOUSE_REPORT_DOUBLECLICK */
2144 return; 2123 return;
2145 } 2124 }
2146 2125
2147 /* 2126 /*
2148 * dumb hack to compensate for the failure of click-and-drag 2127 * dumb hack to compensate for the failure of click-and-drag
… …
2186 { 2165 {
2187 mouse_slip_wheel_speed += v ? -1 : 1; 2166 mouse_slip_wheel_speed += v ? -1 : 1;
2188 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2189 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2190 2169
2191 if (slip_wheel_ev.at < NOW) 2170 if (!slip_wheel_ev.is_active ())
2192 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2171 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2193
2194 slip_wheel_ev.start ();
2195 } 2172 }
2196 else 2173 else
2197 { 2174 {
2198# endif 2175# endif
2199 scr_page (v, i); 2176 scr_page (v, i);
… …
2205 break; 2182 break;
2206#endif 2183#endif
2207 } 2184 }
2208 } 2185 }
2209} 2186}
2210
2211#ifdef TRANSPARENT
2212#if TINTING
2213/* taken from aterm-0.4.2 */
2214
2215typedef uint32_t RUINT32T;
2216
2217void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2218{
2219 int sh_r, sh_g, sh_b;
2220 RUINT32T mask_r, mask_g, mask_b;
2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2224 int i;
2225
2226 Visual *visual = term->visual;
2227
2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2229
2230 /* for convenience */
2231 mask_r = visual->red_mask;
2232 mask_g = visual->green_mask;
2233 mask_b = visual->blue_mask;
2234
2235 /* boring lookup table pre-initialization */
2236 switch (srcImage->bits_per_pixel) {
2237 case 15:
2238 if ((mask_r != 0x7c00) ||
2239 (mask_g != 0x03e0) ||
2240 (mask_b != 0x001f))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2243 lookup_r = lookup;
2244 lookup_g = lookup+32;
2245 lookup_b = lookup+32+32;
2246 sh_r = 10;
2247 sh_g = 5;
2248 sh_b = 0;
2249 break;
2250 case 16:
2251 if ((mask_r != 0xf800) ||
2252 (mask_g != 0x07e0) ||
2253 (mask_b != 0x001f))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2256 lookup_r = lookup;
2257 lookup_g = lookup+32;
2258 lookup_b = lookup+32+64;
2259 sh_r = 11;
2260 sh_g = 5;
2261 sh_b = 0;
2262 break;
2263 case 24:
2264 if ((mask_r != 0xff0000) ||
2265 (mask_g != 0x00ff00) ||
2266 (mask_b != 0x0000ff))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2269 lookup_r = lookup;
2270 lookup_g = lookup+256;
2271 lookup_b = lookup+256+256;
2272 sh_r = 16;
2273 sh_g = 8;
2274 sh_b = 0;
2275 break;
2276 case 32:
2277 if ((mask_r != 0xff0000) ||
2278 (mask_g != 0x00ff00) ||
2279 (mask_b != 0x0000ff))
2280 return;
2281 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2282 lookup_r = lookup;
2283 lookup_g = lookup+256;
2284 lookup_b = lookup+256+256;
2285 sh_r = 16;
2286 sh_g = 8;
2287 sh_b = 0;
2288 break;
2289 default:
2290 return; /* we do not support this color depth */
2291 }
2292
2293 /* prepare limits for color transformation (each channel is handled separately) */
2294 if (shade < 0) {
2295 shade = -shade;
2296 if (shade < 0) shade = 0;
2297 if (shade > 100) shade = 100;
2298
2299 lower_lim_r = 65535-rm;
2300 lower_lim_g = 65535-gm;
2301 lower_lim_b = 65535-bm;
2302
2303 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2304 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2305 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2306
2307 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2308 } else {
2309 if (shade < 0) shade = 0;
2310 if (shade > 100) shade = 100;
2311
2312 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2313
2314 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2315 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2316 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2317 }
2318
2319 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2320 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2321 {
2322 unsigned int tmp;
2323
2324 tmp = lower_lim_r;
2325 lower_lim_r = lower_lim_b;
2326 lower_lim_b = tmp;
2327
2328 tmp = upper_lim_r;
2329 upper_lim_r = upper_lim_b;
2330 upper_lim_b = tmp;
2331 }
2332
2333 /* fill our lookup tables */
2334 for (i = 0; i <= mask_r>>sh_r; i++)
2335 {
2336 RUINT32T tmp;
2337 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2338 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2339 lookup_r[i] = (tmp/65535)<<sh_r;
2340 }
2341 for (i = 0; i <= mask_g>>sh_g; i++)
2342 {
2343 RUINT32T tmp;
2344 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2345 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2346 lookup_g[i] = (tmp/65535)<<sh_g;
2347 }
2348 for (i = 0; i <= mask_b>>sh_b; i++)
2349 {
2350 RUINT32T tmp;
2351 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2352 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2353 lookup_b[i] = (tmp/65535)<<sh_b;
2354 }
2355
2356 /* apply table to input image (replacing colors by newly calculated ones) */
2357 switch (srcImage->bits_per_pixel)
2358 {
2359 case 15:
2360 {
2361 unsigned short *p1, *pf, *p, *pl;
2362 p1 = (unsigned short *) srcImage->data;
2363 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364 while (p1 < pf)
2365 {
2366 p = p1;
2367 pl = p1 + srcImage->width;
2368 for (; p < pl; p++)
2369 {
2370 *p = lookup_r[(*p & 0x7c00)>>10] |
2371 lookup_g[(*p & 0x03e0)>> 5] |
2372 lookup_b[(*p & 0x001f)];
2373 }
2374 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2375 }
2376 break;
2377 }
2378 case 16:
2379 {
2380 unsigned short *p1, *pf, *p, *pl;
2381 p1 = (unsigned short *) srcImage->data;
2382 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2383 while (p1 < pf)
2384 {
2385 p = p1;
2386 pl = p1 + srcImage->width;
2387 for (; p < pl; p++)
2388 {
2389 *p = lookup_r[(*p & 0xf800)>>11] |
2390 lookup_g[(*p & 0x07e0)>> 5] |
2391 lookup_b[(*p & 0x001f)];
2392 }
2393 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2394 }
2395 break;
2396 }
2397 case 24:
2398 {
2399 unsigned char *p1, *pf, *p, *pl;
2400 p1 = (unsigned char *) srcImage->data;
2401 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2402 while (p1 < pf)
2403 {
2404 p = p1;
2405 pl = p1 + srcImage->width * 3;
2406 for (; p < pl; p += 3)
2407 {
2408 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2409 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2410 p[2] = lookup_r[(p[2] & 0x0000ff)];
2411 }
2412 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 case 32:
2417 {
2418 RUINT32T *p1, *pf, *p, *pl;
2419 p1 = (RUINT32T *) srcImage->data;
2420 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2421
2422 while (p1 < pf)
2423 {
2424 p = p1;
2425 pl = p1 + srcImage->width;
2426 for (; p < pl; p++)
2427 {
2428 *p = lookup_r[(*p & 0xff0000)>>16] |
2429 lookup_g[(*p & 0x00ff00)>> 8] |
2430 lookup_b[(*p & 0x0000ff)] |
2431 (*p & ~0xffffff);
2432 }
2433 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2434 }
2435 break;
2436 }
2437 }
2438
2439 free (lookup);
2440}
2441#endif
2442
2443/*
2444 * Check our parents are still who we think they are.
2445 * Do transparency updates if required
2446 */
2447int
2448rxvt_term::check_our_parents ()
2449{
2450 int i, pchanged, aformat, have_pixmap, rootdepth;
2451 unsigned long nitems, bytes_after;
2452 Atom atype;
2453 unsigned char *prop = NULL;
2454 Window root, oldp, *list;
2455 Pixmap rootpixmap = None;
2456 XWindowAttributes wattr, wrootattr;
2457
2458 pchanged = 0;
2459
2460 if (!option (Opt_transparent))
2461 return pchanged; /* Don't try any more */
2462
2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2464 rootdepth = wrootattr.depth;
2465
2466 XGetWindowAttributes (dpy, parent[0], &wattr);
2467
2468 if (rootdepth != wattr.depth)
2469 {
2470 if (am_transparent)
2471 {
2472 pchanged = 1;
2473 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2474 am_transparent = am_pixmap_trans = 0;
2475 }
2476
2477 return pchanged; /* Don't try any more */
2478 }
2479
2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2481 XSync (dpy, False);
2482
2483 /*
2484 * Make the frame window set by the window manager have
2485 * the root background. Some window managers put multiple nested frame
2486 * windows for each client, so we have to take care about that.
2487 */
2488 i = (xa[XA_XROOTPMAP_ID]
2489 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL)
2494 i = (xa[XA_ESETROOT_PMAP_ID]
2495 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2497 &nitems, &bytes_after, &prop) == Success);
2498
2499 if (!i || prop == NULL
2500#if TINTING
2501 || !ISSET_PIXCOLOR (Color_tint)
2502#endif
2503 )
2504 have_pixmap = 0;
2505 else
2506 {
2507 have_pixmap = 1;
2508 rootpixmap = *(Pixmap *)prop;
2509 XFree (prop);
2510 }
2511
2512 if (have_pixmap)
2513 {
2514 /*
2515 * Copy display->root pixmap transparency
2516 */
2517 int sx, sy, nx, ny;
2518 unsigned int nw, nh;
2519 Window cr;
2520 XImage *image;
2521 GC gc;
2522 XGCValues gcvalue;
2523
2524 XTranslateCoordinates (dpy, parent[0], display->root,
2525 0, 0, &sx, &sy, &cr);
2526 nw = (unsigned int)szHint.width;
2527 nh = (unsigned int)szHint.height;
2528 nx = ny = 0;
2529
2530 if (sx < 0)
2531 {
2532 nw += sx;
2533 nx = -sx;
2534 sx = 0;
2535 }
2536
2537 if (sy < 0)
2538 {
2539 nh += sy;
2540 ny = -sy;
2541 sy = 0;
2542 }
2543
2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2546
2547 XSync (dpy, False);
2548 allowedxerror = -1;
2549 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2550
2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2552 /* XXX: may need a delay here? */
2553 allowedxerror = 0;
2554
2555 if (image == NULL)
2556 {
2557 if (am_transparent && am_pixmap_trans)
2558 {
2559 pchanged = 1;
2560 if (pixmap != None)
2561 {
2562 XFreePixmap (dpy, pixmap);
2563 pixmap = None;
2564 }
2565 }
2566
2567 am_pixmap_trans = 0;
2568 }
2569 else
2570 {
2571 if (pixmap != None)
2572 XFreePixmap (dpy, pixmap);
2573
2574#if TINTING
2575 if (ISSET_PIXCOLOR (Color_tint))
2576 {
2577 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2578
2579 rgba c;
2580 pix_colors_focused [Color_tint].get (c);
2581
2582 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2583 }
2584#endif
2585
2586 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2587 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2588 XPutImage (dpy, pixmap, gc, image, 0, 0,
2589 nx, ny, image->width, image->height);
2590 XFreeGC (dpy, gc);
2591 XDestroyImage (image);
2592 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2593 XClearWindow (dpy, parent[0]);
2594
2595 if (!am_transparent || !am_pixmap_trans)
2596 pchanged = 1;
2597
2598 am_transparent = am_pixmap_trans = 1;
2599 }
2600 }
2601
2602 if (am_pixmap_trans)
2603 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2604 else
2605 {
2606 unsigned int n;
2607 /*
2608 * InheritPixmap transparency
2609 */
2610 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2611 {
2612 oldp = parent[i];
2613 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2614 XFree (list);
2615
2616 if (parent[i] == display->root)
2617 {
2618 if (oldp != None)
2619 pchanged = 1;
2620
2621 break;
2622 }
2623
2624 if (oldp != parent[i])
2625 pchanged = 1;
2626 }
2627
2628 n = 0;
2629
2630 if (pchanged)
2631 for (; n < (unsigned int)i; n++)
2632 {
2633 XGetWindowAttributes (dpy, parent[n], &wattr);
2634
2635 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2636 {
2637 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2638 break;
2639 }
2640 }
2641
2642 if (n > (sizeof (parent) / sizeof (parent[0])))
2643 {
2644 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2645 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2646 am_transparent = 0;
2647 /* XXX: also turn off Opt_transparent? */
2648 }
2649 else
2650 {
2651 for (n = 0; n < (unsigned int)i; n++)
2652 {
2653 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2654 XClearWindow (dpy, parent[n]);
2655 }
2656
2657 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2658 am_transparent = 1;
2659 }
2660
2661 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2662 parent[i] = None;
2663 }
2664
2665 if (scrollBar.win)
2666 {
2667 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2668 scrollBar.setIdle ();
2669 scrollbar_show (0);
2670 }
2671
2672 if (am_transparent)
2673 {
2674 want_refresh = want_full_refresh = 1;
2675 if (am_pixmap_trans)
2676 flush ();
2677 }
2678
2679 return pchanged;
2680}
2681#endif
2682 2187
2683/*}}} */ 2188/*}}} */
2684 2189
2685bool 2190bool
2686rxvt_term::cmd_parse () 2191rxvt_term::cmd_parse ()
… …
2735 if (ch == C0_LF) 2240 if (ch == C0_LF)
2736 nlines++; 2241 nlines++;
2737 2242
2738 refresh_count++; 2243 refresh_count++;
2739 2244
2740 if (!option (Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2741 || (refresh_count >= refresh_limit * (nrow - 1)))
2742 { 2246 {
2743 refreshnow = true;
2744 refresh_count = 0; 2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2251 refreshnow = true;
2745 ch = NOCHAR; 2252 ch = NOCHAR;
2746 break; 2253 break;
2254 }
2747 } 2255 }
2748 2256
2749 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2750 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2751 { 2259 {
… …
2779 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2287 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2780 scr_add_lines (buf, str - buf, nlines); 2288 scr_add_lines (buf, str - buf, nlines);
2781 2289
2782 /* 2290 /*
2783 * If there have been a lot of new lines, then update the screen 2291 * If there have been a lot of new lines, then update the screen
2784 * What the heck I'll cheat and only refresh less than every page-full. 2292 * What the heck we'll cheat and only refresh less than every page-full.
2785 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2786 * is incremented here because we must be doing flat-out scrolling.
2787 */ 2294 */
2788 if (refreshnow) 2295 if (refreshnow)
2789 { 2296 {
2790 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2791 refresh_limit++;
2792 else
2793 {
2794 flag = true; 2297 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here
2796 scr_refresh (); 2298 scr_refresh ();
2797 want_refresh = 1; 2299 want_refresh = 1;
2798 }
2799 } 2300 }
2800 2301
2801 } 2302 }
2802 else 2303 else
2803 { 2304 {
… …
2952 { 2453 {
2953 if ((buf[len++] = cmd_getc ()) == 'i') 2454 if ((buf[len++] = cmd_getc ()) == 'i')
2954 break; /* done = 1 */ 2455 break; /* done = 1 */
2955 } 2456 }
2956 } 2457 }
2957 2458
2958 for (i = 0; i < len; i++) 2459 for (i = 0; i < len; i++)
2959 if (putc (buf[i], fd) == EOF) 2460 if (putc (buf[i], fd) == EOF)
2960 { 2461 {
2961 done = 1; 2462 done = 1;
2962 break; 2463 break;
… …
2964 } 2465 }
2965 } 2466 }
2966 2467
2967 pclose_printer (fd); 2468 pclose_printer (fd);
2968} 2469}
2969#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2970/*}}} */ 2471/*}}} */
2971 2472
2972/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2973enum { 2474enum {
2974 C1_40 = 0x40, 2475 C1_40 = 0x40,
… …
3024 process_dcs_seq (); 2525 process_dcs_seq ();
3025 break; 2526 break;
3026 case 0x9b: /* CSI */ 2527 case 0x9b: /* CSI */
3027 process_csi_seq (); 2528 process_csi_seq ();
3028 break; 2529 break;
3029 case 0x9d: /* CSI */ 2530 case 0x9d: /* OSC */
3030 process_osc_seq (); 2531 process_osc_seq ();
3031 break; 2532 break;
3032#endif 2533#endif
3033 } 2534 }
3034} 2535}
… …
3260rxvt_term::process_csi_seq () 2761rxvt_term::process_csi_seq ()
3261{ 2762{
3262 unicode_t ch, priv, i; 2763 unicode_t ch, priv, i;
3263 unsigned int nargs, p; 2764 unsigned int nargs, p;
3264 int n, ndef; 2765 int n, ndef;
3265 int arg[ESC_ARGS]; 2766 int arg[ESC_ARGS] = { };
3266 2767
3267 for (nargs = ESC_ARGS; nargs > 0;) 2768 nargs = 0;
3268 arg[--nargs] = 0;
3269 2769
3270 priv = 0; 2770 priv = 0;
3271 ch = cmd_getc (); 2771 ch = cmd_getc ();
3272 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
3273 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
3274 priv = ch; 2775 priv = ch;
3275 ch = cmd_getc (); 2776 ch = cmd_getc ();
3276 } 2777 }
3277 2778
3278 /* read any numerical arguments */ 2779 /* read any numerical arguments */
… …
3317 switch (priv) 2818 switch (priv)
3318 { 2819 {
3319 case '>': 2820 case '>':
3320 if (ch == CSI_DA) /* secondary device attributes */ 2821 if (ch == CSI_DA) /* secondary device attributes */
3321 { 2822 {
3322 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2823 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3323 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2824 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3324 // 2825 //
3325 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2826 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3326 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2827 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3327 // that we do not support xterm mouse reporting (should be 95 when we do). 2828 // versions.
3328 // 2829 //
3329 tt_printf ("\033[>%d;94;0c", 'U'); 2830 tt_printf ("\033[>%d;95;0c", 'U');
3330 } 2831 }
3331 break; 2832 break;
3332 case '?': 2833 case '?':
3333 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3334 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
… …
3780 int saveop = op; 3281 int saveop = op;
3781 3282
3782 dLocal (Display *, dpy); 3283 dLocal (Display *, dpy);
3783 3284
3784 assert (str != NULL); 3285 assert (str != NULL);
3785 3286
3786 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3287 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3787 return; 3288 return;
3788 3289
3789 switch (op) 3290 switch (op)
3790 { 3291 {
… …
3885 break; 3386 break;
3886 case URxvt_Color_IT: 3387 case URxvt_Color_IT:
3887 process_color_seq (op, Color_IT, str, resp); 3388 process_color_seq (op, Color_IT, str, resp);
3888 break; 3389 break;
3889#endif 3390#endif
3890#if TRANSPARENT && TINTING 3391#if ENABLE_TRANSPARENCY
3891 case URxvt_Color_tint: 3392 case URxvt_Color_tint:
3892 process_color_seq (op, Color_tint, str, resp); 3393 process_color_seq (op, Color_tint, str, resp);
3394 {
3395 bool changed = false;
3893 3396
3894 check_our_parents (); 3397 if (ISSET_PIXCOLOR (Color_tint))
3398 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3399 else
3400 changed = bgPixmap.unset_tint ();
3895 3401
3896 if (am_transparent) 3402 if (changed)
3897 want_full_refresh = want_refresh = 1; 3403 update_background ();
3404 }
3898 3405
3899 break; 3406 break;
3900#endif 3407#endif
3901 3408
3409#if BG_IMAGE_FROM_FILE
3902 case Rxvt_Pixmap: 3410 case Rxvt_Pixmap:
3903 { 3411 if (!strcmp (str, "?"))
3904 if (*str != ';')
3905 { 3412 {
3906#if XPM_BACKGROUND 3413 char str[256];
3907 scale_pixmap (""); /* reset to default scaling */ 3414
3908 set_bgPixmap (str); /* change pixmap */ 3415 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3909 scr_touch (true); 3416 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3910#endif 3417 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3418 process_xterm_seq (XTerm_title, str, CHAR_ST);
3911 } 3419 }
3912 3420 else
3421 {
3913 int changed = 0; 3422 int changed = 0;
3914 3423
3915 while ((str = strchr (str, ';')) != NULL) 3424 if (*str != ';')
3916 { 3425 {
3426 /* reset to default scaling :*/
3427 bgPixmap.unset_geometry ();
3428 if (bgPixmap.set_file (str)) /* change pixmap */
3429 changed++;
3430 str = strchr (str, ';');
3431 if (str == NULL)
3432 bgPixmap.set_defaultGeometry ();
3433 }
3434
3435 while (str)
3436 {
3917 str++; 3437 str++;
3918#if XPM_BACKGROUND 3438 if (bgPixmap.set_geometry (str))
3919 changed += scale_pixmap (str); 3439 changed++;
3920#endif 3440 str = strchr (str, ';');
3921 } 3441 }
3922 3442
3923 if (changed) 3443 if (changed)
3924 { 3444 update_background ();
3925#ifdef XPM_BACKGROUND
3926 resize_pixmap ();
3927 scr_touch (true);
3928#endif
3929 } 3445 }
3930 }
3931 break; 3446 break;
3447#endif
3932 3448
3933 case Rxvt_restoreFG: 3449 case Rxvt_restoreFG:
3934 set_window_color (Color_fg, str); 3450 set_window_color (Color_fg, str);
3935 break; 3451 break;
3936 case Rxvt_restoreBG: 3452 case Rxvt_restoreBG:
… …
4058{ 3574{
4059 unsigned int i, j; 3575 unsigned int i, j;
4060 int state; 3576 int state;
4061 3577
4062 static const struct 3578 static const struct
4063 { 3579 {
4064 const int argval; 3580 const int argval;
4065 const unsigned long bit; 3581 const unsigned long bit;
4066 }
4067
4068 argtopriv[] = { 3582 } argtopriv[] = {
4069 { 1, PrivMode_aplCUR }, 3583 { 1, PrivMode_aplCUR },
4070 { 2, PrivMode_vt52 }, 3584 { 2, PrivMode_vt52 },
4071 { 3, PrivMode_132 }, 3585 { 3, PrivMode_132 },
4072 { 4, PrivMode_smoothScroll }, 3586 { 4, PrivMode_smoothScroll },
4073 { 5, PrivMode_rVideo }, 3587 { 5, PrivMode_rVideo },
… …
4089 { 66, PrivMode_aplKP }, 3603 { 66, PrivMode_aplKP },
4090#ifndef NO_BACKSPACE_KEY 3604#ifndef NO_BACKSPACE_KEY
4091 { 67, PrivMode_BackSpace }, 3605 { 67, PrivMode_BackSpace },
4092#endif 3606#endif
4093 { 1000, PrivMode_MouseX11 }, 3607 { 1000, PrivMode_MouseX11 },
4094 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3608 { 1002, PrivMode_MouseBtnEvent },
4095 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3609 { 1003, PrivMode_MouseAnyEvent },
4096 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4097 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4098 { 1011, PrivMode_Keypress }, // rxvt extension 3611 { 1011, PrivMode_Keypress }, // rxvt extension
4099 // 1035 enable modifiers for alt, numlock NYI 3612 // 1035 enable modifiers for alt, numlock NYI
4100 // 1036 send ESC for meta keys NYI 3613 // 1036 send ESC for meta keys NYI
4101 // 1037 send DEL for keypad delete NYI 3614 // 1037 send DEL for keypad delete NYI
… …
4175 scr_autowrap (state); 3688 scr_autowrap (state);
4176 break; 3689 break;
4177 /* case 8: - auto repeat, can't do on a per window basis */ 3690 /* case 8: - auto repeat, can't do on a per window basis */
4178 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
4179 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
4180 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4181 break; 3694 break;
4182#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
4183 case scrollBar_esc: 3696 case scrollBar_esc:
4184 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
4185 { 3698 {
… …
4198 break; 3711 break;
4199 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
4200 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
4201 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
4202 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
4203 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4204 break; 3717 break;
4205#if 0
4206 case 1001: 3718 case 1002:
4207 break; /* X11 mouse highlighting */ 3719 case 1003:
4208#endif 3720 if (state)
3721 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724 vt_emask_mouse = PointerMotionMask;
3725 }
3726 else
3727 vt_emask_mouse = NoEventMask;
3728 vt_select_input ();
3729 break;
4209 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
4210 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
4211 break; 3732 break;
4212 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
4213 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
… …
4390rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
4391{ 3912{
4392 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
4393 3914
4394 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
4395 { /* query graphics */ 3917 /* query graphics */
4396 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
4397 return; 3919 return;
4398 } 3920 }
4399 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
4400 do 3922 do
… …
4450 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4451 3973
4452 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4453 v_buflen += len; 3975 v_buflen += len;
4454 3976
4455 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4456} 3978}
4457 3979
4458void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4459{ 3981{
4460 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3982 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4465 3987
4466 if (v_buflen == 0) 3988 if (v_buflen == 0)
4467 { 3989 {
4468 free (v_buffer); 3990 free (v_buffer);
4469 v_buffer = 0; 3991 v_buffer = 0;
4470 v_buflen = 0;
4471 3992
4472 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4473 return; 3994 return;
4474 } 3995 }
4475 3996
4476 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4477 } 3998 }
4478 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4479 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4480} 4001}
4481 4002
4482/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4483 4004

Diff Legend

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