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.303 by root, Tue Jan 31 21:47:56 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>
… …
95 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
97 97
98 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
298 297
299 return -1; 298 return -1;
300} 299}
301#endif 300#endif
302 301
303/*{{{ Convert the keypress event into a string */
304void 302void
305rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
306{ 304{
307 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
308 unsigned int newlen; 306 unsigned int newlen;
309 KeySym keysym; 307 KeySym keysym;
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * 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
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
498# endif 501# endif
499 return; 502 return;
500 } 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 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
505# if ISO_14755 516# if ISO_14755
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
536#endif 547#endif
537 548
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 550 {
540 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 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
542 switch (keysym) 584 switch (keysym)
543 { 585 {
544#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 587 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
551 } 593 }
552 else 594 else
553 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 596 break;
555#endif 597#endif
556#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete: 599 case XK_Delete:
568 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 601 break;
570#endif 602#endif
571 case XK_Tab: 603 case XK_Tab:
572 if (shft) 604 if (shft)
573 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
583#endif 615#endif
584 newlen = 0; 616 newlen = 0;
585 } 617 }
586 break; 618 break;
587 619
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
618 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
620 break; 636 break;
621 637
622#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior: 639 case XK_Prior:
634 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
635 break; 641 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next: 642 case XK_Next:
647 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
648 break; 644 break;
649#endif 645#endif
650 case XK_KP_Enter: 646 case XK_KP_Enter:
651 /* allow shift to override */ 647 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
653 { 649 {
654 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
655 break; 651 break;
656 } 652 }
657 653
… …
669 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
671 } 667 }
672 break; 668 break;
673 669
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 694 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
706 { 696 {
707 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 699 }
710 else 700 else
… …
716 706
717 case XK_Find: 707 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
719 break; 709 break;
720 710
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert: 711 case XK_Insert:
732 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
733 break; 713 break;
734#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove: 715 case DXK_Remove:
… …
739 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
740 break; 720 break;
741 case XK_Select: 721 case XK_Select:
742 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
743 break; 723 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End: 724 case XK_End:
755 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
756 break; 726 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home: 727 case XK_Home:
768 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
769 break; 729 break;
770 730
771#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
873 return; 833 return;
874 834
875 if (len <= 0) 835 if (len <= 0)
876 return; /* not mapped */ 836 return; /* not mapped */
877 837
878 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 839 if (view_start)
880 { 840 {
881 view_start = 0; 841 view_start = 0;
882 want_refresh = 1; 842 want_refresh = 1;
883 } 843 }
… …
907 tt_write (&ch, 1); 867 tt_write (&ch, 1);
908 } 868 }
909 869
910 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
911} 871}
912/*}}} */ 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}
913 949
914#if defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
915unsigned int 951unsigned int
916rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
917{ 953{
… …
947void 983void
948rxvt_term::flush () 984rxvt_term::flush ()
949{ 985{
950 flush_ev.stop (); 986 flush_ev.stop ();
951 987
952#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
953 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
954 { 990 {
955 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
956 scr_clear ();
957 scr_touch (false); 992 scr_touch (false);
958 } 993 }
959#endif 994#endif
960 995
961 if (want_refresh) 996 if (want_refresh)
… …
1007 1042
1008 display->flush (); 1043 display->flush ();
1009} 1044}
1010 1045
1011void 1046void
1012rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1013{ 1048{
1014 make_current (); 1049 make_current ();
1015 1050
1016 display->flush (); 1051 display->flush ();
1017 1052
1018 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !ev_is_active (&flush_ev))
1019 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1020} 1055}
1021 1056
1022void 1057void
1023rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1024{ 1059{
1025 make_current (); 1060 make_current ();
1026 1061
1027 refresh_limit = 1;
1028 refresh_count = 0; 1062 refresh_count = 0;
1029 flush (); 1063 flush ();
1030} 1064}
1031 1065
1032#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1033void 1067void
1034rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1035{ 1069{
1036 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1037 want_refresh = 1; 1071 want_refresh = 1;
1038
1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
1040} 1072}
1041#endif 1073#endif
1042 1074
1043#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1044void 1076void
1045rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1046{ 1078{
1047 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1048 { 1080 {
1049 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1050 want_refresh = 1; 1082 want_refresh = 1;
1051 w.start (w.at + TEXT_BLINK_INTERVAL);
1052 } 1083 }
1084 else
1085 w.stop ();
1053} 1086}
1054#endif 1087#endif
1055 1088
1056#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1057void 1090void
1058rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1059{ 1092{
1060 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1061 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1062 {
1063 want_refresh = 1; 1095 want_refresh = 1;
1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
1065 } 1097 w.stop ();
1066} 1098}
1067#endif 1099#endif
1068 1100
1069#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1070void 1102void
1071rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1072{ 1104{
1073 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1074 { 1106 {
1075 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1076 want_refresh = 1; 1108 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1109 }
1110 else
1111 w.stop ();
1079} 1112}
1080#endif 1113#endif
1081 1114
1082#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1083void 1116void
1084rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1085{ 1118{
1086 if (mouse_slip_wheel_speed == 0 1119 if (mouse_slip_wheel_speed == 0
1087 || 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)
1088 : scr_page (UP, mouse_slip_wheel_speed)) 1121 : scr_page (UP, mouse_slip_wheel_speed))
1089 { 1122 {
1090 if (view_start == top_row || view_start == 0) 1123 if (view_start == top_row || view_start == 0)
1091 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1092 1125
1093 want_refresh = 1; 1126 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1127 }
1128 else
1129 w.stop ();
1096} 1130}
1097#endif 1131#endif
1098 1132
1099#if LINUX_YIELD_HACK 1133#if LINUX_YIELD_HACK
1100static struct event_handler 1134static struct event_handler
1101{ 1135{
1102 check_watcher yield_ev; 1136 ev::prepare yield_ev;
1103 1137
1104 void yield_cb (check_watcher &w) 1138 void yield_cb (ev::prepare &w, int revents)
1105 { 1139 {
1106 // this should really be sched_yield(), but the linux guys thought 1140 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than 1141 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels. 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.
1109 1144
1110 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 0 };
1111 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1112 1147
1113 w.stop (); 1148 w.stop ();
… …
1151 } 1186 }
1152 else 1187 else
1153 { 1188 {
1154 pty_ev.stop (); 1189 pty_ev.stop ();
1155 1190
1156 if (!OPTION (Opt_hold)) 1191 if (!option (Opt_hold))
1157 destroy (); 1192 destroy ();
1158 } 1193 }
1159 1194
1160 return false; 1195 return false;
1161} 1196}
1162 1197
1163void 1198void
1164rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1165{ 1200{
1166 make_current (); 1201 make_current ();
1167 1202
1168 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1169 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1170 while (pty_fill ()) 1205 while (pty_fill ())
1171 if (cmd_parse ()) 1206 if (cmd_parse ())
1172 break; 1207 break;
1173 1208
1174 if (revents & EVENT_WRITE) 1209 if (revents & ev::WRITE)
1175 pty_write (); 1210 pty_write ();
1176} 1211}
1177 1212
1178void 1213void
1179rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1180{ 1215{
1181 XDefineCursor (xdisp, vt, TermWin_cursor); 1216 XDefineCursor (dpy, vt, TermWin_cursor);
1182 recolour_cursor (); 1217 recolour_cursor ();
1183 1218
1184#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1185 hidden_pointer = 0; 1220 hidden_pointer = 0;
1186 1221
1187 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1188 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1189#endif 1224#endif
1190} 1225}
1191 1226
1192#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1193void 1228void
1194rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1195{ 1230{
1196 if (!OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1197 return; 1232 return;
1198 1233
1199 XDefineCursor (xdisp, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1200 XFlush (xdisp); 1235 XFlush (dpy);
1201 1236
1202 hidden_pointer = 1; 1237 hidden_pointer = 1;
1203} 1238}
1204 1239
1205void 1240void
1206rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1207{ 1242{
1208 make_current (); 1243 make_current ();
1209 1244
1210 pointer_blank (); 1245 pointer_blank ();
1211} 1246}
… …
1214void 1249void
1215rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1216{ 1251{
1217 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1218 int x, y; 1253 int x, y;
1254 int code = 32;
1219 1255
1220 x = ev.x; 1256 x = Pixel2Col (ev.x);
1221 y = ev.y; 1257 y = Pixel2Row (ev.y);
1222 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 }
1223 1266
1224 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1225 button_number = 3; 1268 button_number = 3;
1226 else 1269 else
1227 { 1270 {
… …
1273 x + 1, 1316 x + 1,
1274 y + 1); 1317 y + 1);
1275#endif 1318#endif
1276 1319
1277 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1278 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1279 (32 + x + 1), 1322 (32 + x + 1),
1280 (32 + y + 1)); 1323 (32 + y + 1));
1281} 1324}
1282 1325
1283/*{{{ process an X event */ 1326/*{{{ process an X event */
1284void 1327void
1285rxvt_term::x_cb (XEvent &ev) 1328rxvt_term::x_cb (XEvent &ev)
1286{ 1329{
1287 make_current (); 1330 make_current ();
1288 1331
1289 dLocal (Display *, xdisp); 1332 dLocal (Display *, dpy);
1290 1333
1291 if (ev.xany.window == vt 1334 if (ev.xany.window == vt
1292 && SHOULD_INVOKE (HOOK_X_EVENT) 1335 && SHOULD_INVOKE (HOOK_X_EVENT)
1293 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1336 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1294 return; 1337 return;
… …
1299 unsigned int unused_mask; 1342 unsigned int unused_mask;
1300 1343
1301 switch (ev.type) 1344 switch (ev.type)
1302 { 1345 {
1303 case KeyPress: 1346 case KeyPress:
1304#if ISO_14755 1347 key_press (ev.xkey);
1305 if (!(iso14755buf & ISO_14755_52))
1306#endif
1307 lookup_key (ev.xkey);
1308
1309 break; 1348 break;
1310 1349
1311 case KeyRelease: 1350 case KeyRelease:
1312 { 1351 key_release (ev.xkey);
1313#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1314 KeySym keysym;
1315
1316 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1317#endif
1318
1319#if ENABLE_FRILLS || ISO_14755
1320 // ISO 14755 support
1321 if (iso14755buf)
1322 if (iso14755buf & ISO_14755_52)
1323 {
1324# if ENABLE_OVERLAY
1325 scr_overlay_off ();
1326# endif
1327# if ISO_14755
1328 // iso14755 part 5.2 handling: release time
1329 // first: controls
1330 if ((ev.xkey.state & ControlMask)
1331 && ((keysym >= 0x40 && keysym <= 0x5f)
1332 || (keysym >= 0x61 && keysym <= 0x7f)))
1333 {
1334 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1335 commit_iso14755 ();
1336 goto skip_switch;
1337 }
1338
1339 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1340 if (i[0] == keysym)
1341 {
1342 iso14755buf = ISO_14755_51 | i[1];
1343 commit_iso14755 ();
1344 goto skip_switch;
1345 }
1346
1347 scr_bell ();
1348# endif
1349 iso14755buf = 0;
1350 break;
1351 }
1352 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1353 {
1354# if ENABLE_OVERLAY
1355 scr_overlay_off ();
1356# endif
1357 if (iso14755buf & ISO_14755_51)
1358 commit_iso14755 ();
1359#if ISO_14755
1360 else if (iso14755buf & ISO_14755_STARTED)
1361 {
1362 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1363
1364 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1365 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1366 }
1367# endif
1368 else
1369 iso14755buf = 0;
1370 }
1371#endif
1372
1373 if (ev.xany.window == vt
1374 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1375 break;
1376
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0;
1382#endif
1383 break; 1352 break;
1384 }
1385 1353
1386 case ButtonPress: 1354 case ButtonPress:
1387 button_press (ev.xbutton); 1355 button_press (ev.xbutton);
1388 break; 1356 break;
1389 1357
… …
1404 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)))
1405 destroy (); 1373 destroy ();
1406 } 1374 }
1407#if ENABLE_EWMH 1375#if ENABLE_EWMH
1408 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])
1409 XSendEvent (xdisp, ev.xclient.window = display->root, 1377 XSendEvent (dpy, ev.xclient.window = display->root,
1410 False, SubstructureRedirectMask | SubstructureNotifyMask, 1378 False, SubstructureRedirectMask | SubstructureNotifyMask,
1411 &ev); 1379 &ev);
1412#endif 1380#endif
1413 } 1381 }
1414 } 1382 }
… …
1420 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1421 focus_out (); 1389 focus_out ();
1422 } 1390 }
1423#endif 1391#endif
1424 } 1392 }
1425 break;
1426
1427 case MappingNotify:
1428 XRefreshKeyboardMapping (&ev.xmapping);
1429 break; 1393 break;
1430 1394
1431 /* 1395 /*
1432 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1433 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1452 break; 1416 break;
1453 } 1417 }
1454 break; 1418 break;
1455 1419
1456 case FocusIn: 1420 case FocusIn:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1457 focus_in (); 1424 focus_in ();
1458 break; 1425 break;
1459 1426
1460 case FocusOut: 1427 case FocusOut:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1461 focus_out (); 1431 focus_out ();
1462 break; 1432 break;
1463 1433
1464 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); */
1465 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1466 { 1439 {
1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468 ; 1441 ;
1469 1442
1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1471 { 1444 {
1472 seen_resize = 1; 1445 seen_resize = 1;
1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1474 } 1447 }
1475 1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 update_background ();
1453#endif
1454 }
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477
1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1479 if (OPTION (Opt_transparent))
1480 check_our_parents ();
1481#endif
1482 } 1456 }
1483 break; 1457 break;
1484 1458
1485 case PropertyNotify: 1459 case PropertyNotify:
1486 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)))
… …
1504 break; 1478 break;
1505 1479
1506 case MapNotify: 1480 case MapNotify:
1507 mapped = 1; 1481 mapped = 1;
1508#ifdef TEXT_BLINK 1482#ifdef TEXT_BLINK
1509 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1483 text_blink_ev.start ();
1510#endif 1484#endif
1511 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1512 break; 1486 break;
1513 1487
1514 case UnmapNotify: 1488 case UnmapNotify:
… …
1516#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1517 text_blink_ev.stop (); 1491 text_blink_ev.stop ();
1518#endif 1492#endif
1519 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break; 1494 break;
1521
1522#ifdef TRANSPARENT
1523 case ReparentNotify:
1524 rootwin_cb (ev);
1525 break;
1526#endif /* TRANSPARENT */
1527 1495
1528 case GraphicsExpose: 1496 case GraphicsExpose:
1529 case Expose: 1497 case Expose:
1530 if (ev.xany.window == vt) 1498 if (ev.xany.window == vt)
1531 { 1499 {
1532 do 1500 do
1501 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1504 }
1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1506
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1508
1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 {
1540 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1541 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1542 1513 }
1543 want_refresh = 1; 1514 want_refresh = 1;
1544 } 1515 }
1545 else 1516 else
1546 { 1517 {
1547 XEvent unused_event; 1518 XEvent unused_event;
1548 1519
1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1550 ; 1521 ;
1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1552 ; 1523 ;
1553 1524
1554 if (isScrollbarWindow (ev.xany.window)) 1525 if (isScrollbarWindow (ev.xany.window))
1555 { 1526 {
1556 scrollBar.setIdle (); 1527 scrollBar.setIdle ();
1557 scrollbar_show (0); 1528 scrollbar_show (0);
1558 } 1529 }
1559
1560#ifdef TRANSPARENT
1561 if (am_transparent && ev.xany.window == parent[0])
1562 XClearWindow (xdisp, ev.xany.window);
1563#endif
1564 } 1530 }
1565 break; 1531 break;
1566 1532
1567 case MotionNotify: 1533 case MotionNotify:
1568#ifdef POINTER_BLANK 1534#ifdef POINTER_BLANK
1569 if (hidden_pointer) 1535 if (hidden_pointer)
1570 pointer_unblank (); 1536 pointer_unblank ();
1571#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);
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1542 break;
1574 1543
1575 if (ev.xany.window == vt) 1544 if (ev.xany.window == vt)
1576 { 1545 {
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1546 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1547 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579 ; // nop 1548 ; // nop
1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1549 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1550 {
1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1583 ; 1552 ;
1584 1553
1585 XQueryPointer (xdisp, vt, 1554 XQueryPointer (dpy, vt,
1586 &unused_root, &unused_child, 1555 &unused_root, &unused_child,
1587 &unused_root_x, &unused_root_y, 1556 &unused_root_x, &unused_root_y,
1588 &ev.xbutton.x, &ev.xbutton.y, 1557 &ev.xbutton.x, &ev.xbutton.y,
1589 &ev.xbutton.state); 1558 &ev.xbutton.state);
1590#ifdef MOUSE_THRESHOLD 1559#ifdef MOUSE_THRESHOLD
… …
1610 int dist; 1579 int dist;
1611 1580
1612 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1613 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1614 */ 1583 */
1615 if (!sel_scroll_ev.active) 1584 if (!ev_is_active (&sel_scroll_ev))
1616 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1617 1586
1618 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1619 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1620 */ 1589 */
1621 selection_save_x = ev.xbutton.x; 1590 selection_save_x = ev.xbutton.x;
… …
1643 else 1612 else
1644 { 1613 {
1645 /* we are within the text window, so we 1614 /* we are within the text window, so we
1646 * shouldn't be scrolling 1615 * shouldn't be scrolling
1647 */ 1616 */
1648 if (sel_scroll_ev.active) 1617 if (ev_is_active (&sel_scroll_ev))
1649 sel_scroll_ev.stop(); 1618 sel_scroll_ev.stop();
1650 } 1619 }
1651#endif 1620#endif
1652#ifdef MOUSE_THRESHOLD 1621#ifdef MOUSE_THRESHOLD
1653 } 1622 }
1654#endif 1623#endif
1655 } 1624 }
1656 } 1625 }
1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1626 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1658 { 1627 {
1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1628 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1660 MotionNotify, &ev)) 1629 MotionNotify, &ev))
1661 ; 1630 ;
1662 1631
1663 XQueryPointer (xdisp, scrollBar.win, 1632 XQueryPointer (dpy, scrollBar.win,
1664 &unused_root, &unused_child, 1633 &unused_root, &unused_child,
1665 &unused_root_x, &unused_root_y, 1634 &unused_root_x, &unused_root_y,
1666 &ev.xbutton.x, &ev.xbutton.y, 1635 &ev.xbutton.x, &ev.xbutton.y,
1667 &unused_mask); 1636 &unused_mask);
1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1637 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1669 scrollbar_size ()); 1638 scrollbar_size ());
1670 want_refresh = 1; 1639 want_refresh = 1;
1671 refresh_limit = 0;
1672 scrollbar_show (1); 1640 scrollbar_show (1);
1673 } 1641 }
1674 break; 1642 break;
1675 } 1643 }
1676 1644
1677skip_switch: ;
1678
1679#if defined(CURSOR_BLINK) 1645#if defined(CURSOR_BLINK)
1680 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1646 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1681 { 1647 {
1682 if (hidden_cursor) 1648 if (hidden_cursor)
1683 { 1649 {
1684 hidden_cursor = 0; 1650 hidden_cursor = 0;
1685 want_refresh = 1; 1651 want_refresh = 1;
1686 } 1652 }
1687 1653
1688 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1654 cursor_blink_ev.again ();
1689 } 1655 }
1690#endif 1656#endif
1691 1657
1692#if defined(POINTER_BLANK) 1658#if defined(POINTER_BLANK)
1693 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1659 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1660 {
1695 if (ev.type == MotionNotify 1661 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress 1662 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease) 1663 || ev.type == ButtonRelease)
1698 if (hidden_pointer) 1664 if (hidden_pointer)
… …
1710 if (!focus) 1676 if (!focus)
1711 { 1677 {
1712 focus = 1; 1678 focus = 1;
1713 want_refresh = 1; 1679 want_refresh = 1;
1714 1680
1715 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1681 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1716 1682
1717#if USE_XIM 1683#if USE_XIM
1718 if (Input_Context != NULL) 1684 if (Input_Context != NULL)
1719 { 1685 {
1720 IMSetStatusPosition (); 1686 IMSetPosition ();
1721 XSetICFocus (Input_Context); 1687 XSetICFocus (Input_Context);
1722 } 1688 }
1723#endif 1689#endif
1724#if CURSOR_BLINK 1690#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink)) 1691 if (option (Opt_cursorBlink))
1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1692 cursor_blink_ev.again ();
1727#endif 1693#endif
1728#if OFF_FOCUS_FADING 1694#if OFF_FOCUS_FADING
1729 if (rs[Rs_fade]) 1695 if (rs[Rs_fade])
1730 { 1696 {
1731 pix_colors = pix_colors_focused; 1697 pix_colors = pix_colors_focused;
1732 scr_recolour (); 1698 scr_recolour ();
1733 } 1699 }
1734#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
1735 } 1711 }
1736} 1712}
1737 1713
1738void 1714void
1739rxvt_term::focus_out () 1715rxvt_term::focus_out ()
… …
1747 1723
1748#if ENABLE_FRILLS || ISO_14755 1724#if ENABLE_FRILLS || ISO_14755
1749 if (iso14755buf) 1725 if (iso14755buf)
1750 { 1726 {
1751 iso14755buf = 0; 1727 iso14755buf = 0;
1752# if ENABLE_OVERLAY 1728# if ISO_14755
1753 scr_overlay_off (); 1729 scr_overlay_off ();
1754# endif 1730# endif
1755 } 1731 }
1756#endif 1732#endif
1757#if USE_XIM 1733#if USE_XIM
1758 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1759 XUnsetICFocus (Input_Context); 1735 XUnsetICFocus (Input_Context);
1760#endif 1736#endif
1761#if CURSOR_BLINK 1737#if CURSOR_BLINK
1762 if (OPTION (Opt_cursorBlink)) 1738 if (option (Opt_cursorBlink))
1763 cursor_blink_ev.stop (); 1739 cursor_blink_ev.stop ();
1740
1764 hidden_cursor = 0; 1741 hidden_cursor = 0;
1765#endif 1742#endif
1766#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1768 { 1745 {
… …
1771 } 1748 }
1772#endif 1749#endif
1773 } 1750 }
1774} 1751}
1775 1752
1776#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
1777void 1767void
1778rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1779{ 1769{
1780 make_current (); 1770 make_current ();
1781 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
1782 switch (ev.type) 1777 switch (ev.type)
1783 { 1778 {
1784 case PropertyNotify: 1779 case PropertyNotify:
1785 /* 1780 /*
1786 * 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,
1787 * 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.
1788 */ 1783 */
1789 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1784 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1790 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1785 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1791 return; 1786 {
1792 1787 bgPixmap.set_root_pixmap ();
1793 /* FALLTHROUGH */ 1788 update_background ();
1794 case ReparentNotify: 1789 }
1795 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1796 want_refresh = want_full_refresh = 1;
1797 break; 1790 break;
1798 } 1791 }
1792# endif
1799} 1793}
1800#endif 1794#endif
1801 1795
1802void 1796void
1803rxvt_term::button_press (XButtonEvent &ev) 1797rxvt_term::button_press (XButtonEvent &ev)
… …
1858 mouse_report (ev); 1852 mouse_report (ev);
1859 } 1853 }
1860#else 1854#else
1861 MEvent.button = ev.button; 1855 MEvent.button = ev.button;
1862 mouse_report (ev); 1856 mouse_report (ev);
1863#endif /* MOUSE_REPORT_DOUBLECLICK */ 1857#endif /* MOUSE_REPORT_DOUBLECLICK */
1864 1858
1865 } 1859 }
1866 else 1860 else
1867 { 1861 {
1868 if (ev.button != MEvent.button) 1862 if (ev.button != MEvent.button)
… …
1962 tt_printf ("\033[5~"); 1956 tt_printf ("\033[5~");
1963 break; 1957 break;
1964 } 1958 }
1965 } 1959 }
1966 else 1960 else
1967#endif /* NO_SCROLLBAR_REPORT */ 1961#endif /* NO_SCROLLBAR_REPORT */
1968 1962
1969 { 1963 {
1970 char upordown = 0; 1964 char upordown = 0;
1971 1965
1972 if (scrollBar.style == R_SB_NEXT) 1966 if (scrollBar.style == R_SB_NEXT)
1973 { 1967 {
1974 if (scrollbarnext_upButton (ev.y)) 1968 if (scrollbarnext_upButton (ev.y))
1975 upordown = -1; /* up */ 1969 upordown = -1; /* up */
… …
1984 upordown = 1; /* down */ 1978 upordown = 1; /* down */
1985 } 1979 }
1986 if (upordown) 1980 if (upordown)
1987 { 1981 {
1988#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1989 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1990#endif 1984#endif
1991 if (scr_page (upordown < 0 ? UP : DN, 1)) 1985 if (scr_page (upordown < 0 ? UP : DN, 1))
1992 { 1986 {
1993 if (upordown < 0) 1987 if (upordown < 0)
1994 scrollBar.setUp (); 1988 scrollBar.setUp ();
… …
2074 scrollBar.setIdle (); 2068 scrollBar.setIdle ();
2075 scrollbar_show (0); 2069 scrollbar_show (0);
2076 } 2070 }
2077 2071
2078#ifdef SELECTION_SCROLLING 2072#ifdef SELECTION_SCROLLING
2079 if (sel_scroll_ev.active) 2073 if (ev_is_active (&sel_scroll_ev))
2080 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2081#endif 2075#endif
2082 2076
2083 if (ev.window == vt) 2077 if (ev.window == vt)
2084 { 2078 {
… …
2109 mouse_report (ev); 2103 mouse_report (ev);
2110 } 2104 }
2111#else /* MOUSE_REPORT_DOUBLECLICK */ 2105#else /* MOUSE_REPORT_DOUBLECLICK */
2112 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
2113 mouse_report (ev); 2107 mouse_report (ev);
2114#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
2115 return; 2109 return;
2116 } 2110 }
2117 2111
2118 /* 2112 /*
2119 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
… …
2131 selection_make (ev.time); 2125 selection_make (ev.time);
2132 break; 2126 break;
2133 2127
2134 case Button2: 2128 case Button2:
2135 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?
2136 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2137 break; 2131 break;
2138 2132
2139#ifdef MOUSE_WHEEL 2133#ifdef MOUSE_WHEEL
2140 case Button4: 2134 case Button4:
2141 case Button5: 2135 case Button5:
… …
2145 2139
2146 v = ev.button == Button4 ? UP : DN; 2140 v = ev.button == Button4 ? UP : DN;
2147 2141
2148 if (ev.state & ShiftMask) 2142 if (ev.state & ShiftMask)
2149 i = 1; 2143 i = 1;
2150 else if (OPTION (Opt_mouseWheelScrollPage)) 2144 else if (option (Opt_mouseWheelScrollPage))
2151 i = nrow - 1; 2145 i = nrow - 1;
2152 else 2146 else
2153 i = 5; 2147 i = 5;
2154 2148
2155# ifdef MOUSE_SLIP_WHEELING 2149# ifdef MOUSE_SLIP_WHEELING
… …
2157 { 2151 {
2158 mouse_slip_wheel_speed += v ? -1 : 1; 2152 mouse_slip_wheel_speed += v ? -1 : 1;
2159 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2160 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2161 2155
2162 if (slip_wheel_ev.at < NOW) 2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2163 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2164
2165 slip_wheel_ev.start ();
2166 } 2157 }
2167 else 2158 else
2168 { 2159 {
2169# endif 2160# endif
2170 scr_page (v, i); 2161 scr_page (v, i);
… …
2176 break; 2167 break;
2177#endif 2168#endif
2178 } 2169 }
2179 } 2170 }
2180} 2171}
2181
2182#ifdef TRANSPARENT
2183#if TINTING
2184/* taken from aterm-0.4.2 */
2185
2186typedef uint32_t RUINT32T;
2187
2188void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2189{
2190 int sh_r, sh_g, sh_b;
2191 RUINT32T mask_r, mask_g, mask_b;
2192 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2193 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2194 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2195 int i;
2196
2197 Visual *visual = term->visual;
2198
2199 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2200
2201 /* for convenience */
2202 mask_r = visual->red_mask;
2203 mask_g = visual->green_mask;
2204 mask_b = visual->blue_mask;
2205
2206 /* boring lookup table pre-initialization */
2207 switch (srcImage->bits_per_pixel) {
2208 case 15:
2209 if ((mask_r != 0x7c00) ||
2210 (mask_g != 0x03e0) ||
2211 (mask_b != 0x001f))
2212 return;
2213 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2214 lookup_r = lookup;
2215 lookup_g = lookup+32;
2216 lookup_b = lookup+32+32;
2217 sh_r = 10;
2218 sh_g = 5;
2219 sh_b = 0;
2220 break;
2221 case 16:
2222 if ((mask_r != 0xf800) ||
2223 (mask_g != 0x07e0) ||
2224 (mask_b != 0x001f))
2225 return;
2226 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2227 lookup_r = lookup;
2228 lookup_g = lookup+32;
2229 lookup_b = lookup+32+64;
2230 sh_r = 11;
2231 sh_g = 5;
2232 sh_b = 0;
2233 break;
2234 case 24:
2235 if ((mask_r != 0xff0000) ||
2236 (mask_g != 0x00ff00) ||
2237 (mask_b != 0x0000ff))
2238 return;
2239 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2240 lookup_r = lookup;
2241 lookup_g = lookup+256;
2242 lookup_b = lookup+256+256;
2243 sh_r = 16;
2244 sh_g = 8;
2245 sh_b = 0;
2246 break;
2247 case 32:
2248 if ((mask_r != 0xff0000) ||
2249 (mask_g != 0x00ff00) ||
2250 (mask_b != 0x0000ff))
2251 return;
2252 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2253 lookup_r = lookup;
2254 lookup_g = lookup+256;
2255 lookup_b = lookup+256+256;
2256 sh_r = 16;
2257 sh_g = 8;
2258 sh_b = 0;
2259 break;
2260 default:
2261 return; /* we do not support this color depth */
2262 }
2263
2264 /* prepare limits for color transformation (each channel is handled separately) */
2265 if (shade < 0) {
2266 shade = -shade;
2267 if (shade < 0) shade = 0;
2268 if (shade > 100) shade = 100;
2269
2270 lower_lim_r = 65535-rm;
2271 lower_lim_g = 65535-gm;
2272 lower_lim_b = 65535-bm;
2273
2274 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2275 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2276 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2277
2278 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2279 } else {
2280 if (shade < 0) shade = 0;
2281 if (shade > 100) shade = 100;
2282
2283 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2284
2285 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2286 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2287 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2288 }
2289
2290 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2291 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2292 {
2293 unsigned int tmp;
2294
2295 tmp = lower_lim_r;
2296 lower_lim_r = lower_lim_b;
2297 lower_lim_b = tmp;
2298
2299 tmp = upper_lim_r;
2300 upper_lim_r = upper_lim_b;
2301 upper_lim_b = tmp;
2302 }
2303
2304 /* fill our lookup tables */
2305 for (i = 0; i <= mask_r>>sh_r; i++)
2306 {
2307 RUINT32T tmp;
2308 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2309 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2310 lookup_r[i] = (tmp/65535)<<sh_r;
2311 }
2312 for (i = 0; i <= mask_g>>sh_g; i++)
2313 {
2314 RUINT32T tmp;
2315 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2316 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2317 lookup_g[i] = (tmp/65535)<<sh_g;
2318 }
2319 for (i = 0; i <= mask_b>>sh_b; i++)
2320 {
2321 RUINT32T tmp;
2322 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2323 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2324 lookup_b[i] = (tmp/65535)<<sh_b;
2325 }
2326
2327 /* apply table to input image (replacing colors by newly calculated ones) */
2328 switch (srcImage->bits_per_pixel)
2329 {
2330 case 15:
2331 {
2332 unsigned short *p1, *pf, *p, *pl;
2333 p1 = (unsigned short *) srcImage->data;
2334 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2335 while (p1 < pf)
2336 {
2337 p = p1;
2338 pl = p1 + srcImage->width;
2339 for (; p < pl; p++)
2340 {
2341 *p = lookup_r[(*p & 0x7c00)>>10] |
2342 lookup_g[(*p & 0x03e0)>> 5] |
2343 lookup_b[(*p & 0x001f)];
2344 }
2345 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2346 }
2347 break;
2348 }
2349 case 16:
2350 {
2351 unsigned short *p1, *pf, *p, *pl;
2352 p1 = (unsigned short *) srcImage->data;
2353 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2354 while (p1 < pf)
2355 {
2356 p = p1;
2357 pl = p1 + srcImage->width;
2358 for (; p < pl; p++)
2359 {
2360 *p = lookup_r[(*p & 0xf800)>>11] |
2361 lookup_g[(*p & 0x07e0)>> 5] |
2362 lookup_b[(*p & 0x001f)];
2363 }
2364 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2365 }
2366 break;
2367 }
2368 case 24:
2369 {
2370 unsigned char *p1, *pf, *p, *pl;
2371 p1 = (unsigned char *) srcImage->data;
2372 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2373 while (p1 < pf)
2374 {
2375 p = p1;
2376 pl = p1 + srcImage->width * 3;
2377 for (; p < pl; p += 3)
2378 {
2379 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2380 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2381 p[2] = lookup_r[(p[2] & 0x0000ff)];
2382 }
2383 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2384 }
2385 break;
2386 }
2387 case 32:
2388 {
2389 RUINT32T *p1, *pf, *p, *pl;
2390 p1 = (RUINT32T *) srcImage->data;
2391 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392
2393 while (p1 < pf)
2394 {
2395 p = p1;
2396 pl = p1 + srcImage->width;
2397 for (; p < pl; p++)
2398 {
2399 *p = lookup_r[(*p & 0xff0000)>>16] |
2400 lookup_g[(*p & 0x00ff00)>> 8] |
2401 lookup_b[(*p & 0x0000ff)] |
2402 (*p & ~0xffffff);
2403 }
2404 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2405 }
2406 break;
2407 }
2408 }
2409
2410 free (lookup);
2411}
2412#endif
2413
2414/*
2415 * Check our parents are still who we think they are.
2416 * Do transparency updates if required
2417 */
2418int
2419rxvt_term::check_our_parents ()
2420{
2421 int i, pchanged, aformat, have_pixmap, rootdepth;
2422 unsigned long nitems, bytes_after;
2423 Atom atype;
2424 unsigned char *prop = NULL;
2425 Window root, oldp, *list;
2426 Pixmap rootpixmap = None;
2427 XWindowAttributes wattr, wrootattr;
2428
2429 pchanged = 0;
2430
2431 if (!OPTION (Opt_transparent))
2432 return pchanged; /* Don't try any more */
2433
2434 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2435 rootdepth = wrootattr.depth;
2436
2437 XGetWindowAttributes (xdisp, parent[0], &wattr);
2438
2439 if (rootdepth != wattr.depth)
2440 {
2441 if (am_transparent)
2442 {
2443 pchanged = 1;
2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2445 am_transparent = am_pixmap_trans = 0;
2446 }
2447
2448 return pchanged; /* Don't try any more */
2449 }
2450
2451 /* Get all X ops out of the queue so that our information is up-to-date. */
2452 XSync (xdisp, False);
2453
2454 /*
2455 * Make the frame window set by the window manager have
2456 * the root background. Some window managers put multiple nested frame
2457 * windows for each client, so we have to take care about that.
2458 */
2459 i = (xa[XA_XROOTPMAP_ID]
2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2462 &nitems, &bytes_after, &prop) == Success);
2463
2464 if (!i || prop == NULL)
2465 i = (xa[XA_ESETROOT_PMAP_ID]
2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success);
2469
2470 if (!i || prop == NULL
2471#if TINTING
2472 || !ISSET_PIXCOLOR (Color_tint)
2473#endif
2474 )
2475 have_pixmap = 0;
2476 else
2477 {
2478 have_pixmap = 1;
2479 rootpixmap = *(Pixmap *)prop;
2480 XFree (prop);
2481 }
2482
2483 if (have_pixmap)
2484 {
2485 /*
2486 * Copy display->root pixmap transparency
2487 */
2488 int sx, sy, nx, ny;
2489 unsigned int nw, nh;
2490 Window cr;
2491 XImage *image;
2492 GC gc;
2493 XGCValues gcvalue;
2494
2495 XTranslateCoordinates (xdisp, parent[0], display->root,
2496 0, 0, &sx, &sy, &cr);
2497 nw = (unsigned int)szHint.width;
2498 nh = (unsigned int)szHint.height;
2499 nx = ny = 0;
2500
2501 if (sx < 0)
2502 {
2503 nw += sx;
2504 nx = -sx;
2505 sx = 0;
2506 }
2507
2508 if (sy < 0)
2509 {
2510 nh += sy;
2511 ny = -sy;
2512 sy = 0;
2513 }
2514
2515 min_it (nw, (unsigned int) (wrootattr.width - sx));
2516 min_it (nh, (unsigned int) (wrootattr.height - sy));
2517
2518 XSync (xdisp, False);
2519 allowedxerror = -1;
2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2521
2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2523 /* XXX: may need a delay here? */
2524 allowedxerror = 0;
2525
2526 if (image == NULL)
2527 {
2528 if (am_transparent && am_pixmap_trans)
2529 {
2530 pchanged = 1;
2531 if (pixmap != None)
2532 {
2533 XFreePixmap (xdisp, pixmap);
2534 pixmap = None;
2535 }
2536 }
2537
2538 am_pixmap_trans = 0;
2539 }
2540 else
2541 {
2542 if (pixmap != None)
2543 XFreePixmap (xdisp, pixmap);
2544
2545#if TINTING
2546 if (ISSET_PIXCOLOR (Color_tint))
2547 {
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 rgba c;
2551 pix_colors_focused [Color_tint].get (c);
2552
2553 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2554 }
2555#endif
2556
2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2559 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (xdisp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2564 XClearWindow (xdisp, parent[0]);
2565
2566 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1;
2568
2569 am_transparent = am_pixmap_trans = 1;
2570 }
2571 }
2572
2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2575 else
2576 {
2577 unsigned int n;
2578 /*
2579 * InheritPixmap transparency
2580 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 {
2583 oldp = parent[i];
2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2585 XFree (list);
2586
2587 if (parent[i] == display->root)
2588 {
2589 if (oldp != None)
2590 pchanged = 1;
2591
2592 break;
2593 }
2594
2595 if (oldp != parent[i])
2596 pchanged = 1;
2597 }
2598
2599 n = 0;
2600
2601 if (pchanged)
2602 for (; n < (unsigned int)i; n++)
2603 {
2604 XGetWindowAttributes (xdisp, parent[n], &wattr);
2605
2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2607 {
2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2609 break;
2610 }
2611 }
2612
2613 if (n > (sizeof (parent) / sizeof (parent[0])))
2614 {
2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2617 am_transparent = 0;
2618 /* XXX: also turn off Opt_transparent? */
2619 }
2620 else
2621 {
2622 for (n = 0; n < (unsigned int)i; n++)
2623 {
2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2625 XClearWindow (xdisp, parent[n]);
2626 }
2627
2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2629 am_transparent = 1;
2630 }
2631
2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2633 parent[i] = None;
2634 }
2635
2636 if (scrollBar.win)
2637 {
2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2639 scrollBar.setIdle ();
2640 scrollbar_show (0);
2641 }
2642
2643 if (am_transparent)
2644 {
2645 want_refresh = want_full_refresh = 1;
2646 if (am_pixmap_trans)
2647 flush ();
2648 }
2649
2650 return pchanged;
2651}
2652#endif
2653 2172
2654/*}}} */ 2173/*}}} */
2655 2174
2656bool 2175bool
2657rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
… …
2706 if (ch == C0_LF) 2225 if (ch == C0_LF)
2707 nlines++; 2226 nlines++;
2708 2227
2709 refresh_count++; 2228 refresh_count++;
2710 2229
2711 if (!OPTION (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2712 || (refresh_count >= refresh_limit * (nrow - 1)))
2713 { 2231 {
2714 refreshnow = true;
2715 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2716 ch = NOCHAR; 2237 ch = NOCHAR;
2717 break; 2238 break;
2239 }
2718 } 2240 }
2719 2241
2720 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2721 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2722 { 2244 {
… …
2750 && 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))))
2751 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2752 2274
2753 /* 2275 /*
2754 * 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
2755 * 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.
2756 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2757 * is incremented here because we must be doing flat-out scrolling.
2758 */ 2279 */
2759 if (refreshnow) 2280 if (refreshnow)
2760 { 2281 {
2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2762 refresh_limit++;
2763 else
2764 {
2765 flag = true; 2282 flag = true;
2766 scr_refresh (); 2283 scr_refresh ();
2767 want_refresh = 1; 2284 want_refresh = 1;
2768 }
2769 } 2285 }
2770 2286
2771 } 2287 }
2772 else 2288 else
2773 { 2289 {
… …
2922 { 2438 {
2923 if ((buf[len++] = cmd_getc ()) == 'i') 2439 if ((buf[len++] = cmd_getc ()) == 'i')
2924 break; /* done = 1 */ 2440 break; /* done = 1 */
2925 } 2441 }
2926 } 2442 }
2927 2443
2928 for (i = 0; i < len; i++) 2444 for (i = 0; i < len; i++)
2929 if (putc (buf[i], fd) == EOF) 2445 if (putc (buf[i], fd) == EOF)
2930 { 2446 {
2931 done = 1; 2447 done = 1;
2932 break; 2448 break;
… …
2934 } 2450 }
2935 } 2451 }
2936 2452
2937 pclose_printer (fd); 2453 pclose_printer (fd);
2938} 2454}
2939#endif /* PRINTPIPE */ 2455#endif /* PRINTPIPE */
2940/*}}} */ 2456/*}}} */
2941 2457
2942/* *INDENT-OFF* */ 2458/* *INDENT-OFF* */
2943enum { 2459enum {
2944 C1_40 = 0x40, 2460 C1_40 = 0x40,
… …
2994 process_dcs_seq (); 2510 process_dcs_seq ();
2995 break; 2511 break;
2996 case 0x9b: /* CSI */ 2512 case 0x9b: /* CSI */
2997 process_csi_seq (); 2513 process_csi_seq ();
2998 break; 2514 break;
2999 case 0x9d: /* CSI */ 2515 case 0x9d: /* OSC */
3000 process_osc_seq (); 2516 process_osc_seq ();
3001 break; 2517 break;
3002#endif 2518#endif
3003 } 2519 }
3004} 2520}
… …
3230rxvt_term::process_csi_seq () 2746rxvt_term::process_csi_seq ()
3231{ 2747{
3232 unicode_t ch, priv, i; 2748 unicode_t ch, priv, i;
3233 unsigned int nargs, p; 2749 unsigned int nargs, p;
3234 int n, ndef; 2750 int n, ndef;
3235 int arg[ESC_ARGS]; 2751 int arg[ESC_ARGS] = { };
3236 2752
3237 for (nargs = ESC_ARGS; nargs > 0;) 2753 nargs = 0;
3238 arg[--nargs] = 0;
3239 2754
3240 priv = 0; 2755 priv = 0;
3241 ch = cmd_getc (); 2756 ch = cmd_getc ();
3242 if (ch >= '<' && ch <= '?') 2757 if (ch >= '<' && ch <= '?')
2758 {
3243 { /* '<' '=' '>' '?' */ 2759 /* '<' '=' '>' '?' */
3244 priv = ch; 2760 priv = ch;
3245 ch = cmd_getc (); 2761 ch = cmd_getc ();
3246 } 2762 }
3247 2763
3248 /* read any numerical arguments */ 2764 /* read any numerical arguments */
… …
3287 switch (priv) 2803 switch (priv)
3288 { 2804 {
3289 case '>': 2805 case '>':
3290 if (ch == CSI_DA) /* secondary device attributes */ 2806 if (ch == CSI_DA) /* secondary device attributes */
3291 { 2807 {
3292 // 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,
3293 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2809 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3294 // 2810 //
3295 // 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
3296 // 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
3297 // that we do not support xterm mouse reporting (should be 95 when we do). 2813 // versions.
3298 // 2814 //
3299 tt_printf ("\033[>%d;94;0c", 'U'); 2815 tt_printf ("\033[>%d;95;0c", 'U');
3300 } 2816 }
3301 break; 2817 break;
3302 case '?': 2818 case '?':
3303 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2819 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3304 process_terminal_mode (ch, priv, nargs, arg); 2820 process_terminal_mode (ch, priv, nargs, arg);
… …
3431 break; 2947 break;
3432 case 6: /* CPR requested */ 2948 case 6: /* CPR requested */
3433 scr_report_position (); 2949 scr_report_position ();
3434 break; 2950 break;
3435 case 7: /* unofficial extension */ 2951 case 7: /* unofficial extension */
3436 if (OPTION (Opt_insecure)) 2952 if (option (Opt_insecure))
3437 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2953 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3438 break; 2954 break;
3439 case 8: /* unofficial extension */ 2955 case 8: /* unofficial extension */
3440 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2956 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3441 break; 2957 break;
… …
3534{ 3050{
3535 int x, y; 3051 int x, y;
3536 XWindowAttributes wattr; 3052 XWindowAttributes wattr;
3537 Window wdummy; 3053 Window wdummy;
3538 3054
3539 dLocal (Display *, xdisp); 3055 dLocal (Display *, dpy);
3540 3056
3541 if (nargs == 0) 3057 if (nargs == 0)
3542 return; 3058 return;
3543 3059
3544 switch (args[0]) 3060 switch (args[0])
3545 { 3061 {
3546 /* 3062 /*
3547 * commands 3063 * commands
3548 */ 3064 */
3549 case 1: /* deiconify window */ 3065 case 1: /* deiconify window */
3550 XMapWindow (xdisp, parent[0]); 3066 XMapWindow (dpy, parent[0]);
3551 break; 3067 break;
3552 case 2: /* iconify window */ 3068 case 2: /* iconify window */
3553 XIconifyWindow (xdisp, parent[0], display->screen); 3069 XIconifyWindow (dpy, parent[0], display->screen);
3554 break; 3070 break;
3555 case 3: /* set position (pixels) */ 3071 case 3: /* set position (pixels) */
3556 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3072 XMoveWindow (dpy, parent[0], args[1], args[2]);
3557 break; 3073 break;
3558 case 4: /* set size (pixels) */ 3074 case 4: /* set size (pixels) */
3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3075 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3560 break; 3076 break;
3561 case 5: /* raise window */ 3077 case 5: /* raise window */
3562 XRaiseWindow (xdisp, parent[0]); 3078 XRaiseWindow (dpy, parent[0]);
3563 break; 3079 break;
3564 case 6: /* lower window */ 3080 case 6: /* lower window */
3565 XLowerWindow (xdisp, parent[0]); 3081 XLowerWindow (dpy, parent[0]);
3566 break; 3082 break;
3567 case 7: /* refresh window */ 3083 case 7: /* refresh window */
3568 scr_touch (true); 3084 scr_touch (true);
3569 break; 3085 break;
3570 case 8: /* set size (chars) */ 3086 case 8: /* set size (chars) */
… …
3581 3097
3582 /* 3098 /*
3583 * reports - some output format copied from XTerm 3099 * reports - some output format copied from XTerm
3584 */ 3100 */
3585 case 11: /* report window state */ 3101 case 11: /* report window state */
3586 XGetWindowAttributes (xdisp, parent[0], &wattr); 3102 XGetWindowAttributes (dpy, parent[0], &wattr);
3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3103 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3588 break; 3104 break;
3589 case 13: /* report window position */ 3105 case 13: /* report window position */
3590 XGetWindowAttributes (xdisp, parent[0], &wattr); 3106 XGetWindowAttributes (dpy, parent[0], &wattr);
3591 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3107 XTranslateCoordinates (dpy, parent[0], wattr.root,
3592 -wattr.border_width, -wattr.border_width, 3108 -wattr.border_width, -wattr.border_width,
3593 &x, &y, &wdummy); 3109 &x, &y, &wdummy);
3594 tt_printf ("\033[3;%d;%dt", x, y); 3110 tt_printf ("\033[3;%d;%dt", x, y);
3595 break; 3111 break;
3596 case 14: /* report window size (pixels) */ 3112 case 14: /* report window size (pixels) */
3597 XGetWindowAttributes (xdisp, parent[0], &wattr); 3113 XGetWindowAttributes (dpy, parent[0], &wattr);
3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3114 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3599 break; 3115 break;
3600 case 18: /* report text area size (chars) */ 3116 case 18: /* report text area size (chars) */
3601 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3117 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3602 break; 3118 break;
… …
3604 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3120 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3605 break; 3121 break;
3606 case 20: /* report icon label */ 3122 case 20: /* report icon label */
3607 { 3123 {
3608 char *s; 3124 char *s;
3609 XGetIconName (xdisp, parent[0], &s); 3125 XGetIconName (dpy, parent[0], &s);
3610 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 */
3611 XFree (s); 3127 XFree (s);
3612 } 3128 }
3613 break; 3129 break;
3614 case 21: /* report window title */ 3130 case 21: /* report window title */
3615 { 3131 {
3616 char *s; 3132 char *s;
3617 XFetchName (xdisp, parent[0], &s); 3133 XFetchName (dpy, parent[0], &s);
3618 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 */
3619 XFree (s); 3135 XFree (s);
3620 } 3136 }
3621 break; 3137 break;
3622 } 3138 }
3623} 3139}
… …
3650 seen_esc = true; 3166 seen_esc = true;
3651 continue; 3167 continue;
3652 } 3168 }
3653 else if (ch == C0_BEL || ch == CHAR_ST) 3169 else if (ch == C0_BEL || ch == CHAR_ST)
3654 break; 3170 break;
3171 else if (ch == C0_SYN)
3172 ch = cmd_get8 ();
3655 else if (ch < 0x20) 3173 else if (ch < 0x20)
3656 return NULL; /* other control character - exit */ 3174 return NULL; /* other control character - exit */
3657 3175
3658 seen_esc = false; 3176 seen_esc = false;
3659 3177
3660 if (n >= STRING_MAX - 1) 3178 if (n >= STRING_MAX - 1)
3661 // stop at some sane length 3179 // stop at some sane length
3662 return NULL; 3180 return NULL;
3663 3181
3664 if (ch == C0_SYN)
3665 string[n++] = cmd_get8 ();
3666 else
3667 string[n++] = ch; 3182 string[n++] = ch;
3668 } 3183 }
3669 3184
3670 string[n++] = '\0'; 3185 string[n++] = '\0';
3671 3186
3672 ends_how = (ch == 0x5c ? C0_ESC : ch); 3187 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3748 int color; 3263 int color;
3749 char *buf, *name; 3264 char *buf, *name;
3750 bool query = str[0] == '?' && !str[1]; 3265 bool query = str[0] == '?' && !str[1];
3751 int saveop = op; 3266 int saveop = op;
3752 3267
3753 dLocal (Display *, xdisp); 3268 dLocal (Display *, dpy);
3754 3269
3755 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
3756 switch (op) 3275 switch (op)
3757 { 3276 {
3758 case XTerm_name: 3277 case XTerm_name:
3759 set_title (str); 3278 set_title (str);
3760 /* FALLTHROUGH */ 3279 /* FALLTHROUGH */
… …
3774 unsigned long bytes_after; 3293 unsigned long bytes_after;
3775 unsigned char *value = 0; 3294 unsigned char *value = 0;
3776 const char *str = ""; 3295 const char *str = "";
3777 3296
3778 if (prop 3297 if (prop
3779 && XGetWindowProperty (xdisp, parent[0], 3298 && XGetWindowProperty (dpy, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType, 3299 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format, 3300 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success 3301 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None 3302 && actual_type != None
3784 && actual_format == 8) 3303 && actual_format == 8)
… …
3796 { 3315 {
3797 *eq = 0; 3316 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1); 3317 set_utf8_property (display->atom (str), eq + 1);
3799 } 3318 }
3800 else 3319 else
3801 XDeleteProperty (xdisp, parent[0], 3320 XDeleteProperty (dpy, parent[0],
3802 display->atom (str)); 3321 display->atom (str));
3803 } 3322 }
3804 break; 3323 break;
3805 3324
3806 case XTerm_Color: 3325 case XTerm_Color:
… …
3852 break; 3371 break;
3853 case URxvt_Color_IT: 3372 case URxvt_Color_IT:
3854 process_color_seq (op, Color_IT, str, resp); 3373 process_color_seq (op, Color_IT, str, resp);
3855 break; 3374 break;
3856#endif 3375#endif
3857#if TRANSPARENT && TINTING 3376#if ENABLE_TRANSPARENCY
3858 case URxvt_Color_tint: 3377 case URxvt_Color_tint:
3859 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 }
3860 3388
3861 check_our_parents ();
3862
3863 if (am_transparent)
3864 want_full_refresh = want_refresh = 1;
3865
3866 break; 3389 break;
3867#endif 3390#endif
3868 3391
3392#if BG_IMAGE_FROM_FILE
3869 case Rxvt_Pixmap: 3393 case Rxvt_Pixmap:
3870 { 3394 if (!strcmp (str, "?"))
3871 if (*str != ';')
3872 { 3395 {
3873#if XPM_BACKGROUND 3396 char str[256];
3874 scale_pixmap (""); /* reset to default scaling */ 3397
3875 set_bgPixmap (str); /* change pixmap */ 3398 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3876 scr_touch (true); 3399 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3877#endif 3400 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3401 process_xterm_seq (XTerm_title, str, CHAR_ST);
3878 } 3402 }
3879 3403 else
3404 {
3880 int changed = 0; 3405 int changed = 0;
3881 3406
3882 while ((str = strchr (str, ';')) != NULL) 3407 if (*str != ';')
3883 { 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 {
3884 str++; 3419 str++;
3885#if XPM_BACKGROUND 3420 if (bgPixmap.set_geometry (str))
3886 changed += scale_pixmap (str); 3421 changed++;
3887#endif 3422 str = strchr (str, ';');
3888 } 3423 }
3889
3890 if (changed) 3424 if (changed)
3891 { 3425 update_background ();
3892#ifdef XPM_BACKGROUND
3893 resize_pixmap ();
3894 scr_touch (true);
3895#endif
3896 } 3426 }
3897 }
3898 break; 3427 break;
3428#endif
3899 3429
3900 case Rxvt_restoreFG: 3430 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3431 set_window_color (Color_fg, str);
3902 break; 3432 break;
3903 case Rxvt_restoreBG: 3433 case Rxvt_restoreBG:
… …
3928 case URxvt_italicFont: 3458 case URxvt_italicFont:
3929 case URxvt_boldItalicFont: 3459 case URxvt_boldItalicFont:
3930#endif 3460#endif
3931 if (query) 3461 if (query)
3932 tt_printf ("\33]%d;%-.250s%c", saveop, 3462 tt_printf ("\33]%d;%-.250s%c", saveop,
3933 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3463 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3934 ? fontset[op - URxvt_font]->fontdesc : "", 3464 ? fontset[op - URxvt_font]->fontdesc : "",
3935 resp); 3465 resp);
3936 else 3466 else
3937 { 3467 {
3938 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3468 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3952 break; 3482 break;
3953 3483
3954#if !ENABLE_MINIMAL 3484#if !ENABLE_MINIMAL
3955 case URxvt_locale: 3485 case URxvt_locale:
3956 if (query) 3486 if (query)
3957 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);
3958 else 3488 else
3959 { 3489 {
3960 set_locale (str); 3490 set_locale (str);
3961 pty->set_utf8_mode (enc_utf8); 3491 pty->set_utf8_mode (enc_utf8);
3962 init_xlocale (); 3492 init_xlocale ();
… …
3977 break; 3507 break;
3978#endif 3508#endif
3979 3509
3980#if ENABLE_PERL 3510#if ENABLE_PERL
3981 case URxvt_perl: 3511 case URxvt_perl:
3982 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)))
3983 ; // no responses yet 3513 ; // no responses yet
3984 break; 3514 break;
3985#endif 3515#endif
3986 } 3516 }
3987} 3517}
… …
4025{ 3555{
4026 unsigned int i, j; 3556 unsigned int i, j;
4027 int state; 3557 int state;
4028 3558
4029 static const struct 3559 static const struct
4030 { 3560 {
4031 const int argval; 3561 const int argval;
4032 const unsigned long bit; 3562 const unsigned long bit;
4033 }
4034
4035 argtopriv[] = { 3563 } argtopriv[] = {
4036 { 1, PrivMode_aplCUR }, 3564 { 1, PrivMode_aplCUR },
4037 { 2, PrivMode_vt52 }, 3565 { 2, PrivMode_vt52 },
4038 { 3, PrivMode_132 }, 3566 { 3, PrivMode_132 },
4039 { 4, PrivMode_smoothScroll }, 3567 { 4, PrivMode_smoothScroll },
4040 { 5, PrivMode_rVideo }, 3568 { 5, PrivMode_rVideo },
… …
4056 { 66, PrivMode_aplKP }, 3584 { 66, PrivMode_aplKP },
4057#ifndef NO_BACKSPACE_KEY 3585#ifndef NO_BACKSPACE_KEY
4058 { 67, PrivMode_BackSpace }, 3586 { 67, PrivMode_BackSpace },
4059#endif 3587#endif
4060 { 1000, PrivMode_MouseX11 }, 3588 { 1000, PrivMode_MouseX11 },
4061 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3589 { 1002, PrivMode_MouseBtnEvent },
4062 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3590 { 1003, PrivMode_MouseAnyEvent },
4063 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4064 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4065 { 1011, PrivMode_Keypress }, // rxvt extension 3592 { 1011, PrivMode_Keypress }, // rxvt extension
4066 // 1035 enable modifiers for alt, numlock NYI 3593 // 1035 enable modifiers for alt, numlock NYI
4067 // 1036 send ESC for meta keys NYI 3594 // 1036 send ESC for meta keys NYI
4068 // 1037 send DEL for keypad delete NYI 3595 // 1037 send DEL for keypad delete NYI
… …
4103 scr_touch (true); 3630 scr_touch (true);
4104 break; 3631 break;
4105#endif 3632#endif
4106 case 1048: /* alternative cursor save */ 3633 case 1048: /* alternative cursor save */
4107 case 1049: 3634 case 1049:
4108 if (OPTION (Opt_secondaryScreen)) 3635 if (option (Opt_secondaryScreen))
4109 if (mode == 0) 3636 if (mode == 0)
4110 scr_cursor (RESTORE); 3637 scr_cursor (RESTORE);
4111 else if (mode == 1) 3638 else if (mode == 1)
4112 scr_cursor (SAVE); 3639 scr_cursor (SAVE);
4113 break; 3640 break;
… …
4142 scr_autowrap (state); 3669 scr_autowrap (state);
4143 break; 3670 break;
4144 /* 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 */
4145 case 9: /* X10 mouse reporting */ 3672 case 9: /* X10 mouse reporting */
4146 if (state) /* orthogonal */ 3673 if (state) /* orthogonal */
4147 priv_modes &= ~PrivMode_MouseX11; 3674 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4148 break; 3675 break;
4149#ifdef scrollBar_esc 3676#ifdef scrollBar_esc
4150 case scrollBar_esc: 3677 case scrollBar_esc:
4151 if (scrollbar_mapping (state)) 3678 if (scrollbar_mapping (state))
4152 { 3679 {
… …
4165 break; 3692 break;
4166 /* case 66: - application key pad */ 3693 /* case 66: - application key pad */
4167 /* case 67: - backspace key */ 3694 /* case 67: - backspace key */
4168 case 1000: /* X11 mouse reporting */ 3695 case 1000: /* X11 mouse reporting */
4169 if (state) /* orthogonal */ 3696 if (state) /* orthogonal */
4170 priv_modes &= ~PrivMode_MouseX10; 3697 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4171 break; 3698 break;
4172#if 0
4173 case 1001: 3699 case 1002:
4174 break; /* X11 mouse highlighting */ 3700 case 1003:
4175#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;
4176 case 1010: /* scroll to bottom on TTY output inhibit */ 3711 case 1010: /* scroll to bottom on TTY output inhibit */
4177 set_option (Opt_scrollTtyOutput, !state); 3712 set_option (Opt_scrollTtyOutput, !state);
4178 break; 3713 break;
4179 case 1011: /* scroll to bottom on key press */ 3714 case 1011: /* scroll to bottom on key press */
4180 set_option (Opt_scrollTtyKeypress, state); 3715 set_option (Opt_scrollTtyKeypress, state);
4181 break; 3716 break;
4182 case 1047: /* secondary screen w/ clearing last */ 3717 case 1047: /* secondary screen w/ clearing last */
4183 if (OPTION (Opt_secondaryScreen)) 3718 if (option (Opt_secondaryScreen))
4184 if (current_screen != PRIMARY) 3719 if (current_screen != PRIMARY)
4185 scr_erase_screen (2); 3720 scr_erase_screen (2);
4186 scr_change_screen (state); 3721 scr_change_screen (state);
4187 break; 3722 break;
4188 case 1049: /* secondary screen w/ clearing first */ 3723 case 1049: /* secondary screen w/ clearing first */
4189 scr_change_screen (state); 3724 scr_change_screen (state);
4190 if (OPTION (Opt_secondaryScreen)) 3725 if (option (Opt_secondaryScreen))
4191 if (current_screen != PRIMARY) 3726 if (current_screen != PRIMARY)
4192 scr_erase_screen (2); 3727 scr_erase_screen (2);
4193 break; 3728 break;
4194 default: 3729 default:
4195 break; 3730 break;
… …
4357rxvt_term::process_graphics () 3892rxvt_term::process_graphics ()
4358{ 3893{
4359 unicode_t ch, cmd = cmd_getc (); 3894 unicode_t ch, cmd = cmd_getc ();
4360 3895
4361 if (cmd == 'Q') 3896 if (cmd == 'Q')
3897 {
4362 { /* query graphics */ 3898 /* query graphics */
4363 tt_printf ("\033G0\012"); /* no graphics */ 3899 tt_printf ("\033G0\012"); /* no graphics */
4364 return; 3900 return;
4365 } 3901 }
4366 /* swallow other graphics sequences until terminating ':' */ 3902 /* swallow other graphics sequences until terminating ':' */
4367 do 3903 do
… …
4417 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3953 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4418 3954
4419 memcpy (v_buffer + v_buflen, data, len); 3955 memcpy (v_buffer + v_buflen, data, len);
4420 v_buflen += len; 3956 v_buflen += len;
4421 3957
4422 pty_ev.set (EVENT_READ | EVENT_WRITE); 3958 pty_ev.set (ev::READ | ev::WRITE);
4423} 3959}
4424 3960
4425void rxvt_term::pty_write () 3961void rxvt_term::pty_write ()
4426{ 3962{
4427 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));
… …
4432 3968
4433 if (v_buflen == 0) 3969 if (v_buflen == 0)
4434 { 3970 {
4435 free (v_buffer); 3971 free (v_buffer);
4436 v_buffer = 0; 3972 v_buffer = 0;
4437 v_buflen = 0;
4438 3973
4439 pty_ev.set (EVENT_READ); 3974 pty_ev.set (ev::READ);
4440 return; 3975 return;
4441 } 3976 }
4442 3977
4443 memmove (v_buffer, v_buffer + written, v_buflen); 3978 memmove (v_buffer, v_buffer + written, v_buflen);
4444 } 3979 }
4445 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3980 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4446 pty_ev.set (EVENT_READ); 3981 pty_ev.set (ev::READ);
4447} 3982}
4448 3983
4449/*----------------------- end-of-file (C source) -----------------------*/ 3984/*----------------------- end-of-file (C source) -----------------------*/
4450 3985

Diff Legend

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