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.311 by root, Sat Mar 4 20:14:35 2006 UTC vs.
Revision 1.395 by root, Sun Jan 20 13:45:21 2008 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 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * 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 34 * 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 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
203 203
204 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
206 206
207 if (y >= 0) 207 if (y >= 0)
208 { 208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
221 ch = *chr++; 221 ch = *chr++;
222 222
223 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
226# if !UNICODE3 226# if !UNICODE_3
227 if (ch >= 0x10000) 227 if (ch >= 0x10000)
228 ch = 0xfffd; 228 ch = 0xfffd;
229# endif 229# endif
230 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231 231
… …
500# if ISO_14755 500# if ISO_14755
501 iso14755_51 (0); 501 iso14755_51 (0);
502# endif 502# endif
503 return; 503 return;
504 } 504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
511 return;
512 }
505 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
506 { 514 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
509# if ISO_14755 517# if ISO_14755
… …
511# endif 519# endif
512 return; 520 return;
513 } 521 }
514 else 522 else
515 { 523 {
516# if ENABLE_OVERLAY 524# if ISO_14755
517 scr_overlay_off (); 525 scr_overlay_off ();
518# endif 526# endif
519 iso14755buf = 0; 527 iso14755buf = 0;
520 } 528 }
521 } 529 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
525 { 533 {
526 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 535# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 538# endif
531 } 539 }
532#endif 540#endif
533 541
534#ifdef PRINTPIPE 542#ifdef PRINTPIPE
535 if (keysym == XK_Print) 543 if (keysym == XK_Print)
536 { 544 {
537 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
538 return; 546 return;
… …
540#endif 548#endif
541 549
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 551 {
544 { 552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
545 newlen = 1; 554 newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 };
572
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
546 switch (keysym) 585 switch (keysym)
547 { 586 {
548#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace: 588 case XK_BackSpace:
550 if (priv_modes & PrivMode_HaveBackSpace) 589 if (priv_modes & PrivMode_HaveBackSpace)
… …
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177'; 592 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0'; 593 kbuf[1] = '\0';
555 } 594 }
556 else 595 else
557 strcpy (kbuf, key_backspace); 596 strcpy (kbuf, rs[Rs_backspace_key]);
558 break; 597 break;
559#endif 598#endif
560#ifndef NO_DELETE_KEY 599#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: 600 case XK_Delete:
572 strcpy (kbuf, key_delete); 601 strcpy (kbuf, rs[Rs_delete_key]);
573 break; 602 break;
574#endif 603#endif
575 case XK_Tab: 604 case XK_Tab:
576 if (shft) 605 if (shft)
577 strcpy (kbuf, "\033[Z"); 606 strcpy (kbuf, "\033[Z");
… …
587#endif 616#endif
588 newlen = 0; 617 newlen = 0;
589 } 618 }
590 break; 619 break;
591 620
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" */ 621 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */ 622 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */ 623 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */ 624 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z"); 625 strcpy (kbuf, "\033[Z");
… …
622 else if (priv_modes & PrivMode_aplCUR) 635 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O'; 636 kbuf[1] = 'O';
624 break; 637 break;
625 638
626#ifndef UNSHIFTED_SCROLLKEYS 639#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: 640 case XK_Prior:
638 strcpy (kbuf, "\033[5~"); 641 strcpy (kbuf, "\033[5~");
639 break; 642 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: 643 case XK_Next:
651 strcpy (kbuf, "\033[6~"); 644 strcpy (kbuf, "\033[6~");
652 break; 645 break;
653#endif 646#endif
654 case XK_KP_Enter: 647 case XK_KP_Enter:
655 /* allow shift to override */ 648 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 649 if (kp)
657 { 650 {
658 strcpy (kbuf, "\033OM"); 651 strcpy (kbuf, "\033OM");
659 break; 652 break;
660 } 653 }
661 654
… …
673 kbuf[0] = '\015'; 666 kbuf[0] = '\015';
674 kbuf[1] = '\0'; 667 kbuf[1] = '\0';
675 } 668 }
676 break; 669 break;
677 670
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" */ 671 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */ 672 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */ 673 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */ 674 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP"); 675 strcpy (kbuf, "\033OP");
… …
704 case XK_KP_6: /* "\033Ov" : "6" */ 691 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */ 692 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */ 693 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */ 694 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */ 695 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 696 if (kp)
710 { 697 {
711 strcpy (kbuf, "\033Oj"); 698 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply); 699 kbuf[2] += (keysym - XK_KP_Multiply);
713 } 700 }
714 else 701 else
… …
720 707
721 case XK_Find: 708 case XK_Find:
722 strcpy (kbuf, "\033[1~"); 709 strcpy (kbuf, "\033[1~");
723 break; 710 break;
724 711
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: 712 case XK_Insert:
736 strcpy (kbuf, "\033[2~"); 713 strcpy (kbuf, "\033[2~");
737 break; 714 break;
738#ifdef DXK_Remove /* support for DEC remove like key */ 715#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove: 716 case DXK_Remove:
… …
743 strcpy (kbuf, "\033[3~"); 720 strcpy (kbuf, "\033[3~");
744 break; 721 break;
745 case XK_Select: 722 case XK_Select:
746 strcpy (kbuf, "\033[4~"); 723 strcpy (kbuf, "\033[4~");
747 break; 724 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: 725 case XK_End:
759 strcpy (kbuf, KS_END); 726 strcpy (kbuf, KS_END);
760 break; 727 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: 728 case XK_Home:
772 strcpy (kbuf, KS_HOME); 729 strcpy (kbuf, KS_HOME);
773 break; 730 break;
774 731
775#define FKEY(n, fkey) \ 732#define FKEY(n, fkey) \
… …
877 return; 834 return;
878 835
879 if (len <= 0) 836 if (len <= 0)
880 return; /* not mapped */ 837 return; /* not mapped */
881 838
882 if (OPTION (Opt_scrollTtyKeypress)) 839 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 840 if (view_start)
884 { 841 {
885 view_start = 0; 842 view_start = 0;
886 want_refresh = 1; 843 want_refresh = 1;
887 } 844 }
… …
926#if ENABLE_FRILLS || ISO_14755 883#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 884 // ISO 14755 support
928 if (iso14755buf) 885 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 886 if (iso14755buf & ISO_14755_52)
930 { 887 {
931# if ENABLE_OVERLAY 888# if ISO_14755
932 scr_overlay_off (); 889 scr_overlay_off ();
933# endif 890# endif
934# if ISO_14755 891# if ISO_14755
935 // iso14755 part 5.2 handling: release time 892 // iso14755 part 5.2 handling: release time
936 // first: controls 893 // first: controls
… …
959 916
960 return; 917 return;
961 } 918 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 919 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 920 {
964# if ENABLE_OVERLAY 921# if ISO_14755
965 scr_overlay_off (); 922 scr_overlay_off ();
966# endif 923# endif
967 if (iso14755buf & ISO_14755_51) 924 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 925 commit_iso14755 ();
969#if ISO_14755 926#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 927 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 928 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 929 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 930
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 931 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 932 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 984void
1028rxvt_term::flush () 985rxvt_term::flush ()
1029{ 986{
1030 flush_ev.stop (); 987 flush_ev.stop ();
1031 988
1032#ifdef TRANSPARENT 989#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 990 if (bgPixmap.check_clearChanged ())
1034 { 991 {
1035 want_full_refresh = 0; 992// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 993 scr_touch (false);
1038 } 994 }
1039#endif 995#endif
1040 996
1041 if (want_refresh) 997 if (want_refresh)
… …
1086 } 1042 }
1087 1043
1088 display->flush (); 1044 display->flush ();
1089} 1045}
1090 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
1091void 1048void
1092rxvt_term::check_cb (check_watcher &w) 1049rxvt_term::refresh_check ()
1050{
1051 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1053
1054 display->flush ();
1055}
1056
1057void
1058rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1059{
1094 make_current (); 1060 make_current ();
1095 1061
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; 1062 refresh_count = 0;
1109 flush (); 1063 flush ();
1110} 1064}
1111 1065
1112#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1113void 1067void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1069{
1116 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1071 want_refresh = 1;
1118 1072 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1073}
1121#endif 1074#endif
1122 1075
1123#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1124void 1077void
1125rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1079{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1081 {
1129 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1130 want_refresh = 1; 1083 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
1132 } 1085 }
1086 else
1087 w.stop ();
1133} 1088}
1134#endif 1089#endif
1135 1090
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1092void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1094{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1142 { 1097 {
1143 want_refresh = 1; 1098 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1145 } 1100 }
1101 else
1102 w.stop ();
1146} 1103}
1147#endif 1104#endif
1148 1105
1149#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1150void 1107void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1109{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1111 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1113 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1158 } 1115 }
1116 else
1117 w.stop ();
1159} 1118}
1160#endif 1119#endif
1161 1120
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1122void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1124{
1166 if (mouse_slip_wheel_speed == 0 1125 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 { 1126 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1127 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1132 {
1133 mouse_slip_wheel_speed = 0;
1134 w.stop ();
1175 } 1135 }
1176} 1136}
1177#endif 1137#endif
1178 1138
1179#if LINUX_YIELD_HACK 1139#if LINUX_YIELD_HACK
1180static struct event_handler 1140static struct event_handler
1181{ 1141{
1182 check_watcher yield_ev; 1142 ev::prepare yield_ev;
1183 1143
1184 void yield_cb (check_watcher &w) 1144 void yield_cb (ev::prepare &w, int revents)
1185 { 1145 {
1186 // this should really be sched_yield(), but the linux guys thought 1146 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1147 // 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 1148 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1149 // allowed by the sus... as is returning ENOSYS.
… …
1232 } 1192 }
1233 else 1193 else
1234 { 1194 {
1235 pty_ev.stop (); 1195 pty_ev.stop ();
1236 1196
1237 if (!OPTION (Opt_hold)) 1197 if (!option (Opt_hold))
1238 destroy (); 1198 destroy ();
1239 } 1199 }
1240 1200
1241 return false; 1201 return false;
1242} 1202}
1243 1203
1244void 1204void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1205rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1206{
1247 make_current (); 1207 make_current ();
1248 1208
1249 if (revents & EVENT_READ) 1209 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1210 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1211 while (pty_fill ())
1252 if (cmd_parse ()) 1212 if (cmd_parse ())
1253 break; 1213 break;
1254 1214
1255 if (revents & EVENT_WRITE) 1215 if (revents & ev::WRITE)
1256 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1257} 1219}
1258 1220
1259void 1221void
1260rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1261{ 1223{
… …
1263 recolour_cursor (); 1225 recolour_cursor ();
1264 1226
1265#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1228 hidden_pointer = 0;
1267 1229
1268 if (OPTION (Opt_pointerBlank)) 1230 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1231 pointer_ev.start (pointerBlankDelay);
1270#endif 1232#endif
1271} 1233}
1272 1234
1273#ifdef POINTER_BLANK 1235#ifdef POINTER_BLANK
1274void 1236void
1275rxvt_term::pointer_blank () 1237rxvt_term::pointer_blank ()
1276{ 1238{
1277 if (!OPTION (Opt_pointerBlank)) 1239 if (!option (Opt_pointerBlank))
1278 return; 1240 return;
1279 1241
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1242 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1243 XFlush (dpy);
1282 1244
1283 hidden_pointer = 1; 1245 hidden_pointer = 1;
1284} 1246}
1285 1247
1286void 1248void
1287rxvt_term::pointer_cb (time_watcher &w) 1249rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1250{
1289 make_current (); 1251 make_current ();
1290 1252
1291 pointer_blank (); 1253 pointer_blank ();
1292} 1254}
… …
1295void 1257void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1258rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1259{
1298 int button_number, key_state = 0; 1260 int button_number, key_state = 0;
1299 int x, y; 1261 int x, y;
1262 int code = 32;
1300 1263
1301 x = ev.x; 1264 x = Pixel2Col (ev.x);
1302 y = ev.y; 1265 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1266 if (ev.type == MotionNotify)
1267 {
1268 if (x == mouse_row && y == mouse_col)
1269 return;
1270 mouse_row = x;
1271 mouse_col = y;
1272 code += 32;
1273 }
1304 1274
1305 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1306 button_number = 3; 1276 button_number = 3;
1307 else 1277 else
1308 { 1278 {
… …
1354 x + 1, 1324 x + 1,
1355 y + 1); 1325 y + 1);
1356#endif 1326#endif
1357 1327
1358 tt_printf ("\033[M%c%c%c", 1328 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1329 (code + button_number + key_state),
1360 (32 + x + 1), 1330 (32 + x + 1),
1361 (32 + y + 1)); 1331 (32 + y + 1));
1362} 1332}
1363 1333
1364/*{{{ process an X event */ 1334/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1396 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1397 focus_out ();
1428 } 1398 }
1429#endif 1399#endif
1430 } 1400 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1401 break;
1436 1402
1437 /* 1403 /*
1438 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1405 * Here's my conclusion:
… …
1458 break; 1424 break;
1459 } 1425 }
1460 break; 1426 break;
1461 1427
1462 case FocusIn: 1428 case FocusIn:
1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1432 focus_in ();
1464 break; 1433 break;
1465 1434
1466 case FocusOut: 1435 case FocusOut:
1436 if (ev.xfocus.detail != NotifyInferior
1437 && ev.xfocus.detail != NotifyPointer
1438 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1439 focus_out ();
1468 break; 1440 break;
1469 1441
1470 case ConfigureNotify: 1442 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */
1471 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1472 { 1447 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1449 ;
1475 1450
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1452 {
1478 seen_resize = 1; 1453 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1455 }
1456 else
1457 {
1458#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1466#endif
1467 }
1481 1468
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1470 }
1489 break; 1471 break;
1490 1472
1491 case PropertyNotify: 1473 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1508 case SelectionRequest: 1490 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1510 break; 1492 break;
1511 1493
1512 case MapNotify: 1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1513 mapped = 1; 1511 mapped = 1;
1514#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1513 text_blink_ev.start ();
1516#endif 1514#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1516 break;
1519 1517
1520 case UnmapNotify: 1518 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1520#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1521 text_blink_ev.stop ();
1524#endif 1522#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1523 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1524 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1525
1534 case GraphicsExpose: 1526 case GraphicsExpose:
1535 case Expose: 1527 case Expose:
1536 if (ev.xany.window == vt) 1528 if (ev.xany.window == vt)
1537 { 1529 {
1538 do 1530 do
1531 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1534 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1536
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1538
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1543 }
1548 1544
1549 want_refresh = 1; 1545 want_refresh = 1;
1550 } 1546 }
1551 else 1547 else
1552 { 1548 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1552 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1554 ;
1559 1555
1560 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1557 {
1562 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1563 scrollbar_show (0); 1559 scrollbar_show (0);
1564 } 1560 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1561 }
1571 break; 1562 break;
1572 1563
1573 case MotionNotify: 1564 case MotionNotify:
1574#ifdef POINTER_BLANK 1565#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1566 if (hidden_pointer)
1576 pointer_unblank (); 1567 pointer_unblank ();
1577#endif 1568#endif
1569 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1570 || priv_modes & PrivMode_MouseAnyEvent)
1571 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1573 break;
1580 1574
1581 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1582 { 1576 {
… …
1616 int dist; 1610 int dist;
1617 1611
1618 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1620 */ 1614 */
1621 if (!sel_scroll_ev.active) 1615 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1616 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1617
1624 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1626 */ 1620 */
1627 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
… …
1649 else 1643 else
1650 { 1644 {
1651 /* we are within the text window, so we 1645 /* we are within the text window, so we
1652 * shouldn't be scrolling 1646 * shouldn't be scrolling
1653 */ 1647 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1656 } 1649 }
1657#endif 1650#endif
1658#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1659 } 1652 }
1660#endif 1653#endif
1661 } 1654 }
1662 } 1655 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1664 { 1657 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1667 ; 1660 ;
1668 1661
… …
1672 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1666 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1668 scrollbar_size ());
1676 want_refresh = 1; 1669 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1670 scrollbar_show (1);
1679 } 1671 }
1680 break; 1672 break;
1681 } 1673 }
1682 1674
1683#if defined(CURSOR_BLINK) 1675#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1677 {
1686 if (hidden_cursor) 1678 if (hidden_cursor)
1687 { 1679 {
1688 hidden_cursor = 0; 1680 hidden_cursor = 0;
1689 want_refresh = 1; 1681 want_refresh = 1;
1690 } 1682 }
1691 1683
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1684 cursor_blink_ev.again ();
1693 } 1685 }
1694#endif 1686#endif
1695 1687
1696#if defined(POINTER_BLANK) 1688#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1690 {
1699 if (ev.type == MotionNotify 1691 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1692 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1693 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1694 if (hidden_pointer)
… …
1704 1696
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1697 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1698 pointer_blank ();
1707 } 1699 }
1708#endif 1700#endif
1701
1702 refresh_check ();
1709} 1703}
1710 1704
1711void 1705void
1712rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1713{ 1707{
… …
1724 IMSetPosition (); 1718 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1726 } 1720 }
1727#endif 1721#endif
1728#if CURSOR_BLINK 1722#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1723 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1724 cursor_blink_ev.again ();
1731#endif 1725#endif
1732#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1734 { 1728 {
1735 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1730 scr_recolour ();
1737 } 1731 }
1738#endif 1732#endif
1733#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell))
1735 {
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif
1739 } 1743 }
1740} 1744}
1741 1745
1742void 1746void
1743rxvt_term::focus_out () 1747rxvt_term::focus_out ()
… …
1751 1755
1752#if ENABLE_FRILLS || ISO_14755 1756#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1757 if (iso14755buf)
1754 { 1758 {
1755 iso14755buf = 0; 1759 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1760# if ISO_14755
1757 scr_overlay_off (); 1761 scr_overlay_off ();
1758# endif 1762# endif
1759 } 1763 }
1760#endif 1764#endif
1761#if USE_XIM 1765#if USE_XIM
1762 if (Input_Context != NULL) 1766 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1767 XUnsetICFocus (Input_Context);
1764#endif 1768#endif
1765#if CURSOR_BLINK 1769#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1770 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1771 cursor_blink_ev.stop ();
1772
1768 hidden_cursor = 0; 1773 hidden_cursor = 0;
1769#endif 1774#endif
1770#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
1772 { 1777 {
… …
1775 } 1780 }
1776#endif 1781#endif
1777 } 1782 }
1778} 1783}
1779 1784
1780#if TRANSPARENT 1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1781void 1799void
1782rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1801{
1784 make_current (); 1802 make_current ();
1785 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1786 switch (ev.type) 1809 switch (ev.type)
1787 { 1810 {
1788 case PropertyNotify: 1811 case PropertyNotify:
1789 /* 1812 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1813 * if user used some Esetroot compatible prog to set the root bg,
1791 * use the property to determine the pixmap. We use it later on. 1814 * use the property to determine the pixmap. We use it later on.
1792 */ 1815 */
1793 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 return; 1818 {
1819 bgPixmap.set_root_pixmap ();
1820 update_background ();
1821 }
1796 1822
1797 /* FALLTHROUGH */
1798 case ReparentNotify:
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1;
1801 break; 1823 break;
1802 } 1824 }
1825# endif
1826
1827 refresh_check ();
1803} 1828}
1804#endif 1829#endif
1805 1830
1806void 1831void
1807rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1862 mouse_report (ev); 1887 mouse_report (ev);
1863 } 1888 }
1864#else 1889#else
1865 MEvent.button = ev.button; 1890 MEvent.button = ev.button;
1866 mouse_report (ev); 1891 mouse_report (ev);
1867#endif /* MOUSE_REPORT_DOUBLECLICK */ 1892#endif /* MOUSE_REPORT_DOUBLECLICK */
1868 1893
1869 } 1894 }
1870 else 1895 else
1871 { 1896 {
1872 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
… …
1920 } 1945 }
1921 1946
1922 /* 1947 /*
1923 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1924 */ 1949 */
1925 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1926 { 1951 {
1927 scrollBar.setIdle (); 1952 scrollBar.setIdle ();
1928 /* 1953 /*
1929 * Rxvt-style scrollbar: 1954 * Rxvt-style scrollbar:
1930 * move up if mouse is above slider 1955 * move up if mouse is above slider
… …
1966 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
1967 break; 1992 break;
1968 } 1993 }
1969 } 1994 }
1970 else 1995 else
1971#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1972 1997
1973 { 1998 {
1974 char upordown = 0; 1999 char upordown = 0;
1975 2000
1976 if (scrollBar.style == R_SB_NEXT) 2001 if (scrollBar.style == R_SB_NEXT)
1977 { 2002 {
1978 if (scrollbarnext_upButton (ev.y)) 2003 if (scrollbarnext_upButton (ev.y))
1979 upordown = -1; /* up */ 2004 upordown = -1; /* up */
… …
1985 if (scrollbarrxvt_upButton (ev.y)) 2010 if (scrollbarrxvt_upButton (ev.y))
1986 upordown = -1; /* up */ 2011 upordown = -1; /* up */
1987 else if (scrollbarrxvt_dnButton (ev.y)) 2012 else if (scrollbarrxvt_dnButton (ev.y))
1988 upordown = 1; /* down */ 2013 upordown = 1; /* down */
1989 } 2014 }
2015
1990 if (upordown) 2016 if (upordown)
1991 { 2017 {
1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ())
1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1994#endif 2021#endif
1995 if (scr_page (upordown < 0 ? UP : DN, 1)) 2022 if (scr_page (upordown < 0 ? UP : DN, 1))
1996 { 2023 {
1997 if (upordown < 0) 2024 if (upordown < 0)
1998 scrollBar.setUp (); 2025 scrollBar.setUp ();
… …
2002 } 2029 }
2003 else 2030 else
2004 switch (ev.button) 2031 switch (ev.button)
2005 { 2032 {
2006 case Button2: 2033 case Button2:
2007 switch (scrollbar_align) 2034 switch (scrollBar.align)
2008 { 2035 {
2009 case R_SB_ALIGN_TOP: 2036 case R_SB_ALIGN_TOP:
2010 csrO = 0; 2037 csrO = 0;
2011 break; 2038 break;
2012 case R_SB_ALIGN_CENTRE: 2039 case R_SB_ALIGN_CENTRE:
… …
2024 2051
2025 scrollBar.setMotion (); 2052 scrollBar.setMotion ();
2026 break; 2053 break;
2027 2054
2028 case Button1: 2055 case Button1:
2029 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2056 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2030 csrO = ev.y - scrollBar.top; 2057 csrO = ev.y - scrollBar.top;
2031 /* FALLTHROUGH */ 2058 /* FALLTHROUGH */
2032 2059
2033 case Button3: 2060 case Button3:
2034 if (scrollBar.style != R_SB_XTERM) 2061 if (scrollBar.style != R_SB_XTERM)
… …
2078 scrollBar.setIdle (); 2105 scrollBar.setIdle ();
2079 scrollbar_show (0); 2106 scrollbar_show (0);
2080 } 2107 }
2081 2108
2082#ifdef SELECTION_SCROLLING 2109#ifdef SELECTION_SCROLLING
2083 if (sel_scroll_ev.active)
2084 sel_scroll_ev.stop(); 2110 sel_scroll_ev.stop();
2085#endif 2111#endif
2086 2112
2087 if (ev.window == vt) 2113 if (ev.window == vt)
2088 { 2114 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2115 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2113 mouse_report (ev); 2139 mouse_report (ev);
2114 } 2140 }
2115#else /* MOUSE_REPORT_DOUBLECLICK */ 2141#else /* MOUSE_REPORT_DOUBLECLICK */
2116 MEvent.button = AnyButton; 2142 MEvent.button = AnyButton;
2117 mouse_report (ev); 2143 mouse_report (ev);
2118#endif /* MOUSE_REPORT_DOUBLECLICK */ 2144#endif /* MOUSE_REPORT_DOUBLECLICK */
2119 return; 2145 return;
2120 } 2146 }
2121 2147
2122 /* 2148 /*
2123 * dumb hack to compensate for the failure of click-and-drag 2149 * dumb hack to compensate for the failure of click-and-drag
… …
2135 selection_make (ev.time); 2161 selection_make (ev.time);
2136 break; 2162 break;
2137 2163
2138 case Button2: 2164 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2165 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2166 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2167 break;
2142 2168
2143#ifdef MOUSE_WHEEL 2169#ifdef MOUSE_WHEEL
2144 case Button4: 2170 case Button4:
2145 case Button5: 2171 case Button5:
… …
2149 2175
2150 v = ev.button == Button4 ? UP : DN; 2176 v = ev.button == Button4 ? UP : DN;
2151 2177
2152 if (ev.state & ShiftMask) 2178 if (ev.state & ShiftMask)
2153 i = 1; 2179 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2180 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2181 i = nrow - 1;
2156 else 2182 else
2157 i = 5; 2183 i = 5;
2158 2184
2159# ifdef MOUSE_SLIP_WHEELING 2185# ifdef MOUSE_SLIP_WHEELING
… …
2161 { 2187 {
2162 mouse_slip_wheel_speed += v ? -1 : 1; 2188 mouse_slip_wheel_speed += v ? -1 : 1;
2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2189 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2190 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2165 2191
2166 if (slip_wheel_ev.at < NOW) 2192 if (!slip_wheel_ev.is_active ())
2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2193 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168
2169 slip_wheel_ev.start ();
2170 } 2194 }
2171 else 2195 else
2196# endif
2172 { 2197 {
2173# endif
2174 scr_page (v, i); 2198 scr_page (v, i);
2175 scrollbar_show (1); 2199 scrollbar_show (1);
2176# ifdef MOUSE_SLIP_WHEELING
2177 } 2200 }
2178# endif
2179 } 2201 }
2180 break; 2202 break;
2181#endif 2203#endif
2182 } 2204 }
2183 } 2205 }
2184} 2206}
2185
2186#ifdef TRANSPARENT
2187#if TINTING
2188/* taken from aterm-0.4.2 */
2189
2190typedef uint32_t RUINT32T;
2191
2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193{
2194 int sh_r, sh_g, sh_b;
2195 RUINT32T mask_r, mask_g, mask_b;
2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199 int i;
2200
2201 Visual *visual = term->visual;
2202
2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205 /* for convenience */
2206 mask_r = visual->red_mask;
2207 mask_g = visual->green_mask;
2208 mask_b = visual->blue_mask;
2209
2210 /* boring lookup table pre-initialization */
2211 switch (srcImage->bits_per_pixel) {
2212 case 15:
2213 if ((mask_r != 0x7c00) ||
2214 (mask_g != 0x03e0) ||
2215 (mask_b != 0x001f))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218 lookup_r = lookup;
2219 lookup_g = lookup+32;
2220 lookup_b = lookup+32+32;
2221 sh_r = 10;
2222 sh_g = 5;
2223 sh_b = 0;
2224 break;
2225 case 16:
2226 if ((mask_r != 0xf800) ||
2227 (mask_g != 0x07e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+64;
2234 sh_r = 11;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 24:
2239 if ((mask_r != 0xff0000) ||
2240 (mask_g != 0x00ff00) ||
2241 (mask_b != 0x0000ff))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244 lookup_r = lookup;
2245 lookup_g = lookup+256;
2246 lookup_b = lookup+256+256;
2247 sh_r = 16;
2248 sh_g = 8;
2249 sh_b = 0;
2250 break;
2251 case 32:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 default:
2265 return; /* we do not support this color depth */
2266 }
2267
2268 /* prepare limits for color transformation (each channel is handled separately) */
2269 if (shade < 0) {
2270 shade = -shade;
2271 if (shade < 0) shade = 0;
2272 if (shade > 100) shade = 100;
2273
2274 lower_lim_r = 65535-rm;
2275 lower_lim_g = 65535-gm;
2276 lower_lim_b = 65535-bm;
2277
2278 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283 } else {
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292 }
2293
2294 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296 {
2297 unsigned int tmp;
2298
2299 tmp = lower_lim_r;
2300 lower_lim_r = lower_lim_b;
2301 lower_lim_b = tmp;
2302
2303 tmp = upper_lim_r;
2304 upper_lim_r = upper_lim_b;
2305 upper_lim_b = tmp;
2306 }
2307
2308 /* fill our lookup tables */
2309 for (i = 0; i <= mask_r>>sh_r; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314 lookup_r[i] = (tmp/65535)<<sh_r;
2315 }
2316 for (i = 0; i <= mask_g>>sh_g; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321 lookup_g[i] = (tmp/65535)<<sh_g;
2322 }
2323 for (i = 0; i <= mask_b>>sh_b; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328 lookup_b[i] = (tmp/65535)<<sh_b;
2329 }
2330
2331 /* apply table to input image (replacing colors by newly calculated ones) */
2332 switch (srcImage->bits_per_pixel)
2333 {
2334 case 15:
2335 {
2336 unsigned short *p1, *pf, *p, *pl;
2337 p1 = (unsigned short *) srcImage->data;
2338 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339 while (p1 < pf)
2340 {
2341 p = p1;
2342 pl = p1 + srcImage->width;
2343 for (; p < pl; p++)
2344 {
2345 *p = lookup_r[(*p & 0x7c00)>>10] |
2346 lookup_g[(*p & 0x03e0)>> 5] |
2347 lookup_b[(*p & 0x001f)];
2348 }
2349 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 case 16:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0xf800)>>11] |
2365 lookup_g[(*p & 0x07e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 24:
2373 {
2374 unsigned char *p1, *pf, *p, *pl;
2375 p1 = (unsigned char *) srcImage->data;
2376 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width * 3;
2381 for (; p < pl; p += 3)
2382 {
2383 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385 p[2] = lookup_r[(p[2] & 0x0000ff)];
2386 }
2387 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 32:
2392 {
2393 RUINT32T *p1, *pf, *p, *pl;
2394 p1 = (RUINT32T *) srcImage->data;
2395 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0xff0000)>>16] |
2404 lookup_g[(*p & 0x00ff00)>> 8] |
2405 lookup_b[(*p & 0x0000ff)] |
2406 (*p & ~0xffffff);
2407 }
2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 }
2413
2414 free (lookup);
2415}
2416#endif
2417
2418/*
2419 * Check our parents are still who we think they are.
2420 * Do transparency updates if required
2421 */
2422int
2423rxvt_term::check_our_parents ()
2424{
2425 int i, pchanged, aformat, have_pixmap, rootdepth;
2426 unsigned long nitems, bytes_after;
2427 Atom atype;
2428 unsigned char *prop = NULL;
2429 Window root, oldp, *list;
2430 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (dpy, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (dpy, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2523 allowedxerror = -1;
2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (dpy, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (dpy, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2556
2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (dpy, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2568 XClearWindow (dpy, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2589 XFree (list);
2590
2591 if (parent[i] == display->root)
2592 {
2593 if (oldp != None)
2594 pchanged = 1;
2595
2596 break;
2597 }
2598
2599 if (oldp != parent[i])
2600 pchanged = 1;
2601 }
2602
2603 n = 0;
2604
2605 if (pchanged)
2606 for (; n < (unsigned int)i; n++)
2607 {
2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611 {
2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613 break;
2614 }
2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2618 {
2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621 am_transparent = 0;
2622 /* XXX: also turn off Opt_transparent? */
2623 }
2624 else
2625 {
2626 for (n = 0; n < (unsigned int)i; n++)
2627 {
2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629 XClearWindow (dpy, parent[n]);
2630 }
2631
2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 am_transparent = 1;
2634 }
2635
2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 parent[i] = None;
2638 }
2639
2640 if (scrollBar.win)
2641 {
2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643 scrollBar.setIdle ();
2644 scrollbar_show (0);
2645 }
2646
2647 if (am_transparent)
2648 {
2649 want_refresh = want_full_refresh = 1;
2650 if (am_pixmap_trans)
2651 flush ();
2652 }
2653
2654 return pchanged;
2655}
2656#endif
2657 2207
2658/*}}} */ 2208/*}}} */
2659 2209
2660bool 2210bool
2661rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
… …
2710 if (ch == C0_LF) 2260 if (ch == C0_LF)
2711 nlines++; 2261 nlines++;
2712 2262
2713 refresh_count++; 2263 refresh_count++;
2714 2264
2715 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2266 {
2718 refreshnow = true;
2719 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 {
2271 refreshnow = true;
2720 ch = NOCHAR; 2272 ch = NOCHAR;
2721 break; 2273 break;
2274 }
2722 } 2275 }
2723 2276
2724 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2726 { 2279 {
… …
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2755 scr_add_lines (buf, str - buf, nlines); 2308 scr_add_lines (buf, str - buf, nlines);
2756 2309
2757 /* 2310 /*
2758 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2759 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2760 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2314 */
2763 if (refreshnow) 2315 if (refreshnow)
2764 { 2316 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true; 2317 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2771 scr_refresh (); 2318 scr_refresh ();
2772 want_refresh = 1; 2319 want_refresh = 1;
2773 }
2774 } 2320 }
2775 2321
2776 } 2322 }
2777 else 2323 else
2778 { 2324 {
… …
2927 { 2473 {
2928 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2929 break; /* done = 1 */ 2475 break; /* done = 1 */
2930 } 2476 }
2931 } 2477 }
2932 2478
2933 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2934 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2935 { 2481 {
2936 done = 1; 2482 done = 1;
2937 break; 2483 break;
… …
2939 } 2485 }
2940 } 2486 }
2941 2487
2942 pclose_printer (fd); 2488 pclose_printer (fd);
2943} 2489}
2944#endif /* PRINTPIPE */ 2490#endif /* PRINTPIPE */
2945/*}}} */ 2491/*}}} */
2946 2492
2947/* *INDENT-OFF* */ 2493/* *INDENT-OFF* */
2948enum { 2494enum {
2949 C1_40 = 0x40, 2495 C1_40 = 0x40,
… …
2999 process_dcs_seq (); 2545 process_dcs_seq ();
3000 break; 2546 break;
3001 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
3002 process_csi_seq (); 2548 process_csi_seq ();
3003 break; 2549 break;
3004 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
3005 process_osc_seq (); 2551 process_osc_seq ();
3006 break; 2552 break;
3007#endif 2553#endif
3008 } 2554 }
3009} 2555}
… …
3235rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3236{ 2782{
3237 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3238 unsigned int nargs, p; 2784 unsigned int nargs, p;
3239 int n, ndef; 2785 int n, ndef;
3240 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3241 2787
3242 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3243 arg[--nargs] = 0;
3244 2789
3245 priv = 0; 2790 priv = 0;
3246 ch = cmd_getc (); 2791 ch = cmd_getc ();
3247 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
2793 {
3248 { /* '<' '=' '>' '?' */ 2794 /* '<' '=' '>' '?' */
3249 priv = ch; 2795 priv = ch;
3250 ch = cmd_getc (); 2796 ch = cmd_getc ();
3251 } 2797 }
3252 2798
3253 /* read any numerical arguments */ 2799 /* read any numerical arguments */
… …
3292 switch (priv) 2838 switch (priv)
3293 { 2839 {
3294 case '>': 2840 case '>':
3295 if (ch == CSI_DA) /* secondary device attributes */ 2841 if (ch == CSI_DA) /* secondary device attributes */
3296 { 2842 {
3297 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2843 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3298 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2844 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299 // 2845 //
3300 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2846 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2847 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3302 // that we do not support xterm mouse reporting (should be 95 when we do). 2848 // versions.
3303 // 2849 //
3304 tt_printf ("\033[>%d;94;0c", 'U'); 2850 tt_printf ("\033[>%d;95;0c", 'U');
3305 } 2851 }
3306 break; 2852 break;
2853
3307 case '?': 2854 case '?':
3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2855 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3309 process_terminal_mode (ch, priv, nargs, arg); 2856 process_terminal_mode (ch, priv, nargs, arg);
3310 break; 2857 break;
3311 } 2858 }
… …
3436 break; 2983 break;
3437 case 6: /* CPR requested */ 2984 case 6: /* CPR requested */
3438 scr_report_position (); 2985 scr_report_position ();
3439 break; 2986 break;
3440 case 7: /* unofficial extension */ 2987 case 7: /* unofficial extension */
3441 if (OPTION (Opt_insecure)) 2988 if (option (Opt_insecure))
3442 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2989 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3443 break; 2990 break;
3444 case 8: /* unofficial extension */ 2991 case 8: /* unofficial extension */
3445 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2992 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3446 break; 2993 break;
… …
3610 break; 3157 break;
3611 case 20: /* report icon label */ 3158 case 20: /* report icon label */
3612 { 3159 {
3613 char *s; 3160 char *s;
3614 XGetIconName (dpy, parent[0], &s); 3161 XGetIconName (dpy, parent[0], &s);
3615 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3162 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3616 XFree (s); 3163 XFree (s);
3617 } 3164 }
3618 break; 3165 break;
3619 case 21: /* report window title */ 3166 case 21: /* report window title */
3620 { 3167 {
3621 char *s; 3168 char *s;
3622 XFetchName (dpy, parent[0], &s); 3169 XFetchName (dpy, parent[0], &s);
3623 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3170 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s); 3171 XFree (s);
3625 } 3172 }
3626 break; 3173 break;
3627 } 3174 }
3628} 3175}
… …
3655 seen_esc = true; 3202 seen_esc = true;
3656 continue; 3203 continue;
3657 } 3204 }
3658 else if (ch == C0_BEL || ch == CHAR_ST) 3205 else if (ch == C0_BEL || ch == CHAR_ST)
3659 break; 3206 break;
3207 else if (ch == C0_SYN)
3208 ch = cmd_get8 ();
3660 else if (ch < 0x20) 3209 else if (ch < 0x20)
3661 return NULL; /* other control character - exit */ 3210 return NULL; /* other control character - exit */
3662 3211
3663 seen_esc = false; 3212 seen_esc = false;
3664 3213
3665 if (n >= STRING_MAX - 1) 3214 if (n >= STRING_MAX - 1)
3666 // stop at some sane length 3215 // stop at some sane length
3667 return NULL; 3216 return NULL;
3668 3217
3669 if (ch == C0_SYN)
3670 string[n++] = cmd_get8 ();
3671 else
3672 string[n++] = ch; 3218 string[n++] = ch;
3673 } 3219 }
3674 3220
3675 string[n++] = '\0'; 3221 string[n++] = '\0';
3676 3222
3677 ends_how = (ch == 0x5c ? C0_ESC : ch); 3223 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3756 int saveop = op; 3302 int saveop = op;
3757 3303
3758 dLocal (Display *, dpy); 3304 dLocal (Display *, dpy);
3759 3305
3760 assert (str != NULL); 3306 assert (str != NULL);
3761 3307
3762 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3308 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3763 ; // no responses yet 3309 return;
3764 3310
3765 switch (op) 3311 switch (op)
3766 { 3312 {
3767 case XTerm_name: 3313 case XTerm_name:
3768 set_title (str); 3314 set_title (str);
… …
3828 *buf++ = '\0'; 3374 *buf++ = '\0';
3829 3375
3830 process_color_seq (op, color, name, resp); 3376 process_color_seq (op, color, name, resp);
3831 } 3377 }
3832 break; 3378 break;
3379 case Rxvt_restoreFG:
3833 case XTerm_Color00: 3380 case XTerm_Color00:
3834 process_color_seq (op, Color_fg, str, resp); 3381 process_color_seq (op, Color_fg, str, resp);
3835 break; 3382 break;
3383 case Rxvt_restoreBG:
3836 case XTerm_Color01: 3384 case XTerm_Color01:
3837 process_color_seq (op, Color_bg, str, resp); 3385 process_color_seq (op, Color_bg, str, resp);
3838 break; 3386 break;
3839#ifndef NO_CURSORCOLOR 3387#ifndef NO_CURSORCOLOR
3840 case XTerm_Color_cursor: 3388 case XTerm_Color_cursor:
… …
3861 break; 3409 break;
3862 case URxvt_Color_IT: 3410 case URxvt_Color_IT:
3863 process_color_seq (op, Color_IT, str, resp); 3411 process_color_seq (op, Color_IT, str, resp);
3864 break; 3412 break;
3865#endif 3413#endif
3866#if TRANSPARENT && TINTING 3414#if ENABLE_TRANSPARENCY
3867 case URxvt_Color_tint: 3415 case URxvt_Color_tint:
3868 process_color_seq (op, Color_tint, str, resp); 3416 process_color_seq (op, Color_tint, str, resp);
3417 {
3418 bool changed = false;
3869 3419
3870 check_our_parents (); 3420 if (ISSET_PIXCOLOR (Color_tint))
3421 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3422 else
3423 changed = bgPixmap.unset_tint ();
3871 3424
3872 if (am_transparent) 3425 if (changed)
3873 want_full_refresh = want_refresh = 1; 3426 update_background ();
3427 }
3874 3428
3875 break; 3429 break;
3876#endif 3430#endif
3877 3431
3432#if BG_IMAGE_FROM_FILE
3878 case Rxvt_Pixmap: 3433 case Rxvt_Pixmap:
3879 { 3434 if (!strcmp (str, "?"))
3880 if (*str != ';')
3881 { 3435 {
3882#if XPM_BACKGROUND 3436 char str[256];
3883 scale_pixmap (""); /* reset to default scaling */ 3437
3884 set_bgPixmap (str); /* change pixmap */ 3438 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3885 scr_touch (true); 3439 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3886#endif 3440 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3441 process_xterm_seq (XTerm_title, str, CHAR_ST);
3887 } 3442 }
3888 3443 else
3444 {
3889 int changed = 0; 3445 int changed = 0;
3890 3446
3891 while ((str = strchr (str, ';')) != NULL) 3447 if (*str != ';')
3892 { 3448 {
3449 /* reset to default scaling :*/
3450 bgPixmap.unset_geometry ();
3451 if (bgPixmap.set_file (str)) /* change pixmap */
3452 changed++;
3453 str = strchr (str, ';');
3454 if (str == NULL)
3455 bgPixmap.set_defaultGeometry ();
3456 }
3457
3458 while (str)
3459 {
3893 str++; 3460 str++;
3894#if XPM_BACKGROUND 3461 if (bgPixmap.set_geometry (str))
3895 changed += scale_pixmap (str); 3462 changed++;
3896#endif 3463 str = strchr (str, ';');
3897 } 3464 }
3898 3465
3899 if (changed) 3466 if (changed)
3900 { 3467 update_background ();
3901#ifdef XPM_BACKGROUND
3902 resize_pixmap ();
3903 scr_touch (true);
3904#endif
3905 } 3468 }
3906 }
3907 break; 3469 break;
3908 3470#endif
3909 case Rxvt_restoreFG:
3910 set_window_color (Color_fg, str);
3911 break;
3912 case Rxvt_restoreBG:
3913 set_window_color (Color_bg, str);
3914 break;
3915 3471
3916 case XTerm_logfile: 3472 case XTerm_logfile:
3917 // TODO, when secure mode? 3473 // TODO, when secure mode?
3918 break; 3474 break;
3919 3475
… …
3937 case URxvt_italicFont: 3493 case URxvt_italicFont:
3938 case URxvt_boldItalicFont: 3494 case URxvt_boldItalicFont:
3939#endif 3495#endif
3940 if (query) 3496 if (query)
3941 tt_printf ("\33]%d;%-.250s%c", saveop, 3497 tt_printf ("\33]%d;%-.250s%c", saveop,
3942 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3498 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3943 ? fontset[op - URxvt_font]->fontdesc : "", 3499 ? fontset[op - URxvt_font]->fontdesc : "",
3944 resp); 3500 resp);
3945 else 3501 else
3946 { 3502 {
3947 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3503 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3961 break; 3517 break;
3962 3518
3963#if !ENABLE_MINIMAL 3519#if !ENABLE_MINIMAL
3964 case URxvt_locale: 3520 case URxvt_locale:
3965 if (query) 3521 if (query)
3966 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3522 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3967 else 3523 else
3968 { 3524 {
3969 set_locale (str); 3525 set_locale (str);
3970 pty->set_utf8_mode (enc_utf8); 3526 pty->set_utf8_mode (enc_utf8);
3971 init_xlocale (); 3527 init_xlocale ();
… …
4034{ 3590{
4035 unsigned int i, j; 3591 unsigned int i, j;
4036 int state; 3592 int state;
4037 3593
4038 static const struct 3594 static const struct
4039 { 3595 {
4040 const int argval; 3596 const int argval;
4041 const unsigned long bit; 3597 const unsigned long bit;
4042 }
4043
4044 argtopriv[] = { 3598 } argtopriv[] = {
4045 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR },
4046 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
4047 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 },
4048 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll },
4049 { 5, PrivMode_rVideo }, 3603 { 5, PrivMode_rVideo },
… …
4065 { 66, PrivMode_aplKP }, 3619 { 66, PrivMode_aplKP },
4066#ifndef NO_BACKSPACE_KEY 3620#ifndef NO_BACKSPACE_KEY
4067 { 67, PrivMode_BackSpace }, 3621 { 67, PrivMode_BackSpace },
4068#endif 3622#endif
4069 { 1000, PrivMode_MouseX11 }, 3623 { 1000, PrivMode_MouseX11 },
4070 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3624 { 1002, PrivMode_MouseBtnEvent },
4071 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3625 { 1003, PrivMode_MouseAnyEvent },
4072 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4073 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4074 { 1011, PrivMode_Keypress }, // rxvt extension 3627 { 1011, PrivMode_Keypress }, // rxvt extension
4075 // 1035 enable modifiers for alt, numlock NYI 3628 // 1035 enable modifiers for alt, numlock NYI
4076 // 1036 send ESC for meta keys NYI 3629 // 1036 send ESC for meta keys NYI
4077 // 1037 send DEL for keypad delete NYI 3630 // 1037 send DEL for keypad delete NYI
… …
4112 scr_touch (true); 3665 scr_touch (true);
4113 break; 3666 break;
4114#endif 3667#endif
4115 case 1048: /* alternative cursor save */ 3668 case 1048: /* alternative cursor save */
4116 case 1049: 3669 case 1049:
4117 if (OPTION (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
4118 if (mode == 0) 3671 if (mode == 0)
4119 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
4120 else if (mode == 1) 3673 else if (mode == 1)
4121 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
4122 break; 3675 break;
… …
4134 */ 3687 */
4135 PrivMode (1, PrivMode_vt52); 3688 PrivMode (1, PrivMode_vt52);
4136 break; 3689 break;
4137 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
4138 if (priv_modes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
3692 {
3693 scr_poweron ();
4139 set_widthheight (((state ? 132 : 80) * fwidth), height); 3694 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3695 }
4140 break; 3696 break;
4141 case 4: /* smooth scrolling */ 3697 case 4: /* smooth scrolling */
4142 set_option (Opt_jumpScroll, !state); 3698 set_option (Opt_jumpScroll, !state);
4143 break; 3699 break;
4144 case 5: /* reverse video */ 3700 case 5: /* reverse video */
… …
4151 scr_autowrap (state); 3707 scr_autowrap (state);
4152 break; 3708 break;
4153 /* case 8: - auto repeat, can't do on a per window basis */ 3709 /* case 8: - auto repeat, can't do on a per window basis */
4154 case 9: /* X10 mouse reporting */ 3710 case 9: /* X10 mouse reporting */
4155 if (state) /* orthogonal */ 3711 if (state) /* orthogonal */
4156 priv_modes &= ~PrivMode_MouseX11; 3712 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4157 break; 3713 break;
4158#ifdef scrollBar_esc 3714#ifdef scrollBar_esc
4159 case scrollBar_esc: 3715 case scrollBar_esc:
4160 if (scrollbar_mapping (state)) 3716 if (scrollbar_mapping (state))
4161 { 3717 {
… …
4174 break; 3730 break;
4175 /* case 66: - application key pad */ 3731 /* case 66: - application key pad */
4176 /* case 67: - backspace key */ 3732 /* case 67: - backspace key */
4177 case 1000: /* X11 mouse reporting */ 3733 case 1000: /* X11 mouse reporting */
4178 if (state) /* orthogonal */ 3734 if (state) /* orthogonal */
4179 priv_modes &= ~PrivMode_MouseX10; 3735 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4180 break; 3736 break;
4181#if 0
4182 case 1001: 3737 case 1002:
4183 break; /* X11 mouse highlighting */ 3738 case 1003:
4184#endif 3739 if (state)
3740 {
3741 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3742 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3743 vt_emask_mouse = PointerMotionMask;
3744 }
3745 else
3746 vt_emask_mouse = NoEventMask;
3747 vt_select_input ();
3748 break;
4185 case 1010: /* scroll to bottom on TTY output inhibit */ 3749 case 1010: /* scroll to bottom on TTY output inhibit */
4186 set_option (Opt_scrollTtyOutput, !state); 3750 set_option (Opt_scrollTtyOutput, !state);
4187 break; 3751 break;
4188 case 1011: /* scroll to bottom on key press */ 3752 case 1011: /* scroll to bottom on key press */
4189 set_option (Opt_scrollTtyKeypress, state); 3753 set_option (Opt_scrollTtyKeypress, state);
4190 break; 3754 break;
4191 case 1047: /* secondary screen w/ clearing last */ 3755 case 1047: /* secondary screen w/ clearing last */
4192 if (OPTION (Opt_secondaryScreen)) 3756 if (option (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY) 3757 if (current_screen != PRIMARY)
4194 scr_erase_screen (2); 3758 scr_erase_screen (2);
4195 scr_change_screen (state); 3759 scr_change_screen (state);
4196 break; 3760 break;
4197 case 1049: /* secondary screen w/ clearing first */ 3761 case 1049: /* secondary screen w/ clearing first */
4198 scr_change_screen (state); 3762 scr_change_screen (state);
4199 if (OPTION (Opt_secondaryScreen)) 3763 if (option (Opt_secondaryScreen))
4200 if (current_screen != PRIMARY) 3764 if (current_screen != PRIMARY)
4201 scr_erase_screen (2); 3765 scr_erase_screen (2);
4202 break; 3766 break;
4203 default: 3767 default:
4204 break; 3768 break;
… …
4366rxvt_term::process_graphics () 3930rxvt_term::process_graphics ()
4367{ 3931{
4368 unicode_t ch, cmd = cmd_getc (); 3932 unicode_t ch, cmd = cmd_getc ();
4369 3933
4370 if (cmd == 'Q') 3934 if (cmd == 'Q')
3935 {
4371 { /* query graphics */ 3936 /* query graphics */
4372 tt_printf ("\033G0\012"); /* no graphics */ 3937 tt_printf ("\033G0\012"); /* no graphics */
4373 return; 3938 return;
4374 } 3939 }
4375 /* swallow other graphics sequences until terminating ':' */ 3940 /* swallow other graphics sequences until terminating ':' */
4376 do 3941 do
… …
4426 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3991 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4427 3992
4428 memcpy (v_buffer + v_buflen, data, len); 3993 memcpy (v_buffer + v_buflen, data, len);
4429 v_buflen += len; 3994 v_buflen += len;
4430 3995
4431 pty_ev.set (EVENT_READ | EVENT_WRITE); 3996 pty_ev.set (ev::READ | ev::WRITE);
4432} 3997}
4433 3998
4434void rxvt_term::pty_write () 3999void rxvt_term::pty_write ()
4435{ 4000{
4436 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4001 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4441 4006
4442 if (v_buflen == 0) 4007 if (v_buflen == 0)
4443 { 4008 {
4444 free (v_buffer); 4009 free (v_buffer);
4445 v_buffer = 0; 4010 v_buffer = 0;
4446 v_buflen = 0;
4447 4011
4448 pty_ev.set (EVENT_READ); 4012 pty_ev.set (ev::READ);
4449 return; 4013 return;
4450 } 4014 }
4451 4015
4452 memmove (v_buffer, v_buffer + written, v_buflen); 4016 memmove (v_buffer, v_buffer + written, v_buflen);
4453 } 4017 }
4454 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4018 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4455 pty_ev.set (EVENT_READ); 4019 pty_ev.set (ev::READ);
4456} 4020}
4457 4021
4458/*----------------------- end-of-file (C source) -----------------------*/ 4022/*----------------------- end-of-file (C source) -----------------------*/
4459 4023

Diff Legend

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