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.315 by root, Tue Aug 22 13:07:17 2006 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 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
… …
302 302
303void 303void
304rxvt_term::key_press (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
305{ 305{
306 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 307 KeySym keysym;
309 int valid_keysym; 308 int valid_keysym;
310 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
311 310
312#if ISO_14755 311#if ISO_14755
… …
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;
539 } 546 }
540#endif 547#endif
541 548
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 550 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1;
553#ifdef XK_KP_Home
554 static const KeySym keypadtrans[] = {
555 XK_KP_7, // XK_KP_Home
556 XK_KP_4, // XK_KP_Left
557 XK_KP_8, // XK_KP_Up
558 XK_KP_6, // XK_KP_Right
559 XK_KP_2, // XK_KP_Down
560#ifndef UNSHIFTED_SCROLLKEYS
561 XK_KP_9, // XK_KP_Prior
562 XK_KP_3, // XK_KP_Next
563#else
564 XK_Prior,
565 XK_Next,
566#endif
567 XK_KP_1, // XK_KP_End
568 XK_KP_5, // XK_KP_Begin
569 };
570
571 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
544 { 572 {
545 newlen = 1; 573 unsigned int index = keysym - XK_KP_Home;
574 keysym = kp ? keypadtrans[index] : XK_Home + index;
575 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
546 switch (keysym) 583 switch (keysym)
547 { 584 {
548#ifndef NO_BACKSPACE_KEY 585#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace: 586 case XK_BackSpace:
550 if (priv_modes & PrivMode_HaveBackSpace) 587 if (priv_modes & PrivMode_HaveBackSpace)
… …
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177'; 590 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0'; 591 kbuf[1] = '\0';
555 } 592 }
556 else 593 else
557 strcpy (kbuf, key_backspace); 594 strcpy (kbuf, rs[Rs_backspace_key]);
558 break; 595 break;
559#endif 596#endif
560#ifndef NO_DELETE_KEY 597#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: 598 case XK_Delete:
572 strcpy (kbuf, key_delete); 599 strcpy (kbuf, rs[Rs_delete_key]);
573 break; 600 break;
574#endif 601#endif
575 case XK_Tab: 602 case XK_Tab:
576 if (shft) 603 if (shft)
577 strcpy (kbuf, "\033[Z"); 604 strcpy (kbuf, "\033[Z");
… …
587#endif 614#endif
588 newlen = 0; 615 newlen = 0;
589 } 616 }
590 break; 617 break;
591 618
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" */ 619 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */ 620 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */ 621 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */ 622 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z"); 623 strcpy (kbuf, "\033[Z");
… …
622 else if (priv_modes & PrivMode_aplCUR) 633 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O'; 634 kbuf[1] = 'O';
624 break; 635 break;
625 636
626#ifndef UNSHIFTED_SCROLLKEYS 637#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: 638 case XK_Prior:
638 strcpy (kbuf, "\033[5~"); 639 strcpy (kbuf, "\033[5~");
639 break; 640 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: 641 case XK_Next:
651 strcpy (kbuf, "\033[6~"); 642 strcpy (kbuf, "\033[6~");
652 break; 643 break;
653#endif 644#endif
654 case XK_KP_Enter: 645 case XK_KP_Enter:
655 /* allow shift to override */ 646 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 647 if (kp)
657 { 648 {
658 strcpy (kbuf, "\033OM"); 649 strcpy (kbuf, "\033OM");
659 break; 650 break;
660 } 651 }
661 652
… …
673 kbuf[0] = '\015'; 664 kbuf[0] = '\015';
674 kbuf[1] = '\0'; 665 kbuf[1] = '\0';
675 } 666 }
676 break; 667 break;
677 668
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" */ 669 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */ 670 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */ 671 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */ 672 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP"); 673 strcpy (kbuf, "\033OP");
… …
704 case XK_KP_6: /* "\033Ov" : "6" */ 689 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */ 690 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */ 691 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */ 692 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */ 693 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 694 if (kp)
710 { 695 {
711 strcpy (kbuf, "\033Oj"); 696 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply); 697 kbuf[2] += (keysym - XK_KP_Multiply);
713 } 698 }
714 else 699 else
… …
720 705
721 case XK_Find: 706 case XK_Find:
722 strcpy (kbuf, "\033[1~"); 707 strcpy (kbuf, "\033[1~");
723 break; 708 break;
724 709
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: 710 case XK_Insert:
736 strcpy (kbuf, "\033[2~"); 711 strcpy (kbuf, "\033[2~");
737 break; 712 break;
738#ifdef DXK_Remove /* support for DEC remove like key */ 713#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove: 714 case DXK_Remove:
… …
743 strcpy (kbuf, "\033[3~"); 718 strcpy (kbuf, "\033[3~");
744 break; 719 break;
745 case XK_Select: 720 case XK_Select:
746 strcpy (kbuf, "\033[4~"); 721 strcpy (kbuf, "\033[4~");
747 break; 722 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: 723 case XK_End:
759 strcpy (kbuf, KS_END); 724 strcpy (kbuf, KS_END);
760 break; 725 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: 726 case XK_Home:
772 strcpy (kbuf, KS_HOME); 727 strcpy (kbuf, KS_HOME);
773 break; 728 break;
774 729
775#define FKEY(n, fkey) \ 730#define FKEY(n, fkey) \
… …
832 break; 787 break;
833 } 788 }
834 789
835 if (newlen) 790 if (newlen)
836 len = strlen (kbuf); 791 len = strlen (kbuf);
837 }
838 792
839 /* 793 /*
840 * Pass meta for all function keys, if 'meta' option set 794 * Pass meta for all function keys, if 'meta' option set
841 */ 795 */
842#ifdef META8_OPTION 796#ifdef META8_OPTION
… …
877 return; 831 return;
878 832
879 if (len <= 0) 833 if (len <= 0)
880 return; /* not mapped */ 834 return; /* not mapped */
881 835
882 if (OPTION (Opt_scrollTtyKeypress)) 836 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 837 if (view_start)
884 { 838 {
885 view_start = 0; 839 view_start = 0;
886 want_refresh = 1; 840 want_refresh = 1;
887 } 841 }
… …
926#if ENABLE_FRILLS || ISO_14755 880#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 881 // ISO 14755 support
928 if (iso14755buf) 882 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 883 if (iso14755buf & ISO_14755_52)
930 { 884 {
931# if ENABLE_OVERLAY 885# if ISO_14755
932 scr_overlay_off (); 886 scr_overlay_off ();
933# endif 887# endif
934# if ISO_14755 888# if ISO_14755
935 // iso14755 part 5.2 handling: release time 889 // iso14755 part 5.2 handling: release time
936 // first: controls 890 // first: controls
… …
959 913
960 return; 914 return;
961 } 915 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 916 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 917 {
964# if ENABLE_OVERLAY 918# if ISO_14755
965 scr_overlay_off (); 919 scr_overlay_off ();
966# endif 920# endif
967 if (iso14755buf & ISO_14755_51) 921 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 922 commit_iso14755 ();
969#if ISO_14755 923#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 924 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 925 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 926 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 927
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 928 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 929 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 981void
1028rxvt_term::flush () 982rxvt_term::flush ()
1029{ 983{
1030 flush_ev.stop (); 984 flush_ev.stop ();
1031 985
1032#ifdef TRANSPARENT 986#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 987 if (bgPixmap.check_clearChanged ())
1034 { 988 {
1035 want_full_refresh = 0; 989// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 990 scr_touch (false);
1038 } 991 }
1039#endif 992#endif
1040 993
1041 if (want_refresh) 994 if (want_refresh)
… …
1086 } 1039 }
1087 1040
1088 display->flush (); 1041 display->flush ();
1089} 1042}
1090 1043
1044/* checks wether a refresh is requested and starts the refresh timer */
1091void 1045void
1092rxvt_term::check_cb (check_watcher &w) 1046rxvt_term::refresh_check ()
1047{
1048 if (want_refresh && !flush_ev.is_active ())
1049 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050
1051 display->flush ();
1052}
1053
1054void
1055rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1056{
1094 make_current (); 1057 make_current ();
1095 1058
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; 1059 refresh_count = 0;
1109 flush (); 1060 flush ();
1110} 1061}
1111 1062
1112#ifdef CURSOR_BLINK 1063#ifdef CURSOR_BLINK
1113void 1064void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1066{
1116 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1068 want_refresh = 1;
1118 1069 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1070}
1121#endif 1071#endif
1122 1072
1123#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1124void 1074void
1125rxvt_term::text_blink_cb (time_watcher &w) 1075rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1076{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1078 {
1129 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1130 want_refresh = 1; 1080 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1081 refresh_check ();
1132 } 1082 }
1083 else
1084 w.stop ();
1133} 1085}
1134#endif 1086#endif
1135 1087
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1089void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1091{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1142 { 1094 {
1143 want_refresh = 1; 1095 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1145 } 1097 }
1098 else
1099 w.stop ();
1146} 1100}
1147#endif 1101#endif
1148 1102
1149#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1150void 1104void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1106{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1108 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1110 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1158 } 1112 }
1113 else
1114 w.stop ();
1159} 1115}
1160#endif 1116#endif
1161 1117
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1119void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1121{
1166 if (mouse_slip_wheel_speed == 0 1122 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 { 1123 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1124 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 refresh_check ();
1126 }
1127
1128 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1129 {
1130 mouse_slip_wheel_speed = 0;
1131 w.stop ();
1175 } 1132 }
1176} 1133}
1177#endif 1134#endif
1178 1135
1179#if LINUX_YIELD_HACK 1136#if LINUX_YIELD_HACK
1180static struct event_handler 1137static struct event_handler
1181{ 1138{
1182 check_watcher yield_ev; 1139 ev::prepare yield_ev;
1183 1140
1184 void yield_cb (check_watcher &w) 1141 void yield_cb (ev::prepare &w, int revents)
1185 { 1142 {
1186 // this should really be sched_yield(), but the linux guys thought 1143 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1144 // 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 1145 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1146 // allowed by the sus... as is returning ENOSYS.
… …
1232 } 1189 }
1233 else 1190 else
1234 { 1191 {
1235 pty_ev.stop (); 1192 pty_ev.stop ();
1236 1193
1237 if (!OPTION (Opt_hold)) 1194 if (!option (Opt_hold))
1238 destroy (); 1195 destroy ();
1239 } 1196 }
1240 1197
1241 return false; 1198 return false;
1242} 1199}
1243 1200
1244void 1201void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1202rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1203{
1247 make_current (); 1204 make_current ();
1248 1205
1249 if (revents & EVENT_READ) 1206 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1207 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1208 while (pty_fill ())
1252 if (cmd_parse ()) 1209 if (cmd_parse ())
1253 break; 1210 break;
1254 1211
1255 if (revents & EVENT_WRITE) 1212 if (revents & ev::WRITE)
1256 pty_write (); 1213 pty_write ();
1214
1215 refresh_check ();
1257} 1216}
1258 1217
1259void 1218void
1260rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
1261{ 1220{
… …
1263 recolour_cursor (); 1222 recolour_cursor ();
1264 1223
1265#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1225 hidden_pointer = 0;
1267 1226
1268 if (OPTION (Opt_pointerBlank)) 1227 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1228 pointer_ev.start (pointerBlankDelay);
1270#endif 1229#endif
1271} 1230}
1272 1231
1273#ifdef POINTER_BLANK 1232#ifdef POINTER_BLANK
1274void 1233void
1275rxvt_term::pointer_blank () 1234rxvt_term::pointer_blank ()
1276{ 1235{
1277 if (!OPTION (Opt_pointerBlank)) 1236 if (!option (Opt_pointerBlank))
1278 return; 1237 return;
1279 1238
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1239 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1240 XFlush (dpy);
1282 1241
1283 hidden_pointer = 1; 1242 hidden_pointer = 1;
1284} 1243}
1285 1244
1286void 1245void
1287rxvt_term::pointer_cb (time_watcher &w) 1246rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1247{
1289 make_current (); 1248 make_current ();
1290 1249
1291 pointer_blank (); 1250 pointer_blank ();
1292} 1251}
… …
1295void 1254void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1255rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1256{
1298 int button_number, key_state = 0; 1257 int button_number, key_state = 0;
1299 int x, y; 1258 int x, y;
1259 int code = 32;
1300 1260
1301 x = ev.x; 1261 x = Pixel2Col (ev.x);
1302 y = ev.y; 1262 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1263 if (ev.type == MotionNotify)
1264 {
1265 if (x == mouse_row && y == mouse_col)
1266 return;
1267 mouse_row = x;
1268 mouse_col = y;
1269 code += 32;
1270 }
1304 1271
1305 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
1306 button_number = 3; 1273 button_number = 3;
1307 else 1274 else
1308 { 1275 {
… …
1354 x + 1, 1321 x + 1,
1355 y + 1); 1322 y + 1);
1356#endif 1323#endif
1357 1324
1358 tt_printf ("\033[M%c%c%c", 1325 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1326 (code + button_number + key_state),
1360 (32 + x + 1), 1327 (32 + x + 1),
1361 (32 + y + 1)); 1328 (32 + y + 1));
1362} 1329}
1363 1330
1364/*{{{ process an X event */ 1331/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1394 focus_out ();
1428 } 1395 }
1429#endif 1396#endif
1430 } 1397 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1398 break;
1436 1399
1437 /* 1400 /*
1438 * XXX: this is not the _current_ arrangement 1401 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1402 * Here's my conclusion:
… …
1458 break; 1421 break;
1459 } 1422 }
1460 break; 1423 break;
1461 1424
1462 case FocusIn: 1425 case FocusIn:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1429 focus_in ();
1464 break; 1430 break;
1465 1431
1466 case FocusOut: 1432 case FocusOut:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1436 focus_out ();
1468 break; 1437 break;
1469 1438
1470 case ConfigureNotify: 1439 case ConfigureNotify:
1440 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height);*/
1471 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1472 { 1444 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1446 ;
1475 1447
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1449 {
1478 seen_resize = 1; 1450 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1452 }
1453 else
1454 {
1455#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ())
1457 {
1458 if (mapped)
1459 update_background ();
1460 else
1461 bgPixmap.invalidate ();
1462 }
1463#endif
1464 }
1481 1465
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1466 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 } 1467 }
1489 break; 1468 break;
1490 1469
1491 case PropertyNotify: 1470 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1471 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1508 case SelectionRequest: 1487 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1488 selection_send (ev.xselectionrequest);
1510 break; 1489 break;
1511 1490
1512 case MapNotify: 1491 case MapNotify:
1492#ifdef HAVE_BG_PIXMAP
1493 /* This is needed spcifically to fix the case of no window manager or a
1494 * non-reparenting window manager. In those cases we never get first
1495 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1496 * care of multiplicity of ConfigureNotify events arriwing while WM does
1497 * reparenting.
1498 * We should not render background immidiately, as there could be several
1499 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1500 * by scheduling background redraw as soon as we can, but giving a short
1501 * bit of time for ConfigureNotifies to arrive.
1502 * We should render background PRIOR to drawing any text, but AFTER all
1503 * of ConfigureNotifys for the best results.
1504 */
1505 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1506 update_background_ev.start (0.025);
1507#endif
1513 mapped = 1; 1508 mapped = 1;
1514#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start ();
1516#endif 1511#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1513 break;
1519 1514
1520 case UnmapNotify: 1515 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1524#endif 1519#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1521 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1522
1534 case GraphicsExpose: 1523 case GraphicsExpose:
1535 case Expose: 1524 case Expose:
1536 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1537 { 1526 {
1538 do 1527 do
1528 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1529 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1530 ev.xexpose.width, ev.xexpose.height, False);
1531 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1533
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1534 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1535
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1537 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1538 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1539 ev.xexpose.width, ev.xexpose.height, False);
1540 }
1548 1541
1549 want_refresh = 1; 1542 want_refresh = 1;
1550 } 1543 }
1551 else 1544 else
1552 { 1545 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1548 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1549 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1551 ;
1559 1552
1560 if (isScrollbarWindow (ev.xany.window)) 1553 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1554 {
1562 scrollBar.setIdle (); 1555 scrollBar.state = STATE_IDLE;
1563 scrollbar_show (0); 1556 scrollbar_show (0);
1564 } 1557 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1558 }
1571 break; 1559 break;
1572 1560
1573 case MotionNotify: 1561 case MotionNotify:
1574#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1563 if (hidden_pointer)
1576 pointer_unblank (); 1564 pointer_unblank ();
1577#endif 1565#endif
1566 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1567 || priv_modes & PrivMode_MouseAnyEvent)
1568 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1569 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1570 break;
1580 1571
1581 if (ev.xany.window == vt) 1572 if (ev.xany.window == vt)
1582 { 1573 {
… …
1616 int dist; 1607 int dist;
1617 1608
1618 /* don't clobber the current delay if we are 1609 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1610 * already in the middle of scrolling.
1620 */ 1611 */
1621 if (!sel_scroll_ev.active) 1612 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1613 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1614
1624 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1626 */ 1617 */
1627 selection_save_x = ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
… …
1649 else 1640 else
1650 { 1641 {
1651 /* we are within the text window, so we 1642 /* we are within the text window, so we
1652 * shouldn't be scrolling 1643 * shouldn't be scrolling
1653 */ 1644 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1645 sel_scroll_ev.stop();
1656 } 1646 }
1657#endif 1647#endif
1658#ifdef MOUSE_THRESHOLD 1648#ifdef MOUSE_THRESHOLD
1659 } 1649 }
1660#endif 1650#endif
1661 } 1651 }
1662 } 1652 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1653 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1664 { 1654 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1655 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1656 MotionNotify, &ev))
1667 ; 1657 ;
1668 1658
… …
1672 &ev.xbutton.x, &ev.xbutton.y, 1662 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1663 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1665 scrollbar_size ());
1676 want_refresh = 1; 1666 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1667 scrollbar_show (1);
1679 } 1668 }
1680 break; 1669 break;
1681 } 1670 }
1682 1671
1683#if defined(CURSOR_BLINK) 1672#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1673 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1674 {
1686 if (hidden_cursor) 1675 if (hidden_cursor)
1687 { 1676 {
1688 hidden_cursor = 0; 1677 hidden_cursor = 0;
1689 want_refresh = 1; 1678 want_refresh = 1;
1690 } 1679 }
1691 1680
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1681 cursor_blink_ev.again ();
1693 } 1682 }
1694#endif 1683#endif
1695 1684
1696#if defined(POINTER_BLANK) 1685#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1686 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1687 {
1699 if (ev.type == MotionNotify 1688 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1689 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1690 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1691 if (hidden_pointer)
… …
1704 1693
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1694 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1695 pointer_blank ();
1707 } 1696 }
1708#endif 1697#endif
1698
1699 refresh_check ();
1709} 1700}
1710 1701
1711void 1702void
1712rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1713{ 1704{
… …
1724 IMSetPosition (); 1715 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1726 } 1717 }
1727#endif 1718#endif
1728#if CURSOR_BLINK 1719#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1720 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1721 cursor_blink_ev.again ();
1731#endif 1722#endif
1732#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1734 { 1725 {
1735 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1727 scr_recolour ();
1737 } 1728 }
1738#endif 1729#endif
1730#if ENABLE_FRILLS
1731 if (option (Opt_urgentOnBell))
1732 {
1733 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1734 {
1735 h->flags &= ~XUrgencyHint;
1736 XSetWMHints (dpy, parent[0], h);
1737 }
1738 }
1739#endif
1739 } 1740 }
1740} 1741}
1741 1742
1742void 1743void
1743rxvt_term::focus_out () 1744rxvt_term::focus_out ()
… …
1751 1752
1752#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1754 if (iso14755buf)
1754 { 1755 {
1755 iso14755buf = 0; 1756 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1757# if ISO_14755
1757 scr_overlay_off (); 1758 scr_overlay_off ();
1758# endif 1759# endif
1759 } 1760 }
1760#endif 1761#endif
1761#if USE_XIM 1762#if USE_XIM
1762 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1764#endif 1765#endif
1765#if CURSOR_BLINK 1766#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1768 hidden_cursor = 0; 1770 hidden_cursor = 0;
1769#endif 1771#endif
1770#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1772 { 1774 {
… …
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 } 1791 }
1790#endif 1792#endif
1791} 1793}
1792 1794
1793#if TRANSPARENT || ENABLE_PERL 1795#if ENABLE_TRANSPARENCY || ENABLE_PERL
1794void 1796void
1795rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1796{ 1798{
1797 make_current (); 1799 make_current ();
1798 1800
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return; 1803 return;
1802 1804
1803# if TRANSPARENT 1805# if ENABLE_TRANSPARENCY
1804 switch (ev.type) 1806 switch (ev.type)
1805 { 1807 {
1806 case PropertyNotify: 1808 case PropertyNotify:
1807 /* 1809 /*
1808 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
1809 * use the property to determine the pixmap. We use it later on. 1811 * use the property to determine the pixmap. We use it later on.
1810 */ 1812 */
1811 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1812 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1813 return; 1815 {
1816 bgPixmap.set_root_pixmap ();
1817 update_background ();
1818 }
1814 1819
1815 /* FALLTHROUGH */
1816 case ReparentNotify:
1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1818 want_refresh = want_full_refresh = 1;
1819 break; 1820 break;
1820 } 1821 }
1821# endif 1822# endif
1823
1824 refresh_check ();
1822} 1825}
1823#endif 1826#endif
1824 1827
1825void 1828void
1826rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
… …
1881 mouse_report (ev); 1884 mouse_report (ev);
1882 } 1885 }
1883#else 1886#else
1884 MEvent.button = ev.button; 1887 MEvent.button = ev.button;
1885 mouse_report (ev); 1888 mouse_report (ev);
1886#endif /* MOUSE_REPORT_DOUBLECLICK */ 1889#endif /* MOUSE_REPORT_DOUBLECLICK */
1887 1890
1888 } 1891 }
1889 else 1892 else
1890 { 1893 {
1891 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
… …
1939 } 1942 }
1940 1943
1941 /* 1944 /*
1942 * Scrollbar window processing of button press 1945 * Scrollbar window processing of button press
1943 */ 1946 */
1944 if (isScrollbarWindow (ev.window)) 1947 if (scrollBar.state && ev.window == scrollBar.win)
1945 { 1948 {
1946 scrollBar.setIdle (); 1949 page_dirn direction = NO_DIR;
1950
1951 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */
1955
1956 scrollBar.state = STATE_IDLE;
1947 /* 1957 /*
1948 * Rxvt-style scrollbar: 1958 * Rxvt-style scrollbar:
1949 * move up if mouse is above slider 1959 * move up if mouse is above slider
1950 * move dn if mouse is below slider 1960 * move dn if mouse is below slider
1951 * 1961 *
… …
1960 /* 1970 /*
1961 * Mouse report disabled scrollbar: 1971 * Mouse report disabled scrollbar:
1962 * arrow buttons - send up/down 1972 * arrow buttons - send up/down
1963 * click on scrollbar - send pageup/down 1973 * click on scrollbar - send pageup/down
1964 */ 1974 */
1965 if ((scrollBar.style == R_SB_NEXT 1975 if (direction == UP)
1966 && scrollbarnext_upButton (ev.y))
1967 || (scrollBar.style == R_SB_RXVT
1968 && scrollbarrxvt_upButton (ev.y)))
1969 tt_printf ("\033[A"); 1976 tt_printf ("\033[A");
1970 else if ((scrollBar.style == R_SB_NEXT 1977 else if (direction == DN)
1971 && scrollbarnext_dnButton (ev.y))
1972 || (scrollBar.style == R_SB_RXVT
1973 && scrollbarrxvt_dnButton (ev.y)))
1974 tt_printf ("\033[B"); 1978 tt_printf ("\033[B");
1975 else 1979 else
1976 switch (ev.button) 1980 switch (ev.button)
1977 { 1981 {
1978 case Button2: 1982 case Button2:
… …
1985 tt_printf ("\033[5~"); 1989 tt_printf ("\033[5~");
1986 break; 1990 break;
1987 } 1991 }
1988 } 1992 }
1989 else 1993 else
1990#endif /* NO_SCROLLBAR_REPORT */ 1994#endif /* NO_SCROLLBAR_REPORT */
1991
1992 {
1993 char upordown = 0;
1994
1995 if (scrollBar.style == R_SB_NEXT)
1996 { 1995 {
1997 if (scrollbarnext_upButton (ev.y)) 1996 if (direction != NO_DIR)
1998 upordown = -1; /* up */
1999 else if (scrollbarnext_dnButton (ev.y))
2000 upordown = 1; /* down */
2001 }
2002 else if (scrollBar.style == R_SB_RXVT)
2003 {
2004 if (scrollbarrxvt_upButton (ev.y))
2005 upordown = -1; /* up */
2006 else if (scrollbarrxvt_dnButton (ev.y))
2007 upordown = 1; /* down */
2008 }
2009 if (upordown)
2010 { 1997 {
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1999 if (!cont_scroll_ev.is_active ())
2012 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2013#endif 2001#endif
2014 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (direction, 1))
2015 { 2003 {
2016 if (upordown < 0) 2004 if (direction == UP)
2017 scrollBar.setUp (); 2005 scrollBar.state = STATE_UP;
2018 else 2006 else
2019 scrollBar.setDn (); 2007 scrollBar.state = STATE_DOWN;
2020 } 2008 }
2021 } 2009 }
2022 else 2010 else
2023 switch (ev.button) 2011 switch (ev.button)
2024 { 2012 {
2025 case Button2: 2013 case Button2:
2026 switch (scrollbar_align) 2014 switch (scrollBar.align)
2027 { 2015 {
2028 case R_SB_ALIGN_TOP: 2016 case R_SB_ALIGN_TOP:
2029 csrO = 0; 2017 csrO = 0;
2030 break; 2018 break;
2031 case R_SB_ALIGN_CENTRE: 2019 case R_SB_ALIGN_CENTRE:
… …
2039 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2040 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2041 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2042 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2043 2031
2044 scrollBar.setMotion (); 2032 scrollBar.state = STATE_MOTION;
2045 break; 2033 break;
2046 2034
2047 case Button1: 2035 case Button1:
2048 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2036 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2049 csrO = ev.y - scrollBar.top; 2037 csrO = ev.y - scrollBar.top;
2050 /* FALLTHROUGH */ 2038 /* FALLTHROUGH */
2051 2039
2052 case Button3: 2040 case Button3:
2053 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
… …
2063 scr_page (DN, nrow - 1); 2051 scr_page (DN, nrow - 1);
2064# else 2052# else
2065 scr_page (DN, nrow / 4); 2053 scr_page (DN, nrow / 4);
2066# endif 2054# endif
2067 else 2055 else
2068 scrollBar.setMotion (); 2056 scrollBar.state = STATE_MOTION;
2069 } 2057 }
2070 else 2058 else
2071 { 2059 {
2072 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2073 (nrow 2061 (nrow
… …
2090 2078
2091 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
2092 if (!bypass_keystate) 2080 if (!bypass_keystate)
2093 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2094 2082
2095 if (scrollbar_isUpDn ()) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2096 { 2084 {
2097 scrollBar.setIdle (); 2085 scrollBar.state = STATE_IDLE;
2098 scrollbar_show (0); 2086 scrollbar_show (0);
2099 } 2087 }
2100 2088
2101#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2102 if (sel_scroll_ev.active)
2103 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2104#endif 2091#endif
2105 2092
2106 if (ev.window == vt) 2093 if (ev.window == vt)
2107 { 2094 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2095 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2132 mouse_report (ev); 2119 mouse_report (ev);
2133 } 2120 }
2134#else /* MOUSE_REPORT_DOUBLECLICK */ 2121#else /* MOUSE_REPORT_DOUBLECLICK */
2135 MEvent.button = AnyButton; 2122 MEvent.button = AnyButton;
2136 mouse_report (ev); 2123 mouse_report (ev);
2137#endif /* MOUSE_REPORT_DOUBLECLICK */ 2124#endif /* MOUSE_REPORT_DOUBLECLICK */
2138 return; 2125 return;
2139 } 2126 }
2140 2127
2141 /* 2128 /*
2142 * dumb hack to compensate for the failure of click-and-drag 2129 * dumb hack to compensate for the failure of click-and-drag
… …
2154 selection_make (ev.time); 2141 selection_make (ev.time);
2155 break; 2142 break;
2156 2143
2157 case Button2: 2144 case Button2:
2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2145 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2147 break;
2161 2148
2162#ifdef MOUSE_WHEEL 2149#ifdef MOUSE_WHEEL
2163 case Button4: 2150 case Button4:
2164 case Button5: 2151 case Button5:
… …
2168 2155
2169 v = ev.button == Button4 ? UP : DN; 2156 v = ev.button == Button4 ? UP : DN;
2170 2157
2171 if (ev.state & ShiftMask) 2158 if (ev.state & ShiftMask)
2172 i = 1; 2159 i = 1;
2173 else if (OPTION (Opt_mouseWheelScrollPage)) 2160 else if (option (Opt_mouseWheelScrollPage))
2174 i = nrow - 1; 2161 i = nrow - 1;
2175 else 2162 else
2176 i = 5; 2163 i = 5;
2177 2164
2178# ifdef MOUSE_SLIP_WHEELING 2165# ifdef MOUSE_SLIP_WHEELING
… …
2180 { 2167 {
2181 mouse_slip_wheel_speed += v ? -1 : 1; 2168 mouse_slip_wheel_speed += v ? -1 : 1;
2182 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2183 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184 2171
2185 if (slip_wheel_ev.at < NOW) 2172 if (!slip_wheel_ev.is_active ())
2186 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187
2188 slip_wheel_ev.start ();
2189 } 2174 }
2190 else 2175 else
2176# endif
2191 { 2177 {
2192# endif
2193 scr_page (v, i); 2178 scr_page (v, i);
2194 scrollbar_show (1); 2179 scrollbar_show (1);
2195# ifdef MOUSE_SLIP_WHEELING
2196 } 2180 }
2197# endif
2198 } 2181 }
2199 break; 2182 break;
2200#endif 2183#endif
2201 } 2184 }
2202 } 2185 }
2203} 2186}
2204
2205#ifdef TRANSPARENT
2206#if TINTING
2207/* taken from aterm-0.4.2 */
2208
2209typedef uint32_t RUINT32T;
2210
2211void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2212{
2213 int sh_r, sh_g, sh_b;
2214 RUINT32T mask_r, mask_g, mask_b;
2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2218 int i;
2219
2220 Visual *visual = term->visual;
2221
2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2223
2224 /* for convenience */
2225 mask_r = visual->red_mask;
2226 mask_g = visual->green_mask;
2227 mask_b = visual->blue_mask;
2228
2229 /* boring lookup table pre-initialization */
2230 switch (srcImage->bits_per_pixel) {
2231 case 15:
2232 if ((mask_r != 0x7c00) ||
2233 (mask_g != 0x03e0) ||
2234 (mask_b != 0x001f))
2235 return;
2236 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2237 lookup_r = lookup;
2238 lookup_g = lookup+32;
2239 lookup_b = lookup+32+32;
2240 sh_r = 10;
2241 sh_g = 5;
2242 sh_b = 0;
2243 break;
2244 case 16:
2245 if ((mask_r != 0xf800) ||
2246 (mask_g != 0x07e0) ||
2247 (mask_b != 0x001f))
2248 return;
2249 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2250 lookup_r = lookup;
2251 lookup_g = lookup+32;
2252 lookup_b = lookup+32+64;
2253 sh_r = 11;
2254 sh_g = 5;
2255 sh_b = 0;
2256 break;
2257 case 24:
2258 if ((mask_r != 0xff0000) ||
2259 (mask_g != 0x00ff00) ||
2260 (mask_b != 0x0000ff))
2261 return;
2262 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2263 lookup_r = lookup;
2264 lookup_g = lookup+256;
2265 lookup_b = lookup+256+256;
2266 sh_r = 16;
2267 sh_g = 8;
2268 sh_b = 0;
2269 break;
2270 case 32:
2271 if ((mask_r != 0xff0000) ||
2272 (mask_g != 0x00ff00) ||
2273 (mask_b != 0x0000ff))
2274 return;
2275 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2276 lookup_r = lookup;
2277 lookup_g = lookup+256;
2278 lookup_b = lookup+256+256;
2279 sh_r = 16;
2280 sh_g = 8;
2281 sh_b = 0;
2282 break;
2283 default:
2284 return; /* we do not support this color depth */
2285 }
2286
2287 /* prepare limits for color transformation (each channel is handled separately) */
2288 if (shade < 0) {
2289 shade = -shade;
2290 if (shade < 0) shade = 0;
2291 if (shade > 100) shade = 100;
2292
2293 lower_lim_r = 65535-rm;
2294 lower_lim_g = 65535-gm;
2295 lower_lim_b = 65535-bm;
2296
2297 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2298 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2299 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2300
2301 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2302 } else {
2303 if (shade < 0) shade = 0;
2304 if (shade > 100) shade = 100;
2305
2306 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2307
2308 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2309 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2310 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2311 }
2312
2313 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2314 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2315 {
2316 unsigned int tmp;
2317
2318 tmp = lower_lim_r;
2319 lower_lim_r = lower_lim_b;
2320 lower_lim_b = tmp;
2321
2322 tmp = upper_lim_r;
2323 upper_lim_r = upper_lim_b;
2324 upper_lim_b = tmp;
2325 }
2326
2327 /* fill our lookup tables */
2328 for (i = 0; i <= mask_r>>sh_r; i++)
2329 {
2330 RUINT32T tmp;
2331 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2332 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2333 lookup_r[i] = (tmp/65535)<<sh_r;
2334 }
2335 for (i = 0; i <= mask_g>>sh_g; i++)
2336 {
2337 RUINT32T tmp;
2338 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2339 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2340 lookup_g[i] = (tmp/65535)<<sh_g;
2341 }
2342 for (i = 0; i <= mask_b>>sh_b; i++)
2343 {
2344 RUINT32T tmp;
2345 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2346 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2347 lookup_b[i] = (tmp/65535)<<sh_b;
2348 }
2349
2350 /* apply table to input image (replacing colors by newly calculated ones) */
2351 switch (srcImage->bits_per_pixel)
2352 {
2353 case 15:
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 & 0x7c00)>>10] |
2365 lookup_g[(*p & 0x03e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 16:
2373 {
2374 unsigned short *p1, *pf, *p, *pl;
2375 p1 = (unsigned short *) srcImage->data;
2376 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width;
2381 for (; p < pl; p++)
2382 {
2383 *p = lookup_r[(*p & 0xf800)>>11] |
2384 lookup_g[(*p & 0x07e0)>> 5] |
2385 lookup_b[(*p & 0x001f)];
2386 }
2387 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 24:
2392 {
2393 unsigned char *p1, *pf, *p, *pl;
2394 p1 = (unsigned char *) srcImage->data;
2395 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width * 3;
2400 for (; p < pl; p += 3)
2401 {
2402 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2403 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2404 p[2] = lookup_r[(p[2] & 0x0000ff)];
2405 }
2406 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 case 32:
2411 {
2412 RUINT32T *p1, *pf, *p, *pl;
2413 p1 = (RUINT32T *) srcImage->data;
2414 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2415
2416 while (p1 < pf)
2417 {
2418 p = p1;
2419 pl = p1 + srcImage->width;
2420 for (; p < pl; p++)
2421 {
2422 *p = lookup_r[(*p & 0xff0000)>>16] |
2423 lookup_g[(*p & 0x00ff00)>> 8] |
2424 lookup_b[(*p & 0x0000ff)] |
2425 (*p & ~0xffffff);
2426 }
2427 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2428 }
2429 break;
2430 }
2431 }
2432
2433 free (lookup);
2434}
2435#endif
2436
2437/*
2438 * Check our parents are still who we think they are.
2439 * Do transparency updates if required
2440 */
2441int
2442rxvt_term::check_our_parents ()
2443{
2444 int i, pchanged, aformat, have_pixmap, rootdepth;
2445 unsigned long nitems, bytes_after;
2446 Atom atype;
2447 unsigned char *prop = NULL;
2448 Window root, oldp, *list;
2449 Pixmap rootpixmap = None;
2450 XWindowAttributes wattr, wrootattr;
2451
2452 pchanged = 0;
2453
2454 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */
2456
2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth;
2459
2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2461
2462 if (rootdepth != wattr.depth)
2463 {
2464 if (am_transparent)
2465 {
2466 pchanged = 1;
2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0;
2469 }
2470
2471 return pchanged; /* Don't try any more */
2472 }
2473
2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (dpy, False);
2476
2477 /*
2478 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that.
2481 */
2482 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL
2494#if TINTING
2495 || !ISSET_PIXCOLOR (Color_tint)
2496#endif
2497 )
2498 have_pixmap = 0;
2499 else
2500 {
2501 have_pixmap = 1;
2502 rootpixmap = *(Pixmap *)prop;
2503 XFree (prop);
2504 }
2505
2506 if (have_pixmap)
2507 {
2508 /*
2509 * Copy display->root pixmap transparency
2510 */
2511 int sx, sy, nx, ny;
2512 unsigned int nw, nh;
2513 Window cr;
2514 XImage *image;
2515 GC gc;
2516 XGCValues gcvalue;
2517
2518 XTranslateCoordinates (dpy, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height;
2522 nx = ny = 0;
2523
2524 if (sx < 0)
2525 {
2526 nw += sx;
2527 nx = -sx;
2528 sx = 0;
2529 }
2530
2531 if (sy < 0)
2532 {
2533 nh += sy;
2534 ny = -sy;
2535 sy = 0;
2536 }
2537
2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (dpy, False);
2542 allowedxerror = -1;
2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */
2547 allowedxerror = 0;
2548
2549 if (image == NULL)
2550 {
2551 if (am_transparent && am_pixmap_trans)
2552 {
2553 pchanged = 1;
2554 if (pixmap != None)
2555 {
2556 XFreePixmap (dpy, pixmap);
2557 pixmap = None;
2558 }
2559 }
2560
2561 am_pixmap_trans = 0;
2562 }
2563 else
2564 {
2565 if (pixmap != None)
2566 XFreePixmap (dpy, pixmap);
2567
2568#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint))
2570 {
2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2572
2573 rgba c;
2574 pix_colors_focused [Color_tint].get (c);
2575
2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577 }
2578#endif
2579
2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2583 nx, ny, image->width, image->height);
2584 XFreeGC (dpy, gc);
2585 XDestroyImage (image);
2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2587 XClearWindow (dpy, parent[0]);
2588
2589 if (!am_transparent || !am_pixmap_trans)
2590 pchanged = 1;
2591
2592 am_transparent = am_pixmap_trans = 1;
2593 }
2594 }
2595
2596 if (am_pixmap_trans)
2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2598 else
2599 {
2600 unsigned int n;
2601 /*
2602 * InheritPixmap transparency
2603 */
2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 {
2606 oldp = parent[i];
2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2608 XFree (list);
2609
2610 if (parent[i] == display->root)
2611 {
2612 if (oldp != None)
2613 pchanged = 1;
2614
2615 break;
2616 }
2617
2618 if (oldp != parent[i])
2619 pchanged = 1;
2620 }
2621
2622 n = 0;
2623
2624 if (pchanged)
2625 for (; n < (unsigned int)i; n++)
2626 {
2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2630 {
2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2632 break;
2633 }
2634 }
2635
2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2637 {
2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2640 am_transparent = 0;
2641 /* XXX: also turn off Opt_transparent? */
2642 }
2643 else
2644 {
2645 for (n = 0; n < (unsigned int)i; n++)
2646 {
2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2648 XClearWindow (dpy, parent[n]);
2649 }
2650
2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2652 am_transparent = 1;
2653 }
2654
2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2656 parent[i] = None;
2657 }
2658
2659 if (scrollBar.win)
2660 {
2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2662 scrollBar.setIdle ();
2663 scrollbar_show (0);
2664 }
2665
2666 if (am_transparent)
2667 {
2668 want_refresh = want_full_refresh = 1;
2669 if (am_pixmap_trans)
2670 flush ();
2671 }
2672
2673 return pchanged;
2674}
2675#endif
2676 2187
2677/*}}} */ 2188/*}}} */
2678 2189
2679bool 2190bool
2680rxvt_term::cmd_parse () 2191rxvt_term::cmd_parse ()
… …
2729 if (ch == C0_LF) 2240 if (ch == C0_LF)
2730 nlines++; 2241 nlines++;
2731 2242
2732 refresh_count++; 2243 refresh_count++;
2733 2244
2734 if (!OPTION (Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2735 || (refresh_count >= refresh_limit * (nrow - 1)))
2736 { 2246 {
2737 refreshnow = true;
2738 refresh_count = 0; 2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2251 refreshnow = true;
2739 ch = NOCHAR; 2252 ch = NOCHAR;
2740 break; 2253 break;
2254 }
2741 } 2255 }
2742 2256
2743 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2744 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2745 { 2259 {
… …
2773 && 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))))
2774 scr_add_lines (buf, str - buf, nlines); 2288 scr_add_lines (buf, str - buf, nlines);
2775 2289
2776 /* 2290 /*
2777 * 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
2778 * 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.
2779 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2780 * is incremented here because we must be doing flat-out scrolling.
2781 */ 2294 */
2782 if (refreshnow) 2295 if (refreshnow)
2783 { 2296 {
2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2785 refresh_limit++;
2786 else
2787 {
2788 flag = true; 2297 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2790 scr_refresh (); 2298 scr_refresh ();
2791 want_refresh = 1; 2299 want_refresh = 1;
2792 }
2793 } 2300 }
2794 2301
2795 } 2302 }
2796 else 2303 else
2797 { 2304 {
… …
2946 { 2453 {
2947 if ((buf[len++] = cmd_getc ()) == 'i') 2454 if ((buf[len++] = cmd_getc ()) == 'i')
2948 break; /* done = 1 */ 2455 break; /* done = 1 */
2949 } 2456 }
2950 } 2457 }
2951 2458
2952 for (i = 0; i < len; i++) 2459 for (i = 0; i < len; i++)
2953 if (putc (buf[i], fd) == EOF) 2460 if (putc (buf[i], fd) == EOF)
2954 { 2461 {
2955 done = 1; 2462 done = 1;
2956 break; 2463 break;
… …
2958 } 2465 }
2959 } 2466 }
2960 2467
2961 pclose_printer (fd); 2468 pclose_printer (fd);
2962} 2469}
2963#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2964/*}}} */ 2471/*}}} */
2965 2472
2966/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2967enum { 2474enum {
2968 C1_40 = 0x40, 2475 C1_40 = 0x40,
… …
3018 process_dcs_seq (); 2525 process_dcs_seq ();
3019 break; 2526 break;
3020 case 0x9b: /* CSI */ 2527 case 0x9b: /* CSI */
3021 process_csi_seq (); 2528 process_csi_seq ();
3022 break; 2529 break;
3023 case 0x9d: /* CSI */ 2530 case 0x9d: /* OSC */
3024 process_osc_seq (); 2531 process_osc_seq ();
3025 break; 2532 break;
3026#endif 2533#endif
3027 } 2534 }
3028} 2535}
… …
3254rxvt_term::process_csi_seq () 2761rxvt_term::process_csi_seq ()
3255{ 2762{
3256 unicode_t ch, priv, i; 2763 unicode_t ch, priv, i;
3257 unsigned int nargs, p; 2764 unsigned int nargs, p;
3258 int n, ndef; 2765 int n, ndef;
3259 int arg[ESC_ARGS]; 2766 int arg[ESC_ARGS] = { };
3260 2767
3261 for (nargs = ESC_ARGS; nargs > 0;) 2768 nargs = 0;
3262 arg[--nargs] = 0;
3263 2769
3264 priv = 0; 2770 priv = 0;
3265 ch = cmd_getc (); 2771 ch = cmd_getc ();
3266 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
3267 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
3268 priv = ch; 2775 priv = ch;
3269 ch = cmd_getc (); 2776 ch = cmd_getc ();
3270 } 2777 }
3271 2778
3272 /* read any numerical arguments */ 2779 /* read any numerical arguments */
… …
3311 switch (priv) 2818 switch (priv)
3312 { 2819 {
3313 case '>': 2820 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2821 if (ch == CSI_DA) /* secondary device attributes */
3315 { 2822 {
3316 // 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,
3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2824 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3318 // 2825 //
3319 // 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
3320 // 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
3321 // that we do not support xterm mouse reporting (should be 95 when we do). 2828 // versions.
3322 // 2829 //
3323 tt_printf ("\033[>%d;94;0c", 'U'); 2830 tt_printf ("\033[>%d;95;0c", 'U');
3324 } 2831 }
3325 break; 2832 break;
2833
3326 case '?': 2834 case '?':
3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3328 process_terminal_mode (ch, priv, nargs, arg); 2836 process_terminal_mode (ch, priv, nargs, arg);
3329 break; 2837 break;
3330 } 2838 }
… …
3455 break; 2963 break;
3456 case 6: /* CPR requested */ 2964 case 6: /* CPR requested */
3457 scr_report_position (); 2965 scr_report_position ();
3458 break; 2966 break;
3459 case 7: /* unofficial extension */ 2967 case 7: /* unofficial extension */
3460 if (OPTION (Opt_insecure)) 2968 if (option (Opt_insecure))
3461 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2969 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3462 break; 2970 break;
3463 case 8: /* unofficial extension */ 2971 case 8: /* unofficial extension */
3464 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2972 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3465 break; 2973 break;
… …
3629 break; 3137 break;
3630 case 20: /* report icon label */ 3138 case 20: /* report icon label */
3631 { 3139 {
3632 char *s; 3140 char *s;
3633 XGetIconName (dpy, parent[0], &s); 3141 XGetIconName (dpy, parent[0], &s);
3634 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3142 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3635 XFree (s); 3143 XFree (s);
3636 } 3144 }
3637 break; 3145 break;
3638 case 21: /* report window title */ 3146 case 21: /* report window title */
3639 { 3147 {
3640 char *s; 3148 char *s;
3641 XFetchName (dpy, parent[0], &s); 3149 XFetchName (dpy, parent[0], &s);
3642 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3150 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3643 XFree (s); 3151 XFree (s);
3644 } 3152 }
3645 break; 3153 break;
3646 } 3154 }
3647} 3155}
… …
3774 int saveop = op; 3282 int saveop = op;
3775 3283
3776 dLocal (Display *, dpy); 3284 dLocal (Display *, dpy);
3777 3285
3778 assert (str != NULL); 3286 assert (str != NULL);
3779 3287
3780 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3288 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3781 return; 3289 return;
3782 3290
3783 switch (op) 3291 switch (op)
3784 { 3292 {
… …
3846 *buf++ = '\0'; 3354 *buf++ = '\0';
3847 3355
3848 process_color_seq (op, color, name, resp); 3356 process_color_seq (op, color, name, resp);
3849 } 3357 }
3850 break; 3358 break;
3359 case Rxvt_restoreFG:
3851 case XTerm_Color00: 3360 case XTerm_Color00:
3852 process_color_seq (op, Color_fg, str, resp); 3361 process_color_seq (op, Color_fg, str, resp);
3853 break; 3362 break;
3363 case Rxvt_restoreBG:
3854 case XTerm_Color01: 3364 case XTerm_Color01:
3855 process_color_seq (op, Color_bg, str, resp); 3365 process_color_seq (op, Color_bg, str, resp);
3856 break; 3366 break;
3857#ifndef NO_CURSORCOLOR 3367#ifndef NO_CURSORCOLOR
3858 case XTerm_Color_cursor: 3368 case XTerm_Color_cursor:
… …
3879 break; 3389 break;
3880 case URxvt_Color_IT: 3390 case URxvt_Color_IT:
3881 process_color_seq (op, Color_IT, str, resp); 3391 process_color_seq (op, Color_IT, str, resp);
3882 break; 3392 break;
3883#endif 3393#endif
3884#if TRANSPARENT && TINTING 3394#if ENABLE_TRANSPARENCY
3885 case URxvt_Color_tint: 3395 case URxvt_Color_tint:
3886 process_color_seq (op, Color_tint, str, resp); 3396 process_color_seq (op, Color_tint, str, resp);
3397 {
3398 bool changed = false;
3887 3399
3888 check_our_parents (); 3400 if (ISSET_PIXCOLOR (Color_tint))
3401 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3402 else
3403 changed = bgPixmap.unset_tint ();
3889 3404
3890 if (am_transparent) 3405 if (changed)
3891 want_full_refresh = want_refresh = 1; 3406 update_background ();
3407 }
3892 3408
3893 break; 3409 break;
3894#endif 3410#endif
3895 3411
3412#if BG_IMAGE_FROM_FILE
3896 case Rxvt_Pixmap: 3413 case Rxvt_Pixmap:
3897 { 3414 if (!strcmp (str, "?"))
3898 if (*str != ';')
3899 { 3415 {
3900#if XPM_BACKGROUND 3416 char str[256];
3901 scale_pixmap (""); /* reset to default scaling */ 3417
3902 set_bgPixmap (str); /* change pixmap */ 3418 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3903 scr_touch (true); 3419 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3904#endif 3420 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3421 process_xterm_seq (XTerm_title, str, CHAR_ST);
3905 } 3422 }
3906 3423 else
3424 {
3907 int changed = 0; 3425 int changed = 0;
3908 3426
3909 while ((str = strchr (str, ';')) != NULL) 3427 if (*str != ';')
3910 { 3428 {
3429 /* reset to default scaling :*/
3430 bgPixmap.unset_geometry ();
3431 if (bgPixmap.set_file (str)) /* change pixmap */
3432 changed++;
3433 str = strchr (str, ';');
3434 if (str == NULL)
3435 bgPixmap.set_defaultGeometry ();
3436 }
3437
3438 while (str)
3439 {
3911 str++; 3440 str++;
3912#if XPM_BACKGROUND 3441 if (bgPixmap.set_geometry (str))
3913 changed += scale_pixmap (str); 3442 changed++;
3914#endif 3443 str = strchr (str, ';');
3915 } 3444 }
3916 3445
3917 if (changed) 3446 if (changed)
3918 { 3447 update_background ();
3919#ifdef XPM_BACKGROUND
3920 resize_pixmap ();
3921 scr_touch (true);
3922#endif
3923 } 3448 }
3924 }
3925 break; 3449 break;
3926 3450#endif
3927 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str);
3929 break;
3930 case Rxvt_restoreBG:
3931 set_window_color (Color_bg, str);
3932 break;
3933 3451
3934 case XTerm_logfile: 3452 case XTerm_logfile:
3935 // TODO, when secure mode? 3453 // TODO, when secure mode?
3936 break; 3454 break;
3937 3455
… …
3955 case URxvt_italicFont: 3473 case URxvt_italicFont:
3956 case URxvt_boldItalicFont: 3474 case URxvt_boldItalicFont:
3957#endif 3475#endif
3958 if (query) 3476 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", saveop, 3477 tt_printf ("\33]%d;%-.250s%c", saveop,
3960 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3478 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3961 ? fontset[op - URxvt_font]->fontdesc : "", 3479 ? fontset[op - URxvt_font]->fontdesc : "",
3962 resp); 3480 resp);
3963 else 3481 else
3964 { 3482 {
3965 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3483 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3979 break; 3497 break;
3980 3498
3981#if !ENABLE_MINIMAL 3499#if !ENABLE_MINIMAL
3982 case URxvt_locale: 3500 case URxvt_locale:
3983 if (query) 3501 if (query)
3984 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3502 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3985 else 3503 else
3986 { 3504 {
3987 set_locale (str); 3505 set_locale (str);
3988 pty->set_utf8_mode (enc_utf8); 3506 pty->set_utf8_mode (enc_utf8);
3989 init_xlocale (); 3507 init_xlocale ();
… …
4052{ 3570{
4053 unsigned int i, j; 3571 unsigned int i, j;
4054 int state; 3572 int state;
4055 3573
4056 static const struct 3574 static const struct
4057 { 3575 {
4058 const int argval; 3576 const int argval;
4059 const unsigned long bit; 3577 const unsigned long bit;
4060 }
4061
4062 argtopriv[] = { 3578 } argtopriv[] = {
4063 { 1, PrivMode_aplCUR }, 3579 { 1, PrivMode_aplCUR },
4064 { 2, PrivMode_vt52 }, 3580 { 2, PrivMode_vt52 },
4065 { 3, PrivMode_132 }, 3581 { 3, PrivMode_132 },
4066 { 4, PrivMode_smoothScroll }, 3582 { 4, PrivMode_smoothScroll },
4067 { 5, PrivMode_rVideo }, 3583 { 5, PrivMode_rVideo },
… …
4083 { 66, PrivMode_aplKP }, 3599 { 66, PrivMode_aplKP },
4084#ifndef NO_BACKSPACE_KEY 3600#ifndef NO_BACKSPACE_KEY
4085 { 67, PrivMode_BackSpace }, 3601 { 67, PrivMode_BackSpace },
4086#endif 3602#endif
4087 { 1000, PrivMode_MouseX11 }, 3603 { 1000, PrivMode_MouseX11 },
4088 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3604 { 1002, PrivMode_MouseBtnEvent },
4089 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3605 { 1003, PrivMode_MouseAnyEvent },
4090 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4091 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4092 { 1011, PrivMode_Keypress }, // rxvt extension 3607 { 1011, PrivMode_Keypress }, // rxvt extension
4093 // 1035 enable modifiers for alt, numlock NYI 3608 // 1035 enable modifiers for alt, numlock NYI
4094 // 1036 send ESC for meta keys NYI 3609 // 1036 send ESC for meta keys NYI
4095 // 1037 send DEL for keypad delete NYI 3610 // 1037 send DEL for keypad delete NYI
4096 { 1047, PrivMode_Screen }, 3611 { 1047, PrivMode_Screen },
4097 // 1048 save and restore cursor 3612 // 1048 save and restore cursor
4098 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3613 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4099 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste },
4100 }; 3616 };
4101 3617
4102 if (nargs == 0) 3618 if (nargs == 0)
4103 return; 3619 return;
4104 3620
… …
4130 scr_touch (true); 3646 scr_touch (true);
4131 break; 3647 break;
4132#endif 3648#endif
4133 case 1048: /* alternative cursor save */ 3649 case 1048: /* alternative cursor save */
4134 case 1049: 3650 case 1049:
4135 if (OPTION (Opt_secondaryScreen)) 3651 if (option (Opt_secondaryScreen))
4136 if (mode == 0) 3652 if (mode == 0)
4137 scr_cursor (RESTORE); 3653 scr_cursor (RESTORE);
4138 else if (mode == 1) 3654 else if (mode == 1)
4139 scr_cursor (SAVE); 3655 scr_cursor (SAVE);
4140 break; 3656 break;
… …
4152 */ 3668 */
4153 PrivMode (1, PrivMode_vt52); 3669 PrivMode (1, PrivMode_vt52);
4154 break; 3670 break;
4155 case 3: /* 80/132 */ 3671 case 3: /* 80/132 */
4156 if (priv_modes & PrivMode_132OK) 3672 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
4157 set_widthheight (((state ? 132 : 80) * fwidth), height); 3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3676 }
4158 break; 3677 break;
4159 case 4: /* smooth scrolling */ 3678 case 4: /* smooth scrolling */
4160 set_option (Opt_jumpScroll, !state); 3679 set_option (Opt_jumpScroll, !state);
4161 break; 3680 break;
4162 case 5: /* reverse video */ 3681 case 5: /* reverse video */
… …
4169 scr_autowrap (state); 3688 scr_autowrap (state);
4170 break; 3689 break;
4171 /* 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 */
4172 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
4173 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
4174 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4175 break; 3694 break;
4176#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
4177 case scrollBar_esc: 3696 case scrollBar_esc:
4178 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
4179 { 3698 {
… …
4192 break; 3711 break;
4193 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
4194 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
4195 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
4196 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
4197 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4198 break; 3717 break;
4199#if 0
4200 case 1001: 3718 case 1002:
4201 break; /* X11 mouse highlighting */ 3719 case 1003:
4202#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;
4203 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
4204 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
4205 break; 3732 break;
4206 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
4207 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
4208 break; 3735 break;
4209 case 1047: /* secondary screen w/ clearing last */ 3736 case 1047: /* secondary screen w/ clearing last */
4210 if (OPTION (Opt_secondaryScreen)) 3737 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 3738 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 3739 scr_erase_screen (2);
4213 scr_change_screen (state); 3740 scr_change_screen (state);
4214 break; 3741 break;
4215 case 1049: /* secondary screen w/ clearing first */ 3742 case 1049: /* secondary screen w/ clearing first */
4216 scr_change_screen (state); 3743 scr_change_screen (state);
4217 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4218 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4219 scr_erase_screen (2); 3746 scr_erase_screen (2);
4220 break; 3747 break;
4221 default: 3748 default:
4222 break; 3749 break;
… …
4384rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
4385{ 3912{
4386 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
4387 3914
4388 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
4389 { /* query graphics */ 3917 /* query graphics */
4390 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
4391 return; 3919 return;
4392 } 3920 }
4393 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
4394 do 3922 do
… …
4444 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4445 3973
4446 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4447 v_buflen += len; 3975 v_buflen += len;
4448 3976
4449 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4450} 3978}
4451 3979
4452void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4453{ 3981{
4454 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));
… …
4459 3987
4460 if (v_buflen == 0) 3988 if (v_buflen == 0)
4461 { 3989 {
4462 free (v_buffer); 3990 free (v_buffer);
4463 v_buffer = 0; 3991 v_buffer = 0;
4464 v_buflen = 0;
4465 3992
4466 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4467 return; 3994 return;
4468 } 3995 }
4469 3996
4470 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4471 } 3998 }
4472 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4473 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4474} 4001}
4475 4002
4476/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4477 4004

Diff Legend

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