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.317 by root, Sat Jan 13 15:06:54 2007 UTC vs.
Revision 1.386 by ayin, Fri Dec 28 11:02:31 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;
221 ch = *chr++; 220 ch = *chr++;
222 221
223 sprintf (buf, "%8x", ch); 222 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 223 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 224 scr_overlay_set (9, y, '=');
226# if !UNICODE3 225# if !UNICODE_3
227 if (ch >= 0x10000) 226 if (ch >= 0x10000)
228 ch = 0xfffd; 227 ch = 0xfffd;
229# endif 228# endif
230 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
231 230
500# if ISO_14755 499# if ISO_14755
501 iso14755_51 (0); 500 iso14755_51 (0);
502# endif 501# endif
503 return; 502 return;
504 } 503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
505 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
506 { 513 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
509# if ISO_14755 516# if ISO_14755
511# endif 518# endif
512 return; 519 return;
513 } 520 }
514 else 521 else
515 { 522 {
516# if ENABLE_OVERLAY 523# if ISO_14755
517 scr_overlay_off (); 524 scr_overlay_off ();
518# endif 525# endif
519 iso14755buf = 0; 526 iso14755buf = 0;
520 } 527 }
521 } 528 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
525 { 532 {
526 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 534# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 537# endif
531 } 538 }
532#endif 539#endif
533 540
534#ifdef PRINTPIPE 541#ifdef PRINTPIPE
535 if (keysym == XK_Print) 542 if (keysym == XK_Print)
536 { 543 {
537 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
538 return; 545 return;
540#endif 547#endif
541 548
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 550 {
544 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
545 newlen = 1; 553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
546 switch (keysym) 584 switch (keysym)
547 { 585 {
548#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace: 587 case XK_BackSpace:
550 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
555 } 593 }
556 else 594 else
557 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
558 break; 596 break;
559#endif 597#endif
560#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete: 599 case XK_Delete:
572 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
573 break; 601 break;
574#endif 602#endif
575 case XK_Tab: 603 case XK_Tab:
576 if (shft) 604 if (shft)
577 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
587#endif 615#endif
588 newlen = 0; 616 newlen = 0;
589 } 617 }
590 break; 618 break;
591 619
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
622 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
624 break; 636 break;
625 637
626#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior: 639 case XK_Prior:
638 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
639 break; 641 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next: 642 case XK_Next:
651 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
652 break; 644 break;
653#endif 645#endif
654 case XK_KP_Enter: 646 case XK_KP_Enter:
655 /* allow shift to override */ 647 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
657 { 649 {
658 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
659 break; 651 break;
660 } 652 }
661 653
673 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
674 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
675 } 667 }
676 break; 668 break;
677 669
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
704 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */ 694 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
710 { 696 {
711 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
713 } 699 }
714 else 700 else
720 706
721 case XK_Find: 707 case XK_Find:
722 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
723 break; 709 break;
724 710
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert: 711 case XK_Insert:
736 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
737 break; 713 break;
738#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove: 715 case DXK_Remove:
743 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
744 break; 720 break;
745 case XK_Select: 721 case XK_Select:
746 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
747 break; 723 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End: 724 case XK_End:
759 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
760 break; 726 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home: 727 case XK_Home:
772 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
773 break; 729 break;
774 730
775#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
877 return; 833 return;
878 834
879 if (len <= 0) 835 if (len <= 0)
880 return; /* not mapped */ 836 return; /* not mapped */
881 837
882 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 839 if (view_start)
884 { 840 {
885 view_start = 0; 841 view_start = 0;
886 want_refresh = 1; 842 want_refresh = 1;
887 } 843 }
926#if ENABLE_FRILLS || ISO_14755 882#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 883 // ISO 14755 support
928 if (iso14755buf) 884 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 885 if (iso14755buf & ISO_14755_52)
930 { 886 {
931# if ENABLE_OVERLAY 887# if ISO_14755
932 scr_overlay_off (); 888 scr_overlay_off ();
933# endif 889# endif
934# if ISO_14755 890# if ISO_14755
935 // iso14755 part 5.2 handling: release time 891 // iso14755 part 5.2 handling: release time
936 // first: controls 892 // first: controls
959 915
960 return; 916 return;
961 } 917 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 919 {
964# if ENABLE_OVERLAY 920# if ISO_14755
965 scr_overlay_off (); 921 scr_overlay_off ();
966# endif 922# endif
967 if (iso14755buf & ISO_14755_51) 923 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 924 commit_iso14755 ();
969#if ISO_14755 925#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 927 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 929
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1027void 983void
1028rxvt_term::flush () 984rxvt_term::flush ()
1029{ 985{
1030 flush_ev.stop (); 986 flush_ev.stop ();
1031 987
1032#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
1034 { 990 {
1035 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 992 scr_touch (false);
1038 } 993 }
1039#endif 994#endif
1040 995
1041 if (want_refresh) 996 if (want_refresh)
1086 } 1041 }
1087 1042
1088 display->flush (); 1043 display->flush ();
1089} 1044}
1090 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1091void 1047void
1092rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1049{
1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1052
1053 display->flush ();
1054}
1055
1056void
1057rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1058{
1094 make_current (); 1059 make_current ();
1095 1060
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1061 refresh_count = 0;
1109 flush (); 1062 flush ();
1110} 1063}
1111 1064
1112#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1113void 1066void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1068{
1116 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1070 want_refresh = 1;
1118 1071 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1072}
1121#endif 1073#endif
1122 1074
1123#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1124void 1076void
1125rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1078{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1080 {
1129 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1130 want_refresh = 1; 1082 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
1132 } 1084 }
1085 else
1086 w.stop ();
1133} 1087}
1134#endif 1088#endif
1135 1089
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1091void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1093{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1142 { 1096 {
1143 want_refresh = 1; 1097 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1145 } 1099 }
1100 else
1101 w.stop ();
1146} 1102}
1147#endif 1103#endif
1148 1104
1149#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1150void 1106void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1108{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1110 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1112 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1158 } 1114 }
1115 else
1116 w.stop ();
1159} 1117}
1160#endif 1118#endif
1161 1119
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1121void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1123{
1166 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1125 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1126 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1175 } 1134 }
1176} 1135}
1177#endif 1136#endif
1178 1137
1179#if LINUX_YIELD_HACK 1138#if LINUX_YIELD_HACK
1180static struct event_handler 1139static struct event_handler
1181{ 1140{
1182 check_watcher yield_ev; 1141 ev::prepare yield_ev;
1183 1142
1184 void yield_cb (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1185 { 1144 {
1186 // this should really be sched_yield(), but the linux guys thought 1145 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1146 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1147 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1148 // allowed by the sus... as is returning ENOSYS.
1232 } 1191 }
1233 else 1192 else
1234 { 1193 {
1235 pty_ev.stop (); 1194 pty_ev.stop ();
1236 1195
1237 if (!OPTION (Opt_hold)) 1196 if (!option (Opt_hold))
1238 destroy (); 1197 destroy ();
1239 } 1198 }
1240 1199
1241 return false; 1200 return false;
1242} 1201}
1243 1202
1244void 1203void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1205{
1247 make_current (); 1206 make_current ();
1248 1207
1249 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1210 while (pty_fill ())
1252 if (cmd_parse ()) 1211 if (cmd_parse ())
1253 break; 1212 break;
1254 1213
1255 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1256 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1257} 1218}
1258 1219
1259void 1220void
1260rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1261{ 1222{
1263 recolour_cursor (); 1224 recolour_cursor ();
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
1275rxvt_term::pointer_blank () 1236rxvt_term::pointer_blank ()
1276{ 1237{
1277 if (!OPTION (Opt_pointerBlank)) 1238 if (!option (Opt_pointerBlank))
1278 return; 1239 return;
1279 1240
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1241 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1242 XFlush (dpy);
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:
1458 break; 1423 break;
1459 } 1424 }
1460 break; 1425 break;
1461 1426
1462 case FocusIn: 1427 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1431 focus_in ();
1465 break; 1432 break;
1466 1433
1467 case FocusOut: 1434 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1435 if (ev.xfocus.detail != NotifyInferior
1436 && ev.xfocus.detail != NotifyPointer
1437 && ev.xfocus.mode != NotifyGrab)
1469 focus_out (); 1438 focus_out ();
1470 break; 1439 break;
1471 1440
1472 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); */
1473 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1474 { 1446 {
1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1476 ; 1448 ;
1477 1449
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 { 1451 {
1480 seen_resize = 1; 1452 seen_resize = 1;
1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1482 } 1454 }
1455 else
1456 {
1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ())
1459 update_background ();
1460#endif
1461 }
1483 1462
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1487#if 0
1488 if (OPTION (Opt_transparent))
1489 check_our_parents ();
1490#endif
1491#endif
1492 } 1464 }
1493 break; 1465 break;
1494 1466
1495 case PropertyNotify: 1467 case PropertyNotify:
1496 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)))
1514 break; 1486 break;
1515 1487
1516 case MapNotify: 1488 case MapNotify:
1517 mapped = 1; 1489 mapped = 1;
1518#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1491 text_blink_ev.start ();
1520#endif 1492#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1494 break;
1523 1495
1524 case UnmapNotify: 1496 case UnmapNotify:
1526#ifdef TEXT_BLINK 1498#ifdef TEXT_BLINK
1527 text_blink_ev.stop (); 1499 text_blink_ev.stop ();
1528#endif 1500#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1501 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1502 break;
1531
1532#ifdef TRANSPARENT
1533 case ReparentNotify:
1534 rootwin_cb (ev);
1535 break;
1536#endif /* TRANSPARENT */
1537 1503
1538 case GraphicsExpose: 1504 case GraphicsExpose:
1539 case Expose: 1505 case Expose:
1540 if (ev.xany.window == vt) 1506 if (ev.xany.window == vt)
1541 { 1507 {
1542 do 1508 do
1509 {
1543 scr_expose (ev.xexpose.x, ev.xexpose.y, 1510 scr_expose (ev.xexpose.x, ev.xexpose.y,
1544 ev.xexpose.width, ev.xexpose.height, False); 1511 ev.xexpose.width, ev.xexpose.height, False);
1512 }
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1513 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1546 1514
1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548 1516
1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1518 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1521 }
1552 1522
1553 want_refresh = 1; 1523 want_refresh = 1;
1554 } 1524 }
1555 else 1525 else
1556 { 1526 {
1564 if (isScrollbarWindow (ev.xany.window)) 1534 if (isScrollbarWindow (ev.xany.window))
1565 { 1535 {
1566 scrollBar.setIdle (); 1536 scrollBar.setIdle ();
1567 scrollbar_show (0); 1537 scrollbar_show (0);
1568 } 1538 }
1569
1570#ifdef TRANSPARENT
1571 if (am_transparent && ev.xany.window == parent[0])
1572 XClearWindow (dpy, ev.xany.window);
1573#endif
1574 } 1539 }
1575 break; 1540 break;
1576 1541
1577 case MotionNotify: 1542 case MotionNotify:
1578#ifdef POINTER_BLANK 1543#ifdef POINTER_BLANK
1579 if (hidden_pointer) 1544 if (hidden_pointer)
1580 pointer_unblank (); 1545 pointer_unblank ();
1581#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);
1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583 break; 1551 break;
1584 1552
1585 if (ev.xany.window == vt) 1553 if (ev.xany.window == vt)
1586 { 1554 {
1620 int dist; 1588 int dist;
1621 1589
1622 /* don't clobber the current delay if we are 1590 /* don't clobber the current delay if we are
1623 * already in the middle of scrolling. 1591 * already in the middle of scrolling.
1624 */ 1592 */
1625 if (!sel_scroll_ev.active) 1593 if (!sel_scroll_ev.is_active ())
1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1594 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627 1595
1628 /* save the event params so we can highlight 1596 /* save the event params so we can highlight
1629 * the selection in the pending-scroll loop 1597 * the selection in the pending-scroll loop
1630 */ 1598 */
1631 selection_save_x = ev.xbutton.x; 1599 selection_save_x = ev.xbutton.x;
1653 else 1621 else
1654 { 1622 {
1655 /* we are within the text window, so we 1623 /* we are within the text window, so we
1656 * shouldn't be scrolling 1624 * shouldn't be scrolling
1657 */ 1625 */
1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop(); 1626 sel_scroll_ev.stop();
1660 } 1627 }
1661#endif 1628#endif
1662#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1663 } 1630 }
1664#endif 1631#endif
1676 &ev.xbutton.x, &ev.xbutton.y, 1643 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1644 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1679 scrollbar_size ()); 1646 scrollbar_size ());
1680 want_refresh = 1; 1647 want_refresh = 1;
1681 refresh_limit = 0;
1682 scrollbar_show (1); 1648 scrollbar_show (1);
1683 } 1649 }
1684 break; 1650 break;
1685 } 1651 }
1686 1652
1687#if defined(CURSOR_BLINK) 1653#if defined(CURSOR_BLINK)
1688 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1654 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1689 { 1655 {
1690 if (hidden_cursor) 1656 if (hidden_cursor)
1691 { 1657 {
1692 hidden_cursor = 0; 1658 hidden_cursor = 0;
1693 want_refresh = 1; 1659 want_refresh = 1;
1694 } 1660 }
1695 1661
1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1662 cursor_blink_ev.again ();
1697 } 1663 }
1698#endif 1664#endif
1699 1665
1700#if defined(POINTER_BLANK) 1666#if defined(POINTER_BLANK)
1701 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1667 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 { 1668 {
1703 if (ev.type == MotionNotify 1669 if (ev.type == MotionNotify
1704 || ev.type == ButtonPress 1670 || ev.type == ButtonPress
1705 || ev.type == ButtonRelease) 1671 || ev.type == ButtonRelease)
1706 if (hidden_pointer) 1672 if (hidden_pointer)
1708 1674
1709 if (ev.type == KeyPress && hidden_pointer == 0) 1675 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank (); 1676 pointer_blank ();
1711 } 1677 }
1712#endif 1678#endif
1679
1680 refresh_check ();
1713} 1681}
1714 1682
1715void 1683void
1716rxvt_term::focus_in () 1684rxvt_term::focus_in ()
1717{ 1685{
1728 IMSetPosition (); 1696 IMSetPosition ();
1729 XSetICFocus (Input_Context); 1697 XSetICFocus (Input_Context);
1730 } 1698 }
1731#endif 1699#endif
1732#if CURSOR_BLINK 1700#if CURSOR_BLINK
1733 if (OPTION (Opt_cursorBlink)) 1701 if (option (Opt_cursorBlink))
1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1702 cursor_blink_ev.again ();
1735#endif 1703#endif
1736#if OFF_FOCUS_FADING 1704#if OFF_FOCUS_FADING
1737 if (rs[Rs_fade]) 1705 if (rs[Rs_fade])
1738 { 1706 {
1739 pix_colors = pix_colors_focused; 1707 pix_colors = pix_colors_focused;
1740 scr_recolour (); 1708 scr_recolour ();
1741 } 1709 }
1742#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
1743 } 1721 }
1744} 1722}
1745 1723
1746void 1724void
1747rxvt_term::focus_out () 1725rxvt_term::focus_out ()
1755 1733
1756#if ENABLE_FRILLS || ISO_14755 1734#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1735 if (iso14755buf)
1758 { 1736 {
1759 iso14755buf = 0; 1737 iso14755buf = 0;
1760# if ENABLE_OVERLAY 1738# if ISO_14755
1761 scr_overlay_off (); 1739 scr_overlay_off ();
1762# endif 1740# endif
1763 } 1741 }
1764#endif 1742#endif
1765#if USE_XIM 1743#if USE_XIM
1766 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1767 XUnsetICFocus (Input_Context); 1745 XUnsetICFocus (Input_Context);
1768#endif 1746#endif
1769#if CURSOR_BLINK 1747#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1771 cursor_blink_ev.stop (); 1749 cursor_blink_ev.stop ();
1750
1772 hidden_cursor = 0; 1751 hidden_cursor = 0;
1773#endif 1752#endif
1774#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1775 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1776 { 1755 {
1792 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);
1793 } 1772 }
1794#endif 1773#endif
1795} 1774}
1796 1775
1797#if TRANSPARENT || ENABLE_PERL 1776#if ENABLE_TRANSPARENCY || ENABLE_PERL
1798void 1777void
1799rxvt_term::rootwin_cb (XEvent &ev) 1778rxvt_term::rootwin_cb (XEvent &ev)
1800{ 1779{
1801 make_current (); 1780 make_current ();
1802 1781
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1782 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1783 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return; 1784 return;
1806 1785
1807# if TRANSPARENT 1786# if ENABLE_TRANSPARENCY
1808 switch (ev.type) 1787 switch (ev.type)
1809 { 1788 {
1810 case PropertyNotify: 1789 case PropertyNotify:
1811 /* 1790 /*
1812 * 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,
1813 * 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.
1814 */ 1793 */
1815 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1794 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1816 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1795 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1817 return; 1796 {
1797 bgPixmap.set_root_pixmap ();
1798 update_background ();
1799 }
1818 1800
1819 /* FALLTHROUGH */
1820 case ReparentNotify:
1821 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1822 want_refresh = want_full_refresh = 1;
1823 break; 1801 break;
1824 } 1802 }
1825# endif 1803# endif
1804
1805 refresh_check ();
1826} 1806}
1827#endif 1807#endif
1828 1808
1829void 1809void
1830rxvt_term::button_press (XButtonEvent &ev) 1810rxvt_term::button_press (XButtonEvent &ev)
1885 mouse_report (ev); 1865 mouse_report (ev);
1886 } 1866 }
1887#else 1867#else
1888 MEvent.button = ev.button; 1868 MEvent.button = ev.button;
1889 mouse_report (ev); 1869 mouse_report (ev);
1890#endif /* MOUSE_REPORT_DOUBLECLICK */ 1870#endif /* MOUSE_REPORT_DOUBLECLICK */
1891 1871
1892 } 1872 }
1893 else 1873 else
1894 { 1874 {
1895 if (ev.button != MEvent.button) 1875 if (ev.button != MEvent.button)
1989 tt_printf ("\033[5~"); 1969 tt_printf ("\033[5~");
1990 break; 1970 break;
1991 } 1971 }
1992 } 1972 }
1993 else 1973 else
1994#endif /* NO_SCROLLBAR_REPORT */ 1974#endif /* NO_SCROLLBAR_REPORT */
1995 1975
1996 { 1976 {
1997 char upordown = 0; 1977 char upordown = 0;
1998 1978
1999 if (scrollBar.style == R_SB_NEXT) 1979 if (scrollBar.style == R_SB_NEXT)
2000 { 1980 {
2001 if (scrollbarnext_upButton (ev.y)) 1981 if (scrollbarnext_upButton (ev.y))
2002 upordown = -1; /* up */ 1982 upordown = -1; /* up */
2008 if (scrollbarrxvt_upButton (ev.y)) 1988 if (scrollbarrxvt_upButton (ev.y))
2009 upordown = -1; /* up */ 1989 upordown = -1; /* up */
2010 else if (scrollbarrxvt_dnButton (ev.y)) 1990 else if (scrollbarrxvt_dnButton (ev.y))
2011 upordown = 1; /* down */ 1991 upordown = 1; /* down */
2012 } 1992 }
1993
2013 if (upordown) 1994 if (upordown)
2014 { 1995 {
2015#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1997 if (!cont_scroll_ev.is_active ())
2016 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1998 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2017#endif 1999#endif
2018 if (scr_page (upordown < 0 ? UP : DN, 1)) 2000 if (scr_page (upordown < 0 ? UP : DN, 1))
2019 { 2001 {
2020 if (upordown < 0) 2002 if (upordown < 0)
2021 scrollBar.setUp (); 2003 scrollBar.setUp ();
2101 scrollBar.setIdle (); 2083 scrollBar.setIdle ();
2102 scrollbar_show (0); 2084 scrollbar_show (0);
2103 } 2085 }
2104 2086
2105#ifdef SELECTION_SCROLLING 2087#ifdef SELECTION_SCROLLING
2106 if (sel_scroll_ev.active)
2107 sel_scroll_ev.stop(); 2088 sel_scroll_ev.stop();
2108#endif 2089#endif
2109 2090
2110 if (ev.window == vt) 2091 if (ev.window == vt)
2111 { 2092 {
2112 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)))
2136 mouse_report (ev); 2117 mouse_report (ev);
2137 } 2118 }
2138#else /* MOUSE_REPORT_DOUBLECLICK */ 2119#else /* MOUSE_REPORT_DOUBLECLICK */
2139 MEvent.button = AnyButton; 2120 MEvent.button = AnyButton;
2140 mouse_report (ev); 2121 mouse_report (ev);
2141#endif /* MOUSE_REPORT_DOUBLECLICK */ 2122#endif /* MOUSE_REPORT_DOUBLECLICK */
2142 return; 2123 return;
2143 } 2124 }
2144 2125
2145 /* 2126 /*
2146 * dumb hack to compensate for the failure of click-and-drag 2127 * dumb hack to compensate for the failure of click-and-drag
2158 selection_make (ev.time); 2139 selection_make (ev.time);
2159 break; 2140 break;
2160 2141
2161 case Button2: 2142 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2144 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164 break; 2145 break;
2165 2146
2166#ifdef MOUSE_WHEEL 2147#ifdef MOUSE_WHEEL
2167 case Button4: 2148 case Button4:
2168 case Button5: 2149 case Button5:
2172 2153
2173 v = ev.button == Button4 ? UP : DN; 2154 v = ev.button == Button4 ? UP : DN;
2174 2155
2175 if (ev.state & ShiftMask) 2156 if (ev.state & ShiftMask)
2176 i = 1; 2157 i = 1;
2177 else if (OPTION (Opt_mouseWheelScrollPage)) 2158 else if (option (Opt_mouseWheelScrollPage))
2178 i = nrow - 1; 2159 i = nrow - 1;
2179 else 2160 else
2180 i = 5; 2161 i = 5;
2181 2162
2182# ifdef MOUSE_SLIP_WHEELING 2163# ifdef MOUSE_SLIP_WHEELING
2184 { 2165 {
2185 mouse_slip_wheel_speed += v ? -1 : 1; 2166 mouse_slip_wheel_speed += v ? -1 : 1;
2186 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2187 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2188 2169
2189 if (slip_wheel_ev.at < NOW) 2170 if (!slip_wheel_ev.is_active ())
2190 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2171 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2191
2192 slip_wheel_ev.start ();
2193 } 2172 }
2194 else 2173 else
2195 { 2174 {
2196# endif 2175# endif
2197 scr_page (v, i); 2176 scr_page (v, i);
2203 break; 2182 break;
2204#endif 2183#endif
2205 } 2184 }
2206 } 2185 }
2207} 2186}
2208
2209#ifdef TRANSPARENT
2210#if TINTING
2211/* taken from aterm-0.4.2 */
2212
2213typedef uint32_t RUINT32T;
2214
2215void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2216{
2217 int sh_r, sh_g, sh_b;
2218 RUINT32T mask_r, mask_g, mask_b;
2219 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2220 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2221 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2222 int i;
2223
2224 Visual *visual = term->visual;
2225
2226 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2227
2228 /* for convenience */
2229 mask_r = visual->red_mask;
2230 mask_g = visual->green_mask;
2231 mask_b = visual->blue_mask;
2232
2233 /* boring lookup table pre-initialization */
2234 switch (srcImage->bits_per_pixel) {
2235 case 15:
2236 if ((mask_r != 0x7c00) ||
2237 (mask_g != 0x03e0) ||
2238 (mask_b != 0x001f))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2241 lookup_r = lookup;
2242 lookup_g = lookup+32;
2243 lookup_b = lookup+32+32;
2244 sh_r = 10;
2245 sh_g = 5;
2246 sh_b = 0;
2247 break;
2248 case 16:
2249 if ((mask_r != 0xf800) ||
2250 (mask_g != 0x07e0) ||
2251 (mask_b != 0x001f))
2252 return;
2253 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2254 lookup_r = lookup;
2255 lookup_g = lookup+32;
2256 lookup_b = lookup+32+64;
2257 sh_r = 11;
2258 sh_g = 5;
2259 sh_b = 0;
2260 break;
2261 case 24:
2262 if ((mask_r != 0xff0000) ||
2263 (mask_g != 0x00ff00) ||
2264 (mask_b != 0x0000ff))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2267 lookup_r = lookup;
2268 lookup_g = lookup+256;
2269 lookup_b = lookup+256+256;
2270 sh_r = 16;
2271 sh_g = 8;
2272 sh_b = 0;
2273 break;
2274 case 32:
2275 if ((mask_r != 0xff0000) ||
2276 (mask_g != 0x00ff00) ||
2277 (mask_b != 0x0000ff))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2280 lookup_r = lookup;
2281 lookup_g = lookup+256;
2282 lookup_b = lookup+256+256;
2283 sh_r = 16;
2284 sh_g = 8;
2285 sh_b = 0;
2286 break;
2287 default:
2288 return; /* we do not support this color depth */
2289 }
2290
2291 /* prepare limits for color transformation (each channel is handled separately) */
2292 if (shade < 0) {
2293 shade = -shade;
2294 if (shade < 0) shade = 0;
2295 if (shade > 100) shade = 100;
2296
2297 lower_lim_r = 65535-rm;
2298 lower_lim_g = 65535-gm;
2299 lower_lim_b = 65535-bm;
2300
2301 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2302 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2303 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2304
2305 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2306 } else {
2307 if (shade < 0) shade = 0;
2308 if (shade > 100) shade = 100;
2309
2310 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2311
2312 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2313 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2314 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2315 }
2316
2317 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2318 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2319 {
2320 unsigned int tmp;
2321
2322 tmp = lower_lim_r;
2323 lower_lim_r = lower_lim_b;
2324 lower_lim_b = tmp;
2325
2326 tmp = upper_lim_r;
2327 upper_lim_r = upper_lim_b;
2328 upper_lim_b = tmp;
2329 }
2330
2331 /* fill our lookup tables */
2332 for (i = 0; i <= mask_r>>sh_r; i++)
2333 {
2334 RUINT32T tmp;
2335 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2336 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2337 lookup_r[i] = (tmp/65535)<<sh_r;
2338 }
2339 for (i = 0; i <= mask_g>>sh_g; i++)
2340 {
2341 RUINT32T tmp;
2342 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2343 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2344 lookup_g[i] = (tmp/65535)<<sh_g;
2345 }
2346 for (i = 0; i <= mask_b>>sh_b; i++)
2347 {
2348 RUINT32T tmp;
2349 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2350 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2351 lookup_b[i] = (tmp/65535)<<sh_b;
2352 }
2353
2354 /* apply table to input image (replacing colors by newly calculated ones) */
2355 switch (srcImage->bits_per_pixel)
2356 {
2357 case 15:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0x7c00)>>10] |
2369 lookup_g[(*p & 0x03e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 16:
2377 {
2378 unsigned short *p1, *pf, *p, *pl;
2379 p1 = (unsigned short *) srcImage->data;
2380 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width;
2385 for (; p < pl; p++)
2386 {
2387 *p = lookup_r[(*p & 0xf800)>>11] |
2388 lookup_g[(*p & 0x07e0)>> 5] |
2389 lookup_b[(*p & 0x001f)];
2390 }
2391 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 24:
2396 {
2397 unsigned char *p1, *pf, *p, *pl;
2398 p1 = (unsigned char *) srcImage->data;
2399 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400 while (p1 < pf)
2401 {
2402 p = p1;
2403 pl = p1 + srcImage->width * 3;
2404 for (; p < pl; p += 3)
2405 {
2406 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2407 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2408 p[2] = lookup_r[(p[2] & 0x0000ff)];
2409 }
2410 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2411 }
2412 break;
2413 }
2414 case 32:
2415 {
2416 RUINT32T *p1, *pf, *p, *pl;
2417 p1 = (RUINT32T *) srcImage->data;
2418 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2419
2420 while (p1 < pf)
2421 {
2422 p = p1;
2423 pl = p1 + srcImage->width;
2424 for (; p < pl; p++)
2425 {
2426 *p = lookup_r[(*p & 0xff0000)>>16] |
2427 lookup_g[(*p & 0x00ff00)>> 8] |
2428 lookup_b[(*p & 0x0000ff)] |
2429 (*p & ~0xffffff);
2430 }
2431 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2432 }
2433 break;
2434 }
2435 }
2436
2437 free (lookup);
2438}
2439#endif
2440
2441/*
2442 * Check our parents are still who we think they are.
2443 * Do transparency updates if required
2444 */
2445int
2446rxvt_term::check_our_parents ()
2447{
2448 int i, pchanged, aformat, have_pixmap, rootdepth;
2449 unsigned long nitems, bytes_after;
2450 Atom atype;
2451 unsigned char *prop = NULL;
2452 Window root, oldp, *list;
2453 Pixmap rootpixmap = None;
2454 XWindowAttributes wattr, wrootattr;
2455
2456 pchanged = 0;
2457
2458 if (!OPTION (Opt_transparent))
2459 return pchanged; /* Don't try any more */
2460
2461 XGetWindowAttributes (dpy, display->root, &wrootattr);
2462 rootdepth = wrootattr.depth;
2463
2464 XGetWindowAttributes (dpy, parent[0], &wattr);
2465
2466 if (rootdepth != wattr.depth)
2467 {
2468 if (am_transparent)
2469 {
2470 pchanged = 1;
2471 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2472 am_transparent = am_pixmap_trans = 0;
2473 }
2474
2475 return pchanged; /* Don't try any more */
2476 }
2477
2478 /* Get all X ops out of the queue so that our information is up-to-date. */
2479 XSync (dpy, False);
2480
2481 /*
2482 * Make the frame window set by the window manager have
2483 * the root background. Some window managers put multiple nested frame
2484 * windows for each client, so we have to take care about that.
2485 */
2486 i = (xa[XA_XROOTPMAP_ID]
2487 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2488 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2489 &nitems, &bytes_after, &prop) == Success);
2490
2491 if (!i || prop == NULL)
2492 i = (xa[XA_ESETROOT_PMAP_ID]
2493 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2494 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2495 &nitems, &bytes_after, &prop) == Success);
2496
2497 if (!i || prop == NULL
2498#if TINTING
2499 || !ISSET_PIXCOLOR (Color_tint)
2500#endif
2501 )
2502 have_pixmap = 0;
2503 else
2504 {
2505 have_pixmap = 1;
2506 rootpixmap = *(Pixmap *)prop;
2507 XFree (prop);
2508 }
2509
2510 if (have_pixmap)
2511 {
2512 /*
2513 * Copy display->root pixmap transparency
2514 */
2515 int sx, sy, nx, ny;
2516 unsigned int nw, nh;
2517 Window cr;
2518 XImage *image;
2519 GC gc;
2520 XGCValues gcvalue;
2521
2522 XTranslateCoordinates (dpy, parent[0], display->root,
2523 0, 0, &sx, &sy, &cr);
2524 nw = (unsigned int)szHint.width;
2525 nh = (unsigned int)szHint.height;
2526 nx = ny = 0;
2527
2528 if (sx < 0)
2529 {
2530 nw += sx;
2531 nx = -sx;
2532 sx = 0;
2533 }
2534
2535 if (sy < 0)
2536 {
2537 nh += sy;
2538 ny = -sy;
2539 sy = 0;
2540 }
2541
2542 min_it (nw, (unsigned int) (wrootattr.width - sx));
2543 min_it (nh, (unsigned int) (wrootattr.height - sy));
2544
2545 XSync (dpy, False);
2546 allowedxerror = -1;
2547 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2548
2549 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2550 /* XXX: may need a delay here? */
2551 allowedxerror = 0;
2552
2553 if (image == NULL)
2554 {
2555 if (am_transparent && am_pixmap_trans)
2556 {
2557 pchanged = 1;
2558 if (pixmap != None)
2559 {
2560 XFreePixmap (dpy, pixmap);
2561 pixmap = None;
2562 }
2563 }
2564
2565 am_pixmap_trans = 0;
2566 }
2567 else
2568 {
2569 if (pixmap != None)
2570 XFreePixmap (dpy, pixmap);
2571
2572#if TINTING
2573 if (ISSET_PIXCOLOR (Color_tint))
2574 {
2575 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2576
2577 rgba c;
2578 pix_colors_focused [Color_tint].get (c);
2579
2580 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2581 }
2582#endif
2583
2584 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2585 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2586 XPutImage (dpy, pixmap, gc, image, 0, 0,
2587 nx, ny, image->width, image->height);
2588 XFreeGC (dpy, gc);
2589 XDestroyImage (image);
2590 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2591 XClearWindow (dpy, parent[0]);
2592
2593 if (!am_transparent || !am_pixmap_trans)
2594 pchanged = 1;
2595
2596 am_transparent = am_pixmap_trans = 1;
2597 }
2598 }
2599
2600 if (am_pixmap_trans)
2601 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2602 else
2603 {
2604 unsigned int n;
2605 /*
2606 * InheritPixmap transparency
2607 */
2608 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2609 {
2610 oldp = parent[i];
2611 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 for (; n < (unsigned int)i; n++)
2630 {
2631 XGetWindowAttributes (dpy, parent[n], &wattr);
2632
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639
2640 if (n > (sizeof (parent) / sizeof (parent[0])))
2641 {
2642 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2643 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2644 am_transparent = 0;
2645 /* XXX: also turn off Opt_transparent? */
2646 }
2647 else
2648 {
2649 for (n = 0; n < (unsigned int)i; n++)
2650 {
2651 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2652 XClearWindow (dpy, parent[n]);
2653 }
2654
2655 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2656 am_transparent = 1;
2657 }
2658
2659 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2660 parent[i] = None;
2661 }
2662
2663 if (scrollBar.win)
2664 {
2665 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2666 scrollBar.setIdle ();
2667 scrollbar_show (0);
2668 }
2669
2670 if (am_transparent)
2671 {
2672 want_refresh = want_full_refresh = 1;
2673 if (am_pixmap_trans)
2674 flush ();
2675 }
2676
2677 return pchanged;
2678}
2679#endif
2680 2187
2681/*}}} */ 2188/*}}} */
2682 2189
2683bool 2190bool
2684rxvt_term::cmd_parse () 2191rxvt_term::cmd_parse ()
2733 if (ch == C0_LF) 2240 if (ch == C0_LF)
2734 nlines++; 2241 nlines++;
2735 2242
2736 refresh_count++; 2243 refresh_count++;
2737 2244
2738 if (!OPTION (Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2739 || (refresh_count >= refresh_limit * (nrow - 1)))
2740 { 2246 {
2741 refreshnow = true;
2742 refresh_count = 0; 2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2251 refreshnow = true;
2743 ch = NOCHAR; 2252 ch = NOCHAR;
2744 break; 2253 break;
2254 }
2745 } 2255 }
2746 2256
2747 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2748 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2749 { 2259 {
2777 && 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))))
2778 scr_add_lines (buf, str - buf, nlines); 2288 scr_add_lines (buf, str - buf, nlines);
2779 2289
2780 /* 2290 /*
2781 * 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
2782 * 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.
2783 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2784 * is incremented here because we must be doing flat-out scrolling.
2785 */ 2294 */
2786 if (refreshnow) 2295 if (refreshnow)
2787 { 2296 {
2788 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2789 refresh_limit++;
2790 else
2791 {
2792 flag = true; 2297 flag = true;
2793 //TODO: due to popular request, implement "skipscroll" option here
2794 scr_refresh (); 2298 scr_refresh ();
2795 want_refresh = 1; 2299 want_refresh = 1;
2796 }
2797 } 2300 }
2798 2301
2799 } 2302 }
2800 else 2303 else
2801 { 2304 {
2950 { 2453 {
2951 if ((buf[len++] = cmd_getc ()) == 'i') 2454 if ((buf[len++] = cmd_getc ()) == 'i')
2952 break; /* done = 1 */ 2455 break; /* done = 1 */
2953 } 2456 }
2954 } 2457 }
2955 2458
2956 for (i = 0; i < len; i++) 2459 for (i = 0; i < len; i++)
2957 if (putc (buf[i], fd) == EOF) 2460 if (putc (buf[i], fd) == EOF)
2958 { 2461 {
2959 done = 1; 2462 done = 1;
2960 break; 2463 break;
2962 } 2465 }
2963 } 2466 }
2964 2467
2965 pclose_printer (fd); 2468 pclose_printer (fd);
2966} 2469}
2967#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2968/*}}} */ 2471/*}}} */
2969 2472
2970/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2971enum { 2474enum {
2972 C1_40 = 0x40, 2475 C1_40 = 0x40,
3022 process_dcs_seq (); 2525 process_dcs_seq ();
3023 break; 2526 break;
3024 case 0x9b: /* CSI */ 2527 case 0x9b: /* CSI */
3025 process_csi_seq (); 2528 process_csi_seq ();
3026 break; 2529 break;
3027 case 0x9d: /* CSI */ 2530 case 0x9d: /* OSC */
3028 process_osc_seq (); 2531 process_osc_seq ();
3029 break; 2532 break;
3030#endif 2533#endif
3031 } 2534 }
3032} 2535}
3258rxvt_term::process_csi_seq () 2761rxvt_term::process_csi_seq ()
3259{ 2762{
3260 unicode_t ch, priv, i; 2763 unicode_t ch, priv, i;
3261 unsigned int nargs, p; 2764 unsigned int nargs, p;
3262 int n, ndef; 2765 int n, ndef;
3263 int arg[ESC_ARGS]; 2766 int arg[ESC_ARGS] = { };
3264 2767
3265 for (nargs = ESC_ARGS; nargs > 0;) 2768 nargs = 0;
3266 arg[--nargs] = 0;
3267 2769
3268 priv = 0; 2770 priv = 0;
3269 ch = cmd_getc (); 2771 ch = cmd_getc ();
3270 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
3271 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
3272 priv = ch; 2775 priv = ch;
3273 ch = cmd_getc (); 2776 ch = cmd_getc ();
3274 } 2777 }
3275 2778
3276 /* read any numerical arguments */ 2779 /* read any numerical arguments */
3315 switch (priv) 2818 switch (priv)
3316 { 2819 {
3317 case '>': 2820 case '>':
3318 if (ch == CSI_DA) /* secondary device attributes */ 2821 if (ch == CSI_DA) /* secondary device attributes */
3319 { 2822 {
3320 // 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,
3321 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2824 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3322 // 2825 //
3323 // 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
3324 // 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
3325 // that we do not support xterm mouse reporting (should be 95 when we do). 2828 // versions.
3326 // 2829 //
3327 tt_printf ("\033[>%d;94;0c", 'U'); 2830 tt_printf ("\033[>%d;95;0c", 'U');
3328 } 2831 }
3329 break; 2832 break;
3330 case '?': 2833 case '?':
3331 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3332 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
3459 break; 2962 break;
3460 case 6: /* CPR requested */ 2963 case 6: /* CPR requested */
3461 scr_report_position (); 2964 scr_report_position ();
3462 break; 2965 break;
3463 case 7: /* unofficial extension */ 2966 case 7: /* unofficial extension */
3464 if (OPTION (Opt_insecure)) 2967 if (option (Opt_insecure))
3465 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2968 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3466 break; 2969 break;
3467 case 8: /* unofficial extension */ 2970 case 8: /* unofficial extension */
3468 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3469 break; 2972 break;
3633 break; 3136 break;
3634 case 20: /* report icon label */ 3137 case 20: /* report icon label */
3635 { 3138 {
3636 char *s; 3139 char *s;
3637 XGetIconName (dpy, parent[0], &s); 3140 XGetIconName (dpy, parent[0], &s);
3638 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3141 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3639 XFree (s); 3142 XFree (s);
3640 } 3143 }
3641 break; 3144 break;
3642 case 21: /* report window title */ 3145 case 21: /* report window title */
3643 { 3146 {
3644 char *s; 3147 char *s;
3645 XFetchName (dpy, parent[0], &s); 3148 XFetchName (dpy, parent[0], &s);
3646 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3149 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3647 XFree (s); 3150 XFree (s);
3648 } 3151 }
3649 break; 3152 break;
3650 } 3153 }
3651} 3154}
3778 int saveop = op; 3281 int saveop = op;
3779 3282
3780 dLocal (Display *, dpy); 3283 dLocal (Display *, dpy);
3781 3284
3782 assert (str != NULL); 3285 assert (str != NULL);
3783 3286
3784 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)))
3785 return; 3288 return;
3786 3289
3787 switch (op) 3290 switch (op)
3788 { 3291 {
3883 break; 3386 break;
3884 case URxvt_Color_IT: 3387 case URxvt_Color_IT:
3885 process_color_seq (op, Color_IT, str, resp); 3388 process_color_seq (op, Color_IT, str, resp);
3886 break; 3389 break;
3887#endif 3390#endif
3888#if TRANSPARENT && TINTING 3391#if ENABLE_TRANSPARENCY
3889 case URxvt_Color_tint: 3392 case URxvt_Color_tint:
3890 process_color_seq (op, Color_tint, str, resp); 3393 process_color_seq (op, Color_tint, str, resp);
3394 {
3395 bool changed = false;
3891 3396
3892 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 ();
3893 3401
3894 if (am_transparent) 3402 if (changed)
3895 want_full_refresh = want_refresh = 1; 3403 update_background ();
3404 }
3896 3405
3897 break; 3406 break;
3898#endif 3407#endif
3899 3408
3409#if BG_IMAGE_FROM_FILE
3900 case Rxvt_Pixmap: 3410 case Rxvt_Pixmap:
3901 { 3411 if (!strcmp (str, "?"))
3902 if (*str != ';')
3903 { 3412 {
3904#if XPM_BACKGROUND 3413 char str[256];
3905 scale_pixmap (""); /* reset to default scaling */ 3414
3906 set_bgPixmap (str); /* change pixmap */ 3415 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3907 scr_touch (true); 3416 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3908#endif 3417 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3418 process_xterm_seq (XTerm_title, str, CHAR_ST);
3909 } 3419 }
3910 3420 else
3421 {
3911 int changed = 0; 3422 int changed = 0;
3912 3423
3913 while ((str = strchr (str, ';')) != NULL) 3424 if (*str != ';')
3914 { 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 {
3915 str++; 3437 str++;
3916#if XPM_BACKGROUND 3438 if (bgPixmap.set_geometry (str))
3917 changed += scale_pixmap (str); 3439 changed++;
3918#endif 3440 str = strchr (str, ';');
3919 } 3441 }
3920 3442
3921 if (changed) 3443 if (changed)
3922 { 3444 update_background ();
3923#ifdef XPM_BACKGROUND
3924 resize_pixmap ();
3925 scr_touch (true);
3926#endif
3927 } 3445 }
3928 }
3929 break; 3446 break;
3447#endif
3930 3448
3931 case Rxvt_restoreFG: 3449 case Rxvt_restoreFG:
3932 set_window_color (Color_fg, str); 3450 set_window_color (Color_fg, str);
3933 break; 3451 break;
3934 case Rxvt_restoreBG: 3452 case Rxvt_restoreBG:
3959 case URxvt_italicFont: 3477 case URxvt_italicFont:
3960 case URxvt_boldItalicFont: 3478 case URxvt_boldItalicFont:
3961#endif 3479#endif
3962 if (query) 3480 if (query)
3963 tt_printf ("\33]%d;%-.250s%c", saveop, 3481 tt_printf ("\33]%d;%-.250s%c", saveop,
3964 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3482 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965 ? fontset[op - URxvt_font]->fontdesc : "", 3483 ? fontset[op - URxvt_font]->fontdesc : "",
3966 resp); 3484 resp);
3967 else 3485 else
3968 { 3486 {
3969 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3487 const char *&res = rs[Rs_font + (op - URxvt_font)];
3983 break; 3501 break;
3984 3502
3985#if !ENABLE_MINIMAL 3503#if !ENABLE_MINIMAL
3986 case URxvt_locale: 3504 case URxvt_locale:
3987 if (query) 3505 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3506 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3989 else 3507 else
3990 { 3508 {
3991 set_locale (str); 3509 set_locale (str);
3992 pty->set_utf8_mode (enc_utf8); 3510 pty->set_utf8_mode (enc_utf8);
3993 init_xlocale (); 3511 init_xlocale ();
4056{ 3574{
4057 unsigned int i, j; 3575 unsigned int i, j;
4058 int state; 3576 int state;
4059 3577
4060 static const struct 3578 static const struct
4061 { 3579 {
4062 const int argval; 3580 const int argval;
4063 const unsigned long bit; 3581 const unsigned long bit;
4064 }
4065
4066 argtopriv[] = { 3582 } argtopriv[] = {
4067 { 1, PrivMode_aplCUR }, 3583 { 1, PrivMode_aplCUR },
4068 { 2, PrivMode_vt52 }, 3584 { 2, PrivMode_vt52 },
4069 { 3, PrivMode_132 }, 3585 { 3, PrivMode_132 },
4070 { 4, PrivMode_smoothScroll }, 3586 { 4, PrivMode_smoothScroll },
4071 { 5, PrivMode_rVideo }, 3587 { 5, PrivMode_rVideo },
4087 { 66, PrivMode_aplKP }, 3603 { 66, PrivMode_aplKP },
4088#ifndef NO_BACKSPACE_KEY 3604#ifndef NO_BACKSPACE_KEY
4089 { 67, PrivMode_BackSpace }, 3605 { 67, PrivMode_BackSpace },
4090#endif 3606#endif
4091 { 1000, PrivMode_MouseX11 }, 3607 { 1000, PrivMode_MouseX11 },
4092 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3608 { 1002, PrivMode_MouseBtnEvent },
4093 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3609 { 1003, PrivMode_MouseAnyEvent },
4094 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4095 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4096 { 1011, PrivMode_Keypress }, // rxvt extension 3611 { 1011, PrivMode_Keypress }, // rxvt extension
4097 // 1035 enable modifiers for alt, numlock NYI 3612 // 1035 enable modifiers for alt, numlock NYI
4098 // 1036 send ESC for meta keys NYI 3613 // 1036 send ESC for meta keys NYI
4099 // 1037 send DEL for keypad delete NYI 3614 // 1037 send DEL for keypad delete NYI
4134 scr_touch (true); 3649 scr_touch (true);
4135 break; 3650 break;
4136#endif 3651#endif
4137 case 1048: /* alternative cursor save */ 3652 case 1048: /* alternative cursor save */
4138 case 1049: 3653 case 1049:
4139 if (OPTION (Opt_secondaryScreen)) 3654 if (option (Opt_secondaryScreen))
4140 if (mode == 0) 3655 if (mode == 0)
4141 scr_cursor (RESTORE); 3656 scr_cursor (RESTORE);
4142 else if (mode == 1) 3657 else if (mode == 1)
4143 scr_cursor (SAVE); 3658 scr_cursor (SAVE);
4144 break; 3659 break;
4173 scr_autowrap (state); 3688 scr_autowrap (state);
4174 break; 3689 break;
4175 /* 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 */
4176 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
4177 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
4178 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4179 break; 3694 break;
4180#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
4181 case scrollBar_esc: 3696 case scrollBar_esc:
4182 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
4183 { 3698 {
4196 break; 3711 break;
4197 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
4198 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
4199 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
4200 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
4201 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4202 break; 3717 break;
4203#if 0
4204 case 1001: 3718 case 1002:
4205 break; /* X11 mouse highlighting */ 3719 case 1003:
4206#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;
4207 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
4208 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
4209 break; 3732 break;
4210 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
4211 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
4212 break; 3735 break;
4213 case 1047: /* secondary screen w/ clearing last */ 3736 case 1047: /* secondary screen w/ clearing last */
4214 if (OPTION (Opt_secondaryScreen)) 3737 if (option (Opt_secondaryScreen))
4215 if (current_screen != PRIMARY) 3738 if (current_screen != PRIMARY)
4216 scr_erase_screen (2); 3739 scr_erase_screen (2);
4217 scr_change_screen (state); 3740 scr_change_screen (state);
4218 break; 3741 break;
4219 case 1049: /* secondary screen w/ clearing first */ 3742 case 1049: /* secondary screen w/ clearing first */
4220 scr_change_screen (state); 3743 scr_change_screen (state);
4221 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4222 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4223 scr_erase_screen (2); 3746 scr_erase_screen (2);
4224 break; 3747 break;
4225 default: 3748 default:
4226 break; 3749 break;
4388rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
4389{ 3912{
4390 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
4391 3914
4392 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
4393 { /* query graphics */ 3917 /* query graphics */
4394 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
4395 return; 3919 return;
4396 } 3920 }
4397 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
4398 do 3922 do
4448 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4449 3973
4450 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4451 v_buflen += len; 3975 v_buflen += len;
4452 3976
4453 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4454} 3978}
4455 3979
4456void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4457{ 3981{
4458 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));
4463 3987
4464 if (v_buflen == 0) 3988 if (v_buflen == 0)
4465 { 3989 {
4466 free (v_buffer); 3990 free (v_buffer);
4467 v_buffer = 0; 3991 v_buffer = 0;
4468 v_buflen = 0;
4469 3992
4470 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4471 return; 3994 return;
4472 } 3995 }
4473 3996
4474 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4475 } 3998 }
4476 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4477 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4478} 4001}
4479 4002
4480/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4481 4004

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines