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.322 by ayin, Wed May 2 23:06:32 2007 UTC vs.
Revision 1.384 by ayin, Tue Dec 18 13:07:55 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 }
1487 1455 else
1456 {
1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ())
1459 update_background ();
1460#endif
1461 }
1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1462 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 } 1463 }
1495 break; 1464 break;
1496 1465
1497 case PropertyNotify: 1466 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1516 break; 1485 break;
1517 1486
1518 case MapNotify: 1487 case MapNotify:
1519 mapped = 1; 1488 mapped = 1;
1520#ifdef TEXT_BLINK 1489#ifdef TEXT_BLINK
1521 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1490 text_blink_ev.start ();
1522#endif 1491#endif
1523 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1524 break; 1493 break;
1525 1494
1526 case UnmapNotify: 1495 case UnmapNotify:
… …
1528#ifdef TEXT_BLINK 1497#ifdef TEXT_BLINK
1529 text_blink_ev.stop (); 1498 text_blink_ev.stop ();
1530#endif 1499#endif
1531 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1500 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 break; 1501 break;
1533
1534#ifdef TRANSPARENT
1535 case ReparentNotify:
1536 rootwin_cb (ev);
1537 break;
1538#endif /* TRANSPARENT */
1539 1502
1540 case GraphicsExpose: 1503 case GraphicsExpose:
1541 case Expose: 1504 case Expose:
1542 if (ev.xany.window == vt) 1505 if (ev.xany.window == vt)
1543 { 1506 {
1544 do 1507 do
1508 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1511 }
1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1548 1513
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1514 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1515
1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1516 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1517 {
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1518 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1519 ev.xexpose.width, ev.xexpose.height, False);
1520 }
1554 1521
1555 want_refresh = 1; 1522 want_refresh = 1;
1556 } 1523 }
1557 else 1524 else
1558 { 1525 {
… …
1566 if (isScrollbarWindow (ev.xany.window)) 1533 if (isScrollbarWindow (ev.xany.window))
1567 { 1534 {
1568 scrollBar.setIdle (); 1535 scrollBar.setIdle ();
1569 scrollbar_show (0); 1536 scrollbar_show (0);
1570 } 1537 }
1571
1572#ifdef TRANSPARENT
1573 if (am_transparent && ev.xany.window == parent[0])
1574 XClearWindow (dpy, ev.xany.window);
1575#endif
1576 } 1538 }
1577 break; 1539 break;
1578 1540
1579 case MotionNotify: 1541 case MotionNotify:
1580#ifdef POINTER_BLANK 1542#ifdef POINTER_BLANK
1581 if (hidden_pointer) 1543 if (hidden_pointer)
1582 pointer_unblank (); 1544 pointer_unblank ();
1583#endif 1545#endif
1546 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1547 || priv_modes & PrivMode_MouseAnyEvent)
1548 mouse_report (ev.xbutton);
1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1549 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1585 break; 1550 break;
1586 1551
1587 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1588 { 1553 {
… …
1622 int dist; 1587 int dist;
1623 1588
1624 /* don't clobber the current delay if we are 1589 /* don't clobber the current delay if we are
1625 * already in the middle of scrolling. 1590 * already in the middle of scrolling.
1626 */ 1591 */
1627 if (!sel_scroll_ev.active) 1592 if (!sel_scroll_ev.is_active ())
1628 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1593 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1629 1594
1630 /* save the event params so we can highlight 1595 /* save the event params so we can highlight
1631 * the selection in the pending-scroll loop 1596 * the selection in the pending-scroll loop
1632 */ 1597 */
1633 selection_save_x = ev.xbutton.x; 1598 selection_save_x = ev.xbutton.x;
… …
1655 else 1620 else
1656 { 1621 {
1657 /* we are within the text window, so we 1622 /* we are within the text window, so we
1658 * shouldn't be scrolling 1623 * shouldn't be scrolling
1659 */ 1624 */
1660 if (sel_scroll_ev.active)
1661 sel_scroll_ev.stop(); 1625 sel_scroll_ev.stop();
1662 } 1626 }
1663#endif 1627#endif
1664#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1665 } 1629 }
1666#endif 1630#endif
… …
1678 &ev.xbutton.x, &ev.xbutton.y, 1642 &ev.xbutton.x, &ev.xbutton.y,
1679 &unused_mask); 1643 &unused_mask);
1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1681 scrollbar_size ()); 1645 scrollbar_size ());
1682 want_refresh = 1; 1646 want_refresh = 1;
1683 refresh_limit = 0;
1684 scrollbar_show (1); 1647 scrollbar_show (1);
1685 } 1648 }
1686 break; 1649 break;
1687 } 1650 }
1688 1651
… …
1693 { 1656 {
1694 hidden_cursor = 0; 1657 hidden_cursor = 0;
1695 want_refresh = 1; 1658 want_refresh = 1;
1696 } 1659 }
1697 1660
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1661 cursor_blink_ev.again ();
1699 } 1662 }
1700#endif 1663#endif
1701 1664
1702#if defined(POINTER_BLANK) 1665#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1666 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1710 1673
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1674 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1675 pointer_blank ();
1713 } 1676 }
1714#endif 1677#endif
1678
1679 refresh_check ();
1715} 1680}
1716 1681
1717void 1682void
1718rxvt_term::focus_in () 1683rxvt_term::focus_in ()
1719{ 1684{
… …
1731 XSetICFocus (Input_Context); 1696 XSetICFocus (Input_Context);
1732 } 1697 }
1733#endif 1698#endif
1734#if CURSOR_BLINK 1699#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink)) 1700 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1701 cursor_blink_ev.again ();
1737#endif 1702#endif
1738#if OFF_FOCUS_FADING 1703#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1704 if (rs[Rs_fade])
1740 { 1705 {
1741 pix_colors = pix_colors_focused; 1706 pix_colors = pix_colors_focused;
… …
1743 } 1708 }
1744#endif 1709#endif
1745#if ENABLE_FRILLS 1710#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell)) 1711 if (option (Opt_urgentOnBell))
1747 { 1712 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]); 1713 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1751 if (h != NULL)
1752 { 1714 {
1753 h->flags &= ~XUrgencyHint; 1715 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h); 1716 XSetWMHints (dpy, parent[0], h);
1755 } 1717 }
1756 } 1718 }
1757#endif 1719#endif
1758 } 1720 }
1759} 1721}
… …
1770 1732
1771#if ENABLE_FRILLS || ISO_14755 1733#if ENABLE_FRILLS || ISO_14755
1772 if (iso14755buf) 1734 if (iso14755buf)
1773 { 1735 {
1774 iso14755buf = 0; 1736 iso14755buf = 0;
1775# if ENABLE_OVERLAY 1737# if ISO_14755
1776 scr_overlay_off (); 1738 scr_overlay_off ();
1777# endif 1739# endif
1778 } 1740 }
1779#endif 1741#endif
1780#if USE_XIM 1742#if USE_XIM
… …
1782 XUnsetICFocus (Input_Context); 1744 XUnsetICFocus (Input_Context);
1783#endif 1745#endif
1784#if CURSOR_BLINK 1746#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink)) 1747 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop (); 1748 cursor_blink_ev.stop ();
1749
1787 hidden_cursor = 0; 1750 hidden_cursor = 0;
1788#endif 1751#endif
1789#if OFF_FOCUS_FADING 1752#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1753 if (rs[Rs_fade])
1791 { 1754 {
… …
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1770 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 } 1771 }
1809#endif 1772#endif
1810} 1773}
1811 1774
1812#if TRANSPARENT || ENABLE_PERL 1775#if ENABLE_TRANSPARENCY || ENABLE_PERL
1813void 1776void
1814rxvt_term::rootwin_cb (XEvent &ev) 1777rxvt_term::rootwin_cb (XEvent &ev)
1815{ 1778{
1816 make_current (); 1779 make_current ();
1817 1780
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1781 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1782 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return; 1783 return;
1821 1784
1822# if TRANSPARENT 1785# if ENABLE_TRANSPARENCY
1823 switch (ev.type) 1786 switch (ev.type)
1824 { 1787 {
1825 case PropertyNotify: 1788 case PropertyNotify:
1826 /* 1789 /*
1827 * if user used some Esetroot compatible prog to set the root bg, 1790 * if user used some Esetroot compatible prog to set the root bg,
1828 * use the property to determine the pixmap. We use it later on. 1791 * use the property to determine the pixmap. We use it later on.
1829 */ 1792 */
1830 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1793 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1794 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 return; 1795 {
1833 1796 bgPixmap.set_root_pixmap ();
1834 /* FALLTHROUGH */ 1797 update_background ();
1835 case ReparentNotify: 1798 }
1836 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1837 want_refresh = want_full_refresh = 1;
1838 break; 1799 break;
1839 } 1800 }
1840# endif 1801# endif
1802
1803 refresh_check ();
1841} 1804}
1842#endif 1805#endif
1843 1806
1844void 1807void
1845rxvt_term::button_press (XButtonEvent &ev) 1808rxvt_term::button_press (XButtonEvent &ev)
… …
1900 mouse_report (ev); 1863 mouse_report (ev);
1901 } 1864 }
1902#else 1865#else
1903 MEvent.button = ev.button; 1866 MEvent.button = ev.button;
1904 mouse_report (ev); 1867 mouse_report (ev);
1905#endif /* MOUSE_REPORT_DOUBLECLICK */ 1868#endif /* MOUSE_REPORT_DOUBLECLICK */
1906 1869
1907 } 1870 }
1908 else 1871 else
1909 { 1872 {
1910 if (ev.button != MEvent.button) 1873 if (ev.button != MEvent.button)
… …
2004 tt_printf ("\033[5~"); 1967 tt_printf ("\033[5~");
2005 break; 1968 break;
2006 } 1969 }
2007 } 1970 }
2008 else 1971 else
2009#endif /* NO_SCROLLBAR_REPORT */ 1972#endif /* NO_SCROLLBAR_REPORT */
2010 1973
2011 { 1974 {
2012 char upordown = 0; 1975 char upordown = 0;
2013 1976
2014 if (scrollBar.style == R_SB_NEXT) 1977 if (scrollBar.style == R_SB_NEXT)
2015 { 1978 {
2016 if (scrollbarnext_upButton (ev.y)) 1979 if (scrollbarnext_upButton (ev.y))
2017 upordown = -1; /* up */ 1980 upordown = -1; /* up */
… …
2023 if (scrollbarrxvt_upButton (ev.y)) 1986 if (scrollbarrxvt_upButton (ev.y))
2024 upordown = -1; /* up */ 1987 upordown = -1; /* up */
2025 else if (scrollbarrxvt_dnButton (ev.y)) 1988 else if (scrollbarrxvt_dnButton (ev.y))
2026 upordown = 1; /* down */ 1989 upordown = 1; /* down */
2027 } 1990 }
1991
2028 if (upordown) 1992 if (upordown)
2029 { 1993 {
2030#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1994#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1995 if (!cont_scroll_ev.is_active ())
2031 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1996 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 1997#endif
2033 if (scr_page (upordown < 0 ? UP : DN, 1)) 1998 if (scr_page (upordown < 0 ? UP : DN, 1))
2034 { 1999 {
2035 if (upordown < 0) 2000 if (upordown < 0)
2036 scrollBar.setUp (); 2001 scrollBar.setUp ();
… …
2116 scrollBar.setIdle (); 2081 scrollBar.setIdle ();
2117 scrollbar_show (0); 2082 scrollbar_show (0);
2118 } 2083 }
2119 2084
2120#ifdef SELECTION_SCROLLING 2085#ifdef SELECTION_SCROLLING
2121 if (sel_scroll_ev.active)
2122 sel_scroll_ev.stop(); 2086 sel_scroll_ev.stop();
2123#endif 2087#endif
2124 2088
2125 if (ev.window == vt) 2089 if (ev.window == vt)
2126 { 2090 {
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2091 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2151 mouse_report (ev); 2115 mouse_report (ev);
2152 } 2116 }
2153#else /* MOUSE_REPORT_DOUBLECLICK */ 2117#else /* MOUSE_REPORT_DOUBLECLICK */
2154 MEvent.button = AnyButton; 2118 MEvent.button = AnyButton;
2155 mouse_report (ev); 2119 mouse_report (ev);
2156#endif /* MOUSE_REPORT_DOUBLECLICK */ 2120#endif /* MOUSE_REPORT_DOUBLECLICK */
2157 return; 2121 return;
2158 } 2122 }
2159 2123
2160 /* 2124 /*
2161 * dumb hack to compensate for the failure of click-and-drag 2125 * dumb hack to compensate for the failure of click-and-drag
… …
2199 { 2163 {
2200 mouse_slip_wheel_speed += v ? -1 : 1; 2164 mouse_slip_wheel_speed += v ? -1 : 1;
2201 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2165 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2202 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2166 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2203 2167
2204 if (slip_wheel_ev.at < NOW) 2168 if (!slip_wheel_ev.is_active ())
2205 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2169 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2206
2207 slip_wheel_ev.start ();
2208 } 2170 }
2209 else 2171 else
2210 { 2172 {
2211# endif 2173# endif
2212 scr_page (v, i); 2174 scr_page (v, i);
… …
2218 break; 2180 break;
2219#endif 2181#endif
2220 } 2182 }
2221 } 2183 }
2222} 2184}
2223
2224#ifdef TRANSPARENT
2225#if TINTING
2226/* taken from aterm-0.4.2 */
2227
2228typedef uint32_t RUINT32T;
2229
2230void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2231{
2232 int sh_r, sh_g, sh_b;
2233 RUINT32T mask_r, mask_g, mask_b;
2234 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2235 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2236 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2237 int i;
2238
2239 Visual *visual = term->visual;
2240
2241 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2242
2243 /* for convenience */
2244 mask_r = visual->red_mask;
2245 mask_g = visual->green_mask;
2246 mask_b = visual->blue_mask;
2247
2248 /* boring lookup table pre-initialization */
2249 switch (srcImage->bits_per_pixel) {
2250 case 15:
2251 if ((mask_r != 0x7c00) ||
2252 (mask_g != 0x03e0) ||
2253 (mask_b != 0x001f))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2256 lookup_r = lookup;
2257 lookup_g = lookup+32;
2258 lookup_b = lookup+32+32;
2259 sh_r = 10;
2260 sh_g = 5;
2261 sh_b = 0;
2262 break;
2263 case 16:
2264 if ((mask_r != 0xf800) ||
2265 (mask_g != 0x07e0) ||
2266 (mask_b != 0x001f))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2269 lookup_r = lookup;
2270 lookup_g = lookup+32;
2271 lookup_b = lookup+32+64;
2272 sh_r = 11;
2273 sh_g = 5;
2274 sh_b = 0;
2275 break;
2276 case 24:
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 case 32:
2290 if ((mask_r != 0xff0000) ||
2291 (mask_g != 0x00ff00) ||
2292 (mask_b != 0x0000ff))
2293 return;
2294 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2295 lookup_r = lookup;
2296 lookup_g = lookup+256;
2297 lookup_b = lookup+256+256;
2298 sh_r = 16;
2299 sh_g = 8;
2300 sh_b = 0;
2301 break;
2302 default:
2303 return; /* we do not support this color depth */
2304 }
2305
2306 /* prepare limits for color transformation (each channel is handled separately) */
2307 if (shade < 0) {
2308 shade = -shade;
2309 if (shade < 0) shade = 0;
2310 if (shade > 100) shade = 100;
2311
2312 lower_lim_r = 65535-rm;
2313 lower_lim_g = 65535-gm;
2314 lower_lim_b = 65535-bm;
2315
2316 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2317 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2318 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2319
2320 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2321 } else {
2322 if (shade < 0) shade = 0;
2323 if (shade > 100) shade = 100;
2324
2325 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2326
2327 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2328 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2329 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2330 }
2331
2332 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2333 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2334 {
2335 unsigned int tmp;
2336
2337 tmp = lower_lim_r;
2338 lower_lim_r = lower_lim_b;
2339 lower_lim_b = tmp;
2340
2341 tmp = upper_lim_r;
2342 upper_lim_r = upper_lim_b;
2343 upper_lim_b = tmp;
2344 }
2345
2346 /* fill our lookup tables */
2347 for (i = 0; i <= mask_r>>sh_r; i++)
2348 {
2349 RUINT32T tmp;
2350 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2351 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2352 lookup_r[i] = (tmp/65535)<<sh_r;
2353 }
2354 for (i = 0; i <= mask_g>>sh_g; i++)
2355 {
2356 RUINT32T tmp;
2357 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2358 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2359 lookup_g[i] = (tmp/65535)<<sh_g;
2360 }
2361 for (i = 0; i <= mask_b>>sh_b; i++)
2362 {
2363 RUINT32T tmp;
2364 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2365 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2366 lookup_b[i] = (tmp/65535)<<sh_b;
2367 }
2368
2369 /* apply table to input image (replacing colors by newly calculated ones) */
2370 switch (srcImage->bits_per_pixel)
2371 {
2372 case 15:
2373 {
2374 unsigned short *p1, *pf, *p, *pl;
2375 p1 = (unsigned short *) srcImage->data;
2376 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width;
2381 for (; p < pl; p++)
2382 {
2383 *p = lookup_r[(*p & 0x7c00)>>10] |
2384 lookup_g[(*p & 0x03e0)>> 5] |
2385 lookup_b[(*p & 0x001f)];
2386 }
2387 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 16:
2392 {
2393 unsigned short *p1, *pf, *p, *pl;
2394 p1 = (unsigned short *) srcImage->data;
2395 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width;
2400 for (; p < pl; p++)
2401 {
2402 *p = lookup_r[(*p & 0xf800)>>11] |
2403 lookup_g[(*p & 0x07e0)>> 5] |
2404 lookup_b[(*p & 0x001f)];
2405 }
2406 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 case 24:
2411 {
2412 unsigned char *p1, *pf, *p, *pl;
2413 p1 = (unsigned char *) srcImage->data;
2414 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2415 while (p1 < pf)
2416 {
2417 p = p1;
2418 pl = p1 + srcImage->width * 3;
2419 for (; p < pl; p += 3)
2420 {
2421 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2422 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2423 p[2] = lookup_r[(p[2] & 0x0000ff)];
2424 }
2425 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2426 }
2427 break;
2428 }
2429 case 32:
2430 {
2431 RUINT32T *p1, *pf, *p, *pl;
2432 p1 = (RUINT32T *) srcImage->data;
2433 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2434
2435 while (p1 < pf)
2436 {
2437 p = p1;
2438 pl = p1 + srcImage->width;
2439 for (; p < pl; p++)
2440 {
2441 *p = lookup_r[(*p & 0xff0000)>>16] |
2442 lookup_g[(*p & 0x00ff00)>> 8] |
2443 lookup_b[(*p & 0x0000ff)] |
2444 (*p & ~0xffffff);
2445 }
2446 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2447 }
2448 break;
2449 }
2450 }
2451
2452 free (lookup);
2453}
2454#endif
2455
2456/*
2457 * Check our parents are still who we think they are.
2458 * Do transparency updates if required
2459 */
2460int
2461rxvt_term::check_our_parents ()
2462{
2463 int i, pchanged, aformat, have_pixmap, rootdepth;
2464 unsigned long nitems, bytes_after;
2465 Atom atype;
2466 unsigned char *prop = NULL;
2467 Window root, oldp, *list;
2468 Pixmap rootpixmap = None;
2469 XWindowAttributes wattr, wrootattr;
2470
2471 pchanged = 0;
2472
2473 if (!option (Opt_transparent))
2474 return pchanged; /* Don't try any more */
2475
2476 XGetWindowAttributes (dpy, display->root, &wrootattr);
2477 rootdepth = wrootattr.depth;
2478
2479 XGetWindowAttributes (dpy, parent[0], &wattr);
2480
2481 if (rootdepth != wattr.depth)
2482 {
2483 if (am_transparent)
2484 {
2485 pchanged = 1;
2486 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2487 am_transparent = am_pixmap_trans = 0;
2488 }
2489
2490 return pchanged; /* Don't try any more */
2491 }
2492
2493 /* Get all X ops out of the queue so that our information is up-to-date. */
2494 XSync (dpy, False);
2495
2496 /*
2497 * Make the frame window set by the window manager have
2498 * the root background. Some window managers put multiple nested frame
2499 * windows for each client, so we have to take care about that.
2500 */
2501 i = (xa[XA_XROOTPMAP_ID]
2502 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2503 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2504 &nitems, &bytes_after, &prop) == Success);
2505
2506 if (!i || prop == NULL)
2507 i = (xa[XA_ESETROOT_PMAP_ID]
2508 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2509 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2510 &nitems, &bytes_after, &prop) == Success);
2511
2512 if (!i || prop == NULL
2513#if TINTING
2514 || !ISSET_PIXCOLOR (Color_tint)
2515#endif
2516 )
2517 have_pixmap = 0;
2518 else
2519 {
2520 have_pixmap = 1;
2521 rootpixmap = *(Pixmap *)prop;
2522 XFree (prop);
2523 }
2524
2525 if (have_pixmap)
2526 {
2527 /*
2528 * Copy display->root pixmap transparency
2529 */
2530 int sx, sy, nx, ny;
2531 unsigned int nw, nh;
2532 Window cr;
2533 XImage *image;
2534 GC gc;
2535 XGCValues gcvalue;
2536
2537 XTranslateCoordinates (dpy, parent[0], display->root,
2538 0, 0, &sx, &sy, &cr);
2539 nw = (unsigned int)szHint.width;
2540 nh = (unsigned int)szHint.height;
2541 nx = ny = 0;
2542
2543 if (sx < 0)
2544 {
2545 nw += sx;
2546 nx = -sx;
2547 sx = 0;
2548 }
2549
2550 if (sy < 0)
2551 {
2552 nh += sy;
2553 ny = -sy;
2554 sy = 0;
2555 }
2556
2557 min_it (nw, (unsigned int) (wrootattr.width - sx));
2558 min_it (nh, (unsigned int) (wrootattr.height - sy));
2559
2560 XSync (dpy, False);
2561 allowedxerror = -1;
2562 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2563
2564 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2565 /* XXX: may need a delay here? */
2566 allowedxerror = 0;
2567
2568 if (image == NULL)
2569 {
2570 if (am_transparent && am_pixmap_trans)
2571 {
2572 pchanged = 1;
2573 if (pixmap != None)
2574 {
2575 XFreePixmap (dpy, pixmap);
2576 pixmap = None;
2577 }
2578 }
2579
2580 am_pixmap_trans = 0;
2581 }
2582 else
2583 {
2584 if (pixmap != None)
2585 XFreePixmap (dpy, pixmap);
2586
2587#if TINTING
2588 if (ISSET_PIXCOLOR (Color_tint))
2589 {
2590 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2591
2592 rgba c;
2593 pix_colors_focused [Color_tint].get (c);
2594
2595 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2596 }
2597#endif
2598
2599 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2600 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2601 XPutImage (dpy, pixmap, gc, image, 0, 0,
2602 nx, ny, image->width, image->height);
2603 XFreeGC (dpy, gc);
2604 XDestroyImage (image);
2605 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2606 XClearWindow (dpy, parent[0]);
2607
2608 if (!am_transparent || !am_pixmap_trans)
2609 pchanged = 1;
2610
2611 am_transparent = am_pixmap_trans = 1;
2612 }
2613 }
2614
2615 if (am_pixmap_trans)
2616 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2617 else
2618 {
2619 unsigned int n;
2620 /*
2621 * InheritPixmap transparency
2622 */
2623 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2624 {
2625 oldp = parent[i];
2626 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2627 XFree (list);
2628
2629 if (parent[i] == display->root)
2630 {
2631 if (oldp != None)
2632 pchanged = 1;
2633
2634 break;
2635 }
2636
2637 if (oldp != parent[i])
2638 pchanged = 1;
2639 }
2640
2641 n = 0;
2642
2643 if (pchanged)
2644 for (; n < (unsigned int)i; n++)
2645 {
2646 XGetWindowAttributes (dpy, parent[n], &wattr);
2647
2648 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2649 {
2650 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2651 break;
2652 }
2653 }
2654
2655 if (n > (sizeof (parent) / sizeof (parent[0])))
2656 {
2657 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2658 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2659 am_transparent = 0;
2660 /* XXX: also turn off Opt_transparent? */
2661 }
2662 else
2663 {
2664 for (n = 0; n < (unsigned int)i; n++)
2665 {
2666 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2667 XClearWindow (dpy, parent[n]);
2668 }
2669
2670 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2671 am_transparent = 1;
2672 }
2673
2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2675 parent[i] = None;
2676 }
2677
2678 if (scrollBar.win)
2679 {
2680 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2681 scrollBar.setIdle ();
2682 scrollbar_show (0);
2683 }
2684
2685 if (am_transparent)
2686 {
2687 want_refresh = want_full_refresh = 1;
2688 if (am_pixmap_trans)
2689 flush ();
2690 }
2691
2692 return pchanged;
2693}
2694#endif
2695 2185
2696/*}}} */ 2186/*}}} */
2697 2187
2698bool 2188bool
2699rxvt_term::cmd_parse () 2189rxvt_term::cmd_parse ()
… …
2748 if (ch == C0_LF) 2238 if (ch == C0_LF)
2749 nlines++; 2239 nlines++;
2750 2240
2751 refresh_count++; 2241 refresh_count++;
2752 2242
2753 if (!option (Opt_jumpScroll) 2243 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2755 { 2244 {
2756 refreshnow = true;
2757 refresh_count = 0; 2245 refresh_count = 0;
2246
2247 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2248 {
2249 refreshnow = true;
2758 ch = NOCHAR; 2250 ch = NOCHAR;
2759 break; 2251 break;
2252 }
2760 } 2253 }
2761 2254
2762 // scr_add_lines only works for nlines <= nrow - 1. 2255 // scr_add_lines only works for nlines <= nrow - 1.
2763 if (nlines >= nrow - 1) 2256 if (nlines >= nrow - 1)
2764 { 2257 {
… …
2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2285 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793 scr_add_lines (buf, str - buf, nlines); 2286 scr_add_lines (buf, str - buf, nlines);
2794 2287
2795 /* 2288 /*
2796 * If there have been a lot of new lines, then update the screen 2289 * If there have been a lot of new lines, then update the screen
2797 * What the heck I'll cheat and only refresh less than every page-full. 2290 * What the heck we'll cheat and only refresh less than every page-full.
2798 * the number of pages between refreshes is refresh_limit, which 2291 * if skipScroll is enabled.
2799 * is incremented here because we must be doing flat-out scrolling.
2800 */ 2292 */
2801 if (refreshnow) 2293 if (refreshnow)
2802 { 2294 {
2803 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2804 refresh_limit++;
2805 else
2806 {
2807 flag = true; 2295 flag = true;
2808 //TODO: due to popular request, implement "skipscroll" option here
2809 scr_refresh (); 2296 scr_refresh ();
2810 want_refresh = 1; 2297 want_refresh = 1;
2811 }
2812 } 2298 }
2813 2299
2814 } 2300 }
2815 else 2301 else
2816 { 2302 {
… …
2965 { 2451 {
2966 if ((buf[len++] = cmd_getc ()) == 'i') 2452 if ((buf[len++] = cmd_getc ()) == 'i')
2967 break; /* done = 1 */ 2453 break; /* done = 1 */
2968 } 2454 }
2969 } 2455 }
2970 2456
2971 for (i = 0; i < len; i++) 2457 for (i = 0; i < len; i++)
2972 if (putc (buf[i], fd) == EOF) 2458 if (putc (buf[i], fd) == EOF)
2973 { 2459 {
2974 done = 1; 2460 done = 1;
2975 break; 2461 break;
… …
2977 } 2463 }
2978 } 2464 }
2979 2465
2980 pclose_printer (fd); 2466 pclose_printer (fd);
2981} 2467}
2982#endif /* PRINTPIPE */ 2468#endif /* PRINTPIPE */
2983/*}}} */ 2469/*}}} */
2984 2470
2985/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
2986enum { 2472enum {
2987 C1_40 = 0x40, 2473 C1_40 = 0x40,
… …
3037 process_dcs_seq (); 2523 process_dcs_seq ();
3038 break; 2524 break;
3039 case 0x9b: /* CSI */ 2525 case 0x9b: /* CSI */
3040 process_csi_seq (); 2526 process_csi_seq ();
3041 break; 2527 break;
3042 case 0x9d: /* CSI */ 2528 case 0x9d: /* OSC */
3043 process_osc_seq (); 2529 process_osc_seq ();
3044 break; 2530 break;
3045#endif 2531#endif
3046 } 2532 }
3047} 2533}
… …
3273rxvt_term::process_csi_seq () 2759rxvt_term::process_csi_seq ()
3274{ 2760{
3275 unicode_t ch, priv, i; 2761 unicode_t ch, priv, i;
3276 unsigned int nargs, p; 2762 unsigned int nargs, p;
3277 int n, ndef; 2763 int n, ndef;
3278 int arg[ESC_ARGS]; 2764 int arg[ESC_ARGS] = { };
3279 2765
3280 for (nargs = ESC_ARGS; nargs > 0;) 2766 nargs = 0;
3281 arg[--nargs] = 0;
3282 2767
3283 priv = 0; 2768 priv = 0;
3284 ch = cmd_getc (); 2769 ch = cmd_getc ();
3285 if (ch >= '<' && ch <= '?') 2770 if (ch >= '<' && ch <= '?')
2771 {
3286 { /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' */
3287 priv = ch; 2773 priv = ch;
3288 ch = cmd_getc (); 2774 ch = cmd_getc ();
3289 } 2775 }
3290 2776
3291 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
3330 switch (priv) 2816 switch (priv)
3331 { 2817 {
3332 case '>': 2818 case '>':
3333 if (ch == CSI_DA) /* secondary device attributes */ 2819 if (ch == CSI_DA) /* secondary device attributes */
3334 { 2820 {
3335 // 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,
3336 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2822 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3337 // 2823 //
3338 // 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
3339 // 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
3340 // that we do not support xterm mouse reporting (should be 95 when we do). 2826 // versions.
3341 // 2827 //
3342 tt_printf ("\033[>%d;94;0c", 'U'); 2828 tt_printf ("\033[>%d;95;0c", 'U');
3343 } 2829 }
3344 break; 2830 break;
3345 case '?': 2831 case '?':
3346 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3347 process_terminal_mode (ch, priv, nargs, arg); 2833 process_terminal_mode (ch, priv, nargs, arg);
… …
3793 int saveop = op; 3279 int saveop = op;
3794 3280
3795 dLocal (Display *, dpy); 3281 dLocal (Display *, dpy);
3796 3282
3797 assert (str != NULL); 3283 assert (str != NULL);
3798 3284
3799 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)))
3800 return; 3286 return;
3801 3287
3802 switch (op) 3288 switch (op)
3803 { 3289 {
… …
3898 break; 3384 break;
3899 case URxvt_Color_IT: 3385 case URxvt_Color_IT:
3900 process_color_seq (op, Color_IT, str, resp); 3386 process_color_seq (op, Color_IT, str, resp);
3901 break; 3387 break;
3902#endif 3388#endif
3903#if TRANSPARENT && TINTING 3389#if ENABLE_TRANSPARENCY
3904 case URxvt_Color_tint: 3390 case URxvt_Color_tint:
3905 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 }
3906 3401
3907 check_our_parents ();
3908
3909 if (am_transparent)
3910 want_full_refresh = want_refresh = 1;
3911
3912 break; 3402 break;
3913#endif 3403#endif
3914 3404
3405#if BG_IMAGE_FROM_FILE
3915 case Rxvt_Pixmap: 3406 case Rxvt_Pixmap:
3916 { 3407 if (!strcmp (str, "?"))
3917 if (*str != ';')
3918 { 3408 {
3919#if XPM_BACKGROUND 3409 char str[256];
3920 scale_pixmap (""); /* reset to default scaling */ 3410
3921 set_bgPixmap (str); /* change pixmap */ 3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3922 scr_touch (true); 3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3923#endif 3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3414 process_xterm_seq (XTerm_title, str, CHAR_ST);
3924 } 3415 }
3925 3416 else
3417 {
3926 int changed = 0; 3418 int changed = 0;
3927 3419
3928 while ((str = strchr (str, ';')) != NULL) 3420 if (*str != ';')
3929 { 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 {
3930 str++; 3432 str++;
3931#if XPM_BACKGROUND 3433 if (bgPixmap.set_geometry (str))
3932 changed += scale_pixmap (str); 3434 changed++;
3933#endif 3435 str = strchr (str, ';');
3934 } 3436 }
3935
3936 if (changed) 3437 if (changed)
3937 { 3438 update_background ();
3938#ifdef XPM_BACKGROUND
3939 resize_pixmap ();
3940 scr_touch (true);
3941#endif
3942 } 3439 }
3943 }
3944 break; 3440 break;
3441#endif
3945 3442
3946 case Rxvt_restoreFG: 3443 case Rxvt_restoreFG:
3947 set_window_color (Color_fg, str); 3444 set_window_color (Color_fg, str);
3948 break; 3445 break;
3949 case Rxvt_restoreBG: 3446 case Rxvt_restoreBG:
… …
4071{ 3568{
4072 unsigned int i, j; 3569 unsigned int i, j;
4073 int state; 3570 int state;
4074 3571
4075 static const struct 3572 static const struct
4076 { 3573 {
4077 const int argval; 3574 const int argval;
4078 const unsigned long bit; 3575 const unsigned long bit;
4079 }
4080
4081 argtopriv[] = { 3576 } argtopriv[] = {
4082 { 1, PrivMode_aplCUR }, 3577 { 1, PrivMode_aplCUR },
4083 { 2, PrivMode_vt52 }, 3578 { 2, PrivMode_vt52 },
4084 { 3, PrivMode_132 }, 3579 { 3, PrivMode_132 },
4085 { 4, PrivMode_smoothScroll }, 3580 { 4, PrivMode_smoothScroll },
4086 { 5, PrivMode_rVideo }, 3581 { 5, PrivMode_rVideo },
… …
4102 { 66, PrivMode_aplKP }, 3597 { 66, PrivMode_aplKP },
4103#ifndef NO_BACKSPACE_KEY 3598#ifndef NO_BACKSPACE_KEY
4104 { 67, PrivMode_BackSpace }, 3599 { 67, PrivMode_BackSpace },
4105#endif 3600#endif
4106 { 1000, PrivMode_MouseX11 }, 3601 { 1000, PrivMode_MouseX11 },
4107 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3602 { 1002, PrivMode_MouseBtnEvent },
4108 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3603 { 1003, PrivMode_MouseAnyEvent },
4109 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4110 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4111 { 1011, PrivMode_Keypress }, // rxvt extension 3605 { 1011, PrivMode_Keypress }, // rxvt extension
4112 // 1035 enable modifiers for alt, numlock NYI 3606 // 1035 enable modifiers for alt, numlock NYI
4113 // 1036 send ESC for meta keys NYI 3607 // 1036 send ESC for meta keys NYI
4114 // 1037 send DEL for keypad delete NYI 3608 // 1037 send DEL for keypad delete NYI
… …
4188 scr_autowrap (state); 3682 scr_autowrap (state);
4189 break; 3683 break;
4190 /* 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 */
4191 case 9: /* X10 mouse reporting */ 3685 case 9: /* X10 mouse reporting */
4192 if (state) /* orthogonal */ 3686 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX11; 3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4194 break; 3688 break;
4195#ifdef scrollBar_esc 3689#ifdef scrollBar_esc
4196 case scrollBar_esc: 3690 case scrollBar_esc:
4197 if (scrollbar_mapping (state)) 3691 if (scrollbar_mapping (state))
4198 { 3692 {
… …
4211 break; 3705 break;
4212 /* case 66: - application key pad */ 3706 /* case 66: - application key pad */
4213 /* case 67: - backspace key */ 3707 /* case 67: - backspace key */
4214 case 1000: /* X11 mouse reporting */ 3708 case 1000: /* X11 mouse reporting */
4215 if (state) /* orthogonal */ 3709 if (state) /* orthogonal */
4216 priv_modes &= ~PrivMode_MouseX10; 3710 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4217 break; 3711 break;
4218#if 0
4219 case 1001: 3712 case 1002:
4220 break; /* X11 mouse highlighting */ 3713 case 1003:
4221#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;
4222 case 1010: /* scroll to bottom on TTY output inhibit */ 3724 case 1010: /* scroll to bottom on TTY output inhibit */
4223 set_option (Opt_scrollTtyOutput, !state); 3725 set_option (Opt_scrollTtyOutput, !state);
4224 break; 3726 break;
4225 case 1011: /* scroll to bottom on key press */ 3727 case 1011: /* scroll to bottom on key press */
4226 set_option (Opt_scrollTtyKeypress, state); 3728 set_option (Opt_scrollTtyKeypress, state);
… …
4403rxvt_term::process_graphics () 3905rxvt_term::process_graphics ()
4404{ 3906{
4405 unicode_t ch, cmd = cmd_getc (); 3907 unicode_t ch, cmd = cmd_getc ();
4406 3908
4407 if (cmd == 'Q') 3909 if (cmd == 'Q')
3910 {
4408 { /* query graphics */ 3911 /* query graphics */
4409 tt_printf ("\033G0\012"); /* no graphics */ 3912 tt_printf ("\033G0\012"); /* no graphics */
4410 return; 3913 return;
4411 } 3914 }
4412 /* swallow other graphics sequences until terminating ':' */ 3915 /* swallow other graphics sequences until terminating ':' */
4413 do 3916 do
… …
4463 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3966 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4464 3967
4465 memcpy (v_buffer + v_buflen, data, len); 3968 memcpy (v_buffer + v_buflen, data, len);
4466 v_buflen += len; 3969 v_buflen += len;
4467 3970
4468 pty_ev.set (EVENT_READ | EVENT_WRITE); 3971 pty_ev.set (ev::READ | ev::WRITE);
4469} 3972}
4470 3973
4471void rxvt_term::pty_write () 3974void rxvt_term::pty_write ()
4472{ 3975{
4473 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));
… …
4478 3981
4479 if (v_buflen == 0) 3982 if (v_buflen == 0)
4480 { 3983 {
4481 free (v_buffer); 3984 free (v_buffer);
4482 v_buffer = 0; 3985 v_buffer = 0;
4483 v_buflen = 0;
4484 3986
4485 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4486 return; 3988 return;
4487 } 3989 }
4488 3990
4489 memmove (v_buffer, v_buffer + written, v_buflen); 3991 memmove (v_buffer, v_buffer + written, v_buflen);
4490 } 3992 }
4491 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3993 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4492 pty_ev.set (EVENT_READ); 3994 pty_ev.set (ev::READ);
4493} 3995}
4494 3996
4495/*----------------------- end-of-file (C source) -----------------------*/ 3997/*----------------------- end-of-file (C source) -----------------------*/
4496 3998

Diff Legend

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