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.302 by root, Tue Jan 31 21:35:39 2006 UTC vs.
Revision 1.375 by root, Tue Dec 11 21:10:46 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
55# include "keyboard.h" 55# include "keyboard.h"
56#endif 56#endif
57 57
58#include <csignal> 58#include <csignal>
59 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
60/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
61 65
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63 67
64#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
… …
91 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
92 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
93 97
94 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
96 XK_ISO_Lock, 0x21eb,
97 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
98 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
99 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
100 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
101 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
294 297
295 return -1; 298 return -1;
296} 299}
297#endif 300#endif
298 301
299/*{{{ Convert the keypress event into a string */
300void 302void
301rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
302{ 304{
303 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
304 unsigned int newlen; 306 unsigned int newlen;
305 KeySym keysym; 307 KeySym keysym;
306 int valid_keysym; 308 int valid_keysym;
307 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
308 315
309 /* 316 /*
310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
311 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
312 * 319 *
… …
492# if ISO_14755 499# if ISO_14755
493 iso14755_51 (0); 500 iso14755_51 (0);
494# endif 501# endif
495 return; 502 return;
496 } 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 }
497 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
498 { 513 {
499 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
500 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
501# if ISO_14755 516# if ISO_14755
… …
503# endif 518# endif
504 return; 519 return;
505 } 520 }
506 else 521 else
507 { 522 {
508# if ENABLE_OVERLAY 523# if ISO_14755
509 scr_overlay_off (); 524 scr_overlay_off ();
510# endif 525# endif
511 iso14755buf = 0; 526 iso14755buf = 0;
512 } 527 }
513 } 528 }
514 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
515 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
516 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
517 { 532 {
518 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
519# if ENABLE_OVERLAY 534# if ISO_14755
520 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
521 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
522# endif 537# endif
523 } 538 }
524#endif 539#endif
525 540
526#ifdef PRINTPIPE 541#ifdef PRINTPIPE
527 if (keysym == XK_Print) 542 if (keysym == XK_Print)
528 { 543 {
529 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
530 return; 545 return;
… …
532#endif 547#endif
533 548
534 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
535 { 550 {
536 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
537 newlen = 1; 553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
538 switch (keysym) 584 switch (keysym)
539 { 585 {
540#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
541 case XK_BackSpace: 587 case XK_BackSpace:
542 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
544 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
545 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
546 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
547 } 593 }
548 else 594 else
549 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
550 break; 596 break;
551#endif 597#endif
552#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
553# ifdef XK_KP_Prior
554 case XK_KP_Delete:
555 /* allow shift to override */
556 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
557 {
558 strcpy (kbuf, "\033On");
559 break;
560 }
561 /* FALLTHROUGH */
562# endif
563 case XK_Delete: 599 case XK_Delete:
564 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
565 break; 601 break;
566#endif 602#endif
567 case XK_Tab: 603 case XK_Tab:
568 if (shft) 604 if (shft)
569 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
579#endif 615#endif
580 newlen = 0; 616 newlen = 0;
581 } 617 }
582 break; 618 break;
583 619
584#ifdef XK_KP_Left
585 case XK_KP_Up: /* \033Ox or standard */
586 case XK_KP_Down: /* \033Or or standard */
587 case XK_KP_Right: /* \033Ov or standard */
588 case XK_KP_Left: /* \033Ot or standard */
589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
590 {
591 strcpy (kbuf, "\033OZ");
592 kbuf[2] = "txvr"[keysym - XK_KP_Left];
593 break;
594 }
595 else
596 /* translate to std. cursor key */
597 keysym = XK_Left + (keysym - XK_KP_Left);
598 /* FALLTHROUGH */
599#endif
600 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
601 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
602 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
603 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
604 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
614 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
615 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
616 break; 636 break;
617 637
618#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
619# ifdef XK_KP_Prior
620 case XK_KP_Prior:
621 /* allow shift to override */
622 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
623 {
624 strcpy (kbuf, "\033Oy");
625 break;
626 }
627 /* FALLTHROUGH */
628# endif
629 case XK_Prior: 639 case XK_Prior:
630 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
631 break; 641 break;
632# ifdef XK_KP_Next
633 case XK_KP_Next:
634 /* allow shift to override */
635 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
636 {
637 strcpy (kbuf, "\033Os");
638 break;
639 }
640 /* FALLTHROUGH */
641# endif
642 case XK_Next: 642 case XK_Next:
643 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
644 break; 644 break;
645#endif 645#endif
646 case XK_KP_Enter: 646 case XK_KP_Enter:
647 /* allow shift to override */ 647 /* allow shift to override */
648 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
649 { 649 {
650 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
651 break; 651 break;
652 } 652 }
653 653
… …
665 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
666 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
667 } 667 }
668 break; 668 break;
669 669
670#ifdef XK_KP_Begin
671 case XK_KP_Begin:
672 strcpy (kbuf, "\033Ou");
673 break;
674
675#endif
676 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
677 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
678 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
679 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
680 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
696 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
697 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
698 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
699 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
700 /* allow shift to override */ 694 /* allow shift to override */
701 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
702 { 696 {
703 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
704 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
705 } 699 }
706 else 700 else
… …
712 706
713 case XK_Find: 707 case XK_Find:
714 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
715 break; 709 break;
716 710
717#ifdef XK_KP_End
718 case XK_KP_Insert:
719 /* allow shift to override */
720 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
721 {
722 strcpy (kbuf, "\033Op");
723 break;
724 }
725 /* FALLTHROUGH */
726#endif
727 case XK_Insert: 711 case XK_Insert:
728 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
729 break; 713 break;
730#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
731 case DXK_Remove: 715 case DXK_Remove:
… …
735 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
736 break; 720 break;
737 case XK_Select: 721 case XK_Select:
738 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
739 break; 723 break;
740#ifdef XK_KP_End
741 case XK_KP_End:
742 /* allow shift to override */
743 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
744 {
745 strcpy (kbuf, "\033Oq");
746 break;
747 }
748 /* FALLTHROUGH */
749#endif
750 case XK_End: 724 case XK_End:
751 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
752 break; 726 break;
753#ifdef XK_KP_Home
754 case XK_KP_Home:
755 /* allow shift to override */
756 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
757 {
758 strcpy (kbuf, "\033Ow");
759 break;
760 }
761 /* FALLTHROUGH */
762#endif
763 case XK_Home: 727 case XK_Home:
764 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
765 break; 729 break;
766 730
767#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
869 return; 833 return;
870 834
871 if (len <= 0) 835 if (len <= 0)
872 return; /* not mapped */ 836 return; /* not mapped */
873 837
874 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 839 if (view_start)
876 { 840 {
877 view_start = 0; 841 view_start = 0;
878 want_refresh = 1; 842 want_refresh = 1;
879 } 843 }
… …
903 tt_write (&ch, 1); 867 tt_write (&ch, 1);
904 } 868 }
905 869
906 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
907} 871}
908/*}}} */ 872
873void
874rxvt_term::key_release (XKeyEvent &ev)
875{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym;
878
879 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
880#endif
881
882#if ENABLE_FRILLS || ISO_14755
883 // ISO 14755 support
884 if (iso14755buf)
885 if (iso14755buf & ISO_14755_52)
886 {
887# if ISO_14755
888 scr_overlay_off ();
889# endif
890# if ISO_14755
891 // iso14755 part 5.2 handling: release time
892 // first: controls
893 if ((ev.state & ControlMask)
894 && ((keysym >= 0x40 && keysym <= 0x5f)
895 || (keysym >= 0x61 && keysym <= 0x7f)))
896 {
897 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
898 commit_iso14755 ();
899
900 return;
901 }
902
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
904 if (i[0] == keysym)
905 {
906 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 ();
908
909 return;
910 }
911
912 scr_bell ();
913# endif
914 iso14755buf = 0;
915
916 return;
917 }
918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
919 {
920# if ISO_14755
921 scr_overlay_off ();
922# endif
923 if (iso14755buf & ISO_14755_51)
924 commit_iso14755 ();
925#if ISO_14755
926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
927 {
928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
929
930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
932 }
933# endif
934 else
935 iso14755buf = 0;
936 }
937#endif
938
939 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
940 return;
941
942#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
943 if (!(ev.state & ControlMask))
944 slip_wheel_ev.stop ();
945 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0;
947#endif
948}
909 949
910#if defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
911unsigned int 951unsigned int
912rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 953{
… …
943void 983void
944rxvt_term::flush () 984rxvt_term::flush ()
945{ 985{
946 flush_ev.stop (); 986 flush_ev.stop ();
947 987
948#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
949 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
950 { 990 {
951 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
952 scr_clear ();
953 scr_touch (false); 992 scr_touch (false);
954 } 993 }
955#endif 994#endif
956 995
957 if (want_refresh) 996 if (want_refresh)
… …
1003 1042
1004 display->flush (); 1043 display->flush ();
1005} 1044}
1006 1045
1007void 1046void
1008rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1009{ 1048{
1010 make_current (); 1049 make_current ();
1011 1050
1012 display->flush (); 1051 display->flush ();
1013 1052
1014 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !ev_is_active (&flush_ev))
1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1016} 1055}
1017 1056
1018void 1057void
1019rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1059{
1021 make_current (); 1060 make_current ();
1022 1061
1023 refresh_limit = 1;
1024 refresh_count = 0; 1062 refresh_count = 0;
1025 flush (); 1063 flush ();
1026} 1064}
1027 1065
1028#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1029void 1067void
1030rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1031{ 1069{
1032 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1033 want_refresh = 1; 1071 want_refresh = 1;
1034
1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1036} 1072}
1037#endif 1073#endif
1038 1074
1039#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1040void 1076void
1041rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1042{ 1078{
1043 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1044 { 1080 {
1045 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1046 want_refresh = 1; 1082 want_refresh = 1;
1047 w.start (w.at + TEXT_BLINK_INTERVAL);
1048 } 1083 }
1084 else
1085 w.stop ();
1049} 1086}
1050#endif 1087#endif
1051 1088
1052#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1053void 1090void
1054rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1055{ 1092{
1056 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1057 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1058 {
1059 want_refresh = 1; 1095 want_refresh = 1;
1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
1061 } 1097 w.stop ();
1062} 1098}
1063#endif 1099#endif
1064 1100
1065#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1066void 1102void
1067rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1068{ 1104{
1069 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1070 { 1106 {
1071 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1072 want_refresh = 1; 1108 want_refresh = 1;
1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1074 } 1109 }
1110 else
1111 w.stop ();
1075} 1112}
1076#endif 1113#endif
1077 1114
1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1079void 1116void
1080rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1081{ 1118{
1082 if (mouse_slip_wheel_speed == 0 1119 if (mouse_slip_wheel_speed == 0
1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1084 : scr_page (UP, mouse_slip_wheel_speed)) 1121 : scr_page (UP, mouse_slip_wheel_speed))
1085 { 1122 {
1086 if (view_start == top_row || view_start == 0) 1123 if (view_start == top_row || view_start == 0)
1087 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1088 1125
1089 want_refresh = 1; 1126 want_refresh = 1;
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1091 } 1127 }
1128 else
1129 w.stop ();
1092} 1130}
1093#endif 1131#endif
1094 1132
1095#if LINUX_YIELD_HACK 1133#if LINUX_YIELD_HACK
1096static struct event_handler 1134static struct event_handler
1097{ 1135{
1098 check_watcher yield_ev; 1136 ev::prepare yield_ev;
1099 1137
1100 void yield_cb (check_watcher &w) 1138 void yield_cb (ev::prepare &w, int revents)
1101 { 1139 {
1102 usleep (0); 1140 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than
1142 // ones with high nice levels is a useful thing to do. It surely is is
1143 // allowed by the sus... as is returning ENOSYS.
1144
1145 struct timespec ts = { 0, 0 };
1146 nanosleep (&ts, 0);
1147
1103 w.stop (); 1148 w.stop ();
1104 } 1149 }
1105 1150
1106 event_handler () 1151 event_handler ()
1107 : yield_ev (this, &event_handler::yield_cb) 1152 : yield_ev (this, &event_handler::yield_cb)
… …
1141 } 1186 }
1142 else 1187 else
1143 { 1188 {
1144 pty_ev.stop (); 1189 pty_ev.stop ();
1145 1190
1146 if (!OPTION (Opt_hold)) 1191 if (!option (Opt_hold))
1147 destroy (); 1192 destroy ();
1148 } 1193 }
1149 1194
1150 return false; 1195 return false;
1151} 1196}
1152 1197
1153void 1198void
1154rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1155{ 1200{
1156 make_current (); 1201 make_current ();
1157 1202
1158 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1159 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1160 while (pty_fill ()) 1205 while (pty_fill ())
1161 if (cmd_parse ()) 1206 if (cmd_parse ())
1162 break; 1207 break;
1163 1208
1164 if (revents & EVENT_WRITE) 1209 if (revents & ev::WRITE)
1165 pty_write (); 1210 pty_write ();
1166} 1211}
1167 1212
1168void 1213void
1169rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1170{ 1215{
1171 XDefineCursor (xdisp, vt, TermWin_cursor); 1216 XDefineCursor (dpy, vt, TermWin_cursor);
1172 recolour_cursor (); 1217 recolour_cursor ();
1173 1218
1174#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1175 hidden_pointer = 0; 1220 hidden_pointer = 0;
1176 1221
1177 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1178 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1179#endif 1224#endif
1180} 1225}
1181 1226
1182#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1183void 1228void
1184rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1185{ 1230{
1186 if (!OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1187 return; 1232 return;
1188 1233
1189 XDefineCursor (xdisp, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1190 XFlush (xdisp); 1235 XFlush (dpy);
1191 1236
1192 hidden_pointer = 1; 1237 hidden_pointer = 1;
1193} 1238}
1194 1239
1195void 1240void
1196rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1197{ 1242{
1198 make_current (); 1243 make_current ();
1199 1244
1200 pointer_blank (); 1245 pointer_blank ();
1201} 1246}
… …
1204void 1249void
1205rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1206{ 1251{
1207 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1208 int x, y; 1253 int x, y;
1254 int code = 32;
1209 1255
1210 x = ev.x; 1256 x = Pixel2Col (ev.x);
1211 y = ev.y; 1257 y = Pixel2Row (ev.y);
1212 pixel_position (&x, &y); 1258 if (ev.type == MotionNotify)
1259 {
1260 if (x == mouse_row && y == mouse_col)
1261 return;
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1213 1266
1214 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1215 button_number = 3; 1268 button_number = 3;
1216 else 1269 else
1217 { 1270 {
… …
1263 x + 1, 1316 x + 1,
1264 y + 1); 1317 y + 1);
1265#endif 1318#endif
1266 1319
1267 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1268 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1269 (32 + x + 1), 1322 (32 + x + 1),
1270 (32 + y + 1)); 1323 (32 + y + 1));
1271} 1324}
1272 1325
1273/*{{{ process an X event */ 1326/*{{{ process an X event */
1274void 1327void
1275rxvt_term::x_cb (XEvent &ev) 1328rxvt_term::x_cb (XEvent &ev)
1276{ 1329{
1277 make_current (); 1330 make_current ();
1278 1331
1279 dLocal (Display *, xdisp); 1332 dLocal (Display *, dpy);
1280 1333
1281 if (ev.xany.window == vt 1334 if (ev.xany.window == vt
1282 && SHOULD_INVOKE (HOOK_X_EVENT) 1335 && SHOULD_INVOKE (HOOK_X_EVENT)
1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1336 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1284 return; 1337 return;
… …
1289 unsigned int unused_mask; 1342 unsigned int unused_mask;
1290 1343
1291 switch (ev.type) 1344 switch (ev.type)
1292 { 1345 {
1293 case KeyPress: 1346 case KeyPress:
1294#if ISO_14755 1347 key_press (ev.xkey);
1295 if (!(iso14755buf & ISO_14755_52))
1296#endif
1297 lookup_key (ev.xkey);
1298
1299 break; 1348 break;
1300 1349
1301 case KeyRelease: 1350 case KeyRelease:
1302 { 1351 key_release (ev.xkey);
1303#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1304 KeySym keysym;
1305
1306 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1307#endif
1308
1309#if ENABLE_FRILLS || ISO_14755
1310 // ISO 14755 support
1311 if (iso14755buf)
1312 if (iso14755buf & ISO_14755_52)
1313 {
1314# if ENABLE_OVERLAY
1315 scr_overlay_off ();
1316# endif
1317# if ISO_14755
1318 // iso14755 part 5.2 handling: release time
1319 // first: controls
1320 if ((ev.xkey.state & ControlMask)
1321 && ((keysym >= 0x40 && keysym <= 0x5f)
1322 || (keysym >= 0x61 && keysym <= 0x7f)))
1323 {
1324 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1325 commit_iso14755 ();
1326 goto skip_switch;
1327 }
1328
1329 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1330 if (i[0] == keysym)
1331 {
1332 iso14755buf = ISO_14755_51 | i[1];
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 scr_bell ();
1338# endif
1339 iso14755buf = 0;
1340 break;
1341 }
1342 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1343 {
1344# if ENABLE_OVERLAY
1345 scr_overlay_off ();
1346# endif
1347 if (iso14755buf & ISO_14755_51)
1348 commit_iso14755 ();
1349#if ISO_14755
1350 else if (iso14755buf & ISO_14755_STARTED)
1351 {
1352 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1353
1354 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1355 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1356 }
1357# endif
1358 else
1359 iso14755buf = 0;
1360 }
1361#endif
1362
1363 if (ev.xany.window == vt
1364 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1365 break;
1366
1367#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1368 if (!(ev.xkey.state & ControlMask))
1369 slip_wheel_ev.stop ();
1370 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1371 mouse_slip_wheel_speed = 0;
1372#endif
1373 break; 1352 break;
1374 }
1375 1353
1376 case ButtonPress: 1354 case ButtonPress:
1377 button_press (ev.xbutton); 1355 button_press (ev.xbutton);
1378 break; 1356 break;
1379 1357
… …
1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1372 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1395 destroy (); 1373 destroy ();
1396 } 1374 }
1397#if ENABLE_EWMH 1375#if ENABLE_EWMH
1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1376 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1399 XSendEvent (xdisp, ev.xclient.window = display->root, 1377 XSendEvent (dpy, ev.xclient.window = display->root,
1400 False, SubstructureRedirectMask | SubstructureNotifyMask, 1378 False, SubstructureRedirectMask | SubstructureNotifyMask,
1401 &ev); 1379 &ev);
1402#endif 1380#endif
1403 } 1381 }
1404 } 1382 }
… …
1410 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1411 focus_out (); 1389 focus_out ();
1412 } 1390 }
1413#endif 1391#endif
1414 } 1392 }
1415 break;
1416
1417 case MappingNotify:
1418 XRefreshKeyboardMapping (&ev.xmapping);
1419 break; 1393 break;
1420 1394
1421 /* 1395 /*
1422 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1423 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1442 break; 1416 break;
1443 } 1417 }
1444 break; 1418 break;
1445 1419
1446 case FocusIn: 1420 case FocusIn:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1447 focus_in (); 1424 focus_in ();
1448 break; 1425 break;
1449 1426
1450 case FocusOut: 1427 case FocusOut:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1451 focus_out (); 1431 focus_out ();
1452 break; 1432 break;
1453 1433
1454 case ConfigureNotify: 1434 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1455 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1456 { 1439 {
1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1458 ; 1441 ;
1459 1442
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1461 { 1444 {
1462 seen_resize = 1; 1445 seen_resize = 1;
1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1464 } 1447 }
1465 1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 update_background ();
1453#endif
1454 }
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467
1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1469 if (OPTION (Opt_transparent))
1470 check_our_parents ();
1471#endif
1472 } 1456 }
1473 break; 1457 break;
1474 1458
1475 case PropertyNotify: 1459 case PropertyNotify:
1476 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1494 break; 1478 break;
1495 1479
1496 case MapNotify: 1480 case MapNotify:
1497 mapped = 1; 1481 mapped = 1;
1498#ifdef TEXT_BLINK 1482#ifdef TEXT_BLINK
1499 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1483 text_blink_ev.start ();
1500#endif 1484#endif
1501 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1502 break; 1486 break;
1503 1487
1504 case UnmapNotify: 1488 case UnmapNotify:
… …
1506#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1507 text_blink_ev.stop (); 1491 text_blink_ev.stop ();
1508#endif 1492#endif
1509 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 break; 1494 break;
1511
1512#ifdef TRANSPARENT
1513 case ReparentNotify:
1514 rootwin_cb (ev);
1515 break;
1516#endif /* TRANSPARENT */
1517 1495
1518 case GraphicsExpose: 1496 case GraphicsExpose:
1519 case Expose: 1497 case Expose:
1520 if (ev.xany.window == vt) 1498 if (ev.xany.window == vt)
1521 { 1499 {
1522 do 1500 do
1501 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1504 }
1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1526 1506
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1508
1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 {
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1532 1513 }
1533 want_refresh = 1; 1514 want_refresh = 1;
1534 } 1515 }
1535 else 1516 else
1536 { 1517 {
1537 XEvent unused_event; 1518 XEvent unused_event;
1538 1519
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1540 ; 1521 ;
1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1542 ; 1523 ;
1543 1524
1544 if (isScrollbarWindow (ev.xany.window)) 1525 if (isScrollbarWindow (ev.xany.window))
1545 { 1526 {
1546 scrollBar.setIdle (); 1527 scrollBar.setIdle ();
1547 scrollbar_show (0); 1528 scrollbar_show (0);
1548 } 1529 }
1549
1550#ifdef TRANSPARENT
1551 if (am_transparent && ev.xany.window == parent[0])
1552 XClearWindow (xdisp, ev.xany.window);
1553#endif
1554 } 1530 }
1555 break; 1531 break;
1556 1532
1557 case MotionNotify: 1533 case MotionNotify:
1558#ifdef POINTER_BLANK 1534#ifdef POINTER_BLANK
1559 if (hidden_pointer) 1535 if (hidden_pointer)
1560 pointer_unblank (); 1536 pointer_unblank ();
1561#endif 1537#endif
1538 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1539 || priv_modes & PrivMode_MouseAnyEvent)
1540 mouse_report (ev.xbutton);
1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1563 break; 1542 break;
1564 1543
1565 if (ev.xany.window == vt) 1544 if (ev.xany.window == vt)
1566 { 1545 {
1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1546 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1547 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1569 ; // nop 1548 ; // nop
1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1549 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1550 {
1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1573 ; 1552 ;
1574 1553
1575 XQueryPointer (xdisp, vt, 1554 XQueryPointer (dpy, vt,
1576 &unused_root, &unused_child, 1555 &unused_root, &unused_child,
1577 &unused_root_x, &unused_root_y, 1556 &unused_root_x, &unused_root_y,
1578 &ev.xbutton.x, &ev.xbutton.y, 1557 &ev.xbutton.x, &ev.xbutton.y,
1579 &ev.xbutton.state); 1558 &ev.xbutton.state);
1580#ifdef MOUSE_THRESHOLD 1559#ifdef MOUSE_THRESHOLD
… …
1600 int dist; 1579 int dist;
1601 1580
1602 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1603 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1604 */ 1583 */
1605 if (!sel_scroll_ev.active) 1584 if (!ev_is_active (&sel_scroll_ev))
1606 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1607 1586
1608 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1609 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1610 */ 1589 */
1611 selection_save_x = ev.xbutton.x; 1590 selection_save_x = ev.xbutton.x;
… …
1633 else 1612 else
1634 { 1613 {
1635 /* we are within the text window, so we 1614 /* we are within the text window, so we
1636 * shouldn't be scrolling 1615 * shouldn't be scrolling
1637 */ 1616 */
1638 if (sel_scroll_ev.active) 1617 if (ev_is_active (&sel_scroll_ev))
1639 sel_scroll_ev.stop(); 1618 sel_scroll_ev.stop();
1640 } 1619 }
1641#endif 1620#endif
1642#ifdef MOUSE_THRESHOLD 1621#ifdef MOUSE_THRESHOLD
1643 } 1622 }
1644#endif 1623#endif
1645 } 1624 }
1646 } 1625 }
1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1626 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1648 { 1627 {
1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1628 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1650 MotionNotify, &ev)) 1629 MotionNotify, &ev))
1651 ; 1630 ;
1652 1631
1653 XQueryPointer (xdisp, scrollBar.win, 1632 XQueryPointer (dpy, scrollBar.win,
1654 &unused_root, &unused_child, 1633 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1634 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1635 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1636 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1637 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1638 scrollbar_size ());
1660 want_refresh = 1; 1639 want_refresh = 1;
1661 refresh_limit = 0;
1662 scrollbar_show (1); 1640 scrollbar_show (1);
1663 } 1641 }
1664 break; 1642 break;
1665 } 1643 }
1666 1644
1667skip_switch: ;
1668
1669#if defined(CURSOR_BLINK) 1645#if defined(CURSOR_BLINK)
1670 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1646 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1671 { 1647 {
1672 if (hidden_cursor) 1648 if (hidden_cursor)
1673 { 1649 {
1674 hidden_cursor = 0; 1650 hidden_cursor = 0;
1675 want_refresh = 1; 1651 want_refresh = 1;
1676 } 1652 }
1677 1653
1678 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1654 cursor_blink_ev.again ();
1679 } 1655 }
1680#endif 1656#endif
1681 1657
1682#if defined(POINTER_BLANK) 1658#if defined(POINTER_BLANK)
1683 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1659 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1684 { 1660 {
1685 if (ev.type == MotionNotify 1661 if (ev.type == MotionNotify
1686 || ev.type == ButtonPress 1662 || ev.type == ButtonPress
1687 || ev.type == ButtonRelease) 1663 || ev.type == ButtonRelease)
1688 if (hidden_pointer) 1664 if (hidden_pointer)
… …
1700 if (!focus) 1676 if (!focus)
1701 { 1677 {
1702 focus = 1; 1678 focus = 1;
1703 want_refresh = 1; 1679 want_refresh = 1;
1704 1680
1705 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1681 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1706 1682
1707#if USE_XIM 1683#if USE_XIM
1708 if (Input_Context != NULL) 1684 if (Input_Context != NULL)
1709 { 1685 {
1710 IMSetStatusPosition (); 1686 IMSetPosition ();
1711 XSetICFocus (Input_Context); 1687 XSetICFocus (Input_Context);
1712 } 1688 }
1713#endif 1689#endif
1714#if CURSOR_BLINK 1690#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink)) 1691 if (option (Opt_cursorBlink))
1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1692 cursor_blink_ev.again ();
1717#endif 1693#endif
1718#if OFF_FOCUS_FADING 1694#if OFF_FOCUS_FADING
1719 if (rs[Rs_fade]) 1695 if (rs[Rs_fade])
1720 { 1696 {
1721 pix_colors = pix_colors_focused; 1697 pix_colors = pix_colors_focused;
1722 scr_recolour (); 1698 scr_recolour ();
1723 } 1699 }
1724#endif 1700#endif
1701#if ENABLE_FRILLS
1702 if (option (Opt_urgentOnBell))
1703 {
1704 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1705 {
1706 h->flags &= ~XUrgencyHint;
1707 XSetWMHints (dpy, parent[0], h);
1708 }
1709 }
1710#endif
1725 } 1711 }
1726} 1712}
1727 1713
1728void 1714void
1729rxvt_term::focus_out () 1715rxvt_term::focus_out ()
… …
1737 1723
1738#if ENABLE_FRILLS || ISO_14755 1724#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1725 if (iso14755buf)
1740 { 1726 {
1741 iso14755buf = 0; 1727 iso14755buf = 0;
1742# if ENABLE_OVERLAY 1728# if ISO_14755
1743 scr_overlay_off (); 1729 scr_overlay_off ();
1744# endif 1730# endif
1745 } 1731 }
1746#endif 1732#endif
1747#if USE_XIM 1733#if USE_XIM
1748 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1749 XUnsetICFocus (Input_Context); 1735 XUnsetICFocus (Input_Context);
1750#endif 1736#endif
1751#if CURSOR_BLINK 1737#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1738 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.stop (); 1739 cursor_blink_ev.stop ();
1740
1754 hidden_cursor = 0; 1741 hidden_cursor = 0;
1755#endif 1742#endif
1756#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1758 { 1745 {
… …
1761 } 1748 }
1762#endif 1749#endif
1763 } 1750 }
1764} 1751}
1765 1752
1766#if TRANSPARENT 1753void
1754rxvt_term::update_fade_color (unsigned int idx)
1755{
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 rgba c;
1760 pix_colors [Color_fade].get (c);
1761 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1762 }
1763#endif
1764}
1765
1766#if ENABLE_TRANSPARENCY || ENABLE_PERL
1767void 1767void
1768rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1769{ 1769{
1770 make_current (); 1770 make_current ();
1771 1771
1772 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1773 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1774 return;
1775
1776# if ENABLE_TRANSPARENCY
1772 switch (ev.type) 1777 switch (ev.type)
1773 { 1778 {
1774 case PropertyNotify: 1779 case PropertyNotify:
1775 /* 1780 /*
1776 * if user used some Esetroot compatible prog to set the root bg, 1781 * if user used some Esetroot compatible prog to set the root bg,
1777 * use the property to determine the pixmap. We use it later on. 1782 * use the property to determine the pixmap. We use it later on.
1778 */ 1783 */
1779 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1784 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1780 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1785 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1781 return; 1786 {
1782 1787 bgPixmap.set_root_pixmap ();
1783 /* FALLTHROUGH */ 1788 update_background ();
1784 case ReparentNotify: 1789 }
1785 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1786 want_refresh = want_full_refresh = 1;
1787 break; 1790 break;
1788 } 1791 }
1792# endif
1789} 1793}
1790#endif 1794#endif
1791 1795
1792void 1796void
1793rxvt_term::button_press (XButtonEvent &ev) 1797rxvt_term::button_press (XButtonEvent &ev)
… …
1848 mouse_report (ev); 1852 mouse_report (ev);
1849 } 1853 }
1850#else 1854#else
1851 MEvent.button = ev.button; 1855 MEvent.button = ev.button;
1852 mouse_report (ev); 1856 mouse_report (ev);
1853#endif /* MOUSE_REPORT_DOUBLECLICK */ 1857#endif /* MOUSE_REPORT_DOUBLECLICK */
1854 1858
1855 } 1859 }
1856 else 1860 else
1857 { 1861 {
1858 if (ev.button != MEvent.button) 1862 if (ev.button != MEvent.button)
… …
1952 tt_printf ("\033[5~"); 1956 tt_printf ("\033[5~");
1953 break; 1957 break;
1954 } 1958 }
1955 } 1959 }
1956 else 1960 else
1957#endif /* NO_SCROLLBAR_REPORT */ 1961#endif /* NO_SCROLLBAR_REPORT */
1958 1962
1959 { 1963 {
1960 char upordown = 0; 1964 char upordown = 0;
1961 1965
1962 if (scrollBar.style == R_SB_NEXT) 1966 if (scrollBar.style == R_SB_NEXT)
1963 { 1967 {
1964 if (scrollbarnext_upButton (ev.y)) 1968 if (scrollbarnext_upButton (ev.y))
1965 upordown = -1; /* up */ 1969 upordown = -1; /* up */
… …
1974 upordown = 1; /* down */ 1978 upordown = 1; /* down */
1975 } 1979 }
1976 if (upordown) 1980 if (upordown)
1977 { 1981 {
1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1979 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1980#endif 1984#endif
1981 if (scr_page (upordown < 0 ? UP : DN, 1)) 1985 if (scr_page (upordown < 0 ? UP : DN, 1))
1982 { 1986 {
1983 if (upordown < 0) 1987 if (upordown < 0)
1984 scrollBar.setUp (); 1988 scrollBar.setUp ();
… …
2064 scrollBar.setIdle (); 2068 scrollBar.setIdle ();
2065 scrollbar_show (0); 2069 scrollbar_show (0);
2066 } 2070 }
2067 2071
2068#ifdef SELECTION_SCROLLING 2072#ifdef SELECTION_SCROLLING
2069 if (sel_scroll_ev.active) 2073 if (ev_is_active (&sel_scroll_ev))
2070 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2071#endif 2075#endif
2072 2076
2073 if (ev.window == vt) 2077 if (ev.window == vt)
2074 { 2078 {
… …
2099 mouse_report (ev); 2103 mouse_report (ev);
2100 } 2104 }
2101#else /* MOUSE_REPORT_DOUBLECLICK */ 2105#else /* MOUSE_REPORT_DOUBLECLICK */
2102 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
2103 mouse_report (ev); 2107 mouse_report (ev);
2104#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
2105 return; 2109 return;
2106 } 2110 }
2107 2111
2108 /* 2112 /*
2109 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
… …
2121 selection_make (ev.time); 2125 selection_make (ev.time);
2122 break; 2126 break;
2123 2127
2124 case Button2: 2128 case Button2:
2125 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2126 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2127 break; 2131 break;
2128 2132
2129#ifdef MOUSE_WHEEL 2133#ifdef MOUSE_WHEEL
2130 case Button4: 2134 case Button4:
2131 case Button5: 2135 case Button5:
… …
2135 2139
2136 v = ev.button == Button4 ? UP : DN; 2140 v = ev.button == Button4 ? UP : DN;
2137 2141
2138 if (ev.state & ShiftMask) 2142 if (ev.state & ShiftMask)
2139 i = 1; 2143 i = 1;
2140 else if (OPTION (Opt_mouseWheelScrollPage)) 2144 else if (option (Opt_mouseWheelScrollPage))
2141 i = nrow - 1; 2145 i = nrow - 1;
2142 else 2146 else
2143 i = 5; 2147 i = 5;
2144 2148
2145# ifdef MOUSE_SLIP_WHEELING 2149# ifdef MOUSE_SLIP_WHEELING
… …
2147 { 2151 {
2148 mouse_slip_wheel_speed += v ? -1 : 1; 2152 mouse_slip_wheel_speed += v ? -1 : 1;
2149 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2150 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2151 2155
2152 if (slip_wheel_ev.at < NOW) 2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2153 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2154
2155 slip_wheel_ev.start ();
2156 } 2157 }
2157 else 2158 else
2158 { 2159 {
2159# endif 2160# endif
2160 scr_page (v, i); 2161 scr_page (v, i);
… …
2166 break; 2167 break;
2167#endif 2168#endif
2168 } 2169 }
2169 } 2170 }
2170} 2171}
2171
2172#ifdef TRANSPARENT
2173#if TINTING
2174/* taken from aterm-0.4.2 */
2175
2176typedef uint32_t RUINT32T;
2177
2178void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2179{
2180 int sh_r, sh_g, sh_b;
2181 RUINT32T mask_r, mask_g, mask_b;
2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2185 int i;
2186
2187 Visual *visual = term->visual;
2188
2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2190
2191 /* for convenience */
2192 mask_r = visual->red_mask;
2193 mask_g = visual->green_mask;
2194 mask_b = visual->blue_mask;
2195
2196 /* boring lookup table pre-initialization */
2197 switch (srcImage->bits_per_pixel) {
2198 case 15:
2199 if ((mask_r != 0x7c00) ||
2200 (mask_g != 0x03e0) ||
2201 (mask_b != 0x001f))
2202 return;
2203 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2204 lookup_r = lookup;
2205 lookup_g = lookup+32;
2206 lookup_b = lookup+32+32;
2207 sh_r = 10;
2208 sh_g = 5;
2209 sh_b = 0;
2210 break;
2211 case 16:
2212 if ((mask_r != 0xf800) ||
2213 (mask_g != 0x07e0) ||
2214 (mask_b != 0x001f))
2215 return;
2216 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2217 lookup_r = lookup;
2218 lookup_g = lookup+32;
2219 lookup_b = lookup+32+64;
2220 sh_r = 11;
2221 sh_g = 5;
2222 sh_b = 0;
2223 break;
2224 case 24:
2225 if ((mask_r != 0xff0000) ||
2226 (mask_g != 0x00ff00) ||
2227 (mask_b != 0x0000ff))
2228 return;
2229 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2230 lookup_r = lookup;
2231 lookup_g = lookup+256;
2232 lookup_b = lookup+256+256;
2233 sh_r = 16;
2234 sh_g = 8;
2235 sh_b = 0;
2236 break;
2237 case 32:
2238 if ((mask_r != 0xff0000) ||
2239 (mask_g != 0x00ff00) ||
2240 (mask_b != 0x0000ff))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2243 lookup_r = lookup;
2244 lookup_g = lookup+256;
2245 lookup_b = lookup+256+256;
2246 sh_r = 16;
2247 sh_g = 8;
2248 sh_b = 0;
2249 break;
2250 default:
2251 return; /* we do not support this color depth */
2252 }
2253
2254 /* prepare limits for color transformation (each channel is handled separately) */
2255 if (shade < 0) {
2256 shade = -shade;
2257 if (shade < 0) shade = 0;
2258 if (shade > 100) shade = 100;
2259
2260 lower_lim_r = 65535-rm;
2261 lower_lim_g = 65535-gm;
2262 lower_lim_b = 65535-bm;
2263
2264 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2265 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2266 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2267
2268 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2269 } else {
2270 if (shade < 0) shade = 0;
2271 if (shade > 100) shade = 100;
2272
2273 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2274
2275 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2276 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2277 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2278 }
2279
2280 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2281 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2282 {
2283 unsigned int tmp;
2284
2285 tmp = lower_lim_r;
2286 lower_lim_r = lower_lim_b;
2287 lower_lim_b = tmp;
2288
2289 tmp = upper_lim_r;
2290 upper_lim_r = upper_lim_b;
2291 upper_lim_b = tmp;
2292 }
2293
2294 /* fill our lookup tables */
2295 for (i = 0; i <= mask_r>>sh_r; i++)
2296 {
2297 RUINT32T tmp;
2298 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2299 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2300 lookup_r[i] = (tmp/65535)<<sh_r;
2301 }
2302 for (i = 0; i <= mask_g>>sh_g; i++)
2303 {
2304 RUINT32T tmp;
2305 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2306 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2307 lookup_g[i] = (tmp/65535)<<sh_g;
2308 }
2309 for (i = 0; i <= mask_b>>sh_b; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2313 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2314 lookup_b[i] = (tmp/65535)<<sh_b;
2315 }
2316
2317 /* apply table to input image (replacing colors by newly calculated ones) */
2318 switch (srcImage->bits_per_pixel)
2319 {
2320 case 15:
2321 {
2322 unsigned short *p1, *pf, *p, *pl;
2323 p1 = (unsigned short *) srcImage->data;
2324 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2325 while (p1 < pf)
2326 {
2327 p = p1;
2328 pl = p1 + srcImage->width;
2329 for (; p < pl; p++)
2330 {
2331 *p = lookup_r[(*p & 0x7c00)>>10] |
2332 lookup_g[(*p & 0x03e0)>> 5] |
2333 lookup_b[(*p & 0x001f)];
2334 }
2335 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2336 }
2337 break;
2338 }
2339 case 16:
2340 {
2341 unsigned short *p1, *pf, *p, *pl;
2342 p1 = (unsigned short *) srcImage->data;
2343 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2344 while (p1 < pf)
2345 {
2346 p = p1;
2347 pl = p1 + srcImage->width;
2348 for (; p < pl; p++)
2349 {
2350 *p = lookup_r[(*p & 0xf800)>>11] |
2351 lookup_g[(*p & 0x07e0)>> 5] |
2352 lookup_b[(*p & 0x001f)];
2353 }
2354 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2355 }
2356 break;
2357 }
2358 case 24:
2359 {
2360 unsigned char *p1, *pf, *p, *pl;
2361 p1 = (unsigned char *) srcImage->data;
2362 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2363 while (p1 < pf)
2364 {
2365 p = p1;
2366 pl = p1 + srcImage->width * 3;
2367 for (; p < pl; p += 3)
2368 {
2369 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2370 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2371 p[2] = lookup_r[(p[2] & 0x0000ff)];
2372 }
2373 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2374 }
2375 break;
2376 }
2377 case 32:
2378 {
2379 RUINT32T *p1, *pf, *p, *pl;
2380 p1 = (RUINT32T *) srcImage->data;
2381 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2382
2383 while (p1 < pf)
2384 {
2385 p = p1;
2386 pl = p1 + srcImage->width;
2387 for (; p < pl; p++)
2388 {
2389 *p = lookup_r[(*p & 0xff0000)>>16] |
2390 lookup_g[(*p & 0x00ff00)>> 8] |
2391 lookup_b[(*p & 0x0000ff)] |
2392 (*p & ~0xffffff);
2393 }
2394 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2395 }
2396 break;
2397 }
2398 }
2399
2400 free (lookup);
2401}
2402#endif
2403
2404/*
2405 * Check our parents are still who we think they are.
2406 * Do transparency updates if required
2407 */
2408int
2409rxvt_term::check_our_parents ()
2410{
2411 int i, pchanged, aformat, have_pixmap, rootdepth;
2412 unsigned long nitems, bytes_after;
2413 Atom atype;
2414 unsigned char *prop = NULL;
2415 Window root, oldp, *list;
2416 Pixmap rootpixmap = None;
2417 XWindowAttributes wattr, wrootattr;
2418
2419 pchanged = 0;
2420
2421 if (!OPTION (Opt_transparent))
2422 return pchanged; /* Don't try any more */
2423
2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2425 rootdepth = wrootattr.depth;
2426
2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2428
2429 if (rootdepth != wattr.depth)
2430 {
2431 if (am_transparent)
2432 {
2433 pchanged = 1;
2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2435 am_transparent = am_pixmap_trans = 0;
2436 }
2437
2438 return pchanged; /* Don't try any more */
2439 }
2440
2441 /* Get all X ops out of the queue so that our information is up-to-date. */
2442 XSync (xdisp, False);
2443
2444 /*
2445 * Make the frame window set by the window manager have
2446 * the root background. Some window managers put multiple nested frame
2447 * windows for each client, so we have to take care about that.
2448 */
2449 i = (xa[XA_XROOTPMAP_ID]
2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2452 &nitems, &bytes_after, &prop) == Success);
2453
2454 if (!i || prop == NULL)
2455 i = (xa[XA_ESETROOT_PMAP_ID]
2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2458 &nitems, &bytes_after, &prop) == Success);
2459
2460 if (!i || prop == NULL
2461#if TINTING
2462 || !ISSET_PIXCOLOR (Color_tint)
2463#endif
2464 )
2465 have_pixmap = 0;
2466 else
2467 {
2468 have_pixmap = 1;
2469 rootpixmap = *(Pixmap *)prop;
2470 XFree (prop);
2471 }
2472
2473 if (have_pixmap)
2474 {
2475 /*
2476 * Copy display->root pixmap transparency
2477 */
2478 int sx, sy, nx, ny;
2479 unsigned int nw, nh;
2480 Window cr;
2481 XImage *image;
2482 GC gc;
2483 XGCValues gcvalue;
2484
2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2486 0, 0, &sx, &sy, &cr);
2487 nw = (unsigned int)szHint.width;
2488 nh = (unsigned int)szHint.height;
2489 nx = ny = 0;
2490
2491 if (sx < 0)
2492 {
2493 nw += sx;
2494 nx = -sx;
2495 sx = 0;
2496 }
2497
2498 if (sy < 0)
2499 {
2500 nh += sy;
2501 ny = -sy;
2502 sy = 0;
2503 }
2504
2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2507
2508 XSync (xdisp, False);
2509 allowedxerror = -1;
2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2511
2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2513 /* XXX: may need a delay here? */
2514 allowedxerror = 0;
2515
2516 if (image == NULL)
2517 {
2518 if (am_transparent && am_pixmap_trans)
2519 {
2520 pchanged = 1;
2521 if (pixmap != None)
2522 {
2523 XFreePixmap (xdisp, pixmap);
2524 pixmap = None;
2525 }
2526 }
2527
2528 am_pixmap_trans = 0;
2529 }
2530 else
2531 {
2532 if (pixmap != None)
2533 XFreePixmap (xdisp, pixmap);
2534
2535#if TINTING
2536 if (ISSET_PIXCOLOR (Color_tint))
2537 {
2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2539
2540 rgba c;
2541 pix_colors_focused [Color_tint].get (c);
2542
2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2544 }
2545#endif
2546
2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2550 nx, ny, image->width, image->height);
2551 XFreeGC (xdisp, gc);
2552 XDestroyImage (image);
2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2554 XClearWindow (xdisp, parent[0]);
2555
2556 if (!am_transparent || !am_pixmap_trans)
2557 pchanged = 1;
2558
2559 am_transparent = am_pixmap_trans = 1;
2560 }
2561 }
2562
2563 if (am_pixmap_trans)
2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2565 else
2566 {
2567 unsigned int n;
2568 /*
2569 * InheritPixmap transparency
2570 */
2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2572 {
2573 oldp = parent[i];
2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2575 XFree (list);
2576
2577 if (parent[i] == display->root)
2578 {
2579 if (oldp != None)
2580 pchanged = 1;
2581
2582 break;
2583 }
2584
2585 if (oldp != parent[i])
2586 pchanged = 1;
2587 }
2588
2589 n = 0;
2590
2591 if (pchanged)
2592 for (; n < (unsigned int)i; n++)
2593 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2597 {
2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2599 break;
2600 }
2601 }
2602
2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */
2609 }
2610 else
2611 {
2612 for (n = 0; n < (unsigned int)i; n++)
2613 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]);
2616 }
2617
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2619 am_transparent = 1;
2620 }
2621
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None;
2624 }
2625
2626 if (scrollBar.win)
2627 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle ();
2630 scrollbar_show (0);
2631 }
2632
2633 if (am_transparent)
2634 {
2635 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans)
2637 flush ();
2638 }
2639
2640 return pchanged;
2641}
2642#endif
2643 2172
2644/*}}} */ 2173/*}}} */
2645 2174
2646bool 2175bool
2647rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
… …
2696 if (ch == C0_LF) 2225 if (ch == C0_LF)
2697 nlines++; 2226 nlines++;
2698 2227
2699 refresh_count++; 2228 refresh_count++;
2700 2229
2701 if (!OPTION (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2231 {
2704 refreshnow = true;
2705 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2706 ch = NOCHAR; 2237 ch = NOCHAR;
2707 break; 2238 break;
2239 }
2708 } 2240 }
2709 2241
2710 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2711 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2712 { 2244 {
… …
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2741 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2742 2274
2743 /* 2275 /*
2744 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2745 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2746 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2747 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2279 */
2749 if (refreshnow) 2280 if (refreshnow)
2750 { 2281 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++;
2753 else
2754 {
2755 flag = true; 2282 flag = true;
2756 scr_refresh (); 2283 scr_refresh ();
2757 want_refresh = 1; 2284 want_refresh = 1;
2758 }
2759 } 2285 }
2760 2286
2761 } 2287 }
2762 else 2288 else
2763 { 2289 {
… …
2912 { 2438 {
2913 if ((buf[len++] = cmd_getc ()) == 'i') 2439 if ((buf[len++] = cmd_getc ()) == 'i')
2914 break; /* done = 1 */ 2440 break; /* done = 1 */
2915 } 2441 }
2916 } 2442 }
2917 2443
2918 for (i = 0; i < len; i++) 2444 for (i = 0; i < len; i++)
2919 if (putc (buf[i], fd) == EOF) 2445 if (putc (buf[i], fd) == EOF)
2920 { 2446 {
2921 done = 1; 2447 done = 1;
2922 break; 2448 break;
… …
2924 } 2450 }
2925 } 2451 }
2926 2452
2927 pclose_printer (fd); 2453 pclose_printer (fd);
2928} 2454}
2929#endif /* PRINTPIPE */ 2455#endif /* PRINTPIPE */
2930/*}}} */ 2456/*}}} */
2931 2457
2932/* *INDENT-OFF* */ 2458/* *INDENT-OFF* */
2933enum { 2459enum {
2934 C1_40 = 0x40, 2460 C1_40 = 0x40,
… …
2984 process_dcs_seq (); 2510 process_dcs_seq ();
2985 break; 2511 break;
2986 case 0x9b: /* CSI */ 2512 case 0x9b: /* CSI */
2987 process_csi_seq (); 2513 process_csi_seq ();
2988 break; 2514 break;
2989 case 0x9d: /* CSI */ 2515 case 0x9d: /* OSC */
2990 process_osc_seq (); 2516 process_osc_seq ();
2991 break; 2517 break;
2992#endif 2518#endif
2993 } 2519 }
2994} 2520}
… …
3220rxvt_term::process_csi_seq () 2746rxvt_term::process_csi_seq ()
3221{ 2747{
3222 unicode_t ch, priv, i; 2748 unicode_t ch, priv, i;
3223 unsigned int nargs, p; 2749 unsigned int nargs, p;
3224 int n, ndef; 2750 int n, ndef;
3225 int arg[ESC_ARGS]; 2751 int arg[ESC_ARGS] = { };
3226 2752
3227 for (nargs = ESC_ARGS; nargs > 0;) 2753 nargs = 0;
3228 arg[--nargs] = 0;
3229 2754
3230 priv = 0; 2755 priv = 0;
3231 ch = cmd_getc (); 2756 ch = cmd_getc ();
3232 if (ch >= '<' && ch <= '?') 2757 if (ch >= '<' && ch <= '?')
2758 {
3233 { /* '<' '=' '>' '?' */ 2759 /* '<' '=' '>' '?' */
3234 priv = ch; 2760 priv = ch;
3235 ch = cmd_getc (); 2761 ch = cmd_getc ();
3236 } 2762 }
3237 2763
3238 /* read any numerical arguments */ 2764 /* read any numerical arguments */
… …
3277 switch (priv) 2803 switch (priv)
3278 { 2804 {
3279 case '>': 2805 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 2806 if (ch == CSI_DA) /* secondary device attributes */
3281 { 2807 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2808 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2809 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 2810 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2811 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2812 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3287 // that we do not support xterm mouse reporting (should be 95 when we do). 2813 // versions.
3288 // 2814 //
3289 tt_printf ("\033[>%d;94;0c", 'U'); 2815 tt_printf ("\033[>%d;95;0c", 'U');
3290 } 2816 }
3291 break; 2817 break;
3292 case '?': 2818 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2819 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 2820 process_terminal_mode (ch, priv, nargs, arg);
… …
3421 break; 2947 break;
3422 case 6: /* CPR requested */ 2948 case 6: /* CPR requested */
3423 scr_report_position (); 2949 scr_report_position ();
3424 break; 2950 break;
3425 case 7: /* unofficial extension */ 2951 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 2952 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2953 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 2954 break;
3429 case 8: /* unofficial extension */ 2955 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2956 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 2957 break;
… …
3524{ 3050{
3525 int x, y; 3051 int x, y;
3526 XWindowAttributes wattr; 3052 XWindowAttributes wattr;
3527 Window wdummy; 3053 Window wdummy;
3528 3054
3529 dLocal (Display *, xdisp); 3055 dLocal (Display *, dpy);
3530 3056
3531 if (nargs == 0) 3057 if (nargs == 0)
3532 return; 3058 return;
3533 3059
3534 switch (args[0]) 3060 switch (args[0])
3535 { 3061 {
3536 /* 3062 /*
3537 * commands 3063 * commands
3538 */ 3064 */
3539 case 1: /* deiconify window */ 3065 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3066 XMapWindow (dpy, parent[0]);
3541 break; 3067 break;
3542 case 2: /* iconify window */ 3068 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3069 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3070 break;
3545 case 3: /* set position (pixels) */ 3071 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3072 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3073 break;
3548 case 4: /* set size (pixels) */ 3074 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3075 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3076 break;
3551 case 5: /* raise window */ 3077 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3078 XRaiseWindow (dpy, parent[0]);
3553 break; 3079 break;
3554 case 6: /* lower window */ 3080 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3081 XLowerWindow (dpy, parent[0]);
3556 break; 3082 break;
3557 case 7: /* refresh window */ 3083 case 7: /* refresh window */
3558 scr_touch (true); 3084 scr_touch (true);
3559 break; 3085 break;
3560 case 8: /* set size (chars) */ 3086 case 8: /* set size (chars) */
… …
3571 3097
3572 /* 3098 /*
3573 * reports - some output format copied from XTerm 3099 * reports - some output format copied from XTerm
3574 */ 3100 */
3575 case 11: /* report window state */ 3101 case 11: /* report window state */
3576 XGetWindowAttributes (xdisp, parent[0], &wattr); 3102 XGetWindowAttributes (dpy, parent[0], &wattr);
3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3103 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3578 break; 3104 break;
3579 case 13: /* report window position */ 3105 case 13: /* report window position */
3580 XGetWindowAttributes (xdisp, parent[0], &wattr); 3106 XGetWindowAttributes (dpy, parent[0], &wattr);
3581 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3107 XTranslateCoordinates (dpy, parent[0], wattr.root,
3582 -wattr.border_width, -wattr.border_width, 3108 -wattr.border_width, -wattr.border_width,
3583 &x, &y, &wdummy); 3109 &x, &y, &wdummy);
3584 tt_printf ("\033[3;%d;%dt", x, y); 3110 tt_printf ("\033[3;%d;%dt", x, y);
3585 break; 3111 break;
3586 case 14: /* report window size (pixels) */ 3112 case 14: /* report window size (pixels) */
3587 XGetWindowAttributes (xdisp, parent[0], &wattr); 3113 XGetWindowAttributes (dpy, parent[0], &wattr);
3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3114 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3589 break; 3115 break;
3590 case 18: /* report text area size (chars) */ 3116 case 18: /* report text area size (chars) */
3591 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3117 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3592 break; 3118 break;
… …
3594 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3120 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3595 break; 3121 break;
3596 case 20: /* report icon label */ 3122 case 20: /* report icon label */
3597 { 3123 {
3598 char *s; 3124 char *s;
3599 XGetIconName (xdisp, parent[0], &s); 3125 XGetIconName (dpy, parent[0], &s);
3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3126 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3601 XFree (s); 3127 XFree (s);
3602 } 3128 }
3603 break; 3129 break;
3604 case 21: /* report window title */ 3130 case 21: /* report window title */
3605 { 3131 {
3606 char *s; 3132 char *s;
3607 XFetchName (xdisp, parent[0], &s); 3133 XFetchName (dpy, parent[0], &s);
3608 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3134 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3609 XFree (s); 3135 XFree (s);
3610 } 3136 }
3611 break; 3137 break;
3612 } 3138 }
3613} 3139}
… …
3640 seen_esc = true; 3166 seen_esc = true;
3641 continue; 3167 continue;
3642 } 3168 }
3643 else if (ch == C0_BEL || ch == CHAR_ST) 3169 else if (ch == C0_BEL || ch == CHAR_ST)
3644 break; 3170 break;
3171 else if (ch == C0_SYN)
3172 ch = cmd_get8 ();
3645 else if (ch < 0x20) 3173 else if (ch < 0x20)
3646 return NULL; /* other control character - exit */ 3174 return NULL; /* other control character - exit */
3647 3175
3648 seen_esc = false; 3176 seen_esc = false;
3649 3177
3650 if (n >= STRING_MAX - 1) 3178 if (n >= STRING_MAX - 1)
3651 // stop at some sane length 3179 // stop at some sane length
3652 return NULL; 3180 return NULL;
3653 3181
3654 if (ch == C0_SYN)
3655 string[n++] = cmd_get8 ();
3656 else
3657 string[n++] = ch; 3182 string[n++] = ch;
3658 } 3183 }
3659 3184
3660 string[n++] = '\0'; 3185 string[n++] = '\0';
3661 3186
3662 ends_how = (ch == 0x5c ? C0_ESC : ch); 3187 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3738 int color; 3263 int color;
3739 char *buf, *name; 3264 char *buf, *name;
3740 bool query = str[0] == '?' && !str[1]; 3265 bool query = str[0] == '?' && !str[1];
3741 int saveop = op; 3266 int saveop = op;
3742 3267
3743 dLocal (Display *, xdisp); 3268 dLocal (Display *, dpy);
3744 3269
3745 assert (str != NULL); 3270 assert (str != NULL);
3271
3272 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3273 return;
3274
3746 switch (op) 3275 switch (op)
3747 { 3276 {
3748 case XTerm_name: 3277 case XTerm_name:
3749 set_title (str); 3278 set_title (str);
3750 /* FALLTHROUGH */ 3279 /* FALLTHROUGH */
… …
3764 unsigned long bytes_after; 3293 unsigned long bytes_after;
3765 unsigned char *value = 0; 3294 unsigned char *value = 0;
3766 const char *str = ""; 3295 const char *str = "";
3767 3296
3768 if (prop 3297 if (prop
3769 && XGetWindowProperty (xdisp, parent[0], 3298 && XGetWindowProperty (dpy, parent[0],
3770 prop, 0, 1<<16, 0, AnyPropertyType, 3299 prop, 0, 1<<16, 0, AnyPropertyType,
3771 &actual_type, &actual_format, 3300 &actual_type, &actual_format,
3772 &nitems, &bytes_after, &value) == Success 3301 &nitems, &bytes_after, &value) == Success
3773 && actual_type != None 3302 && actual_type != None
3774 && actual_format == 8) 3303 && actual_format == 8)
… …
3786 { 3315 {
3787 *eq = 0; 3316 *eq = 0;
3788 set_utf8_property (display->atom (str), eq + 1); 3317 set_utf8_property (display->atom (str), eq + 1);
3789 } 3318 }
3790 else 3319 else
3791 XDeleteProperty (xdisp, parent[0], 3320 XDeleteProperty (dpy, parent[0],
3792 display->atom (str)); 3321 display->atom (str));
3793 } 3322 }
3794 break; 3323 break;
3795 3324
3796 case XTerm_Color: 3325 case XTerm_Color:
… …
3842 break; 3371 break;
3843 case URxvt_Color_IT: 3372 case URxvt_Color_IT:
3844 process_color_seq (op, Color_IT, str, resp); 3373 process_color_seq (op, Color_IT, str, resp);
3845 break; 3374 break;
3846#endif 3375#endif
3847#if TRANSPARENT && TINTING 3376#if ENABLE_TRANSPARENCY
3848 case URxvt_Color_tint: 3377 case URxvt_Color_tint:
3849 process_color_seq (op, Color_tint, str, resp); 3378 process_color_seq (op, Color_tint, str, resp);
3379 {
3380 bool changed = false;
3381 if (ISSET_PIXCOLOR (Color_tint))
3382 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3383 else
3384 changed = bgPixmap.unset_tint ();
3385 if (changed)
3386 update_background ();
3387 }
3850 3388
3851 check_our_parents ();
3852
3853 if (am_transparent)
3854 want_full_refresh = want_refresh = 1;
3855
3856 break; 3389 break;
3857#endif 3390#endif
3858 3391
3392#if BG_IMAGE_FROM_FILE
3859 case Rxvt_Pixmap: 3393 case Rxvt_Pixmap:
3860 { 3394 if (!strcmp (str, "?"))
3861 if (*str != ';')
3862 { 3395 {
3863#if XPM_BACKGROUND 3396 char str[256];
3864 scale_pixmap (""); /* reset to default scaling */ 3397
3865 set_bgPixmap (str); /* change pixmap */ 3398 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3866 scr_touch (true); 3399 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3867#endif 3400 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3401 process_xterm_seq (XTerm_title, str, CHAR_ST);
3868 } 3402 }
3869 3403 else
3404 {
3870 int changed = 0; 3405 int changed = 0;
3871 3406
3872 while ((str = strchr (str, ';')) != NULL) 3407 if (*str != ';')
3873 { 3408 {
3409 /* reset to default scaling :*/
3410 bgPixmap.unset_geometry ();
3411 if (bgPixmap.set_file (str)) /* change pixmap */
3412 changed++;
3413 str = strchr (str, ';');
3414 if (str == NULL)
3415 bgPixmap.set_defaultGeometry ();
3416 }
3417 while (str)
3418 {
3874 str++; 3419 str++;
3875#if XPM_BACKGROUND 3420 if (bgPixmap.set_geometry (str))
3876 changed += scale_pixmap (str); 3421 changed++;
3877#endif 3422 str = strchr (str, ';');
3878 } 3423 }
3879
3880 if (changed) 3424 if (changed)
3881 { 3425 update_background ();
3882#ifdef XPM_BACKGROUND
3883 resize_pixmap ();
3884 scr_touch (true);
3885#endif
3886 } 3426 }
3887 }
3888 break; 3427 break;
3428#endif
3889 3429
3890 case Rxvt_restoreFG: 3430 case Rxvt_restoreFG:
3891 set_window_color (Color_fg, str); 3431 set_window_color (Color_fg, str);
3892 break; 3432 break;
3893 case Rxvt_restoreBG: 3433 case Rxvt_restoreBG:
… …
3918 case URxvt_italicFont: 3458 case URxvt_italicFont:
3919 case URxvt_boldItalicFont: 3459 case URxvt_boldItalicFont:
3920#endif 3460#endif
3921 if (query) 3461 if (query)
3922 tt_printf ("\33]%d;%-.250s%c", saveop, 3462 tt_printf ("\33]%d;%-.250s%c", saveop,
3923 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3463 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3924 ? fontset[op - URxvt_font]->fontdesc : "", 3464 ? fontset[op - URxvt_font]->fontdesc : "",
3925 resp); 3465 resp);
3926 else 3466 else
3927 { 3467 {
3928 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3468 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3942 break; 3482 break;
3943 3483
3944#if !ENABLE_MINIMAL 3484#if !ENABLE_MINIMAL
3945 case URxvt_locale: 3485 case URxvt_locale:
3946 if (query) 3486 if (query)
3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3487 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3948 else 3488 else
3949 { 3489 {
3950 set_locale (str); 3490 set_locale (str);
3951 pty->set_utf8_mode (enc_utf8); 3491 pty->set_utf8_mode (enc_utf8);
3952 init_xlocale (); 3492 init_xlocale ();
… …
3967 break; 3507 break;
3968#endif 3508#endif
3969 3509
3970#if ENABLE_PERL 3510#if ENABLE_PERL
3971 case URxvt_perl: 3511 case URxvt_perl:
3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3973 ; // no responses yet 3513 ; // no responses yet
3974 break; 3514 break;
3975#endif 3515#endif
3976 } 3516 }
3977} 3517}
… …
4015{ 3555{
4016 unsigned int i, j; 3556 unsigned int i, j;
4017 int state; 3557 int state;
4018 3558
4019 static const struct 3559 static const struct
4020 { 3560 {
4021 const int argval; 3561 const int argval;
4022 const unsigned long bit; 3562 const unsigned long bit;
4023 }
4024
4025 argtopriv[] = { 3563 } argtopriv[] = {
4026 { 1, PrivMode_aplCUR }, 3564 { 1, PrivMode_aplCUR },
4027 { 2, PrivMode_vt52 }, 3565 { 2, PrivMode_vt52 },
4028 { 3, PrivMode_132 }, 3566 { 3, PrivMode_132 },
4029 { 4, PrivMode_smoothScroll }, 3567 { 4, PrivMode_smoothScroll },
4030 { 5, PrivMode_rVideo }, 3568 { 5, PrivMode_rVideo },
… …
4046 { 66, PrivMode_aplKP }, 3584 { 66, PrivMode_aplKP },
4047#ifndef NO_BACKSPACE_KEY 3585#ifndef NO_BACKSPACE_KEY
4048 { 67, PrivMode_BackSpace }, 3586 { 67, PrivMode_BackSpace },
4049#endif 3587#endif
4050 { 1000, PrivMode_MouseX11 }, 3588 { 1000, PrivMode_MouseX11 },
4051 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3589 { 1002, PrivMode_MouseBtnEvent },
4052 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3590 { 1003, PrivMode_MouseAnyEvent },
4053 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4054 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4055 { 1011, PrivMode_Keypress }, // rxvt extension 3592 { 1011, PrivMode_Keypress }, // rxvt extension
4056 // 1035 enable modifiers for alt, numlock NYI 3593 // 1035 enable modifiers for alt, numlock NYI
4057 // 1036 send ESC for meta keys NYI 3594 // 1036 send ESC for meta keys NYI
4058 // 1037 send DEL for keypad delete NYI 3595 // 1037 send DEL for keypad delete NYI
… …
4093 scr_touch (true); 3630 scr_touch (true);
4094 break; 3631 break;
4095#endif 3632#endif
4096 case 1048: /* alternative cursor save */ 3633 case 1048: /* alternative cursor save */
4097 case 1049: 3634 case 1049:
4098 if (OPTION (Opt_secondaryScreen)) 3635 if (option (Opt_secondaryScreen))
4099 if (mode == 0) 3636 if (mode == 0)
4100 scr_cursor (RESTORE); 3637 scr_cursor (RESTORE);
4101 else if (mode == 1) 3638 else if (mode == 1)
4102 scr_cursor (SAVE); 3639 scr_cursor (SAVE);
4103 break; 3640 break;
… …
4132 scr_autowrap (state); 3669 scr_autowrap (state);
4133 break; 3670 break;
4134 /* case 8: - auto repeat, can't do on a per window basis */ 3671 /* case 8: - auto repeat, can't do on a per window basis */
4135 case 9: /* X10 mouse reporting */ 3672 case 9: /* X10 mouse reporting */
4136 if (state) /* orthogonal */ 3673 if (state) /* orthogonal */
4137 priv_modes &= ~PrivMode_MouseX11; 3674 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4138 break; 3675 break;
4139#ifdef scrollBar_esc 3676#ifdef scrollBar_esc
4140 case scrollBar_esc: 3677 case scrollBar_esc:
4141 if (scrollbar_mapping (state)) 3678 if (scrollbar_mapping (state))
4142 { 3679 {
… …
4155 break; 3692 break;
4156 /* case 66: - application key pad */ 3693 /* case 66: - application key pad */
4157 /* case 67: - backspace key */ 3694 /* case 67: - backspace key */
4158 case 1000: /* X11 mouse reporting */ 3695 case 1000: /* X11 mouse reporting */
4159 if (state) /* orthogonal */ 3696 if (state) /* orthogonal */
4160 priv_modes &= ~PrivMode_MouseX10; 3697 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4161 break; 3698 break;
4162#if 0
4163 case 1001: 3699 case 1002:
4164 break; /* X11 mouse highlighting */ 3700 case 1003:
4165#endif 3701 if (state)
3702 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3705 vt_emask_mouse = PointerMotionMask;
3706 }
3707 else
3708 vt_emask_mouse = NoEventMask;
3709 vt_select_input ();
3710 break;
4166 case 1010: /* scroll to bottom on TTY output inhibit */ 3711 case 1010: /* scroll to bottom on TTY output inhibit */
4167 set_option (Opt_scrollTtyOutput, !state); 3712 set_option (Opt_scrollTtyOutput, !state);
4168 break; 3713 break;
4169 case 1011: /* scroll to bottom on key press */ 3714 case 1011: /* scroll to bottom on key press */
4170 set_option (Opt_scrollTtyKeypress, state); 3715 set_option (Opt_scrollTtyKeypress, state);
4171 break; 3716 break;
4172 case 1047: /* secondary screen w/ clearing last */ 3717 case 1047: /* secondary screen w/ clearing last */
4173 if (OPTION (Opt_secondaryScreen)) 3718 if (option (Opt_secondaryScreen))
4174 if (current_screen != PRIMARY) 3719 if (current_screen != PRIMARY)
4175 scr_erase_screen (2); 3720 scr_erase_screen (2);
4176 scr_change_screen (state); 3721 scr_change_screen (state);
4177 break; 3722 break;
4178 case 1049: /* secondary screen w/ clearing first */ 3723 case 1049: /* secondary screen w/ clearing first */
4179 scr_change_screen (state); 3724 scr_change_screen (state);
4180 if (OPTION (Opt_secondaryScreen)) 3725 if (option (Opt_secondaryScreen))
4181 if (current_screen != PRIMARY) 3726 if (current_screen != PRIMARY)
4182 scr_erase_screen (2); 3727 scr_erase_screen (2);
4183 break; 3728 break;
4184 default: 3729 default:
4185 break; 3730 break;
… …
4347rxvt_term::process_graphics () 3892rxvt_term::process_graphics ()
4348{ 3893{
4349 unicode_t ch, cmd = cmd_getc (); 3894 unicode_t ch, cmd = cmd_getc ();
4350 3895
4351 if (cmd == 'Q') 3896 if (cmd == 'Q')
3897 {
4352 { /* query graphics */ 3898 /* query graphics */
4353 tt_printf ("\033G0\012"); /* no graphics */ 3899 tt_printf ("\033G0\012"); /* no graphics */
4354 return; 3900 return;
4355 } 3901 }
4356 /* swallow other graphics sequences until terminating ':' */ 3902 /* swallow other graphics sequences until terminating ':' */
4357 do 3903 do
… …
4407 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3953 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4408 3954
4409 memcpy (v_buffer + v_buflen, data, len); 3955 memcpy (v_buffer + v_buflen, data, len);
4410 v_buflen += len; 3956 v_buflen += len;
4411 3957
4412 pty_ev.set (EVENT_READ | EVENT_WRITE); 3958 pty_ev.set (ev::READ | ev::WRITE);
4413} 3959}
4414 3960
4415void rxvt_term::pty_write () 3961void rxvt_term::pty_write ()
4416{ 3962{
4417 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3963 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4422 3968
4423 if (v_buflen == 0) 3969 if (v_buflen == 0)
4424 { 3970 {
4425 free (v_buffer); 3971 free (v_buffer);
4426 v_buffer = 0; 3972 v_buffer = 0;
4427 v_buflen = 0;
4428 3973
4429 pty_ev.set (EVENT_READ); 3974 pty_ev.set (ev::READ);
4430 return; 3975 return;
4431 } 3976 }
4432 3977
4433 memmove (v_buffer, v_buffer + written, v_buflen); 3978 memmove (v_buffer, v_buffer + written, v_buflen);
4434 } 3979 }
4435 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3980 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4436 pty_ev.set (EVENT_READ); 3981 pty_ev.set (ev::READ);
4437} 3982}
4438 3983
4439/*----------------------- end-of-file (C source) -----------------------*/ 3984/*----------------------- end-of-file (C source) -----------------------*/
4440 3985

Diff Legend

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