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

Diff Legend

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