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.279 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.375 by root, Tue Dec 11 21:10:46 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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,
… …
227# if !UNICODE3 225# if !UNICODE3
228 if (ch >= 0x10000) 226 if (ch >= 0x10000)
229 ch = 0xfffd; 227 ch = 0xfffd;
230# endif 228# endif
231 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
233 } 233 }
234 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
235 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
237 242
238 free (fname); 243 free (fname);
239 244
… …
292 297
293 return -1; 298 return -1;
294} 299}
295#endif 300#endif
296 301
297/*{{{ Convert the keypress event into a string */
298void 302void
299rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
300{ 304{
301 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
302 unsigned int newlen; 306 unsigned int newlen;
303 KeySym keysym; 307 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 308 int valid_keysym;
308 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
309 315
310 /* 316 /*
311 * 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
312 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
313 * 319 *
… …
493# if ISO_14755 499# if ISO_14755
494 iso14755_51 (0); 500 iso14755_51 (0);
495# endif 501# endif
496 return; 502 return;
497 } 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 }
498 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
499 { 513 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
502# if ISO_14755 516# if ISO_14755
… …
504# endif 518# endif
505 return; 519 return;
506 } 520 }
507 else 521 else
508 { 522 {
509# if ENABLE_OVERLAY 523# if ISO_14755
510 scr_overlay_off (); 524 scr_overlay_off ();
511# endif 525# endif
512 iso14755buf = 0; 526 iso14755buf = 0;
513 } 527 }
514 } 528 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
518 { 532 {
519 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 534# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 537# endif
524 } 538 }
525#endif 539#endif
526 540
527#ifdef PRINTPIPE 541#ifdef PRINTPIPE
528 if (keysym == XK_Print) 542 if (keysym == XK_Print)
529 { 543 {
530 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
531 return; 545 return;
… …
533#endif 547#endif
534 548
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 550 {
537 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
538 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
539 switch (keysym) 584 switch (keysym)
540 { 585 {
541#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
542 case XK_BackSpace: 587 case XK_BackSpace:
543 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
548 } 593 }
549 else 594 else
550 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
551 break; 596 break;
552#endif 597#endif
553#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
564 case XK_Delete: 599 case XK_Delete:
565 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
566 break; 601 break;
567#endif 602#endif
568 case XK_Tab: 603 case XK_Tab:
569 if (shft) 604 if (shft)
570 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
580#endif 615#endif
581 newlen = 0; 616 newlen = 0;
582 } 617 }
583 break; 618 break;
584 619
585#ifdef XK_KP_Left
586 case XK_KP_Up: /* \033Ox or standard */
587 case XK_KP_Down: /* \033Or or standard */
588 case XK_KP_Right: /* \033Ov or standard */
589 case XK_KP_Left: /* \033Ot or standard */
590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
591 {
592 strcpy (kbuf, "\033OZ");
593 kbuf[2] = "txvr"[keysym - XK_KP_Left];
594 break;
595 }
596 else
597 /* translate to std. cursor key */
598 keysym = XK_Left + (keysym - XK_KP_Left);
599 /* FALLTHROUGH */
600#endif
601 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
602 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
603 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
604 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
605 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
615 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
616 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
617 break; 636 break;
618 637
619#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
620# ifdef XK_KP_Prior
621 case XK_KP_Prior:
622 /* allow shift to override */
623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
624 {
625 strcpy (kbuf, "\033Oy");
626 break;
627 }
628 /* FALLTHROUGH */
629# endif
630 case XK_Prior: 639 case XK_Prior:
631 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
632 break; 641 break;
633# ifdef XK_KP_Next
634 case XK_KP_Next:
635 /* allow shift to override */
636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
637 {
638 strcpy (kbuf, "\033Os");
639 break;
640 }
641 /* FALLTHROUGH */
642# endif
643 case XK_Next: 642 case XK_Next:
644 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
645 break; 644 break;
646#endif 645#endif
647 case XK_KP_Enter: 646 case XK_KP_Enter:
648 /* allow shift to override */ 647 /* allow shift to override */
649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
650 { 649 {
651 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
652 break; 651 break;
653 } 652 }
654 653
… …
666 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
667 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
668 } 667 }
669 break; 668 break;
670 669
671#ifdef XK_KP_Begin
672 case XK_KP_Begin:
673 strcpy (kbuf, "\033Ou");
674 break;
675
676#endif
677 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
678 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
679 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
680 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
681 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
697 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
698 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
699 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
700 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
701 /* allow shift to override */ 694 /* allow shift to override */
702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
703 { 696 {
704 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
705 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
706 } 699 }
707 else 700 else
… …
713 706
714 case XK_Find: 707 case XK_Find:
715 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
716 break; 709 break;
717 710
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_Insert: 711 case XK_Insert:
729 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
730 break; 713 break;
731#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
732 case DXK_Remove: 715 case DXK_Remove:
… …
736 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
737 break; 720 break;
738 case XK_Select: 721 case XK_Select:
739 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
740 break; 723 break;
741#ifdef XK_KP_End
742 case XK_KP_End:
743 /* allow shift to override */
744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
745 {
746 strcpy (kbuf, "\033Oq");
747 break;
748 }
749 /* FALLTHROUGH */
750#endif
751 case XK_End: 724 case XK_End:
752 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
753 break; 726 break;
754#ifdef XK_KP_Home
755 case XK_KP_Home:
756 /* allow shift to override */
757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
758 {
759 strcpy (kbuf, "\033Ow");
760 break;
761 }
762 /* FALLTHROUGH */
763#endif
764 case XK_Home: 727 case XK_Home:
765 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
766 break; 729 break;
767 730
768#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
870 return; 833 return;
871 834
872 if (len <= 0) 835 if (len <= 0)
873 return; /* not mapped */ 836 return; /* not mapped */
874 837
875 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 839 if (view_start)
877 { 840 {
878 view_start = 0; 841 view_start = 0;
879 want_refresh = 1; 842 want_refresh = 1;
880 } 843 }
… …
902 { 865 {
903 const char ch = C0_ESC; 866 const char ch = C0_ESC;
904 tt_write (&ch, 1); 867 tt_write (&ch, 1);
905 } 868 }
906 869
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
918} 871}
919/*}}} */ 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}
920 949
921#if defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
922unsigned int 951unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 953{
… …
954void 983void
955rxvt_term::flush () 984rxvt_term::flush ()
956{ 985{
957 flush_ev.stop (); 986 flush_ev.stop ();
958 987
959#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
961 { 990 {
962 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 992 scr_touch (false);
965 } 993 }
966#endif 994#endif
967 995
968 if (want_refresh) 996 if (want_refresh)
… …
1014 1042
1015 display->flush (); 1043 display->flush ();
1016} 1044}
1017 1045
1018void 1046void
1019rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1020{ 1048{
1021 make_current (); 1049 make_current ();
1022 1050
1023 display->flush (); 1051 display->flush ();
1024 1052
1025 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !ev_is_active (&flush_ev))
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1027} 1055}
1028 1056
1029void 1057void
1030rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1031{ 1059{
1032 make_current (); 1060 make_current ();
1033 1061
1034 refresh_limit = 1;
1035 refresh_count = 0; 1062 refresh_count = 0;
1036 flush (); 1063 flush ();
1037} 1064}
1038 1065
1039#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1040void 1067void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1069{
1043 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1071 want_refresh = 1;
1045
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1072}
1048#endif 1073#endif
1049 1074
1050#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1051void 1076void
1052rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1078{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1080 {
1056 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1057 want_refresh = 1; 1082 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL);
1059 } 1083 }
1084 else
1085 w.stop ();
1060} 1086}
1061#endif 1087#endif
1062 1088
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1090void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1092{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1069 {
1070 want_refresh = 1; 1095 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
1072 } 1097 w.stop ();
1073} 1098}
1074#endif 1099#endif
1075 1100
1076#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1077void 1102void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1104{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1106 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1108 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1085 } 1109 }
1110 else
1111 w.stop ();
1086} 1112}
1087#endif 1113#endif
1088 1114
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1116void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1118{
1093 if (mouse_slip_wheel_speed == 0 1119 if (mouse_slip_wheel_speed == 0
1094 || 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)
1095 : scr_page (UP, mouse_slip_wheel_speed)) 1121 : scr_page (UP, mouse_slip_wheel_speed))
1096 { 1122 {
1097 if (view_start == top_row || view_start == 0) 1123 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1099 1125
1100 want_refresh = 1; 1126 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1127 }
1128 else
1129 w.stop ();
1103} 1130}
1104#endif 1131#endif
1105 1132
1106#if HAVE_SCHED_YIELD 1133#if LINUX_YIELD_HACK
1107static struct event_handler 1134static struct event_handler
1108{ 1135{
1109 check_watcher cw_yield; 1136 ev::prepare yield_ev;
1110 1137
1111 void yield (check_watcher &w) 1138 void yield_cb (ev::prepare &w, int revents)
1112 { 1139 {
1113 sched_yield (); 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
1114 w.stop (); 1148 w.stop ();
1115 } 1149 }
1116 1150
1117 event_handler () 1151 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1152 : yield_ev (this, &event_handler::yield_cb)
1119 { 1153 {
1120 } 1154 }
1121} event_handler; 1155} event_handler;
1122#endif 1156#endif
1123 1157
… …
1143 cmdbuf_endp += r; 1177 cmdbuf_endp += r;
1144 return true; 1178 return true;
1145 } 1179 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1180 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1181 {
1148#if HAVE_SCHED_YIELD 1182#if LINUX_YIELD_HACK
1149 if (display->is_local) 1183 if (display->is_local)
1150 event_handler.cw_yield.start (); 1184 event_handler.yield_ev.start ();
1151#endif 1185#endif
1152 } 1186 }
1153 else 1187 else
1154 { 1188 {
1155 pty_ev.stop (); 1189 pty_ev.stop ();
1156 1190
1157 if (!OPTION (Opt_hold)) 1191 if (!option (Opt_hold))
1158 destroy (); 1192 destroy ();
1159 } 1193 }
1160 1194
1161 return false; 1195 return false;
1162} 1196}
1163 1197
1164void 1198void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1200{
1167 make_current (); 1201 make_current ();
1168 1202
1169 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1205 while (pty_fill ())
1172 if (cmd_parse ()) 1206 if (cmd_parse ())
1173 break; 1207 break;
1174 1208
1175 if (revents & EVENT_WRITE) 1209 if (revents & ev::WRITE)
1176 pty_write (); 1210 pty_write ();
1177} 1211}
1178 1212
1179void 1213void
1180rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1181{ 1215{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1216 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1217 recolour_cursor ();
1184 1218
1185#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1220 hidden_pointer = 0;
1187 1221
1188 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1190#endif 1224#endif
1191} 1225}
1192 1226
1193#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1194void 1228void
1195rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1196{ 1230{
1197 if (!OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1198 return; 1232 return;
1199 1233
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1235 XFlush (dpy);
1202 1236
1203 hidden_pointer = 1; 1237 hidden_pointer = 1;
1204} 1238}
1205 1239
1206void 1240void
1207rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1242{
1209 make_current (); 1243 make_current ();
1210 1244
1211 pointer_blank (); 1245 pointer_blank ();
1212} 1246}
… …
1215void 1249void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1251{
1218 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1219 int x, y; 1253 int x, y;
1254 int code = 32;
1220 1255
1221 x = ev.x; 1256 x = Pixel2Col (ev.x);
1222 y = ev.y; 1257 y = Pixel2Row (ev.y);
1223 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 }
1224 1266
1225 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1226 button_number = 3; 1268 button_number = 3;
1227 else 1269 else
1228 { 1270 {
… …
1274 x + 1, 1316 x + 1,
1275 y + 1); 1317 y + 1);
1276#endif 1318#endif
1277 1319
1278 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1280 (32 + x + 1), 1322 (32 + x + 1),
1281 (32 + y + 1)); 1323 (32 + y + 1));
1282} 1324}
1283
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293 1325
1294/*{{{ process an X event */ 1326/*{{{ process an X event */
1295void 1327void
1296rxvt_term::x_cb (XEvent &ev) 1328rxvt_term::x_cb (XEvent &ev)
1297{ 1329{
1298 make_current (); 1330 make_current ();
1299 1331
1300 dDisp; 1332 dLocal (Display *, dpy);
1301 1333
1302 if (ev.xany.window == vt 1334 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1335 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1336 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1337 return;
… …
1310 unsigned int unused_mask; 1342 unsigned int unused_mask;
1311 1343
1312 switch (ev.type) 1344 switch (ev.type)
1313 { 1345 {
1314 case KeyPress: 1346 case KeyPress:
1315#if ISO_14755 1347 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1348 break;
1321 1349
1322 case KeyRelease: 1350 case KeyRelease:
1323 { 1351 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1352 break;
1395 }
1396 1353
1397 case ButtonPress: 1354 case ButtonPress:
1398 button_press (ev.xbutton); 1355 button_press (ev.xbutton);
1399 break; 1356 break;
1400 1357
… …
1415 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)))
1416 destroy (); 1373 destroy ();
1417 } 1374 }
1418#if ENABLE_EWMH 1375#if ENABLE_EWMH
1419 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])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1377 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1378 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1379 &ev);
1423#endif 1380#endif
1424 } 1381 }
1425 } 1382 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1389 focus_out ();
1433 } 1390 }
1434#endif 1391#endif
1435 } 1392 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1393 break;
1441 1394
1442 /* 1395 /*
1443 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1463 break; 1416 break;
1464 } 1417 }
1465 break; 1418 break;
1466 1419
1467 case FocusIn: 1420 case FocusIn:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1424 focus_in ();
1469 break; 1425 break;
1470 1426
1471 case FocusOut: 1427 case FocusOut:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1431 focus_out ();
1473 break; 1432 break;
1474 1433
1475 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); */
1476 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1477 { 1439 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1441 ;
1480 1442
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1444 {
1483 seen_resize = 1; 1445 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1447 }
1486 1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 update_background ();
1453#endif
1454 }
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490 if (OPTION (Opt_transparent))
1491 check_our_parents ();
1492#endif
1493 } 1456 }
1494 break; 1457 break;
1495 1458
1496 case PropertyNotify: 1459 case PropertyNotify:
1497 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)))
… …
1515 break; 1478 break;
1516 1479
1517 case MapNotify: 1480 case MapNotify:
1518 mapped = 1; 1481 mapped = 1;
1519#ifdef TEXT_BLINK 1482#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1483 text_blink_ev.start ();
1521#endif 1484#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1486 break;
1524 1487
1525 case UnmapNotify: 1488 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1491 text_blink_ev.stop ();
1529#endif 1492#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1494 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1495
1539 case GraphicsExpose: 1496 case GraphicsExpose:
1540 case Expose: 1497 case Expose:
1541 if (ev.xany.window == vt) 1498 if (ev.xany.window == vt)
1542 { 1499 {
1543 do 1500 do
1501 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1504 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1506
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1508
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1553 1513 }
1554 want_refresh = 1; 1514 want_refresh = 1;
1555 } 1515 }
1556 else 1516 else
1557 { 1517 {
1558 XEvent unused_event; 1518 XEvent unused_event;
1559 1519
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1521 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1523 ;
1564 1524
1565 if (isScrollbarWindow (ev.xany.window)) 1525 if (isScrollbarWindow (ev.xany.window))
1566 { 1526 {
1567 scrollBar.setIdle (); 1527 scrollBar.setIdle ();
1568 scrollbar_show (0); 1528 scrollbar_show (0);
1569 } 1529 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1530 }
1576 break; 1531 break;
1577 1532
1578 case MotionNotify: 1533 case MotionNotify:
1579#ifdef POINTER_BLANK 1534#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1535 if (hidden_pointer)
1581 pointer_unblank (); 1536 pointer_unblank ();
1582#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);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1542 break;
1585 1543
1586 if (ev.xany.window == vt) 1544 if (ev.xany.window == vt)
1587 { 1545 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1546 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1547 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1548 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1549 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1550 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1552 ;
1595 1553
1596 XQueryPointer (disp, vt, 1554 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1555 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1556 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1557 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1558 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1559#ifdef MOUSE_THRESHOLD
… …
1621 int dist; 1579 int dist;
1622 1580
1623 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1625 */ 1583 */
1626 if (!sel_scroll_ev.active) 1584 if (!ev_is_active (&sel_scroll_ev))
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1586
1629 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1631 */ 1589 */
1632 selection_save_x = ev.xbutton.x; 1590 selection_save_x = ev.xbutton.x;
… …
1654 else 1612 else
1655 { 1613 {
1656 /* we are within the text window, so we 1614 /* we are within the text window, so we
1657 * shouldn't be scrolling 1615 * shouldn't be scrolling
1658 */ 1616 */
1659 if (sel_scroll_ev.active) 1617 if (ev_is_active (&sel_scroll_ev))
1660 sel_scroll_ev.stop(); 1618 sel_scroll_ev.stop();
1661 } 1619 }
1662#endif 1620#endif
1663#ifdef MOUSE_THRESHOLD 1621#ifdef MOUSE_THRESHOLD
1664 } 1622 }
1665#endif 1623#endif
1666 } 1624 }
1667 } 1625 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1626 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1627 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1628 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1629 MotionNotify, &ev))
1672 ; 1630 ;
1673 1631
1674 XQueryPointer (disp, scrollBar.win, 1632 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1633 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1634 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1635 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1636 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1637 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1638 scrollbar_size ());
1681 want_refresh = 1; 1639 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1640 scrollbar_show (1);
1684 } 1641 }
1685 break; 1642 break;
1686 } 1643 }
1687 1644
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1645#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1646 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1647 {
1693 if (hidden_cursor) 1648 if (hidden_cursor)
1694 { 1649 {
1695 hidden_cursor = 0; 1650 hidden_cursor = 0;
1696 want_refresh = 1; 1651 want_refresh = 1;
1697 } 1652 }
1698 1653
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1654 cursor_blink_ev.again ();
1700 } 1655 }
1701#endif 1656#endif
1702 1657
1703#if defined(POINTER_BLANK) 1658#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1659 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1660 {
1706 if (ev.type == MotionNotify 1661 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1662 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1663 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1664 if (hidden_pointer)
… …
1721 if (!focus) 1676 if (!focus)
1722 { 1677 {
1723 focus = 1; 1678 focus = 1;
1724 want_refresh = 1; 1679 want_refresh = 1;
1725 1680
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1681 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727 1682
1728#if USE_XIM 1683#if USE_XIM
1729 if (Input_Context != NULL) 1684 if (Input_Context != NULL)
1730 { 1685 {
1731 IMSetStatusPosition (); 1686 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1687 XSetICFocus (Input_Context);
1733 } 1688 }
1734#endif 1689#endif
1735#if CURSOR_BLINK 1690#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1691 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1692 cursor_blink_ev.again ();
1738#endif 1693#endif
1739#if OFF_FOCUS_FADING 1694#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1695 if (rs[Rs_fade])
1741 { 1696 {
1742 pix_colors = pix_colors_focused; 1697 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1698 scr_recolour ();
1744 } 1699 }
1745#endif 1700#endif
1701#if ENABLE_FRILLS
1702 if (option (Opt_urgentOnBell))
1703 {
1704 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1705 {
1706 h->flags &= ~XUrgencyHint;
1707 XSetWMHints (dpy, parent[0], h);
1708 }
1709 }
1710#endif
1746 } 1711 }
1747} 1712}
1748 1713
1749void 1714void
1750rxvt_term::focus_out () 1715rxvt_term::focus_out ()
… …
1758 1723
1759#if ENABLE_FRILLS || ISO_14755 1724#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1725 if (iso14755buf)
1761 { 1726 {
1762 iso14755buf = 0; 1727 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1728# if ISO_14755
1764 scr_overlay_off (); 1729 scr_overlay_off ();
1765# endif 1730# endif
1766 } 1731 }
1767#endif 1732#endif
1768#if USE_XIM 1733#if USE_XIM
1769 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1735 XUnsetICFocus (Input_Context);
1771#endif 1736#endif
1772#if CURSOR_BLINK 1737#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1738 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1739 cursor_blink_ev.stop ();
1740
1775 hidden_cursor = 0; 1741 hidden_cursor = 0;
1776#endif 1742#endif
1777#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1779 { 1745 {
… …
1782 } 1748 }
1783#endif 1749#endif
1784 } 1750 }
1785} 1751}
1786 1752
1787#if TRANSPARENT 1753void
1754rxvt_term::update_fade_color (unsigned int idx)
1755{
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 rgba c;
1760 pix_colors [Color_fade].get (c);
1761 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1762 }
1763#endif
1764}
1765
1766#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1767void
1789rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1769{
1791 make_current (); 1770 make_current ();
1792 1771
1772 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1773 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1774 return;
1775
1776# if ENABLE_TRANSPARENCY
1793 switch (ev.type) 1777 switch (ev.type)
1794 { 1778 {
1795 case PropertyNotify: 1779 case PropertyNotify:
1796 /* 1780 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1781 * if user used some Esetroot compatible prog to set the root bg,
1798 * use the property to determine the pixmap. We use it later on. 1782 * use the property to determine the pixmap. We use it later on.
1799 */ 1783 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1784 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1785 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1786 {
1803 1787 bgPixmap.set_root_pixmap ();
1804 /* FALLTHROUGH */ 1788 update_background ();
1805 case ReparentNotify: 1789 }
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1790 break;
1809 } 1791 }
1792# endif
1810} 1793}
1811#endif 1794#endif
1812 1795
1813void 1796void
1814rxvt_term::button_press (XButtonEvent &ev) 1797rxvt_term::button_press (XButtonEvent &ev)
… …
1823 /* 1806 /*
1824 * VT window processing of button press 1807 * VT window processing of button press
1825 */ 1808 */
1826 if (ev.window == vt) 1809 if (ev.window == vt)
1827 { 1810 {
1811 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1812 return;
1813
1828#if ISO_14755 1814#if ISO_14755
1829 // 5.4 1815 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1816 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1817 {
1832 iso14755_54 (ev.x, ev.y); 1818 iso14755_54 (ev.x, ev.y);
… …
1866 mouse_report (ev); 1852 mouse_report (ev);
1867 } 1853 }
1868#else 1854#else
1869 MEvent.button = ev.button; 1855 MEvent.button = ev.button;
1870 mouse_report (ev); 1856 mouse_report (ev);
1871#endif /* MOUSE_REPORT_DOUBLECLICK */ 1857#endif /* MOUSE_REPORT_DOUBLECLICK */
1872 1858
1873 } 1859 }
1874 else 1860 else
1875 { 1861 {
1876 if (ev.button != MEvent.button) 1862 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1863 MEvent.clicks = 0;
1878 1864
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1865 switch (ev.button)
1881 { 1866 {
1882 case Button1: 1867 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1868 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1869 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1870#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1871 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1872#else
1888 selection.rect = false; 1873 selection.rect = false;
1889#endif 1874#endif
1890 1875
1891 /* allow shift+left click to extend selection */ 1876 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1877 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1878 {
1894 if (MEvent.button == Button1 && clickintime) 1879 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1880 selection_rotate (ev.x, ev.y);
1896 else 1881 else
1897 selection_extend (ev.x, ev.y, 1); 1882 selection_extend (ev.x, ev.y, 1);
1898 } 1883 }
1899 else 1884 else
1900 { 1885 {
1901 if (MEvent.button == Button1 && clickintime) 1886 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1887 MEvent.clicks++;
1903 else 1888 else
1904 MEvent.clicks = 1; 1889 MEvent.clicks = 1;
1905 1890
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1891 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1892 }
1908 1893
1909 MEvent.button = Button1; 1894 MEvent.button = Button1;
1910 break; 1895 break;
1911 1896
1912 case Button3: 1897 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1898 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1899 selection_rotate (ev.x, ev.y);
1915 else 1900 else
1916 selection_extend (ev.x, ev.y, 1); 1901 selection_extend (ev.x, ev.y, 1);
1917 1902
1918 MEvent.button = Button3; 1903 MEvent.button = Button3;
1919 break; 1904 break;
1920 } 1905 }
1921 } 1906 }
1922 1907
1923 MEvent.time = ev.time; 1908 MEvent.time = ev.time;
1924 return; 1909 return;
1925 } 1910 }
1926 1911
… …
1971 tt_printf ("\033[5~"); 1956 tt_printf ("\033[5~");
1972 break; 1957 break;
1973 } 1958 }
1974 } 1959 }
1975 else 1960 else
1976#endif /* NO_SCROLLBAR_REPORT */ 1961#endif /* NO_SCROLLBAR_REPORT */
1977 1962
1978 { 1963 {
1979 char upordown = 0; 1964 char upordown = 0;
1980 1965
1981 if (scrollBar.style == R_SB_NEXT) 1966 if (scrollBar.style == R_SB_NEXT)
1982 { 1967 {
1983 if (scrollbarnext_upButton (ev.y)) 1968 if (scrollbarnext_upButton (ev.y))
1984 upordown = -1; /* up */ 1969 upordown = -1; /* up */
… …
1993 upordown = 1; /* down */ 1978 upordown = 1; /* down */
1994 } 1979 }
1995 if (upordown) 1980 if (upordown)
1996 { 1981 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 1984#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 1985 if (scr_page (upordown < 0 ? UP : DN, 1))
2001 { 1986 {
2002 if (upordown < 0) 1987 if (upordown < 0)
2003 scrollBar.setUp (); 1988 scrollBar.setUp ();
… …
2083 scrollBar.setIdle (); 2068 scrollBar.setIdle ();
2084 scrollbar_show (0); 2069 scrollbar_show (0);
2085 } 2070 }
2086 2071
2087#ifdef SELECTION_SCROLLING 2072#ifdef SELECTION_SCROLLING
2088 if (sel_scroll_ev.active) 2073 if (ev_is_active (&sel_scroll_ev))
2089 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2090#endif 2075#endif
2091 2076
2092 if (ev.window == vt) 2077 if (ev.window == vt)
2093 { 2078 {
2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2080 return;
2081
2094#if ISO_14755 2082#if ISO_14755
2095 // 5.4 2083 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2084 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2085 return;
2098#endif 2086#endif
2087
2099 if (reportmode) 2088 if (reportmode)
2100 { 2089 {
2101 /* mouse report from vt window */ 2090 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2091 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2092 if (ev.button >= 4)
… …
2114 mouse_report (ev); 2103 mouse_report (ev);
2115 } 2104 }
2116#else /* MOUSE_REPORT_DOUBLECLICK */ 2105#else /* MOUSE_REPORT_DOUBLECLICK */
2117 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
2118 mouse_report (ev); 2107 mouse_report (ev);
2119#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
2120 return; 2109 return;
2121 } 2110 }
2122 2111
2123 /* 2112 /*
2124 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
… …
2127 if (priv_modes & PrivMode_mouse_report 2116 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2117 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2118 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2119 selection_extend (ev.x, ev.y, 0);
2131 2120
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2121 switch (ev.button)
2136 { 2122 {
2137 case Button1: 2123 case Button1:
2138 case Button3: 2124 case Button3:
2139 selection_make (ev.time); 2125 selection_make (ev.time);
2140 break; 2126 break;
2141 2127
2142 case Button2: 2128 case Button2:
2143 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?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2131 break;
2146 2132
2147#ifdef MOUSE_WHEEL 2133#ifdef MOUSE_WHEEL
2148 case Button4: 2134 case Button4:
2149 case Button5: 2135 case Button5:
… …
2153 2139
2154 v = ev.button == Button4 ? UP : DN; 2140 v = ev.button == Button4 ? UP : DN;
2155 2141
2156 if (ev.state & ShiftMask) 2142 if (ev.state & ShiftMask)
2157 i = 1; 2143 i = 1;
2158 else if (OPTION (Opt_mouseWheelScrollPage)) 2144 else if (option (Opt_mouseWheelScrollPage))
2159 i = nrow - 1; 2145 i = nrow - 1;
2160 else 2146 else
2161 i = 5; 2147 i = 5;
2162 2148
2163# ifdef MOUSE_SLIP_WHEELING 2149# ifdef MOUSE_SLIP_WHEELING
… …
2165 { 2151 {
2166 mouse_slip_wheel_speed += v ? -1 : 1; 2152 mouse_slip_wheel_speed += v ? -1 : 1;
2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2169 2155
2170 if (slip_wheel_ev.at < NOW) 2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2171 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2172
2173 slip_wheel_ev.start ();
2174 } 2157 }
2175 else 2158 else
2176 { 2159 {
2177# endif 2160# endif
2178 scr_page (v, i); 2161 scr_page (v, i);
… …
2184 break; 2167 break;
2185#endif 2168#endif
2186 } 2169 }
2187 } 2170 }
2188} 2171}
2189
2190#ifdef TRANSPARENT
2191#if TINTING
2192/* taken from aterm-0.4.2 */
2193
2194typedef uint32_t RUINT32T;
2195
2196void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2197{
2198 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i;
2204
2205 Visual *visual = display->visual;
2206
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208
2209 /* for convenience */
2210 mask_r = visual->red_mask;
2211 mask_g = visual->green_mask;
2212 mask_b = visual->blue_mask;
2213
2214 /* boring lookup table pre-initialization */
2215 switch (srcImage->bits_per_pixel) {
2216 case 15:
2217 if ((mask_r != 0x7c00) ||
2218 (mask_g != 0x03e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+32;
2225 sh_r = 10;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 16:
2230 if ((mask_r != 0xf800) ||
2231 (mask_g != 0x07e0) ||
2232 (mask_b != 0x001f))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2235 lookup_r = lookup;
2236 lookup_g = lookup+32;
2237 lookup_b = lookup+32+64;
2238 sh_r = 11;
2239 sh_g = 5;
2240 sh_b = 0;
2241 break;
2242 case 24:
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 case 32:
2256 if ((mask_r != 0xff0000) ||
2257 (mask_g != 0x00ff00) ||
2258 (mask_b != 0x0000ff))
2259 return;
2260 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2261 lookup_r = lookup;
2262 lookup_g = lookup+256;
2263 lookup_b = lookup+256+256;
2264 sh_r = 16;
2265 sh_g = 8;
2266 sh_b = 0;
2267 break;
2268 default:
2269 return; /* we do not support this color depth */
2270 }
2271
2272 /* prepare limits for color transformation (each channel is handled separately) */
2273 if (shade < 0) {
2274 shade = -shade;
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = 65535-rm;
2279 lower_lim_g = 65535-gm;
2280 lower_lim_b = 65535-bm;
2281
2282 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2283 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2284 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2285
2286 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2287 } else {
2288 if (shade < 0) shade = 0;
2289 if (shade > 100) shade = 100;
2290
2291 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2292
2293 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2294 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2295 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2296 }
2297
2298 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2299 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2300 {
2301 unsigned int tmp;
2302
2303 tmp = lower_lim_r;
2304 lower_lim_r = lower_lim_b;
2305 lower_lim_b = tmp;
2306
2307 tmp = upper_lim_r;
2308 upper_lim_r = upper_lim_b;
2309 upper_lim_b = tmp;
2310 }
2311
2312 /* fill our lookup tables */
2313 for (i = 0; i <= mask_r>>sh_r; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2317 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2318 lookup_r[i] = (tmp/65535)<<sh_r;
2319 }
2320 for (i = 0; i <= mask_g>>sh_g; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2324 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2325 lookup_g[i] = (tmp/65535)<<sh_g;
2326 }
2327 for (i = 0; i <= mask_b>>sh_b; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2331 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2332 lookup_b[i] = (tmp/65535)<<sh_b;
2333 }
2334
2335 /* apply table to input image (replacing colors by newly calculated ones) */
2336 switch (srcImage->bits_per_pixel)
2337 {
2338 case 15:
2339 {
2340 unsigned short *p1, *pf, *p, *pl;
2341 p1 = (unsigned short *) srcImage->data;
2342 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2343 while (p1 < pf)
2344 {
2345 p = p1;
2346 pl = p1 + srcImage->width;
2347 for (; p < pl; p++)
2348 {
2349 *p = lookup_r[(*p & 0x7c00)>>10] |
2350 lookup_g[(*p & 0x03e0)>> 5] |
2351 lookup_b[(*p & 0x001f)];
2352 }
2353 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2354 }
2355 break;
2356 }
2357 case 16:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0xf800)>>11] |
2369 lookup_g[(*p & 0x07e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 24:
2377 {
2378 unsigned char *p1, *pf, *p, *pl;
2379 p1 = (unsigned char *) srcImage->data;
2380 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width * 3;
2385 for (; p < pl; p += 3)
2386 {
2387 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2388 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2389 p[2] = lookup_r[(p[2] & 0x0000ff)];
2390 }
2391 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 32:
2396 {
2397 RUINT32T *p1, *pf, *p, *pl;
2398 p1 = (RUINT32T *) srcImage->data;
2399 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400
2401 while (p1 < pf)
2402 {
2403 p = p1;
2404 pl = p1 + srcImage->width;
2405 for (; p < pl; p++)
2406 {
2407 *p = lookup_r[(*p & 0xff0000)>>16] |
2408 lookup_g[(*p & 0x00ff00)>> 8] |
2409 lookup_b[(*p & 0x0000ff)] |
2410 (*p & ~0xffffff);
2411 }
2412 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 }
2417
2418 free (lookup);
2419}
2420#endif
2421
2422/*
2423 * Check our parents are still who we think they are.
2424 * Do transparency updates if required
2425 */
2426int
2427rxvt_term::check_our_parents ()
2428{
2429 int i, pchanged, aformat, have_pixmap, rootdepth;
2430 unsigned long nitems, bytes_after;
2431 Atom atype;
2432 unsigned char *prop = NULL;
2433 Window root, oldp, *list;
2434 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437
2438 pchanged = 0;
2439
2440 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */
2442
2443 XGetWindowAttributes (disp, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth;
2445
2446 XGetWindowAttributes (disp, parent[0], &wattr);
2447
2448 if (rootdepth != wattr.depth)
2449 {
2450 if (am_transparent)
2451 {
2452 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0;
2455 }
2456
2457 return pchanged; /* Don't try any more */
2458 }
2459
2460 /* Get all X ops out of the queue so that our information is up-to-date. */
2461 XSync (disp, False);
2462
2463 /*
2464 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame
2466 * windows for each client, so we have to take care about that.
2467 */
2468 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success);
2472
2473 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success);
2478
2479 if (!i || prop == NULL
2480#if TINTING
2481 || !rs[Rs_color + Color_tint]
2482#endif
2483 )
2484 have_pixmap = 0;
2485 else
2486 {
2487 have_pixmap = 1;
2488 rootpixmap = *(Pixmap *)prop;
2489 XFree (prop);
2490 }
2491
2492 if (have_pixmap)
2493 {
2494 /*
2495 * Copy display->root pixmap transparency
2496 */
2497 int sx, sy, nx, ny;
2498 unsigned int nw, nh;
2499 Window cr;
2500 XImage *image;
2501 GC gc;
2502 XGCValues gcvalue;
2503
2504 XTranslateCoordinates (disp, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height;
2508 nx = ny = 0;
2509
2510 if (sx < 0)
2511 {
2512 nw += sx;
2513 nx = -sx;
2514 sx = 0;
2515 }
2516
2517 if (sy < 0)
2518 {
2519 nh += sy;
2520 ny = -sy;
2521 sy = 0;
2522 }
2523
2524 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526
2527 XSync (disp, False);
2528 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */
2533 allowedxerror = 0;
2534
2535 if (image == NULL)
2536 {
2537 if (am_transparent && am_pixmap_trans)
2538 {
2539 pchanged = 1;
2540 if (pixmap != None)
2541 {
2542 XFreePixmap (disp, pixmap);
2543 pixmap = None;
2544 }
2545 }
2546
2547 am_pixmap_trans = 0;
2548 }
2549 else
2550 {
2551 if (pixmap != None)
2552 XFreePixmap (disp, pixmap);
2553
2554#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint))
2556 {
2557 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2561
2562 ShadeXImage (display, image, shade, rm, gm, bm);
2563 }
2564#endif
2565
2566 pixmap = XCreatePixmap (disp, vt,
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc);
2572 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]);
2575
2576 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1;
2578
2579 am_transparent = am_pixmap_trans = 1;
2580 }
2581 }
2582
2583 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 else
2586 {
2587 unsigned int n;
2588 /*
2589 * InheritPixmap transparency
2590 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 {
2593 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root,
2595 &parent[i], &list, &n);
2596 XFree (list);
2597
2598 if (parent[i] == display->root)
2599 {
2600 if (oldp != None)
2601 pchanged = 1;
2602
2603 break;
2604 }
2605
2606 if (oldp != parent[i])
2607 pchanged = 1;
2608 }
2609
2610 n = 0;
2611
2612 if (pchanged)
2613 {
2614 for (; n < (unsigned int)i; n++)
2615 {
2616 XGetWindowAttributes (disp, parent[n], &wattr);
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break;
2621 }
2622 }
2623 }
2624
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2626 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */
2631 }
2632 else
2633 {
2634 for (n = 0; n < (unsigned int)i; n++)
2635 {
2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]);
2638 }
2639
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 am_transparent = 1;
2642 }
2643
2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2660 }
2661
2662 return pchanged;
2663}
2664#endif
2665 2172
2666/*}}} */ 2173/*}}} */
2667 2174
2668bool 2175bool
2669rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
… …
2718 if (ch == C0_LF) 2225 if (ch == C0_LF)
2719 nlines++; 2226 nlines++;
2720 2227
2721 refresh_count++; 2228 refresh_count++;
2722 2229
2723 if (!OPTION (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2725 { 2231 {
2726 refreshnow = true;
2727 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2728 ch = NOCHAR; 2237 ch = NOCHAR;
2729 break; 2238 break;
2239 }
2730 } 2240 }
2731 2241
2732 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2734 { 2244 {
… …
2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2763 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2764 2274
2765 /* 2275 /*
2766 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2767 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2768 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2769 * is incremented here because we must be doing flat-out scrolling.
2770 */ 2279 */
2771 if (refreshnow) 2280 if (refreshnow)
2772 { 2281 {
2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2774 refresh_limit++;
2775 else
2776 {
2777 flag = true; 2282 flag = true;
2778 scr_refresh (); 2283 scr_refresh ();
2779 want_refresh = 1; 2284 want_refresh = 1;
2780 }
2781 } 2285 }
2782 2286
2783 } 2287 }
2784 else 2288 else
2785 { 2289 {
… …
2934 { 2438 {
2935 if ((buf[len++] = cmd_getc ()) == 'i') 2439 if ((buf[len++] = cmd_getc ()) == 'i')
2936 break; /* done = 1 */ 2440 break; /* done = 1 */
2937 } 2441 }
2938 } 2442 }
2939 2443
2940 for (i = 0; i < len; i++) 2444 for (i = 0; i < len; i++)
2941 if (putc (buf[i], fd) == EOF) 2445 if (putc (buf[i], fd) == EOF)
2942 { 2446 {
2943 done = 1; 2447 done = 1;
2944 break; 2448 break;
… …
2946 } 2450 }
2947 } 2451 }
2948 2452
2949 pclose_printer (fd); 2453 pclose_printer (fd);
2950} 2454}
2951#endif /* PRINTPIPE */ 2455#endif /* PRINTPIPE */
2952/*}}} */ 2456/*}}} */
2953 2457
2954/* *INDENT-OFF* */ 2458/* *INDENT-OFF* */
2955enum { 2459enum {
2956 C1_40 = 0x40, 2460 C1_40 = 0x40,
… …
3006 process_dcs_seq (); 2510 process_dcs_seq ();
3007 break; 2511 break;
3008 case 0x9b: /* CSI */ 2512 case 0x9b: /* CSI */
3009 process_csi_seq (); 2513 process_csi_seq ();
3010 break; 2514 break;
3011 case 0x9d: /* CSI */ 2515 case 0x9d: /* OSC */
3012 process_osc_seq (); 2516 process_osc_seq ();
3013 break; 2517 break;
3014#endif 2518#endif
3015 } 2519 }
3016} 2520}
… …
3106 scr_charset_set (2, (unsigned int)cmd_getc ()); 2610 scr_charset_set (2, (unsigned int)cmd_getc ());
3107 break; 2611 break;
3108 case '+': 2612 case '+':
3109 scr_charset_set (3, (unsigned int)cmd_getc ()); 2613 scr_charset_set (3, (unsigned int)cmd_getc ());
3110 break; 2614 break;
3111#if ENABLE_FRILLS 2615#if !ENABLE_MINIMAL
3112 case '6': 2616 case '6':
3113 scr_backindex (); 2617 scr_backindex ();
3114 break; 2618 break;
3115#endif 2619#endif
3116 case '7': 2620 case '7':
3117 scr_cursor (SAVE); 2621 scr_cursor (SAVE);
3118 break; 2622 break;
3119 case '8': 2623 case '8':
3120 scr_cursor (RESTORE); 2624 scr_cursor (RESTORE);
3121 break; 2625 break;
3122#if ENABLE_FRILLS 2626#if !ENABLE_MINIMAL
3123 case '9': 2627 case '9':
3124 scr_forwardindex (); 2628 scr_forwardindex ();
3125 break; 2629 break;
3126#endif 2630#endif
3127 case '=': 2631 case '=':
… …
3242rxvt_term::process_csi_seq () 2746rxvt_term::process_csi_seq ()
3243{ 2747{
3244 unicode_t ch, priv, i; 2748 unicode_t ch, priv, i;
3245 unsigned int nargs, p; 2749 unsigned int nargs, p;
3246 int n, ndef; 2750 int n, ndef;
3247 int arg[ESC_ARGS]; 2751 int arg[ESC_ARGS] = { };
3248 2752
3249 for (nargs = ESC_ARGS; nargs > 0;) 2753 nargs = 0;
3250 arg[--nargs] = 0;
3251 2754
3252 priv = 0; 2755 priv = 0;
3253 ch = cmd_getc (); 2756 ch = cmd_getc ();
3254 if (ch >= '<' && ch <= '?') 2757 if (ch >= '<' && ch <= '?')
2758 {
3255 { /* '<' '=' '>' '?' */ 2759 /* '<' '=' '>' '?' */
3256 priv = ch; 2760 priv = ch;
3257 ch = cmd_getc (); 2761 ch = cmd_getc ();
3258 } 2762 }
3259 2763
3260 /* read any numerical arguments */ 2764 /* read any numerical arguments */
… …
3289 ndef = get_byte_array_bit (csi_defaults, i); 2793 ndef = get_byte_array_bit (csi_defaults, i);
3290 for (p = 0; p < nargs; p++) 2794 for (p = 0; p < nargs; p++)
3291 if (arg[p] == -1) 2795 if (arg[p] == -1)
3292 arg[p] = ndef; 2796 arg[p] = ndef;
3293 2797
3294#ifdef DEBUG_CMD
3295 fprintf (stderr, "CSI ");
3296 for (p = 0; p < nargs; p++)
3297 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3298 fprintf (stderr, "%c\n", ch);
3299#endif
3300
3301 /* 2798 /*
3302 * private mode handling 2799 * private mode handling
3303 */ 2800 */
3304 if (priv) 2801 if (priv)
3305 { 2802 {
3306 switch (priv) 2803 switch (priv)
3307 { 2804 {
3308 case '>': 2805 case '>':
3309 if (ch == CSI_DA) /* secondary device attributes */ 2806 if (ch == CSI_DA) /* secondary device attributes */
3310 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2807 {
2808 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2809 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2810 //
2811 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2812 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2813 // versions.
2814 //
2815 tt_printf ("\033[>%d;95;0c", 'U');
2816 }
3311 break; 2817 break;
3312 case '?': 2818 case '?':
3313 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2819 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3314 process_terminal_mode (ch, priv, nargs, arg); 2820 process_terminal_mode (ch, priv, nargs, arg);
3315 break; 2821 break;
… …
3441 break; 2947 break;
3442 case 6: /* CPR requested */ 2948 case 6: /* CPR requested */
3443 scr_report_position (); 2949 scr_report_position ();
3444 break; 2950 break;
3445 case 7: /* unofficial extension */ 2951 case 7: /* unofficial extension */
3446 if (OPTION (Opt_insecure)) 2952 if (option (Opt_insecure))
3447 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2953 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3448 break; 2954 break;
3449 case 8: /* unofficial extension */ 2955 case 8: /* unofficial extension */
3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2956 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3451 break; 2957 break;
… …
3518 break; 3024 break;
3519 case CSI_75: 3025 case CSI_75:
3520 scr_cursor (RESTORE); 3026 scr_cursor (RESTORE);
3521 break; 3027 break;
3522 3028
3523#if ENABLE_FRILLS 3029#if !ENABLE_MINIMAL
3524 case CSI_74: 3030 case CSI_74:
3525 process_window_ops (arg, nargs); 3031 process_window_ops (arg, nargs);
3526 break; 3032 break;
3527#endif 3033#endif
3528 3034
… …
3535 break; 3041 break;
3536 } 3042 }
3537} 3043}
3538/*}}} */ 3044/*}}} */
3539 3045
3540#if ENABLE_FRILLS 3046#if !ENABLE_MINIMAL
3541/* ARGSUSED */ 3047/* ARGSUSED */
3542void 3048void
3543rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3049rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544{ 3050{
3545 int x, y; 3051 int x, y;
3546 XWindowAttributes wattr; 3052 XWindowAttributes wattr;
3547 Window wdummy; 3053 Window wdummy;
3548 dDisp; 3054
3055 dLocal (Display *, dpy);
3549 3056
3550 if (nargs == 0) 3057 if (nargs == 0)
3551 return; 3058 return;
3552 3059
3553 switch (args[0]) 3060 switch (args[0])
3554 { 3061 {
3555 /* 3062 /*
3556 * commands 3063 * commands
3557 */ 3064 */
3558 case 1: /* deiconify window */ 3065 case 1: /* deiconify window */
3559 XMapWindow (disp, parent[0]); 3066 XMapWindow (dpy, parent[0]);
3560 break; 3067 break;
3561 case 2: /* iconify window */ 3068 case 2: /* iconify window */
3562 XIconifyWindow (disp, parent[0], display->screen); 3069 XIconifyWindow (dpy, parent[0], display->screen);
3563 break; 3070 break;
3564 case 3: /* set position (pixels) */ 3071 case 3: /* set position (pixels) */
3565 XMoveWindow (disp, parent[0], args[1], args[2]); 3072 XMoveWindow (dpy, parent[0], args[1], args[2]);
3566 break; 3073 break;
3567 case 4: /* set size (pixels) */ 3074 case 4: /* set size (pixels) */
3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3075 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569 break; 3076 break;
3570 case 5: /* raise window */ 3077 case 5: /* raise window */
3571 XRaiseWindow (disp, parent[0]); 3078 XRaiseWindow (dpy, parent[0]);
3572 break; 3079 break;
3573 case 6: /* lower window */ 3080 case 6: /* lower window */
3574 XLowerWindow (disp, parent[0]); 3081 XLowerWindow (dpy, parent[0]);
3575 break; 3082 break;
3576 case 7: /* refresh window */ 3083 case 7: /* refresh window */
3577 scr_touch (true); 3084 scr_touch (true);
3578 break; 3085 break;
3579 case 8: /* set size (chars) */ 3086 case 8: /* set size (chars) */
… …
3586 if (args[0] >= 24) /* set height (chars) */ 3093 if (args[0] >= 24) /* set height (chars) */
3587 set_widthheight ((unsigned int)width, 3094 set_widthheight ((unsigned int)width,
3588 (unsigned int) (args[1] * fheight)); 3095 (unsigned int) (args[1] * fheight));
3589 break; 3096 break;
3590 3097
3591
3592 /* 3098 /*
3593 * reports - some output format copied from XTerm 3099 * reports - some output format copied from XTerm
3594 */ 3100 */
3595 case 11: /* report window state */ 3101 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3102 XGetWindowAttributes (dpy, parent[0], &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3103 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3104 break;
3599 case 13: /* report window position */ 3105 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3106 XGetWindowAttributes (dpy, parent[0], &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3107 XTranslateCoordinates (dpy, parent[0], wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3108 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3109 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3110 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3111 break;
3606 case 14: /* report window size (pixels) */ 3112 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3113 XGetWindowAttributes (dpy, parent[0], &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3114 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3115 break;
3610 case 18: /* report text area size (chars) */ 3116 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3117 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3118 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3120 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3121 break;
3616 case 20: /* report icon label */ 3122 case 20: /* report icon label */
3617 { 3123 {
3618 char *s; 3124 char *s;
3619 XGetIconName (disp, parent[0], &s); 3125 XGetIconName (dpy, parent[0], &s);
3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3126 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3127 XFree (s);
3622 } 3128 }
3623 break; 3129 break;
3624 case 21: /* report window title */ 3130 case 21: /* report window title */
3625 { 3131 {
3626 char *s; 3132 char *s;
3627 XFetchName (disp, parent[0], &s); 3133 XFetchName (dpy, parent[0], &s);
3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3134 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3135 XFree (s);
3630 } 3136 }
3631 break; 3137 break;
3632 } 3138 }
3633} 3139}
… …
3660 seen_esc = true; 3166 seen_esc = true;
3661 continue; 3167 continue;
3662 } 3168 }
3663 else if (ch == C0_BEL || ch == CHAR_ST) 3169 else if (ch == C0_BEL || ch == CHAR_ST)
3664 break; 3170 break;
3171 else if (ch == C0_SYN)
3172 ch = cmd_get8 ();
3665 else if (ch < 0x20) 3173 else if (ch < 0x20)
3666 return NULL; /* other control character - exit */ 3174 return NULL; /* other control character - exit */
3667 3175
3668 seen_esc = false; 3176 seen_esc = false;
3669 3177
3670 if (n >= STRING_MAX - 1) 3178 if (n >= STRING_MAX - 1)
3671 // stop at some sane length 3179 // stop at some sane length
3672 return NULL; 3180 return NULL;
3673 3181
3674 if (ch == C0_SYN)
3675 string[n++] = cmd_get8 ();
3676 else
3677 string[n++] = ch; 3182 string[n++] = ch;
3678 } 3183 }
3679 3184
3680 string[n++] = '\0'; 3185 string[n++] = '\0';
3681 3186
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3187 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3733void 3238void
3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3239rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3240{
3736 if (str[0] == '?' && !str[1]) 3241 if (str[0] == '?' && !str[1])
3737 { 3242 {
3738 unsigned short r, g, b; 3243 rgba c;
3739 pix_colors_focused[color].get (display, r, g, b); 3244 pix_colors_focused[color].get (c);
3245
3246#if XFT
3247 if (c.a != rgba::MAX_CC)
3248 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3249 else
3250#endif
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3251 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3741 } 3252 }
3742 else 3253 else
3743 set_window_color (color, str); 3254 set_window_color (color, str);
3744} 3255}
3745 3256
… …
3751{ 3262{
3752 int color; 3263 int color;
3753 char *buf, *name; 3264 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3265 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3266 int saveop = op;
3756 dDisp; 3267
3268 dLocal (Display *, dpy);
3757 3269
3758 assert (str != NULL); 3270 assert (str != NULL);
3271
3272 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3273 return;
3274
3759 switch (op) 3275 switch (op)
3760 { 3276 {
3761 case XTerm_name: 3277 case XTerm_name:
3762 set_title (str); 3278 set_title (str);
3763 /* FALLTHROUGH */ 3279 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3293 unsigned long bytes_after;
3778 unsigned char *value = 0; 3294 unsigned char *value = 0;
3779 const char *str = ""; 3295 const char *str = "";
3780 3296
3781 if (prop 3297 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3298 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3299 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3300 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3301 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3302 && actual_type != None
3787 && actual_format == 8) 3303 && actual_format == 8)
3788 str = (const char *)(value); 3304 str = (const char *)(value);
3789 3305
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3306 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3307
3792 XFree (value); 3308 XFree (value);
3793 } 3309 }
3794 else 3310 else
3795 { 3311 {
… …
3799 { 3315 {
3800 *eq = 0; 3316 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3317 set_utf8_property (display->atom (str), eq + 1);
3802 } 3318 }
3803 else 3319 else
3804 XDeleteProperty (disp, parent[0], 3320 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3321 display->atom (str));
3806 } 3322 }
3807 break; 3323 break;
3808 3324
3809 case XTerm_Color: 3325 case XTerm_Color:
… …
3819 break; 3335 break;
3820 3336
3821 if ((buf = strchr (name, ';')) != NULL) 3337 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3338 *buf++ = '\0';
3823 3339
3824 if (name[0] == '?' && !name[1]) 3340 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color, name);
3832 } 3341 }
3833 break; 3342 break;
3834 case XTerm_Color00: 3343 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3344 process_color_seq (op, Color_fg, str, resp);
3836 break; 3345 break;
3837 case XTerm_Color01: 3346 case XTerm_Color01:
3838 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3347 process_color_seq (op, Color_bg, str, resp);
3839 break; 3348 break;
3840#ifndef NO_CURSORCOLOR 3349#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3350 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3351 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3352 break;
3844#endif 3353#endif
3845 case XTerm_Color_pointer_fg: 3354 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3355 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3356 break;
3848 case XTerm_Color_pointer_bg: 3357 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3358 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3359 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3360#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_RV: 3361 case XTerm_Color_RV:
3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3362 process_color_seq (op, Color_RV, str, resp);
3854 break; 3363 break;
3855 case Rxvt_Color_BD: 3364 case Rxvt_Color_BD:
3856 case URxvt_Color_BD: 3365 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp); 3366 process_color_seq (op, Color_BD, str, resp);
3858 break; 3367 break;
3859 case Rxvt_Color_UL: 3368 case Rxvt_Color_UL:
3860 case URxvt_Color_UL: 3369 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp); 3370 process_color_seq (op, Color_UL, str, resp);
3862 break; 3371 break;
3863 case URxvt_Color_IT: 3372 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3373 process_color_seq (op, Color_IT, str, resp);
3865 break; 3374 break;
3866#endif 3375#endif
3867#if TRANSPARENT && TINTING 3376#if ENABLE_TRANSPARENCY
3868 case URxvt_Color_tint: 3377 case URxvt_Color_tint:
3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3378 process_color_seq (op, Color_tint, str, resp);
3870 check_our_parents (); 3379 {
3871 if (am_transparent) 3380 bool changed = false;
3872 want_full_refresh = want_refresh = 1; 3381 if (ISSET_PIXCOLOR (Color_tint))
3873 break; 3382 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3874#endif 3383 else
3384 changed = bgPixmap.unset_tint ();
3385 if (changed)
3386 update_background ();
3387 }
3875 3388
3389 break;
3390#endif
3391
3392#if BG_IMAGE_FROM_FILE
3876 case Rxvt_Pixmap: 3393 case Rxvt_Pixmap:
3877 { 3394 if (!strcmp (str, "?"))
3878 if (*str != ';')
3879 { 3395 {
3880#if XPM_BACKGROUND 3396 char str[256];
3881 scale_pixmap (""); /* reset to default scaling */ 3397
3882 set_bgPixmap (str); /* change pixmap */ 3398 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3883 scr_touch (true); 3399 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3884#endif 3400 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3401 process_xterm_seq (XTerm_title, str, CHAR_ST);
3885 } 3402 }
3886 3403 else
3404 {
3887 int changed = 0; 3405 int changed = 0;
3888 3406
3889 while ((str = strchr (str, ';')) != NULL) 3407 if (*str != ';')
3890 { 3408 {
3409 /* reset to default scaling :*/
3410 bgPixmap.unset_geometry ();
3411 if (bgPixmap.set_file (str)) /* change pixmap */
3412 changed++;
3413 str = strchr (str, ';');
3414 if (str == NULL)
3415 bgPixmap.set_defaultGeometry ();
3416 }
3417 while (str)
3418 {
3891 str++; 3419 str++;
3892#if XPM_BACKGROUND 3420 if (bgPixmap.set_geometry (str))
3893 changed += scale_pixmap (str); 3421 changed++;
3894#endif 3422 str = strchr (str, ';');
3895 } 3423 }
3896
3897 if (changed) 3424 if (changed)
3898 { 3425 update_background ();
3899#ifdef XPM_BACKGROUND
3900 resize_pixmap ();
3901 scr_touch (true);
3902#endif
3903 } 3426 }
3904 }
3905 break; 3427 break;
3428#endif
3906 3429
3907 case Rxvt_restoreFG: 3430 case Rxvt_restoreFG:
3908 set_window_color (Color_fg, str); 3431 set_window_color (Color_fg, str);
3909 break; 3432 break;
3910 case Rxvt_restoreBG: 3433 case Rxvt_restoreBG:
… …
3935 case URxvt_italicFont: 3458 case URxvt_italicFont:
3936 case URxvt_boldItalicFont: 3459 case URxvt_boldItalicFont:
3937#endif 3460#endif
3938 if (query) 3461 if (query)
3939 tt_printf ("\33]%d;%-.250s%c", saveop, 3462 tt_printf ("\33]%d;%-.250s%c", saveop,
3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3463 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3941 ? fontset[op - URxvt_font]->fontdesc : "", 3464 ? fontset[op - URxvt_font]->fontdesc : "",
3942 resp); 3465 resp);
3943 else 3466 else
3944 { 3467 {
3945 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3468 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3948 allocated.push_back ((void *)res); 3471 allocated.push_back ((void *)res);
3949 set_fonts (); 3472 set_fonts ();
3950 } 3473 }
3951 break; 3474 break;
3952 3475
3953#if ENABLE_FRILLS 3476 case URxvt_version:
3477 if (query)
3478 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3479 op,
3480 rs[Rs_name], VERSION[0], VERSION[2],
3481 resp);
3482 break;
3483
3484#if !ENABLE_MINIMAL
3954 case URxvt_locale: 3485 case URxvt_locale:
3955 if (query) 3486 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3487 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3957 else 3488 else
3958 { 3489 {
3959 set_locale (str); 3490 set_locale (str);
3960 pty->set_utf8_mode (enc_utf8); 3491 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 3492 init_xlocale ();
… …
3976 break; 3507 break;
3977#endif 3508#endif
3978 3509
3979#if ENABLE_PERL 3510#if ENABLE_PERL
3980 case URxvt_perl: 3511 case URxvt_perl:
3981 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3982 ; // no responses yet 3513 ; // no responses yet
3983 break; 3514 break;
3984#endif 3515#endif
3985 } 3516 }
3986} 3517}
… …
4024{ 3555{
4025 unsigned int i, j; 3556 unsigned int i, j;
4026 int state; 3557 int state;
4027 3558
4028 static const struct 3559 static const struct
4029 { 3560 {
4030 const int argval; 3561 const int argval;
4031 const unsigned long bit; 3562 const unsigned long bit;
4032 }
4033
4034 argtopriv[] = { 3563 } argtopriv[] = {
4035 { 1, PrivMode_aplCUR }, 3564 { 1, PrivMode_aplCUR },
4036 { 2, PrivMode_vt52 }, 3565 { 2, PrivMode_vt52 },
4037 { 3, PrivMode_132 }, 3566 { 3, PrivMode_132 },
4038 { 4, PrivMode_smoothScroll }, 3567 { 4, PrivMode_smoothScroll },
4039 { 5, PrivMode_rVideo }, 3568 { 5, PrivMode_rVideo },
… …
4055 { 66, PrivMode_aplKP }, 3584 { 66, PrivMode_aplKP },
4056#ifndef NO_BACKSPACE_KEY 3585#ifndef NO_BACKSPACE_KEY
4057 { 67, PrivMode_BackSpace }, 3586 { 67, PrivMode_BackSpace },
4058#endif 3587#endif
4059 { 1000, PrivMode_MouseX11 }, 3588 { 1000, PrivMode_MouseX11 },
4060 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3589 { 1002, PrivMode_MouseBtnEvent },
4061 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3590 { 1003, PrivMode_MouseAnyEvent },
4062 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4063 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4064 { 1011, PrivMode_Keypress }, // rxvt extension 3592 { 1011, PrivMode_Keypress }, // rxvt extension
4065 // 1035 enable modifiers for alt, numlock NYI 3593 // 1035 enable modifiers for alt, numlock NYI
4066 // 1036 send ESC for meta keys NYI 3594 // 1036 send ESC for meta keys NYI
4067 // 1037 send DEL for keypad delete NYI 3595 // 1037 send DEL for keypad delete NYI
… …
4102 scr_touch (true); 3630 scr_touch (true);
4103 break; 3631 break;
4104#endif 3632#endif
4105 case 1048: /* alternative cursor save */ 3633 case 1048: /* alternative cursor save */
4106 case 1049: 3634 case 1049:
4107 if (OPTION (Opt_secondaryScreen)) 3635 if (option (Opt_secondaryScreen))
4108 if (mode == 0) 3636 if (mode == 0)
4109 scr_cursor (RESTORE); 3637 scr_cursor (RESTORE);
4110 else if (mode == 1) 3638 else if (mode == 1)
4111 scr_cursor (SAVE); 3639 scr_cursor (SAVE);
4112 break; 3640 break;
… …
4141 scr_autowrap (state); 3669 scr_autowrap (state);
4142 break; 3670 break;
4143 /* case 8: - auto repeat, can't do on a per window basis */ 3671 /* case 8: - auto repeat, can't do on a per window basis */
4144 case 9: /* X10 mouse reporting */ 3672 case 9: /* X10 mouse reporting */
4145 if (state) /* orthogonal */ 3673 if (state) /* orthogonal */
4146 priv_modes &= ~PrivMode_MouseX11; 3674 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4147 break; 3675 break;
4148#ifdef scrollBar_esc 3676#ifdef scrollBar_esc
4149 case scrollBar_esc: 3677 case scrollBar_esc:
4150 if (scrollbar_mapping (state)) 3678 if (scrollbar_mapping (state))
4151 { 3679 {
… …
4164 break; 3692 break;
4165 /* case 66: - application key pad */ 3693 /* case 66: - application key pad */
4166 /* case 67: - backspace key */ 3694 /* case 67: - backspace key */
4167 case 1000: /* X11 mouse reporting */ 3695 case 1000: /* X11 mouse reporting */
4168 if (state) /* orthogonal */ 3696 if (state) /* orthogonal */
4169 priv_modes &= ~PrivMode_MouseX10; 3697 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4170 break; 3698 break;
4171#if 0
4172 case 1001: 3699 case 1002:
4173 break; /* X11 mouse highlighting */ 3700 case 1003:
4174#endif 3701 if (state)
3702 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3705 vt_emask_mouse = PointerMotionMask;
3706 }
3707 else
3708 vt_emask_mouse = NoEventMask;
3709 vt_select_input ();
3710 break;
4175 case 1010: /* scroll to bottom on TTY output inhibit */ 3711 case 1010: /* scroll to bottom on TTY output inhibit */
4176 set_option (Opt_scrollTtyOutput, !state); 3712 set_option (Opt_scrollTtyOutput, !state);
4177 break; 3713 break;
4178 case 1011: /* scroll to bottom on key press */ 3714 case 1011: /* scroll to bottom on key press */
4179 set_option (Opt_scrollTtyKeypress, state); 3715 set_option (Opt_scrollTtyKeypress, state);
4180 break; 3716 break;
4181 case 1047: /* secondary screen w/ clearing last */ 3717 case 1047: /* secondary screen w/ clearing last */
4182 if (OPTION (Opt_secondaryScreen)) 3718 if (option (Opt_secondaryScreen))
4183 if (current_screen != PRIMARY) 3719 if (current_screen != PRIMARY)
4184 scr_erase_screen (2); 3720 scr_erase_screen (2);
4185 scr_change_screen (state); 3721 scr_change_screen (state);
4186 break; 3722 break;
4187 case 1049: /* secondary screen w/ clearing first */ 3723 case 1049: /* secondary screen w/ clearing first */
4188 scr_change_screen (state); 3724 scr_change_screen (state);
4189 if (OPTION (Opt_secondaryScreen)) 3725 if (option (Opt_secondaryScreen))
4190 if (current_screen != PRIMARY) 3726 if (current_screen != PRIMARY)
4191 scr_erase_screen (2); 3727 scr_erase_screen (2);
4192 break; 3728 break;
4193 default: 3729 default:
4194 break; 3730 break;
… …
4322 scr_color (Color_bg, Color_bg); 3858 scr_color (Color_bg, Color_bg);
4323 break; 3859 break;
4324 3860
4325 //case 50: // not variable spacing 3861 //case 50: // not variable spacing
4326 3862
4327#if ENABLE_FRILLS 3863#if !ENABLE_MINIMAL
4328 case 90: 3864 case 90:
4329 case 91: /* set bright fg color */ 3865 case 91: /* set bright fg color */
4330 case 92: 3866 case 92:
4331 case 93: 3867 case 93:
4332 case 94: 3868 case 94:
… …
4356rxvt_term::process_graphics () 3892rxvt_term::process_graphics ()
4357{ 3893{
4358 unicode_t ch, cmd = cmd_getc (); 3894 unicode_t ch, cmd = cmd_getc ();
4359 3895
4360 if (cmd == 'Q') 3896 if (cmd == 'Q')
3897 {
4361 { /* query graphics */ 3898 /* query graphics */
4362 tt_printf ("\033G0\012"); /* no graphics */ 3899 tt_printf ("\033G0\012"); /* no graphics */
4363 return; 3900 return;
4364 } 3901 }
4365 /* swallow other graphics sequences until terminating ':' */ 3902 /* swallow other graphics sequences until terminating ':' */
4366 do 3903 do
… …
4416 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3953 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4417 3954
4418 memcpy (v_buffer + v_buflen, data, len); 3955 memcpy (v_buffer + v_buflen, data, len);
4419 v_buflen += len; 3956 v_buflen += len;
4420 3957
4421 pty_ev.set (EVENT_READ | EVENT_WRITE); 3958 pty_ev.set (ev::READ | ev::WRITE);
4422} 3959}
4423 3960
4424void rxvt_term::pty_write () 3961void rxvt_term::pty_write ()
4425{ 3962{
4426 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3963 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4431 3968
4432 if (v_buflen == 0) 3969 if (v_buflen == 0)
4433 { 3970 {
4434 free (v_buffer); 3971 free (v_buffer);
4435 v_buffer = 0; 3972 v_buffer = 0;
4436 v_buflen = 0;
4437 3973
4438 pty_ev.set (EVENT_READ); 3974 pty_ev.set (ev::READ);
4439 return; 3975 return;
4440 } 3976 }
4441 3977
4442 memmove (v_buffer, v_buffer + written, v_buflen); 3978 memmove (v_buffer, v_buffer + written, v_buflen);
4443 } 3979 }
4444 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3980 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4445 pty_ev.set (EVENT_READ); 3981 pty_ev.set (ev::READ);
4446} 3982}
4447 3983
4448/*----------------------- end-of-file (C source) -----------------------*/ 3984/*----------------------- end-of-file (C source) -----------------------*/
4449 3985

Diff Legend

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