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.301 by root, Tue Jan 31 21:23:13 2006 UTC vs.
Revision 1.377 by root, Fri Dec 14 02:22:24 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>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
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 && !flush_ev.is_active ())
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); 1127 }
1128 else
1129 w.stop ();
1130}
1131#endif
1132
1133#if LINUX_YIELD_HACK
1134static struct event_handler
1135{
1136 ev::prepare yield_ev;
1137
1138 void yield_cb (ev::prepare &w, int revents)
1139 {
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
1148 w.stop ();
1091 } 1149 }
1092} 1150
1151 event_handler ()
1152 : yield_ev (this, &event_handler::yield_cb)
1153 {
1154 }
1155} event_handler;
1093#endif 1156#endif
1094 1157
1095bool 1158bool
1096rxvt_term::pty_fill () 1159rxvt_term::pty_fill ()
1097{ 1160{
… …
1114 cmdbuf_endp += r; 1177 cmdbuf_endp += r;
1115 return true; 1178 return true;
1116 } 1179 }
1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1180 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 { 1181 {
1119#if HAVE_SCHED_YIELD 1182#if LINUX_YIELD_HACK
1120 if (display->is_local) 1183 if (display->is_local)
1121 event_handler.cw_yield.start (); 1184 event_handler.yield_ev.start ();
1122#endif 1185#endif
1123 } 1186 }
1124 else 1187 else
1125 { 1188 {
1126 pty_ev.stop (); 1189 pty_ev.stop ();
1127 1190
1128 if (!OPTION (Opt_hold)) 1191 if (!option (Opt_hold))
1129 destroy (); 1192 destroy ();
1130 } 1193 }
1131 1194
1132 return false; 1195 return false;
1133} 1196}
1134 1197
1135void 1198void
1136rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1137{ 1200{
1138 make_current (); 1201 make_current ();
1139 1202
1140 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1141 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1205 while (pty_fill ())
1143 if (cmd_parse ()) 1206 if (cmd_parse ())
1144 break; 1207 break;
1145 1208
1146 if (revents & EVENT_WRITE) 1209 if (revents & ev::WRITE)
1147 pty_write (); 1210 pty_write ();
1148} 1211}
1149 1212
1150void 1213void
1151rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1152{ 1215{
1153 XDefineCursor (xdisp, vt, TermWin_cursor); 1216 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1217 recolour_cursor ();
1155 1218
1156#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1220 hidden_pointer = 0;
1158 1221
1159 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1161#endif 1224#endif
1162} 1225}
1163 1226
1164#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1165void 1228void
1166rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1167{ 1230{
1168 if (!OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1169 return; 1232 return;
1170 1233
1171 XDefineCursor (xdisp, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (xdisp); 1235 XFlush (dpy);
1173 1236
1174 hidden_pointer = 1; 1237 hidden_pointer = 1;
1175} 1238}
1176 1239
1177void 1240void
1178rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1179{ 1242{
1180 make_current (); 1243 make_current ();
1181 1244
1182 pointer_blank (); 1245 pointer_blank ();
1183} 1246}
… …
1186void 1249void
1187rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1188{ 1251{
1189 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1190 int x, y; 1253 int x, y;
1254 int code = 32;
1191 1255
1192 x = ev.x; 1256 x = Pixel2Col (ev.x);
1193 y = ev.y; 1257 y = Pixel2Row (ev.y);
1194 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 }
1195 1266
1196 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1197 button_number = 3; 1268 button_number = 3;
1198 else 1269 else
1199 { 1270 {
… …
1245 x + 1, 1316 x + 1,
1246 y + 1); 1317 y + 1);
1247#endif 1318#endif
1248 1319
1249 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1250 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1251 (32 + x + 1), 1322 (32 + x + 1),
1252 (32 + y + 1)); 1323 (32 + y + 1));
1253} 1324}
1254 1325
1255/*{{{ process an X event */ 1326/*{{{ process an X event */
1256void 1327void
1257rxvt_term::x_cb (XEvent &ev) 1328rxvt_term::x_cb (XEvent &ev)
1258{ 1329{
1259 make_current (); 1330 make_current ();
1260 1331
1261 dLocal (Display *, xdisp); 1332 dLocal (Display *, dpy);
1262 1333
1263 if (ev.xany.window == vt 1334 if (ev.xany.window == vt
1264 && SHOULD_INVOKE (HOOK_X_EVENT) 1335 && SHOULD_INVOKE (HOOK_X_EVENT)
1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1336 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1266 return; 1337 return;
… …
1271 unsigned int unused_mask; 1342 unsigned int unused_mask;
1272 1343
1273 switch (ev.type) 1344 switch (ev.type)
1274 { 1345 {
1275 case KeyPress: 1346 case KeyPress:
1276#if ISO_14755 1347 key_press (ev.xkey);
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1279 lookup_key (ev.xkey);
1280
1281 break; 1348 break;
1282 1349
1283 case KeyRelease: 1350 case KeyRelease:
1284 { 1351 key_release (ev.xkey);
1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1286 KeySym keysym;
1287
1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1289#endif
1290
1291#if ENABLE_FRILLS || ISO_14755
1292 // ISO 14755 support
1293 if (iso14755buf)
1294 if (iso14755buf & ISO_14755_52)
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299# if ISO_14755
1300 // iso14755 part 5.2 handling: release time
1301 // first: controls
1302 if ((ev.xkey.state & ControlMask)
1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1305 {
1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1307 commit_iso14755 ();
1308 goto skip_switch;
1309 }
1310
1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1312 if (i[0] == keysym)
1313 {
1314 iso14755buf = ISO_14755_51 | i[1];
1315 commit_iso14755 ();
1316 goto skip_switch;
1317 }
1318
1319 scr_bell ();
1320# endif
1321 iso14755buf = 0;
1322 break;
1323 }
1324 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1325 {
1326# if ENABLE_OVERLAY
1327 scr_overlay_off ();
1328# endif
1329 if (iso14755buf & ISO_14755_51)
1330 commit_iso14755 ();
1331#if ISO_14755
1332 else if (iso14755buf & ISO_14755_STARTED)
1333 {
1334 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1335
1336 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1337 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1338 }
1339# endif
1340 else
1341 iso14755buf = 0;
1342 }
1343#endif
1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop ();
1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0;
1354#endif
1355 break; 1352 break;
1356 }
1357 1353
1358 case ButtonPress: 1354 case ButtonPress:
1359 button_press (ev.xbutton); 1355 button_press (ev.xbutton);
1360 break; 1356 break;
1361 1357
… …
1376 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)))
1377 destroy (); 1373 destroy ();
1378 } 1374 }
1379#if ENABLE_EWMH 1375#if ENABLE_EWMH
1380 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])
1381 XSendEvent (xdisp, ev.xclient.window = display->root, 1377 XSendEvent (dpy, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask, 1378 False, SubstructureRedirectMask | SubstructureNotifyMask,
1383 &ev); 1379 &ev);
1384#endif 1380#endif
1385 } 1381 }
1386 } 1382 }
… …
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out (); 1389 focus_out ();
1394 } 1390 }
1395#endif 1391#endif
1396 } 1392 }
1397 break;
1398
1399 case MappingNotify:
1400 XRefreshKeyboardMapping (&ev.xmapping);
1401 break; 1393 break;
1402 1394
1403 /* 1395 /*
1404 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1405 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1424 break; 1416 break;
1425 } 1417 }
1426 break; 1418 break;
1427 1419
1428 case FocusIn: 1420 case FocusIn:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1429 focus_in (); 1424 focus_in ();
1430 break; 1425 break;
1431 1426
1432 case FocusOut: 1427 case FocusOut:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1431 focus_out ();
1434 break; 1432 break;
1435 1433
1436 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); */
1437 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1438 { 1439 {
1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1440 ; 1441 ;
1441 1442
1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1444 {
1444 seen_resize = 1; 1445 seen_resize = 1;
1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1447 }
1447 1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 update_background ();
1453#endif
1454 }
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (OPTION (Opt_transparent))
1452 check_our_parents ();
1453#endif
1454 } 1456 }
1455 break; 1457 break;
1456 1458
1457 case PropertyNotify: 1459 case PropertyNotify:
1458 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)))
… …
1476 break; 1478 break;
1477 1479
1478 case MapNotify: 1480 case MapNotify:
1479 mapped = 1; 1481 mapped = 1;
1480#ifdef TEXT_BLINK 1482#ifdef TEXT_BLINK
1481 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1483 text_blink_ev.start ();
1482#endif 1484#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1486 break;
1485 1487
1486 case UnmapNotify: 1488 case UnmapNotify:
… …
1488#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1489 text_blink_ev.stop (); 1491 text_blink_ev.stop ();
1490#endif 1492#endif
1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 break; 1494 break;
1493
1494#ifdef TRANSPARENT
1495 case ReparentNotify:
1496 rootwin_cb (ev);
1497 break;
1498#endif /* TRANSPARENT */
1499 1495
1500 case GraphicsExpose: 1496 case GraphicsExpose:
1501 case Expose: 1497 case Expose:
1502 if (ev.xany.window == vt) 1498 if (ev.xany.window == vt)
1503 { 1499 {
1504 do 1500 do
1501 {
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1504 }
1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1508 1506
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1508
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 {
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1514 1513 }
1515 want_refresh = 1; 1514 want_refresh = 1;
1516 } 1515 }
1517 else 1516 else
1518 { 1517 {
1519 XEvent unused_event; 1518 XEvent unused_event;
1520 1519
1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1522 ; 1521 ;
1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1523 ;
1525 1524
1526 if (isScrollbarWindow (ev.xany.window)) 1525 if (isScrollbarWindow (ev.xany.window))
1527 { 1526 {
1528 scrollBar.setIdle (); 1527 scrollBar.setIdle ();
1529 scrollbar_show (0); 1528 scrollbar_show (0);
1530 } 1529 }
1531
1532#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window);
1535#endif
1536 } 1530 }
1537 break; 1531 break;
1538 1532
1539 case MotionNotify: 1533 case MotionNotify:
1540#ifdef POINTER_BLANK 1534#ifdef POINTER_BLANK
1541 if (hidden_pointer) 1535 if (hidden_pointer)
1542 pointer_unblank (); 1536 pointer_unblank ();
1543#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);
1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1545 break; 1542 break;
1546 1543
1547 if (ev.xany.window == vt) 1544 if (ev.xany.window == vt)
1548 { 1545 {
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1546 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1547 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop 1548 ; // nop
1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1549 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1550 {
1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1552 ;
1556 1553
1557 XQueryPointer (xdisp, vt, 1554 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1555 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1556 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1557 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1558 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1559#ifdef MOUSE_THRESHOLD
… …
1582 int dist; 1579 int dist;
1583 1580
1584 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1586 */ 1583 */
1587 if (!sel_scroll_ev.active) 1584 if (!sel_scroll_ev.is_active ())
1588 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1589 1586
1590 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1591 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1592 */ 1589 */
1593 selection_save_x = ev.xbutton.x; 1590 selection_save_x = ev.xbutton.x;
… …
1615 else 1612 else
1616 { 1613 {
1617 /* we are within the text window, so we 1614 /* we are within the text window, so we
1618 * shouldn't be scrolling 1615 * shouldn't be scrolling
1619 */ 1616 */
1620 if (sel_scroll_ev.active)
1621 sel_scroll_ev.stop(); 1617 sel_scroll_ev.stop();
1622 } 1618 }
1623#endif 1619#endif
1624#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
1625 } 1621 }
1626#endif 1622#endif
1627 } 1623 }
1628 } 1624 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1630 { 1626 {
1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1627 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1628 MotionNotify, &ev))
1633 ; 1629 ;
1634 1630
1635 XQueryPointer (xdisp, scrollBar.win, 1631 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1632 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1633 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1634 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1635 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1637 scrollbar_size ());
1642 want_refresh = 1; 1638 want_refresh = 1;
1643 refresh_limit = 0;
1644 scrollbar_show (1); 1639 scrollbar_show (1);
1645 } 1640 }
1646 break; 1641 break;
1647 } 1642 }
1648 1643
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK) 1644#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1645 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1653 { 1646 {
1654 if (hidden_cursor) 1647 if (hidden_cursor)
1655 { 1648 {
1656 hidden_cursor = 0; 1649 hidden_cursor = 0;
1657 want_refresh = 1; 1650 want_refresh = 1;
1658 } 1651 }
1659 1652
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1653 cursor_blink_ev.again ();
1661 } 1654 }
1662#endif 1655#endif
1663 1656
1664#if defined(POINTER_BLANK) 1657#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1658 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 { 1659 {
1667 if (ev.type == MotionNotify 1660 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress 1661 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease) 1662 || ev.type == ButtonRelease)
1670 if (hidden_pointer) 1663 if (hidden_pointer)
… …
1682 if (!focus) 1675 if (!focus)
1683 { 1676 {
1684 focus = 1; 1677 focus = 1;
1685 want_refresh = 1; 1678 want_refresh = 1;
1686 1679
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1680 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1688 1681
1689#if USE_XIM 1682#if USE_XIM
1690 if (Input_Context != NULL) 1683 if (Input_Context != NULL)
1691 { 1684 {
1692 IMSetStatusPosition (); 1685 IMSetPosition ();
1693 XSetICFocus (Input_Context); 1686 XSetICFocus (Input_Context);
1694 } 1687 }
1695#endif 1688#endif
1696#if CURSOR_BLINK 1689#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink)) 1690 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1691 cursor_blink_ev.again ();
1699#endif 1692#endif
1700#if OFF_FOCUS_FADING 1693#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade]) 1694 if (rs[Rs_fade])
1702 { 1695 {
1703 pix_colors = pix_colors_focused; 1696 pix_colors = pix_colors_focused;
1704 scr_recolour (); 1697 scr_recolour ();
1705 } 1698 }
1706#endif 1699#endif
1700#if ENABLE_FRILLS
1701 if (option (Opt_urgentOnBell))
1702 {
1703 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1704 {
1705 h->flags &= ~XUrgencyHint;
1706 XSetWMHints (dpy, parent[0], h);
1707 }
1708 }
1709#endif
1707 } 1710 }
1708} 1711}
1709 1712
1710void 1713void
1711rxvt_term::focus_out () 1714rxvt_term::focus_out ()
… …
1719 1722
1720#if ENABLE_FRILLS || ISO_14755 1723#if ENABLE_FRILLS || ISO_14755
1721 if (iso14755buf) 1724 if (iso14755buf)
1722 { 1725 {
1723 iso14755buf = 0; 1726 iso14755buf = 0;
1724# if ENABLE_OVERLAY 1727# if ISO_14755
1725 scr_overlay_off (); 1728 scr_overlay_off ();
1726# endif 1729# endif
1727 } 1730 }
1728#endif 1731#endif
1729#if USE_XIM 1732#if USE_XIM
1730 if (Input_Context != NULL) 1733 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context); 1734 XUnsetICFocus (Input_Context);
1732#endif 1735#endif
1733#if CURSOR_BLINK 1736#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink)) 1737 if (option (Opt_cursorBlink))
1735 cursor_blink_ev.stop (); 1738 cursor_blink_ev.stop ();
1739
1736 hidden_cursor = 0; 1740 hidden_cursor = 0;
1737#endif 1741#endif
1738#if OFF_FOCUS_FADING 1742#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1743 if (rs[Rs_fade])
1740 { 1744 {
… …
1743 } 1747 }
1744#endif 1748#endif
1745 } 1749 }
1746} 1750}
1747 1751
1748#if TRANSPARENT 1752void
1753rxvt_term::update_fade_color (unsigned int idx)
1754{
1755#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade])
1757 {
1758 rgba c;
1759 pix_colors [Color_fade].get (c);
1760 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1761 }
1762#endif
1763}
1764
1765#if ENABLE_TRANSPARENCY || ENABLE_PERL
1749void 1766void
1750rxvt_term::rootwin_cb (XEvent &ev) 1767rxvt_term::rootwin_cb (XEvent &ev)
1751{ 1768{
1752 make_current (); 1769 make_current ();
1753 1770
1771 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1772 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1773 return;
1774
1775# if ENABLE_TRANSPARENCY
1754 switch (ev.type) 1776 switch (ev.type)
1755 { 1777 {
1756 case PropertyNotify: 1778 case PropertyNotify:
1757 /* 1779 /*
1758 * if user used some Esetroot compatible prog to set the root bg, 1780 * if user used some Esetroot compatible prog to set the root bg,
1759 * use the property to determine the pixmap. We use it later on. 1781 * use the property to determine the pixmap. We use it later on.
1760 */ 1782 */
1761 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1783 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1784 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1763 return; 1785 {
1764 1786 bgPixmap.set_root_pixmap ();
1765 /* FALLTHROUGH */ 1787 update_background ();
1766 case ReparentNotify: 1788 }
1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1768 want_refresh = want_full_refresh = 1;
1769 break; 1789 break;
1770 } 1790 }
1791# endif
1771} 1792}
1772#endif 1793#endif
1773 1794
1774void 1795void
1775rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
… …
1830 mouse_report (ev); 1851 mouse_report (ev);
1831 } 1852 }
1832#else 1853#else
1833 MEvent.button = ev.button; 1854 MEvent.button = ev.button;
1834 mouse_report (ev); 1855 mouse_report (ev);
1835#endif /* MOUSE_REPORT_DOUBLECLICK */ 1856#endif /* MOUSE_REPORT_DOUBLECLICK */
1836 1857
1837 } 1858 }
1838 else 1859 else
1839 { 1860 {
1840 if (ev.button != MEvent.button) 1861 if (ev.button != MEvent.button)
… …
1934 tt_printf ("\033[5~"); 1955 tt_printf ("\033[5~");
1935 break; 1956 break;
1936 } 1957 }
1937 } 1958 }
1938 else 1959 else
1939#endif /* NO_SCROLLBAR_REPORT */ 1960#endif /* NO_SCROLLBAR_REPORT */
1940 1961
1941 { 1962 {
1942 char upordown = 0; 1963 char upordown = 0;
1943 1964
1944 if (scrollBar.style == R_SB_NEXT) 1965 if (scrollBar.style == R_SB_NEXT)
1945 { 1966 {
1946 if (scrollbarnext_upButton (ev.y)) 1967 if (scrollbarnext_upButton (ev.y))
1947 upordown = -1; /* up */ 1968 upordown = -1; /* up */
… …
1953 if (scrollbarrxvt_upButton (ev.y)) 1974 if (scrollbarrxvt_upButton (ev.y))
1954 upordown = -1; /* up */ 1975 upordown = -1; /* up */
1955 else if (scrollbarrxvt_dnButton (ev.y)) 1976 else if (scrollbarrxvt_dnButton (ev.y))
1956 upordown = 1; /* down */ 1977 upordown = 1; /* down */
1957 } 1978 }
1979
1958 if (upordown) 1980 if (upordown)
1959 { 1981 {
1960#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1983 if (!cont_scroll_ev.is_active ())
1961 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1984 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1962#endif 1985#endif
1963 if (scr_page (upordown < 0 ? UP : DN, 1)) 1986 if (scr_page (upordown < 0 ? UP : DN, 1))
1964 { 1987 {
1965 if (upordown < 0) 1988 if (upordown < 0)
1966 scrollBar.setUp (); 1989 scrollBar.setUp ();
… …
2046 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
2047 scrollbar_show (0); 2070 scrollbar_show (0);
2048 } 2071 }
2049 2072
2050#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2051 if (sel_scroll_ev.active)
2052 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2053#endif 2075#endif
2054 2076
2055 if (ev.window == vt) 2077 if (ev.window == vt)
2056 { 2078 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2081 mouse_report (ev); 2103 mouse_report (ev);
2082 } 2104 }
2083#else /* MOUSE_REPORT_DOUBLECLICK */ 2105#else /* MOUSE_REPORT_DOUBLECLICK */
2084 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
2085 mouse_report (ev); 2107 mouse_report (ev);
2086#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
2087 return; 2109 return;
2088 } 2110 }
2089 2111
2090 /* 2112 /*
2091 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
… …
2103 selection_make (ev.time); 2125 selection_make (ev.time);
2104 break; 2126 break;
2105 2127
2106 case Button2: 2128 case Button2:
2107 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?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2109 break; 2131 break;
2110 2132
2111#ifdef MOUSE_WHEEL 2133#ifdef MOUSE_WHEEL
2112 case Button4: 2134 case Button4:
2113 case Button5: 2135 case Button5:
… …
2117 2139
2118 v = ev.button == Button4 ? UP : DN; 2140 v = ev.button == Button4 ? UP : DN;
2119 2141
2120 if (ev.state & ShiftMask) 2142 if (ev.state & ShiftMask)
2121 i = 1; 2143 i = 1;
2122 else if (OPTION (Opt_mouseWheelScrollPage)) 2144 else if (option (Opt_mouseWheelScrollPage))
2123 i = nrow - 1; 2145 i = nrow - 1;
2124 else 2146 else
2125 i = 5; 2147 i = 5;
2126 2148
2127# ifdef MOUSE_SLIP_WHEELING 2149# ifdef MOUSE_SLIP_WHEELING
… …
2129 { 2151 {
2130 mouse_slip_wheel_speed += v ? -1 : 1; 2152 mouse_slip_wheel_speed += v ? -1 : 1;
2131 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2132 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2133 2155
2134 if (slip_wheel_ev.at < NOW) 2156 if (!slip_wheel_ev.is_active ())
2135 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2157 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2136
2137 slip_wheel_ev.start ();
2138 } 2158 }
2139 else 2159 else
2140 { 2160 {
2141# endif 2161# endif
2142 scr_page (v, i); 2162 scr_page (v, i);
… …
2148 break; 2168 break;
2149#endif 2169#endif
2150 } 2170 }
2151 } 2171 }
2152} 2172}
2153
2154#ifdef TRANSPARENT
2155#if TINTING
2156/* taken from aterm-0.4.2 */
2157
2158typedef uint32_t RUINT32T;
2159
2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2161{
2162 int sh_r, sh_g, sh_b;
2163 RUINT32T mask_r, mask_g, mask_b;
2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2167 int i;
2168
2169 Visual *visual = term->visual;
2170
2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2172
2173 /* for convenience */
2174 mask_r = visual->red_mask;
2175 mask_g = visual->green_mask;
2176 mask_b = visual->blue_mask;
2177
2178 /* boring lookup table pre-initialization */
2179 switch (srcImage->bits_per_pixel) {
2180 case 15:
2181 if ((mask_r != 0x7c00) ||
2182 (mask_g != 0x03e0) ||
2183 (mask_b != 0x001f))
2184 return;
2185 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2186 lookup_r = lookup;
2187 lookup_g = lookup+32;
2188 lookup_b = lookup+32+32;
2189 sh_r = 10;
2190 sh_g = 5;
2191 sh_b = 0;
2192 break;
2193 case 16:
2194 if ((mask_r != 0xf800) ||
2195 (mask_g != 0x07e0) ||
2196 (mask_b != 0x001f))
2197 return;
2198 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2199 lookup_r = lookup;
2200 lookup_g = lookup+32;
2201 lookup_b = lookup+32+64;
2202 sh_r = 11;
2203 sh_g = 5;
2204 sh_b = 0;
2205 break;
2206 case 24:
2207 if ((mask_r != 0xff0000) ||
2208 (mask_g != 0x00ff00) ||
2209 (mask_b != 0x0000ff))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2212 lookup_r = lookup;
2213 lookup_g = lookup+256;
2214 lookup_b = lookup+256+256;
2215 sh_r = 16;
2216 sh_g = 8;
2217 sh_b = 0;
2218 break;
2219 case 32:
2220 if ((mask_r != 0xff0000) ||
2221 (mask_g != 0x00ff00) ||
2222 (mask_b != 0x0000ff))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2225 lookup_r = lookup;
2226 lookup_g = lookup+256;
2227 lookup_b = lookup+256+256;
2228 sh_r = 16;
2229 sh_g = 8;
2230 sh_b = 0;
2231 break;
2232 default:
2233 return; /* we do not support this color depth */
2234 }
2235
2236 /* prepare limits for color transformation (each channel is handled separately) */
2237 if (shade < 0) {
2238 shade = -shade;
2239 if (shade < 0) shade = 0;
2240 if (shade > 100) shade = 100;
2241
2242 lower_lim_r = 65535-rm;
2243 lower_lim_g = 65535-gm;
2244 lower_lim_b = 65535-bm;
2245
2246 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2247 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2248 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2249
2250 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2251 } else {
2252 if (shade < 0) shade = 0;
2253 if (shade > 100) shade = 100;
2254
2255 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2256
2257 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2258 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2259 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2260 }
2261
2262 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2263 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2264 {
2265 unsigned int tmp;
2266
2267 tmp = lower_lim_r;
2268 lower_lim_r = lower_lim_b;
2269 lower_lim_b = tmp;
2270
2271 tmp = upper_lim_r;
2272 upper_lim_r = upper_lim_b;
2273 upper_lim_b = tmp;
2274 }
2275
2276 /* fill our lookup tables */
2277 for (i = 0; i <= mask_r>>sh_r; i++)
2278 {
2279 RUINT32T tmp;
2280 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2281 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2282 lookup_r[i] = (tmp/65535)<<sh_r;
2283 }
2284 for (i = 0; i <= mask_g>>sh_g; i++)
2285 {
2286 RUINT32T tmp;
2287 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2288 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2289 lookup_g[i] = (tmp/65535)<<sh_g;
2290 }
2291 for (i = 0; i <= mask_b>>sh_b; i++)
2292 {
2293 RUINT32T tmp;
2294 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2295 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2296 lookup_b[i] = (tmp/65535)<<sh_b;
2297 }
2298
2299 /* apply table to input image (replacing colors by newly calculated ones) */
2300 switch (srcImage->bits_per_pixel)
2301 {
2302 case 15:
2303 {
2304 unsigned short *p1, *pf, *p, *pl;
2305 p1 = (unsigned short *) srcImage->data;
2306 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width;
2311 for (; p < pl; p++)
2312 {
2313 *p = lookup_r[(*p & 0x7c00)>>10] |
2314 lookup_g[(*p & 0x03e0)>> 5] |
2315 lookup_b[(*p & 0x001f)];
2316 }
2317 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2318 }
2319 break;
2320 }
2321 case 16:
2322 {
2323 unsigned short *p1, *pf, *p, *pl;
2324 p1 = (unsigned short *) srcImage->data;
2325 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2326 while (p1 < pf)
2327 {
2328 p = p1;
2329 pl = p1 + srcImage->width;
2330 for (; p < pl; p++)
2331 {
2332 *p = lookup_r[(*p & 0xf800)>>11] |
2333 lookup_g[(*p & 0x07e0)>> 5] |
2334 lookup_b[(*p & 0x001f)];
2335 }
2336 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2337 }
2338 break;
2339 }
2340 case 24:
2341 {
2342 unsigned char *p1, *pf, *p, *pl;
2343 p1 = (unsigned char *) srcImage->data;
2344 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2345 while (p1 < pf)
2346 {
2347 p = p1;
2348 pl = p1 + srcImage->width * 3;
2349 for (; p < pl; p += 3)
2350 {
2351 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2352 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2353 p[2] = lookup_r[(p[2] & 0x0000ff)];
2354 }
2355 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2356 }
2357 break;
2358 }
2359 case 32:
2360 {
2361 RUINT32T *p1, *pf, *p, *pl;
2362 p1 = (RUINT32T *) srcImage->data;
2363 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364
2365 while (p1 < pf)
2366 {
2367 p = p1;
2368 pl = p1 + srcImage->width;
2369 for (; p < pl; p++)
2370 {
2371 *p = lookup_r[(*p & 0xff0000)>>16] |
2372 lookup_g[(*p & 0x00ff00)>> 8] |
2373 lookup_b[(*p & 0x0000ff)] |
2374 (*p & ~0xffffff);
2375 }
2376 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2377 }
2378 break;
2379 }
2380 }
2381
2382 free (lookup);
2383}
2384#endif
2385
2386/*
2387 * Check our parents are still who we think they are.
2388 * Do transparency updates if required
2389 */
2390int
2391rxvt_term::check_our_parents ()
2392{
2393 int i, pchanged, aformat, have_pixmap, rootdepth;
2394 unsigned long nitems, bytes_after;
2395 Atom atype;
2396 unsigned char *prop = NULL;
2397 Window root, oldp, *list;
2398 Pixmap rootpixmap = None;
2399 XWindowAttributes wattr, wrootattr;
2400
2401 pchanged = 0;
2402
2403 if (!OPTION (Opt_transparent))
2404 return pchanged; /* Don't try any more */
2405
2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2407 rootdepth = wrootattr.depth;
2408
2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2410
2411 if (rootdepth != wattr.depth)
2412 {
2413 if (am_transparent)
2414 {
2415 pchanged = 1;
2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2417 am_transparent = am_pixmap_trans = 0;
2418 }
2419
2420 return pchanged; /* Don't try any more */
2421 }
2422
2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2424 XSync (xdisp, False);
2425
2426 /*
2427 * Make the frame window set by the window manager have
2428 * the root background. Some window managers put multiple nested frame
2429 * windows for each client, so we have to take care about that.
2430 */
2431 i = (xa[XA_XROOTPMAP_ID]
2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success);
2435
2436 if (!i || prop == NULL)
2437 i = (xa[XA_ESETROOT_PMAP_ID]
2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2440 &nitems, &bytes_after, &prop) == Success);
2441
2442 if (!i || prop == NULL
2443#if TINTING
2444 || !ISSET_PIXCOLOR (Color_tint)
2445#endif
2446 )
2447 have_pixmap = 0;
2448 else
2449 {
2450 have_pixmap = 1;
2451 rootpixmap = *(Pixmap *)prop;
2452 XFree (prop);
2453 }
2454
2455 if (have_pixmap)
2456 {
2457 /*
2458 * Copy display->root pixmap transparency
2459 */
2460 int sx, sy, nx, ny;
2461 unsigned int nw, nh;
2462 Window cr;
2463 XImage *image;
2464 GC gc;
2465 XGCValues gcvalue;
2466
2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2468 0, 0, &sx, &sy, &cr);
2469 nw = (unsigned int)szHint.width;
2470 nh = (unsigned int)szHint.height;
2471 nx = ny = 0;
2472
2473 if (sx < 0)
2474 {
2475 nw += sx;
2476 nx = -sx;
2477 sx = 0;
2478 }
2479
2480 if (sy < 0)
2481 {
2482 nh += sy;
2483 ny = -sy;
2484 sy = 0;
2485 }
2486
2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489
2490 XSync (xdisp, False);
2491 allowedxerror = -1;
2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2493
2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2495 /* XXX: may need a delay here? */
2496 allowedxerror = 0;
2497
2498 if (image == NULL)
2499 {
2500 if (am_transparent && am_pixmap_trans)
2501 {
2502 pchanged = 1;
2503 if (pixmap != None)
2504 {
2505 XFreePixmap (xdisp, pixmap);
2506 pixmap = None;
2507 }
2508 }
2509
2510 am_pixmap_trans = 0;
2511 }
2512 else
2513 {
2514 if (pixmap != None)
2515 XFreePixmap (xdisp, pixmap);
2516
2517#if TINTING
2518 if (ISSET_PIXCOLOR (Color_tint))
2519 {
2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2521
2522 rgba c;
2523 pix_colors_focused [Color_tint].get (c);
2524
2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2526 }
2527#endif
2528
2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2532 nx, ny, image->width, image->height);
2533 XFreeGC (xdisp, gc);
2534 XDestroyImage (image);
2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2536 XClearWindow (xdisp, parent[0]);
2537
2538 if (!am_transparent || !am_pixmap_trans)
2539 pchanged = 1;
2540
2541 am_transparent = am_pixmap_trans = 1;
2542 }
2543 }
2544
2545 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2547 else
2548 {
2549 unsigned int n;
2550 /*
2551 * InheritPixmap transparency
2552 */
2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 {
2555 oldp = parent[i];
2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2557 XFree (list);
2558
2559 if (parent[i] == display->root)
2560 {
2561 if (oldp != None)
2562 pchanged = 1;
2563
2564 break;
2565 }
2566
2567 if (oldp != parent[i])
2568 pchanged = 1;
2569 }
2570
2571 n = 0;
2572
2573 if (pchanged)
2574 for (; n < (unsigned int)i; n++)
2575 {
2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2579 {
2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2581 break;
2582 }
2583 }
2584
2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2586 {
2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2589 am_transparent = 0;
2590 /* XXX: also turn off Opt_transparent? */
2591 }
2592 else
2593 {
2594 for (n = 0; n < (unsigned int)i; n++)
2595 {
2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2597 XClearWindow (xdisp, parent[n]);
2598 }
2599
2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2601 am_transparent = 1;
2602 }
2603
2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 parent[i] = None;
2606 }
2607
2608 if (scrollBar.win)
2609 {
2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2611 scrollBar.setIdle ();
2612 scrollbar_show (0);
2613 }
2614
2615 if (am_transparent)
2616 {
2617 want_refresh = want_full_refresh = 1;
2618 if (am_pixmap_trans)
2619 flush ();
2620 }
2621
2622 return pchanged;
2623}
2624#endif
2625 2173
2626/*}}} */ 2174/*}}} */
2627 2175
2628bool 2176bool
2629rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
… …
2678 if (ch == C0_LF) 2226 if (ch == C0_LF)
2679 nlines++; 2227 nlines++;
2680 2228
2681 refresh_count++; 2229 refresh_count++;
2682 2230
2683 if (!OPTION (Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2684 || (refresh_count >= refresh_limit * (nrow - 1)))
2685 { 2232 {
2686 refreshnow = true;
2687 refresh_count = 0; 2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2237 refreshnow = true;
2688 ch = NOCHAR; 2238 ch = NOCHAR;
2689 break; 2239 break;
2240 }
2690 } 2241 }
2691 2242
2692 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2693 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2694 { 2245 {
… …
2722 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2273 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2723 scr_add_lines (buf, str - buf, nlines); 2274 scr_add_lines (buf, str - buf, nlines);
2724 2275
2725 /* 2276 /*
2726 * If there have been a lot of new lines, then update the screen 2277 * If there have been a lot of new lines, then update the screen
2727 * What the heck I'll cheat and only refresh less than every page-full. 2278 * What the heck we'll cheat and only refresh less than every page-full.
2728 * the number of pages between refreshes is refresh_limit, which 2279 * if skipScroll is enabled.
2729 * is incremented here because we must be doing flat-out scrolling.
2730 */ 2280 */
2731 if (refreshnow) 2281 if (refreshnow)
2732 { 2282 {
2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2734 refresh_limit++;
2735 else
2736 {
2737 flag = true; 2283 flag = true;
2738 scr_refresh (); 2284 scr_refresh ();
2739 want_refresh = 1; 2285 want_refresh = 1;
2740 }
2741 } 2286 }
2742 2287
2743 } 2288 }
2744 else 2289 else
2745 { 2290 {
… …
2894 { 2439 {
2895 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2896 break; /* done = 1 */ 2441 break; /* done = 1 */
2897 } 2442 }
2898 } 2443 }
2899 2444
2900 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2901 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2902 { 2447 {
2903 done = 1; 2448 done = 1;
2904 break; 2449 break;
… …
2906 } 2451 }
2907 } 2452 }
2908 2453
2909 pclose_printer (fd); 2454 pclose_printer (fd);
2910} 2455}
2911#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2912/*}}} */ 2457/*}}} */
2913 2458
2914/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2915enum { 2460enum {
2916 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
2966 process_dcs_seq (); 2511 process_dcs_seq ();
2967 break; 2512 break;
2968 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
2969 process_csi_seq (); 2514 process_csi_seq ();
2970 break; 2515 break;
2971 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
2972 process_osc_seq (); 2517 process_osc_seq ();
2973 break; 2518 break;
2974#endif 2519#endif
2975 } 2520 }
2976} 2521}
… …
3202rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3203{ 2748{
3204 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3205 unsigned int nargs, p; 2750 unsigned int nargs, p;
3206 int n, ndef; 2751 int n, ndef;
3207 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3208 2753
3209 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3210 arg[--nargs] = 0;
3211 2755
3212 priv = 0; 2756 priv = 0;
3213 ch = cmd_getc (); 2757 ch = cmd_getc ();
3214 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3215 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3216 priv = ch; 2761 priv = ch;
3217 ch = cmd_getc (); 2762 ch = cmd_getc ();
3218 } 2763 }
3219 2764
3220 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3259 switch (priv) 2804 switch (priv)
3260 { 2805 {
3261 case '>': 2806 case '>':
3262 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3263 { 2808 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2809 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2810 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 // 2811 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2812 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2813 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3269 // that we do not support xterm mouse reporting (should be 95 when we do). 2814 // versions.
3270 // 2815 //
3271 tt_printf ("\033[>%d;94;0c", 'U'); 2816 tt_printf ("\033[>%d;95;0c", 'U');
3272 } 2817 }
3273 break; 2818 break;
3274 case '?': 2819 case '?':
3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3276 process_terminal_mode (ch, priv, nargs, arg); 2821 process_terminal_mode (ch, priv, nargs, arg);
… …
3403 break; 2948 break;
3404 case 6: /* CPR requested */ 2949 case 6: /* CPR requested */
3405 scr_report_position (); 2950 scr_report_position ();
3406 break; 2951 break;
3407 case 7: /* unofficial extension */ 2952 case 7: /* unofficial extension */
3408 if (OPTION (Opt_insecure)) 2953 if (option (Opt_insecure))
3409 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2954 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3410 break; 2955 break;
3411 case 8: /* unofficial extension */ 2956 case 8: /* unofficial extension */
3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2957 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3413 break; 2958 break;
… …
3506{ 3051{
3507 int x, y; 3052 int x, y;
3508 XWindowAttributes wattr; 3053 XWindowAttributes wattr;
3509 Window wdummy; 3054 Window wdummy;
3510 3055
3511 dLocal (Display *, xdisp); 3056 dLocal (Display *, dpy);
3512 3057
3513 if (nargs == 0) 3058 if (nargs == 0)
3514 return; 3059 return;
3515 3060
3516 switch (args[0]) 3061 switch (args[0])
3517 { 3062 {
3518 /* 3063 /*
3519 * commands 3064 * commands
3520 */ 3065 */
3521 case 1: /* deiconify window */ 3066 case 1: /* deiconify window */
3522 XMapWindow (xdisp, parent[0]); 3067 XMapWindow (dpy, parent[0]);
3523 break; 3068 break;
3524 case 2: /* iconify window */ 3069 case 2: /* iconify window */
3525 XIconifyWindow (xdisp, parent[0], display->screen); 3070 XIconifyWindow (dpy, parent[0], display->screen);
3526 break; 3071 break;
3527 case 3: /* set position (pixels) */ 3072 case 3: /* set position (pixels) */
3528 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3073 XMoveWindow (dpy, parent[0], args[1], args[2]);
3529 break; 3074 break;
3530 case 4: /* set size (pixels) */ 3075 case 4: /* set size (pixels) */
3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3532 break; 3077 break;
3533 case 5: /* raise window */ 3078 case 5: /* raise window */
3534 XRaiseWindow (xdisp, parent[0]); 3079 XRaiseWindow (dpy, parent[0]);
3535 break; 3080 break;
3536 case 6: /* lower window */ 3081 case 6: /* lower window */
3537 XLowerWindow (xdisp, parent[0]); 3082 XLowerWindow (dpy, parent[0]);
3538 break; 3083 break;
3539 case 7: /* refresh window */ 3084 case 7: /* refresh window */
3540 scr_touch (true); 3085 scr_touch (true);
3541 break; 3086 break;
3542 case 8: /* set size (chars) */ 3087 case 8: /* set size (chars) */
… …
3553 3098
3554 /* 3099 /*
3555 * reports - some output format copied from XTerm 3100 * reports - some output format copied from XTerm
3556 */ 3101 */
3557 case 11: /* report window state */ 3102 case 11: /* report window state */
3558 XGetWindowAttributes (xdisp, parent[0], &wattr); 3103 XGetWindowAttributes (dpy, parent[0], &wattr);
3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3560 break; 3105 break;
3561 case 13: /* report window position */ 3106 case 13: /* report window position */
3562 XGetWindowAttributes (xdisp, parent[0], &wattr); 3107 XGetWindowAttributes (dpy, parent[0], &wattr);
3563 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3108 XTranslateCoordinates (dpy, parent[0], wattr.root,
3564 -wattr.border_width, -wattr.border_width, 3109 -wattr.border_width, -wattr.border_width,
3565 &x, &y, &wdummy); 3110 &x, &y, &wdummy);
3566 tt_printf ("\033[3;%d;%dt", x, y); 3111 tt_printf ("\033[3;%d;%dt", x, y);
3567 break; 3112 break;
3568 case 14: /* report window size (pixels) */ 3113 case 14: /* report window size (pixels) */
3569 XGetWindowAttributes (xdisp, parent[0], &wattr); 3114 XGetWindowAttributes (dpy, parent[0], &wattr);
3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3571 break; 3116 break;
3572 case 18: /* report text area size (chars) */ 3117 case 18: /* report text area size (chars) */
3573 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3118 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3574 break; 3119 break;
… …
3576 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3121 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3577 break; 3122 break;
3578 case 20: /* report icon label */ 3123 case 20: /* report icon label */
3579 { 3124 {
3580 char *s; 3125 char *s;
3581 XGetIconName (xdisp, parent[0], &s); 3126 XGetIconName (dpy, parent[0], &s);
3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3583 XFree (s); 3128 XFree (s);
3584 } 3129 }
3585 break; 3130 break;
3586 case 21: /* report window title */ 3131 case 21: /* report window title */
3587 { 3132 {
3588 char *s; 3133 char *s;
3589 XFetchName (xdisp, parent[0], &s); 3134 XFetchName (dpy, parent[0], &s);
3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3591 XFree (s); 3136 XFree (s);
3592 } 3137 }
3593 break; 3138 break;
3594 } 3139 }
3595} 3140}
… …
3622 seen_esc = true; 3167 seen_esc = true;
3623 continue; 3168 continue;
3624 } 3169 }
3625 else if (ch == C0_BEL || ch == CHAR_ST) 3170 else if (ch == C0_BEL || ch == CHAR_ST)
3626 break; 3171 break;
3172 else if (ch == C0_SYN)
3173 ch = cmd_get8 ();
3627 else if (ch < 0x20) 3174 else if (ch < 0x20)
3628 return NULL; /* other control character - exit */ 3175 return NULL; /* other control character - exit */
3629 3176
3630 seen_esc = false; 3177 seen_esc = false;
3631 3178
3632 if (n >= STRING_MAX - 1) 3179 if (n >= STRING_MAX - 1)
3633 // stop at some sane length 3180 // stop at some sane length
3634 return NULL; 3181 return NULL;
3635 3182
3636 if (ch == C0_SYN)
3637 string[n++] = cmd_get8 ();
3638 else
3639 string[n++] = ch; 3183 string[n++] = ch;
3640 } 3184 }
3641 3185
3642 string[n++] = '\0'; 3186 string[n++] = '\0';
3643 3187
3644 ends_how = (ch == 0x5c ? C0_ESC : ch); 3188 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3720 int color; 3264 int color;
3721 char *buf, *name; 3265 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3266 bool query = str[0] == '?' && !str[1];
3723 int saveop = op; 3267 int saveop = op;
3724 3268
3725 dLocal (Display *, xdisp); 3269 dLocal (Display *, dpy);
3726 3270
3727 assert (str != NULL); 3271 assert (str != NULL);
3272
3273 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3274 return;
3275
3728 switch (op) 3276 switch (op)
3729 { 3277 {
3730 case XTerm_name: 3278 case XTerm_name:
3731 set_title (str); 3279 set_title (str);
3732 /* FALLTHROUGH */ 3280 /* FALLTHROUGH */
… …
3746 unsigned long bytes_after; 3294 unsigned long bytes_after;
3747 unsigned char *value = 0; 3295 unsigned char *value = 0;
3748 const char *str = ""; 3296 const char *str = "";
3749 3297
3750 if (prop 3298 if (prop
3751 && XGetWindowProperty (xdisp, parent[0], 3299 && XGetWindowProperty (dpy, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3300 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3301 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3302 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3303 && actual_type != None
3756 && actual_format == 8) 3304 && actual_format == 8)
… …
3768 { 3316 {
3769 *eq = 0; 3317 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 3318 set_utf8_property (display->atom (str), eq + 1);
3771 } 3319 }
3772 else 3320 else
3773 XDeleteProperty (xdisp, parent[0], 3321 XDeleteProperty (dpy, parent[0],
3774 display->atom (str)); 3322 display->atom (str));
3775 } 3323 }
3776 break; 3324 break;
3777 3325
3778 case XTerm_Color: 3326 case XTerm_Color:
… …
3824 break; 3372 break;
3825 case URxvt_Color_IT: 3373 case URxvt_Color_IT:
3826 process_color_seq (op, Color_IT, str, resp); 3374 process_color_seq (op, Color_IT, str, resp);
3827 break; 3375 break;
3828#endif 3376#endif
3829#if TRANSPARENT && TINTING 3377#if ENABLE_TRANSPARENCY
3830 case URxvt_Color_tint: 3378 case URxvt_Color_tint:
3831 process_color_seq (op, Color_tint, str, resp); 3379 process_color_seq (op, Color_tint, str, resp);
3380 {
3381 bool changed = false;
3382 if (ISSET_PIXCOLOR (Color_tint))
3383 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3384 else
3385 changed = bgPixmap.unset_tint ();
3386 if (changed)
3387 update_background ();
3388 }
3832 3389
3833 check_our_parents ();
3834
3835 if (am_transparent)
3836 want_full_refresh = want_refresh = 1;
3837
3838 break; 3390 break;
3839#endif 3391#endif
3840 3392
3393#if BG_IMAGE_FROM_FILE
3841 case Rxvt_Pixmap: 3394 case Rxvt_Pixmap:
3842 { 3395 if (!strcmp (str, "?"))
3843 if (*str != ';')
3844 { 3396 {
3845#if XPM_BACKGROUND 3397 char str[256];
3846 scale_pixmap (""); /* reset to default scaling */ 3398
3847 set_bgPixmap (str); /* change pixmap */ 3399 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3848 scr_touch (true); 3400 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3849#endif 3401 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3402 process_xterm_seq (XTerm_title, str, CHAR_ST);
3850 } 3403 }
3851 3404 else
3405 {
3852 int changed = 0; 3406 int changed = 0;
3853 3407
3854 while ((str = strchr (str, ';')) != NULL) 3408 if (*str != ';')
3855 { 3409 {
3410 /* reset to default scaling :*/
3411 bgPixmap.unset_geometry ();
3412 if (bgPixmap.set_file (str)) /* change pixmap */
3413 changed++;
3414 str = strchr (str, ';');
3415 if (str == NULL)
3416 bgPixmap.set_defaultGeometry ();
3417 }
3418 while (str)
3419 {
3856 str++; 3420 str++;
3857#if XPM_BACKGROUND 3421 if (bgPixmap.set_geometry (str))
3858 changed += scale_pixmap (str); 3422 changed++;
3859#endif 3423 str = strchr (str, ';');
3860 } 3424 }
3861
3862 if (changed) 3425 if (changed)
3863 { 3426 update_background ();
3864#ifdef XPM_BACKGROUND
3865 resize_pixmap ();
3866 scr_touch (true);
3867#endif
3868 } 3427 }
3869 }
3870 break; 3428 break;
3429#endif
3871 3430
3872 case Rxvt_restoreFG: 3431 case Rxvt_restoreFG:
3873 set_window_color (Color_fg, str); 3432 set_window_color (Color_fg, str);
3874 break; 3433 break;
3875 case Rxvt_restoreBG: 3434 case Rxvt_restoreBG:
… …
3900 case URxvt_italicFont: 3459 case URxvt_italicFont:
3901 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3902#endif 3461#endif
3903 if (query) 3462 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp); 3466 resp);
3908 else 3467 else
3909 { 3468 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3924 break; 3483 break;
3925 3484
3926#if !ENABLE_MINIMAL 3485#if !ENABLE_MINIMAL
3927 case URxvt_locale: 3486 case URxvt_locale:
3928 if (query) 3487 if (query)
3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3488 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3930 else 3489 else
3931 { 3490 {
3932 set_locale (str); 3491 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale (); 3493 init_xlocale ();
… …
3949 break; 3508 break;
3950#endif 3509#endif
3951 3510
3952#if ENABLE_PERL 3511#if ENABLE_PERL
3953 case URxvt_perl: 3512 case URxvt_perl:
3954 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3955 ; // no responses yet 3514 ; // no responses yet
3956 break; 3515 break;
3957#endif 3516#endif
3958 } 3517 }
3959} 3518}
… …
3997{ 3556{
3998 unsigned int i, j; 3557 unsigned int i, j;
3999 int state; 3558 int state;
4000 3559
4001 static const struct 3560 static const struct
4002 { 3561 {
4003 const int argval; 3562 const int argval;
4004 const unsigned long bit; 3563 const unsigned long bit;
4005 }
4006
4007 argtopriv[] = { 3564 } argtopriv[] = {
4008 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
4009 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
4010 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
4011 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
4012 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
… …
4028 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4029#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4030 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4031#endif 3588#endif
4032 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4033 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4034 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4035 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4036 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4037 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4038 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4039 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4040 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
… …
4075 scr_touch (true); 3631 scr_touch (true);
4076 break; 3632 break;
4077#endif 3633#endif
4078 case 1048: /* alternative cursor save */ 3634 case 1048: /* alternative cursor save */
4079 case 1049: 3635 case 1049:
4080 if (OPTION (Opt_secondaryScreen)) 3636 if (option (Opt_secondaryScreen))
4081 if (mode == 0) 3637 if (mode == 0)
4082 scr_cursor (RESTORE); 3638 scr_cursor (RESTORE);
4083 else if (mode == 1) 3639 else if (mode == 1)
4084 scr_cursor (SAVE); 3640 scr_cursor (SAVE);
4085 break; 3641 break;
… …
4114 scr_autowrap (state); 3670 scr_autowrap (state);
4115 break; 3671 break;
4116 /* case 8: - auto repeat, can't do on a per window basis */ 3672 /* case 8: - auto repeat, can't do on a per window basis */
4117 case 9: /* X10 mouse reporting */ 3673 case 9: /* X10 mouse reporting */
4118 if (state) /* orthogonal */ 3674 if (state) /* orthogonal */
4119 priv_modes &= ~PrivMode_MouseX11; 3675 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4120 break; 3676 break;
4121#ifdef scrollBar_esc 3677#ifdef scrollBar_esc
4122 case scrollBar_esc: 3678 case scrollBar_esc:
4123 if (scrollbar_mapping (state)) 3679 if (scrollbar_mapping (state))
4124 { 3680 {
… …
4137 break; 3693 break;
4138 /* case 66: - application key pad */ 3694 /* case 66: - application key pad */
4139 /* case 67: - backspace key */ 3695 /* case 67: - backspace key */
4140 case 1000: /* X11 mouse reporting */ 3696 case 1000: /* X11 mouse reporting */
4141 if (state) /* orthogonal */ 3697 if (state) /* orthogonal */
4142 priv_modes &= ~PrivMode_MouseX10; 3698 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4143 break; 3699 break;
4144#if 0
4145 case 1001: 3700 case 1002:
4146 break; /* X11 mouse highlighting */ 3701 case 1003:
4147#endif 3702 if (state)
3703 {
3704 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3705 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3706 vt_emask_mouse = PointerMotionMask;
3707 }
3708 else
3709 vt_emask_mouse = NoEventMask;
3710 vt_select_input ();
3711 break;
4148 case 1010: /* scroll to bottom on TTY output inhibit */ 3712 case 1010: /* scroll to bottom on TTY output inhibit */
4149 set_option (Opt_scrollTtyOutput, !state); 3713 set_option (Opt_scrollTtyOutput, !state);
4150 break; 3714 break;
4151 case 1011: /* scroll to bottom on key press */ 3715 case 1011: /* scroll to bottom on key press */
4152 set_option (Opt_scrollTtyKeypress, state); 3716 set_option (Opt_scrollTtyKeypress, state);
4153 break; 3717 break;
4154 case 1047: /* secondary screen w/ clearing last */ 3718 case 1047: /* secondary screen w/ clearing last */
4155 if (OPTION (Opt_secondaryScreen)) 3719 if (option (Opt_secondaryScreen))
4156 if (current_screen != PRIMARY) 3720 if (current_screen != PRIMARY)
4157 scr_erase_screen (2); 3721 scr_erase_screen (2);
4158 scr_change_screen (state); 3722 scr_change_screen (state);
4159 break; 3723 break;
4160 case 1049: /* secondary screen w/ clearing first */ 3724 case 1049: /* secondary screen w/ clearing first */
4161 scr_change_screen (state); 3725 scr_change_screen (state);
4162 if (OPTION (Opt_secondaryScreen)) 3726 if (option (Opt_secondaryScreen))
4163 if (current_screen != PRIMARY) 3727 if (current_screen != PRIMARY)
4164 scr_erase_screen (2); 3728 scr_erase_screen (2);
4165 break; 3729 break;
4166 default: 3730 default:
4167 break; 3731 break;
… …
4329rxvt_term::process_graphics () 3893rxvt_term::process_graphics ()
4330{ 3894{
4331 unicode_t ch, cmd = cmd_getc (); 3895 unicode_t ch, cmd = cmd_getc ();
4332 3896
4333 if (cmd == 'Q') 3897 if (cmd == 'Q')
3898 {
4334 { /* query graphics */ 3899 /* query graphics */
4335 tt_printf ("\033G0\012"); /* no graphics */ 3900 tt_printf ("\033G0\012"); /* no graphics */
4336 return; 3901 return;
4337 } 3902 }
4338 /* swallow other graphics sequences until terminating ':' */ 3903 /* swallow other graphics sequences until terminating ':' */
4339 do 3904 do
… …
4389 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4390 3955
4391 memcpy (v_buffer + v_buflen, data, len); 3956 memcpy (v_buffer + v_buflen, data, len);
4392 v_buflen += len; 3957 v_buflen += len;
4393 3958
4394 pty_ev.set (EVENT_READ | EVENT_WRITE); 3959 pty_ev.set (ev::READ | ev::WRITE);
4395} 3960}
4396 3961
4397void rxvt_term::pty_write () 3962void rxvt_term::pty_write ()
4398{ 3963{
4399 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3964 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4404 3969
4405 if (v_buflen == 0) 3970 if (v_buflen == 0)
4406 { 3971 {
4407 free (v_buffer); 3972 free (v_buffer);
4408 v_buffer = 0; 3973 v_buffer = 0;
4409 v_buflen = 0;
4410 3974
4411 pty_ev.set (EVENT_READ); 3975 pty_ev.set (ev::READ);
4412 return; 3976 return;
4413 } 3977 }
4414 3978
4415 memmove (v_buffer, v_buffer + written, v_buflen); 3979 memmove (v_buffer, v_buffer + written, v_buflen);
4416 } 3980 }
4417 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3981 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4418 pty_ev.set (EVENT_READ); 3982 pty_ev.set (ev::READ);
4419} 3983}
4420 3984
4421/*----------------------- end-of-file (C source) -----------------------*/ 3985/*----------------------- end-of-file (C source) -----------------------*/
4422 3986

Diff Legend

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