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.278 by root, Fri Jan 20 18:50:49 2006 UTC vs.
Revision 1.373 by root, Tue Dec 11 15:42:51 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.again ();
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 }
1060} 1084}
1061#endif 1085#endif
1062 1086
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1088void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1090{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1069 {
1070 want_refresh = 1; 1093 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
1072 } 1095 w.stop ();
1073} 1096}
1074#endif 1097#endif
1075 1098
1076#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1077void 1100void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1102{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1104 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1106 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1085 } 1107 }
1108 else
1109 w.stop ();
1086} 1110}
1087#endif 1111#endif
1088 1112
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1114void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1116{
1093 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
1096 { 1120 {
1097 if (view_start == top_row || view_start == 0) 1121 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0; 1122 mouse_slip_wheel_speed = 0;
1099 1123
1100 want_refresh = 1; 1124 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1125 }
1126 else
1127 w.stop ();
1103} 1128}
1104#endif 1129#endif
1105 1130
1106#if HAVE_SCHED_YIELD 1131#if LINUX_YIELD_HACK
1107static struct event_handler 1132static struct event_handler
1108{ 1133{
1109 check_watcher cw_yield; 1134 ev::prepare yield_ev;
1110 1135
1111 void yield (check_watcher &w) 1136 void yield_cb (ev::prepare &w, int revents)
1112 { 1137 {
1113 sched_yield (); 1138 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS.
1142
1143 struct timespec ts = { 0, 0 };
1144 nanosleep (&ts, 0);
1145
1114 w.stop (); 1146 w.stop ();
1115 } 1147 }
1116 1148
1117 event_handler () 1149 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1150 : yield_ev (this, &event_handler::yield_cb)
1119 { 1151 {
1120 } 1152 }
1121} event_handler; 1153} event_handler;
1122#endif 1154#endif
1123 1155
… …
1143 cmdbuf_endp += r; 1175 cmdbuf_endp += r;
1144 return true; 1176 return true;
1145 } 1177 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1179 {
1148#if HAVE_SCHED_YIELD 1180#if LINUX_YIELD_HACK
1149 if (display->is_local) 1181 if (display->is_local)
1150 event_handler.cw_yield.start (); 1182 event_handler.yield_ev.start ();
1151#endif 1183#endif
1152 } 1184 }
1153 else 1185 else
1154 { 1186 {
1155 pty_ev.stop (); 1187 pty_ev.stop ();
1156 1188
1157 if (!OPTION (Opt_hold)) 1189 if (!option (Opt_hold))
1158 destroy (); 1190 destroy ();
1159 } 1191 }
1160 1192
1161 return false; 1193 return false;
1162} 1194}
1163 1195
1164void 1196void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1198{
1167 make_current (); 1199 make_current ();
1168 1200
1169 if (revents & EVENT_READ) 1201 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1203 while (pty_fill ())
1172 if (cmd_parse ()) 1204 if (cmd_parse ())
1173 break; 1205 break;
1174 1206
1175 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1176 pty_write (); 1208 pty_write ();
1177} 1209}
1178 1210
1179void 1211void
1180rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1181{ 1213{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1215 recolour_cursor ();
1184 1216
1185#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1218 hidden_pointer = 0;
1187 1219
1188 if (OPTION (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1190#endif 1222#endif
1191} 1223}
1192 1224
1193#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1194void 1226void
1195rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
1196{ 1228{
1197 if (!OPTION (Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
1198 return; 1230 return;
1199 1231
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1233 XFlush (dpy);
1202 1234
1203 hidden_pointer = 1; 1235 hidden_pointer = 1;
1204} 1236}
1205 1237
1206void 1238void
1207rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1240{
1209 make_current (); 1241 make_current ();
1210 1242
1211 pointer_blank (); 1243 pointer_blank ();
1212} 1244}
… …
1215void 1247void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1249{
1218 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1219 int x, y; 1251 int x, y;
1252 int code = 32;
1220 1253
1221 x = ev.x; 1254 x = Pixel2Col (ev.x);
1222 y = ev.y; 1255 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260 mouse_row = x;
1261 mouse_col = y;
1262 code += 32;
1263 }
1224 1264
1225 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
1226 button_number = 3; 1266 button_number = 3;
1227 else 1267 else
1228 { 1268 {
… …
1274 x + 1, 1314 x + 1,
1275 y + 1); 1315 y + 1);
1276#endif 1316#endif
1277 1317
1278 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1319 (code + button_number + key_state),
1280 (32 + x + 1), 1320 (32 + x + 1),
1281 (32 + y + 1)); 1321 (32 + y + 1));
1282} 1322}
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 1323
1294/*{{{ process an X event */ 1324/*{{{ process an X event */
1295void 1325void
1296rxvt_term::x_cb (XEvent &ev) 1326rxvt_term::x_cb (XEvent &ev)
1297{ 1327{
1298 make_current (); 1328 make_current ();
1299 1329
1300 dDisp; 1330 dLocal (Display *, dpy);
1301 1331
1302 if (ev.xany.window == vt 1332 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1333 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1334 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1335 return;
… …
1310 unsigned int unused_mask; 1340 unsigned int unused_mask;
1311 1341
1312 switch (ev.type) 1342 switch (ev.type)
1313 { 1343 {
1314 case KeyPress: 1344 case KeyPress:
1315#if ISO_14755 1345 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1346 break;
1321 1347
1322 case KeyRelease: 1348 case KeyRelease:
1323 { 1349 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; 1350 break;
1395 }
1396 1351
1397 case ButtonPress: 1352 case ButtonPress:
1398 button_press (ev.xbutton); 1353 button_press (ev.xbutton);
1399 break; 1354 break;
1400 1355
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1370 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1371 destroy ();
1417 } 1372 }
1418#if ENABLE_EWMH 1373#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1374 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1375 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1376 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1377 &ev);
1423#endif 1378#endif
1424 } 1379 }
1425 } 1380 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1386 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1387 focus_out ();
1433 } 1388 }
1434#endif 1389#endif
1435 } 1390 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1391 break;
1441 1392
1442 /* 1393 /*
1443 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1463 break; 1414 break;
1464 } 1415 }
1465 break; 1416 break;
1466 1417
1467 case FocusIn: 1418 case FocusIn:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1422 focus_in ();
1469 break; 1423 break;
1470 1424
1471 case FocusOut: 1425 case FocusOut:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1429 focus_out ();
1473 break; 1430 break;
1474 1431
1475 case ConfigureNotify: 1432 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1476 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1477 { 1437 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1439 ;
1480 1440
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1442 {
1483 seen_resize = 1; 1443 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1445 }
1486 1446 else
1447 {
1448#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ())
1450 update_background ();
1451#endif
1452 }
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 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 } 1454 }
1494 break; 1455 break;
1495 1456
1496 case PropertyNotify: 1457 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1515 break; 1476 break;
1516 1477
1517 case MapNotify: 1478 case MapNotify:
1518 mapped = 1; 1479 mapped = 1;
1519#ifdef TEXT_BLINK 1480#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1481 text_blink_ev.again ();
1521#endif 1482#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1484 break;
1524 1485
1525 case UnmapNotify: 1486 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1529#endif 1490#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1492 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1493
1539 case GraphicsExpose: 1494 case GraphicsExpose:
1540 case Expose: 1495 case Expose:
1541 if (ev.xany.window == vt) 1496 if (ev.xany.window == vt)
1542 { 1497 {
1543 do 1498 do
1499 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1504
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1506
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1553 1511 }
1554 want_refresh = 1; 1512 want_refresh = 1;
1555 } 1513 }
1556 else 1514 else
1557 { 1515 {
1558 XEvent unused_event; 1516 XEvent unused_event;
1559 1517
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1519 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1521 ;
1564 1522
1565 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1566 { 1524 {
1567 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1568 scrollbar_show (0); 1526 scrollbar_show (0);
1569 } 1527 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1528 }
1576 break; 1529 break;
1577 1530
1578 case MotionNotify: 1531 case MotionNotify:
1579#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1533 if (hidden_pointer)
1581 pointer_unblank (); 1534 pointer_unblank ();
1582#endif 1535#endif
1536 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1537 || priv_modes & PrivMode_MouseAnyEvent)
1538 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1540 break;
1585 1541
1586 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1587 { 1543 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1544 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1545 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1546 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1547 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1548 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1549 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1550 ;
1595 1551
1596 XQueryPointer (disp, vt, 1552 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1553 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1554 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1555 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1556 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1557#ifdef MOUSE_THRESHOLD
… …
1621 int dist; 1577 int dist;
1622 1578
1623 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1625 */ 1581 */
1626 if (!sel_scroll_ev.active) 1582 if (!ev_is_active (&sel_scroll_ev))
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1584
1629 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1631 */ 1587 */
1632 selection_save_x = ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
… …
1654 else 1610 else
1655 { 1611 {
1656 /* we are within the text window, so we 1612 /* we are within the text window, so we
1657 * shouldn't be scrolling 1613 * shouldn't be scrolling
1658 */ 1614 */
1659 if (sel_scroll_ev.active) 1615 if (ev_is_active (&sel_scroll_ev))
1660 sel_scroll_ev.stop(); 1616 sel_scroll_ev.stop();
1661 } 1617 }
1662#endif 1618#endif
1663#ifdef MOUSE_THRESHOLD 1619#ifdef MOUSE_THRESHOLD
1664 } 1620 }
1665#endif 1621#endif
1666 } 1622 }
1667 } 1623 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1625 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1627 MotionNotify, &ev))
1672 ; 1628 ;
1673 1629
1674 XQueryPointer (disp, scrollBar.win, 1630 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1631 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1632 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1633 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1634 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1636 scrollbar_size ());
1681 want_refresh = 1; 1637 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1638 scrollbar_show (1);
1684 } 1639 }
1685 break; 1640 break;
1686 } 1641 }
1687 1642
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1643#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1644 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1645 {
1693 if (hidden_cursor) 1646 if (hidden_cursor)
1694 { 1647 {
1695 hidden_cursor = 0; 1648 hidden_cursor = 0;
1696 want_refresh = 1; 1649 want_refresh = 1;
1697 } 1650 }
1698 1651
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1652 cursor_blink_ev.again ();
1700 } 1653 }
1701#endif 1654#endif
1702 1655
1703#if defined(POINTER_BLANK) 1656#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1657 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1658 {
1706 if (ev.type == MotionNotify 1659 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1660 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1661 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1662 if (hidden_pointer)
… …
1721 if (!focus) 1674 if (!focus)
1722 { 1675 {
1723 focus = 1; 1676 focus = 1;
1724 want_refresh = 1; 1677 want_refresh = 1;
1725 1678
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1679 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727 1680
1728#if USE_XIM 1681#if USE_XIM
1729 if (Input_Context != NULL) 1682 if (Input_Context != NULL)
1730 { 1683 {
1731 IMSetStatusPosition (); 1684 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1685 XSetICFocus (Input_Context);
1733 } 1686 }
1734#endif 1687#endif
1735#if CURSOR_BLINK 1688#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1689 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1738#endif 1691#endif
1739#if OFF_FOCUS_FADING 1692#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1693 if (rs[Rs_fade])
1741 { 1694 {
1742 pix_colors = pix_colors_focused; 1695 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1696 scr_recolour ();
1744 } 1697 }
1745#endif 1698#endif
1699#if ENABLE_FRILLS
1700 if (option (Opt_urgentOnBell))
1701 {
1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1703 {
1704 h->flags &= ~XUrgencyHint;
1705 XSetWMHints (dpy, parent[0], h);
1706 }
1707 }
1708#endif
1746 } 1709 }
1747} 1710}
1748 1711
1749void 1712void
1750rxvt_term::focus_out () 1713rxvt_term::focus_out ()
… …
1758 1721
1759#if ENABLE_FRILLS || ISO_14755 1722#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1723 if (iso14755buf)
1761 { 1724 {
1762 iso14755buf = 0; 1725 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1726# if ISO_14755
1764 scr_overlay_off (); 1727 scr_overlay_off ();
1765# endif 1728# endif
1766 } 1729 }
1767#endif 1730#endif
1768#if USE_XIM 1731#if USE_XIM
1769 if (Input_Context != NULL) 1732 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1733 XUnsetICFocus (Input_Context);
1771#endif 1734#endif
1772#if CURSOR_BLINK 1735#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1737 cursor_blink_ev.stop ();
1738
1775 hidden_cursor = 0; 1739 hidden_cursor = 0;
1776#endif 1740#endif
1777#if OFF_FOCUS_FADING 1741#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1742 if (rs[Rs_fade])
1779 { 1743 {
… …
1782 } 1746 }
1783#endif 1747#endif
1784 } 1748 }
1785} 1749}
1786 1750
1787#if TRANSPARENT 1751void
1752rxvt_term::update_fade_color (unsigned int idx)
1753{
1754#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade])
1756 {
1757 rgba c;
1758 pix_colors [Color_fade].get (c);
1759 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1760 }
1761#endif
1762}
1763
1764#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1765void
1789rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1767{
1791 make_current (); 1768 make_current ();
1792 1769
1770 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1771 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1772 return;
1773
1774# if ENABLE_TRANSPARENCY
1793 switch (ev.type) 1775 switch (ev.type)
1794 { 1776 {
1795 case PropertyNotify: 1777 case PropertyNotify:
1796 /* 1778 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1779 * 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. 1780 * use the property to determine the pixmap. We use it later on.
1799 */ 1781 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1784 {
1803 1785 bgPixmap.set_root_pixmap ();
1804 /* FALLTHROUGH */ 1786 update_background ();
1805 case ReparentNotify: 1787 }
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1788 break;
1809 } 1789 }
1790# endif
1810} 1791}
1811#endif 1792#endif
1812 1793
1813void 1794void
1814rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
… …
1823 /* 1804 /*
1824 * VT window processing of button press 1805 * VT window processing of button press
1825 */ 1806 */
1826 if (ev.window == vt) 1807 if (ev.window == vt)
1827 { 1808 {
1809 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1810 return;
1811
1828#if ISO_14755 1812#if ISO_14755
1829 // 5.4 1813 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1814 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1815 {
1832 iso14755_54 (ev.x, ev.y); 1816 iso14755_54 (ev.x, ev.y);
… …
1866 mouse_report (ev); 1850 mouse_report (ev);
1867 } 1851 }
1868#else 1852#else
1869 MEvent.button = ev.button; 1853 MEvent.button = ev.button;
1870 mouse_report (ev); 1854 mouse_report (ev);
1871#endif /* MOUSE_REPORT_DOUBLECLICK */ 1855#endif /* MOUSE_REPORT_DOUBLECLICK */
1872 1856
1873 } 1857 }
1874 else 1858 else
1875 { 1859 {
1876 if (ev.button != MEvent.button) 1860 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1861 MEvent.clicks = 0;
1878 1862
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1863 switch (ev.button)
1881 { 1864 {
1882 case Button1: 1865 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1866 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1867 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1868#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1869 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1870#else
1888 selection.rect = false; 1871 selection.rect = false;
1889#endif 1872#endif
1890 1873
1891 /* allow shift+left click to extend selection */ 1874 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1875 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1876 {
1894 if (MEvent.button == Button1 && clickintime) 1877 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1878 selection_rotate (ev.x, ev.y);
1896 else 1879 else
1897 selection_extend (ev.x, ev.y, 1); 1880 selection_extend (ev.x, ev.y, 1);
1898 } 1881 }
1899 else 1882 else
1900 { 1883 {
1901 if (MEvent.button == Button1 && clickintime) 1884 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1885 MEvent.clicks++;
1903 else 1886 else
1904 MEvent.clicks = 1; 1887 MEvent.clicks = 1;
1905 1888
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1889 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1890 }
1908 1891
1909 MEvent.button = Button1; 1892 MEvent.button = Button1;
1910 break; 1893 break;
1911 1894
1912 case Button3: 1895 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1896 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1915 else 1898 else
1916 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1917 1900
1918 MEvent.button = Button3; 1901 MEvent.button = Button3;
1919 break; 1902 break;
1920 } 1903 }
1921 } 1904 }
1922 1905
1923 MEvent.time = ev.time; 1906 MEvent.time = ev.time;
1924 return; 1907 return;
1925 } 1908 }
1926 1909
… …
1971 tt_printf ("\033[5~"); 1954 tt_printf ("\033[5~");
1972 break; 1955 break;
1973 } 1956 }
1974 } 1957 }
1975 else 1958 else
1976#endif /* NO_SCROLLBAR_REPORT */ 1959#endif /* NO_SCROLLBAR_REPORT */
1977 1960
1978 { 1961 {
1979 char upordown = 0; 1962 char upordown = 0;
1980 1963
1981 if (scrollBar.style == R_SB_NEXT) 1964 if (scrollBar.style == R_SB_NEXT)
1982 { 1965 {
1983 if (scrollbarnext_upButton (ev.y)) 1966 if (scrollbarnext_upButton (ev.y))
1984 upordown = -1; /* up */ 1967 upordown = -1; /* up */
… …
1993 upordown = 1; /* down */ 1976 upordown = 1; /* down */
1994 } 1977 }
1995 if (upordown) 1978 if (upordown)
1996 { 1979 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 1982#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
2001 { 1984 {
2002 if (upordown < 0) 1985 if (upordown < 0)
2003 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
2083 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
2084 scrollbar_show (0); 2067 scrollbar_show (0);
2085 } 2068 }
2086 2069
2087#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
2088 if (sel_scroll_ev.active) 2071 if (ev_is_active (&sel_scroll_ev))
2089 sel_scroll_ev.stop(); 2072 sel_scroll_ev.stop();
2090#endif 2073#endif
2091 2074
2092 if (ev.window == vt) 2075 if (ev.window == vt)
2093 { 2076 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2078 return;
2079
2094#if ISO_14755 2080#if ISO_14755
2095 // 5.4 2081 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2083 return;
2098#endif 2084#endif
2085
2099 if (reportmode) 2086 if (reportmode)
2100 { 2087 {
2101 /* mouse report from vt window */ 2088 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
2114 mouse_report (ev); 2101 mouse_report (ev);
2115 } 2102 }
2116#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
2117 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
2118 mouse_report (ev); 2105 mouse_report (ev);
2119#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
2120 return; 2107 return;
2121 } 2108 }
2122 2109
2123 /* 2110 /*
2124 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
… …
2127 if (priv_modes & PrivMode_mouse_report 2114 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2115 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2116 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2117 selection_extend (ev.x, ev.y, 0);
2131 2118
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2119 switch (ev.button)
2136 { 2120 {
2137 case Button1: 2121 case Button1:
2138 case Button3: 2122 case Button3:
2139 selection_make (ev.time); 2123 selection_make (ev.time);
2140 break; 2124 break;
2141 2125
2142 case Button2: 2126 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2127 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); 2128 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2129 break;
2146 2130
2147#ifdef MOUSE_WHEEL 2131#ifdef MOUSE_WHEEL
2148 case Button4: 2132 case Button4:
2149 case Button5: 2133 case Button5:
… …
2153 2137
2154 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2155 2139
2156 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2157 i = 1; 2141 i = 1;
2158 else if (OPTION (Opt_mouseWheelScrollPage)) 2142 else if (option (Opt_mouseWheelScrollPage))
2159 i = nrow - 1; 2143 i = nrow - 1;
2160 else 2144 else
2161 i = 5; 2145 i = 5;
2162 2146
2163# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
… …
2165 { 2149 {
2166 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2169 2153
2170 if (slip_wheel_ev.at < NOW) 2154 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 } 2155 }
2175 else 2156 else
2176 { 2157 {
2177# endif 2158# endif
2178 scr_page (v, i); 2159 scr_page (v, i);
… …
2184 break; 2165 break;
2185#endif 2166#endif
2186 } 2167 }
2187 } 2168 }
2188} 2169}
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#if WAIT_FOR_WM
2635 /* wait (an arbitrary period) for the WM to do its thing
2636 * needed for fvwm2.2.2 (and before?) */
2637 sleep (1);
2638#endif
2639 for (n = 0; n < (unsigned int)i; n++)
2640 {
2641 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2642 XClearWindow (disp, parent[n]);
2643 }
2644
2645 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2646 am_transparent = 1;
2647 }
2648
2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2650 parent[i] = None;
2651 }
2652
2653 if (scrollBar.win)
2654 {
2655 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2656 scrollBar.setIdle ();
2657 scrollbar_show (0);
2658 }
2659
2660 if (am_transparent)
2661 {
2662 want_refresh = want_full_refresh = 1;
2663 if (am_pixmap_trans)
2664 flush ();
2665 }
2666
2667 return pchanged;
2668}
2669#endif
2670 2170
2671/*}}} */ 2171/*}}} */
2672 2172
2673bool 2173bool
2674rxvt_term::cmd_parse () 2174rxvt_term::cmd_parse ()
… …
2723 if (ch == C0_LF) 2223 if (ch == C0_LF)
2724 nlines++; 2224 nlines++;
2725 2225
2726 refresh_count++; 2226 refresh_count++;
2727 2227
2728 if (!OPTION (Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2729 || (refresh_count >= refresh_limit * (nrow - 1)))
2730 { 2229 {
2731 refreshnow = true;
2732 refresh_count = 0; 2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 {
2234 refreshnow = true;
2733 ch = NOCHAR; 2235 ch = NOCHAR;
2734 break; 2236 break;
2237 }
2735 } 2238 }
2736 2239
2737 // scr_add_lines only works for nlines <= nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2738 if (nlines >= nrow - 1) 2241 if (nlines >= nrow - 1)
2739 { 2242 {
… …
2767 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2768 scr_add_lines (buf, str - buf, nlines); 2271 scr_add_lines (buf, str - buf, nlines);
2769 2272
2770 /* 2273 /*
2771 * If there have been a lot of new lines, then update the screen 2274 * If there have been a lot of new lines, then update the screen
2772 * What the heck I'll cheat and only refresh less than every page-full. 2275 * What the heck we'll cheat and only refresh less than every page-full.
2773 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2774 * is incremented here because we must be doing flat-out scrolling.
2775 */ 2277 */
2776 if (refreshnow) 2278 if (refreshnow)
2777 { 2279 {
2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2779 refresh_limit++;
2780 else
2781 {
2782 flag = true; 2280 flag = true;
2783 scr_refresh (); 2281 scr_refresh ();
2784 want_refresh = 1; 2282 want_refresh = 1;
2785 }
2786 } 2283 }
2787 2284
2788 } 2285 }
2789 else 2286 else
2790 { 2287 {
… …
2939 { 2436 {
2940 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
2941 break; /* done = 1 */ 2438 break; /* done = 1 */
2942 } 2439 }
2943 } 2440 }
2944 2441
2945 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
2946 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
2947 { 2444 {
2948 done = 1; 2445 done = 1;
2949 break; 2446 break;
… …
2951 } 2448 }
2952 } 2449 }
2953 2450
2954 pclose_printer (fd); 2451 pclose_printer (fd);
2955} 2452}
2956#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
2957/*}}} */ 2454/*}}} */
2958 2455
2959/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
2960enum { 2457enum {
2961 C1_40 = 0x40, 2458 C1_40 = 0x40,
… …
3011 process_dcs_seq (); 2508 process_dcs_seq ();
3012 break; 2509 break;
3013 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
3014 process_csi_seq (); 2511 process_csi_seq ();
3015 break; 2512 break;
3016 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
3017 process_osc_seq (); 2514 process_osc_seq ();
3018 break; 2515 break;
3019#endif 2516#endif
3020 } 2517 }
3021} 2518}
… …
3111 scr_charset_set (2, (unsigned int)cmd_getc ()); 2608 scr_charset_set (2, (unsigned int)cmd_getc ());
3112 break; 2609 break;
3113 case '+': 2610 case '+':
3114 scr_charset_set (3, (unsigned int)cmd_getc ()); 2611 scr_charset_set (3, (unsigned int)cmd_getc ());
3115 break; 2612 break;
3116#if ENABLE_FRILLS 2613#if !ENABLE_MINIMAL
3117 case '6': 2614 case '6':
3118 scr_backindex (); 2615 scr_backindex ();
3119 break; 2616 break;
3120#endif 2617#endif
3121 case '7': 2618 case '7':
3122 scr_cursor (SAVE); 2619 scr_cursor (SAVE);
3123 break; 2620 break;
3124 case '8': 2621 case '8':
3125 scr_cursor (RESTORE); 2622 scr_cursor (RESTORE);
3126 break; 2623 break;
3127#if ENABLE_FRILLS 2624#if !ENABLE_MINIMAL
3128 case '9': 2625 case '9':
3129 scr_forwardindex (); 2626 scr_forwardindex ();
3130 break; 2627 break;
3131#endif 2628#endif
3132 case '=': 2629 case '=':
… …
3247rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
3248{ 2745{
3249 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
3250 unsigned int nargs, p; 2747 unsigned int nargs, p;
3251 int n, ndef; 2748 int n, ndef;
3252 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
3253 2750
3254 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
3255 arg[--nargs] = 0;
3256 2752
3257 priv = 0; 2753 priv = 0;
3258 ch = cmd_getc (); 2754 ch = cmd_getc ();
3259 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
2756 {
3260 { /* '<' '=' '>' '?' */ 2757 /* '<' '=' '>' '?' */
3261 priv = ch; 2758 priv = ch;
3262 ch = cmd_getc (); 2759 ch = cmd_getc ();
3263 } 2760 }
3264 2761
3265 /* read any numerical arguments */ 2762 /* read any numerical arguments */
… …
3294 ndef = get_byte_array_bit (csi_defaults, i); 2791 ndef = get_byte_array_bit (csi_defaults, i);
3295 for (p = 0; p < nargs; p++) 2792 for (p = 0; p < nargs; p++)
3296 if (arg[p] == -1) 2793 if (arg[p] == -1)
3297 arg[p] = ndef; 2794 arg[p] = ndef;
3298 2795
3299#ifdef DEBUG_CMD
3300 fprintf (stderr, "CSI ");
3301 for (p = 0; p < nargs; p++)
3302 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3303 fprintf (stderr, "%c\n", ch);
3304#endif
3305
3306 /* 2796 /*
3307 * private mode handling 2797 * private mode handling
3308 */ 2798 */
3309 if (priv) 2799 if (priv)
3310 { 2800 {
3311 switch (priv) 2801 switch (priv)
3312 { 2802 {
3313 case '>': 2803 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2804 if (ch == CSI_DA) /* secondary device attributes */
3315 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2805 {
2806 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2807 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2808 //
2809 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2810 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2811 // versions.
2812 //
2813 tt_printf ("\033[>%d;95;0c", 'U');
2814 }
3316 break; 2815 break;
3317 case '?': 2816 case '?':
3318 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3319 process_terminal_mode (ch, priv, nargs, arg); 2818 process_terminal_mode (ch, priv, nargs, arg);
3320 break; 2819 break;
… …
3446 break; 2945 break;
3447 case 6: /* CPR requested */ 2946 case 6: /* CPR requested */
3448 scr_report_position (); 2947 scr_report_position ();
3449 break; 2948 break;
3450 case 7: /* unofficial extension */ 2949 case 7: /* unofficial extension */
3451 if (OPTION (Opt_insecure)) 2950 if (option (Opt_insecure))
3452 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2951 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3453 break; 2952 break;
3454 case 8: /* unofficial extension */ 2953 case 8: /* unofficial extension */
3455 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2954 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3456 break; 2955 break;
… …
3523 break; 3022 break;
3524 case CSI_75: 3023 case CSI_75:
3525 scr_cursor (RESTORE); 3024 scr_cursor (RESTORE);
3526 break; 3025 break;
3527 3026
3528#if ENABLE_FRILLS 3027#if !ENABLE_MINIMAL
3529 case CSI_74: 3028 case CSI_74:
3530 process_window_ops (arg, nargs); 3029 process_window_ops (arg, nargs);
3531 break; 3030 break;
3532#endif 3031#endif
3533 3032
… …
3540 break; 3039 break;
3541 } 3040 }
3542} 3041}
3543/*}}} */ 3042/*}}} */
3544 3043
3545#if ENABLE_FRILLS 3044#if !ENABLE_MINIMAL
3546/* ARGSUSED */ 3045/* ARGSUSED */
3547void 3046void
3548rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3047rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3549{ 3048{
3550 int x, y; 3049 int x, y;
3551 XWindowAttributes wattr; 3050 XWindowAttributes wattr;
3552 Window wdummy; 3051 Window wdummy;
3553 dDisp; 3052
3053 dLocal (Display *, dpy);
3554 3054
3555 if (nargs == 0) 3055 if (nargs == 0)
3556 return; 3056 return;
3557 3057
3558 switch (args[0]) 3058 switch (args[0])
3559 { 3059 {
3560 /* 3060 /*
3561 * commands 3061 * commands
3562 */ 3062 */
3563 case 1: /* deiconify window */ 3063 case 1: /* deiconify window */
3564 XMapWindow (disp, parent[0]); 3064 XMapWindow (dpy, parent[0]);
3565 break; 3065 break;
3566 case 2: /* iconify window */ 3066 case 2: /* iconify window */
3567 XIconifyWindow (disp, parent[0], display->screen); 3067 XIconifyWindow (dpy, parent[0], display->screen);
3568 break; 3068 break;
3569 case 3: /* set position (pixels) */ 3069 case 3: /* set position (pixels) */
3570 XMoveWindow (disp, parent[0], args[1], args[2]); 3070 XMoveWindow (dpy, parent[0], args[1], args[2]);
3571 break; 3071 break;
3572 case 4: /* set size (pixels) */ 3072 case 4: /* set size (pixels) */
3573 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3073 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3574 break; 3074 break;
3575 case 5: /* raise window */ 3075 case 5: /* raise window */
3576 XRaiseWindow (disp, parent[0]); 3076 XRaiseWindow (dpy, parent[0]);
3577 break; 3077 break;
3578 case 6: /* lower window */ 3078 case 6: /* lower window */
3579 XLowerWindow (disp, parent[0]); 3079 XLowerWindow (dpy, parent[0]);
3580 break; 3080 break;
3581 case 7: /* refresh window */ 3081 case 7: /* refresh window */
3582 scr_touch (true); 3082 scr_touch (true);
3583 break; 3083 break;
3584 case 8: /* set size (chars) */ 3084 case 8: /* set size (chars) */
… …
3591 if (args[0] >= 24) /* set height (chars) */ 3091 if (args[0] >= 24) /* set height (chars) */
3592 set_widthheight ((unsigned int)width, 3092 set_widthheight ((unsigned int)width,
3593 (unsigned int) (args[1] * fheight)); 3093 (unsigned int) (args[1] * fheight));
3594 break; 3094 break;
3595 3095
3596
3597 /* 3096 /*
3598 * reports - some output format copied from XTerm 3097 * reports - some output format copied from XTerm
3599 */ 3098 */
3600 case 11: /* report window state */ 3099 case 11: /* report window state */
3601 XGetWindowAttributes (disp, parent[0], &wattr); 3100 XGetWindowAttributes (dpy, parent[0], &wattr);
3602 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3101 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3603 break; 3102 break;
3604 case 13: /* report window position */ 3103 case 13: /* report window position */
3605 XGetWindowAttributes (disp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3606 XTranslateCoordinates (disp, parent[0], wattr.root, 3105 XTranslateCoordinates (dpy, parent[0], wattr.root,
3607 -wattr.border_width, -wattr.border_width, 3106 -wattr.border_width, -wattr.border_width,
3608 &x, &y, &wdummy); 3107 &x, &y, &wdummy);
3609 tt_printf ("\033[3;%d;%dt", x, y); 3108 tt_printf ("\033[3;%d;%dt", x, y);
3610 break; 3109 break;
3611 case 14: /* report window size (pixels) */ 3110 case 14: /* report window size (pixels) */
3612 XGetWindowAttributes (disp, parent[0], &wattr); 3111 XGetWindowAttributes (dpy, parent[0], &wattr);
3613 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3112 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3614 break; 3113 break;
3615 case 18: /* report text area size (chars) */ 3114 case 18: /* report text area size (chars) */
3616 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3115 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3617 break; 3116 break;
… …
3619 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3118 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3620 break; 3119 break;
3621 case 20: /* report icon label */ 3120 case 20: /* report icon label */
3622 { 3121 {
3623 char *s; 3122 char *s;
3624 XGetIconName (disp, parent[0], &s); 3123 XGetIconName (dpy, parent[0], &s);
3625 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3124 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3626 XFree (s); 3125 XFree (s);
3627 } 3126 }
3628 break; 3127 break;
3629 case 21: /* report window title */ 3128 case 21: /* report window title */
3630 { 3129 {
3631 char *s; 3130 char *s;
3632 XFetchName (disp, parent[0], &s); 3131 XFetchName (dpy, parent[0], &s);
3633 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3132 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3634 XFree (s); 3133 XFree (s);
3635 } 3134 }
3636 break; 3135 break;
3637 } 3136 }
3638} 3137}
… …
3665 seen_esc = true; 3164 seen_esc = true;
3666 continue; 3165 continue;
3667 } 3166 }
3668 else if (ch == C0_BEL || ch == CHAR_ST) 3167 else if (ch == C0_BEL || ch == CHAR_ST)
3669 break; 3168 break;
3169 else if (ch == C0_SYN)
3170 ch = cmd_get8 ();
3670 else if (ch < 0x20) 3171 else if (ch < 0x20)
3671 return NULL; /* other control character - exit */ 3172 return NULL; /* other control character - exit */
3672 3173
3673 seen_esc = false; 3174 seen_esc = false;
3674 3175
3675 if (n >= STRING_MAX - 1) 3176 if (n >= STRING_MAX - 1)
3676 // stop at some sane length 3177 // stop at some sane length
3677 return NULL; 3178 return NULL;
3678 3179
3679 if (ch == C0_SYN)
3680 string[n++] = cmd_get8 ();
3681 else
3682 string[n++] = ch; 3180 string[n++] = ch;
3683 } 3181 }
3684 3182
3685 string[n++] = '\0'; 3183 string[n++] = '\0';
3686 3184
3687 ends_how = (ch == 0x5c ? C0_ESC : ch); 3185 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3738void 3236void
3739rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3237rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3740{ 3238{
3741 if (str[0] == '?' && !str[1]) 3239 if (str[0] == '?' && !str[1])
3742 { 3240 {
3743 unsigned short r, g, b; 3241 rgba c;
3744 pix_colors_focused[color].get (display, r, g, b); 3242 pix_colors_focused[color].get (c);
3243
3244#if XFT
3245 if (c.a != rgba::MAX_CC)
3246 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3247 else
3248#endif
3745 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3249 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3746 } 3250 }
3747 else 3251 else
3748 set_window_color (color, str); 3252 set_window_color (color, str);
3749} 3253}
3750 3254
… …
3756{ 3260{
3757 int color; 3261 int color;
3758 char *buf, *name; 3262 char *buf, *name;
3759 bool query = str[0] == '?' && !str[1]; 3263 bool query = str[0] == '?' && !str[1];
3760 int saveop = op; 3264 int saveop = op;
3761 dDisp; 3265
3266 dLocal (Display *, dpy);
3762 3267
3763 assert (str != NULL); 3268 assert (str != NULL);
3269
3270 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3271 return;
3272
3764 switch (op) 3273 switch (op)
3765 { 3274 {
3766 case XTerm_name: 3275 case XTerm_name:
3767 set_title (str); 3276 set_title (str);
3768 /* FALLTHROUGH */ 3277 /* FALLTHROUGH */
… …
3782 unsigned long bytes_after; 3291 unsigned long bytes_after;
3783 unsigned char *value = 0; 3292 unsigned char *value = 0;
3784 const char *str = ""; 3293 const char *str = "";
3785 3294
3786 if (prop 3295 if (prop
3787 && XGetWindowProperty (disp, parent[0], 3296 && XGetWindowProperty (dpy, parent[0],
3788 prop, 0, 1<<16, 0, AnyPropertyType, 3297 prop, 0, 1<<16, 0, AnyPropertyType,
3789 &actual_type, &actual_format, 3298 &actual_type, &actual_format,
3790 &nitems, &bytes_after, &value) == Success 3299 &nitems, &bytes_after, &value) == Success
3791 && actual_type != None 3300 && actual_type != None
3792 && actual_format == 8) 3301 && actual_format == 8)
3793 str = (const char *)(value); 3302 str = (const char *)(value);
3794 3303
3795 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3304 tt_printf ("\033]%d;%s%c", op, str, resp);
3796 3305
3797 XFree (value); 3306 XFree (value);
3798 } 3307 }
3799 else 3308 else
3800 { 3309 {
… …
3804 { 3313 {
3805 *eq = 0; 3314 *eq = 0;
3806 set_utf8_property (display->atom (str), eq + 1); 3315 set_utf8_property (display->atom (str), eq + 1);
3807 } 3316 }
3808 else 3317 else
3809 XDeleteProperty (disp, parent[0], 3318 XDeleteProperty (dpy, parent[0],
3810 display->atom (str)); 3319 display->atom (str));
3811 } 3320 }
3812 break; 3321 break;
3813 3322
3814 case XTerm_Color: 3323 case XTerm_Color:
… …
3824 break; 3333 break;
3825 3334
3826 if ((buf = strchr (name, ';')) != NULL) 3335 if ((buf = strchr (name, ';')) != NULL)
3827 *buf++ = '\0'; 3336 *buf++ = '\0';
3828 3337
3829 if (name[0] == '?' && !name[1]) 3338 process_color_seq (op, color, name, resp);
3830 {
3831 unsigned short r, g, b;
3832 pix_colors_focused[color].get (display, r, g, b);
3833 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3834 }
3835 else
3836 set_window_color (color, name);
3837 } 3339 }
3838 break; 3340 break;
3839 case XTerm_Color00: 3341 case XTerm_Color00:
3840 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3342 process_color_seq (op, Color_fg, str, resp);
3841 break; 3343 break;
3842 case XTerm_Color01: 3344 case XTerm_Color01:
3843 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3345 process_color_seq (op, Color_bg, str, resp);
3844 break; 3346 break;
3845#ifndef NO_CURSORCOLOR 3347#ifndef NO_CURSORCOLOR
3846 case XTerm_Color_cursor: 3348 case XTerm_Color_cursor:
3847 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3349 process_color_seq (op, Color_cursor, str, resp);
3848 break; 3350 break;
3849#endif 3351#endif
3850 case XTerm_Color_pointer_fg: 3352 case XTerm_Color_pointer_fg:
3851 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3353 process_color_seq (op, Color_pointer_fg, str, resp);
3852 break; 3354 break;
3853 case XTerm_Color_pointer_bg: 3355 case XTerm_Color_pointer_bg:
3854 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3356 process_color_seq (op, Color_pointer_bg, str, resp);
3855 break; 3357 break;
3856#ifndef NO_BOLD_UNDERLINE_REVERSE 3358#ifndef NO_BOLD_UNDERLINE_REVERSE
3857 case XTerm_Color_RV: 3359 case XTerm_Color_RV:
3858 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3360 process_color_seq (op, Color_RV, str, resp);
3859 break; 3361 break;
3860 case Rxvt_Color_BD: 3362 case Rxvt_Color_BD:
3861 case URxvt_Color_BD: 3363 case URxvt_Color_BD:
3862 process_color_seq (op, Color_BD, str, resp); 3364 process_color_seq (op, Color_BD, str, resp);
3863 break; 3365 break;
3864 case Rxvt_Color_UL: 3366 case Rxvt_Color_UL:
3865 case URxvt_Color_UL: 3367 case URxvt_Color_UL:
3866 process_color_seq (op, Color_UL, str, resp); 3368 process_color_seq (op, Color_UL, str, resp);
3867 break; 3369 break;
3868 case URxvt_Color_IT: 3370 case URxvt_Color_IT:
3869 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3371 process_color_seq (op, Color_IT, str, resp);
3870 break; 3372 break;
3871#endif 3373#endif
3872#if TRANSPARENT && TINTING 3374#if ENABLE_TRANSPARENCY
3873 case URxvt_Color_tint: 3375 case URxvt_Color_tint:
3874 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3376 process_color_seq (op, Color_tint, str, resp);
3875 check_our_parents (); 3377 {
3876 if (am_transparent) 3378 bool changed = false;
3877 want_full_refresh = want_refresh = 1; 3379 if (ISSET_PIXCOLOR (Color_tint))
3878 break; 3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3879#endif 3381 else
3382 changed = bgPixmap.unset_tint ();
3383 if (changed)
3384 update_background ();
3385 }
3880 3386
3387 break;
3388#endif
3389
3390#if BG_IMAGE_FROM_FILE
3881 case Rxvt_Pixmap: 3391 case Rxvt_Pixmap:
3882 { 3392 if (!strcmp (str, "?"))
3883 if (*str != ';')
3884 { 3393 {
3885#if XPM_BACKGROUND 3394 char str[256];
3886 scale_pixmap (""); /* reset to default scaling */ 3395
3887 set_bgPixmap (str); /* change pixmap */ 3396 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3888 scr_touch (true); 3397 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3889#endif 3398 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3399 process_xterm_seq (XTerm_title, str, CHAR_ST);
3890 } 3400 }
3891 3401 else
3402 {
3892 int changed = 0; 3403 int changed = 0;
3893 3404
3894 while ((str = strchr (str, ';')) != NULL) 3405 if (*str != ';')
3895 { 3406 {
3407 /* reset to default scaling :*/
3408 bgPixmap.unset_geometry ();
3409 if (bgPixmap.set_file (str)) /* change pixmap */
3410 changed++;
3411 str = strchr (str, ';');
3412 if (str == NULL)
3413 bgPixmap.set_defaultGeometry ();
3414 }
3415 while (str)
3416 {
3896 str++; 3417 str++;
3897#if XPM_BACKGROUND 3418 if (bgPixmap.set_geometry (str))
3898 changed += scale_pixmap (str); 3419 changed++;
3899#endif 3420 str = strchr (str, ';');
3900 } 3421 }
3901
3902 if (changed) 3422 if (changed)
3903 { 3423 update_background ();
3904#ifdef XPM_BACKGROUND
3905 resize_pixmap ();
3906 scr_touch (true);
3907#endif
3908 } 3424 }
3909 }
3910 break; 3425 break;
3426#endif
3911 3427
3912 case Rxvt_restoreFG: 3428 case Rxvt_restoreFG:
3913 set_window_color (Color_fg, str); 3429 set_window_color (Color_fg, str);
3914 break; 3430 break;
3915 case Rxvt_restoreBG: 3431 case Rxvt_restoreBG:
… …
3940 case URxvt_italicFont: 3456 case URxvt_italicFont:
3941 case URxvt_boldItalicFont: 3457 case URxvt_boldItalicFont:
3942#endif 3458#endif
3943 if (query) 3459 if (query)
3944 tt_printf ("\33]%d;%-.250s%c", saveop, 3460 tt_printf ("\33]%d;%-.250s%c", saveop,
3945 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3461 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3946 ? fontset[op - URxvt_font]->fontdesc : "", 3462 ? fontset[op - URxvt_font]->fontdesc : "",
3947 resp); 3463 resp);
3948 else 3464 else
3949 { 3465 {
3950 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3466 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3953 allocated.push_back ((void *)res); 3469 allocated.push_back ((void *)res);
3954 set_fonts (); 3470 set_fonts ();
3955 } 3471 }
3956 break; 3472 break;
3957 3473
3958#if ENABLE_FRILLS 3474 case URxvt_version:
3475 if (query)
3476 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3477 op,
3478 rs[Rs_name], VERSION[0], VERSION[2],
3479 resp);
3480 break;
3481
3482#if !ENABLE_MINIMAL
3959 case URxvt_locale: 3483 case URxvt_locale:
3960 if (query) 3484 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3485 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3962 else 3486 else
3963 { 3487 {
3964 set_locale (str); 3488 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8); 3489 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale (); 3490 init_xlocale ();
… …
3981 break; 3505 break;
3982#endif 3506#endif
3983 3507
3984#if ENABLE_PERL 3508#if ENABLE_PERL
3985 case URxvt_perl: 3509 case URxvt_perl:
3986 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3510 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3987 ; // no responses yet 3511 ; // no responses yet
3988 break; 3512 break;
3989#endif 3513#endif
3990 } 3514 }
3991} 3515}
… …
4029{ 3553{
4030 unsigned int i, j; 3554 unsigned int i, j;
4031 int state; 3555 int state;
4032 3556
4033 static const struct 3557 static const struct
4034 { 3558 {
4035 const int argval; 3559 const int argval;
4036 const unsigned long bit; 3560 const unsigned long bit;
4037 }
4038
4039 argtopriv[] = { 3561 } argtopriv[] = {
4040 { 1, PrivMode_aplCUR }, 3562 { 1, PrivMode_aplCUR },
4041 { 2, PrivMode_vt52 }, 3563 { 2, PrivMode_vt52 },
4042 { 3, PrivMode_132 }, 3564 { 3, PrivMode_132 },
4043 { 4, PrivMode_smoothScroll }, 3565 { 4, PrivMode_smoothScroll },
4044 { 5, PrivMode_rVideo }, 3566 { 5, PrivMode_rVideo },
… …
4060 { 66, PrivMode_aplKP }, 3582 { 66, PrivMode_aplKP },
4061#ifndef NO_BACKSPACE_KEY 3583#ifndef NO_BACKSPACE_KEY
4062 { 67, PrivMode_BackSpace }, 3584 { 67, PrivMode_BackSpace },
4063#endif 3585#endif
4064 { 1000, PrivMode_MouseX11 }, 3586 { 1000, PrivMode_MouseX11 },
4065 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
4066 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
4067 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4068 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4069 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
4070 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
4071 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
4072 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
4107 scr_touch (true); 3628 scr_touch (true);
4108 break; 3629 break;
4109#endif 3630#endif
4110 case 1048: /* alternative cursor save */ 3631 case 1048: /* alternative cursor save */
4111 case 1049: 3632 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 3633 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 3634 if (mode == 0)
4114 scr_cursor (RESTORE); 3635 scr_cursor (RESTORE);
4115 else if (mode == 1) 3636 else if (mode == 1)
4116 scr_cursor (SAVE); 3637 scr_cursor (SAVE);
4117 break; 3638 break;
… …
4146 scr_autowrap (state); 3667 scr_autowrap (state);
4147 break; 3668 break;
4148 /* case 8: - auto repeat, can't do on a per window basis */ 3669 /* case 8: - auto repeat, can't do on a per window basis */
4149 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
4150 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3673 break;
4153#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
4154 case scrollBar_esc: 3675 case scrollBar_esc:
4155 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
4156 { 3677 {
… …
4169 break; 3690 break;
4170 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
4171 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
4172 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
4173 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4174 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4175 break; 3696 break;
4176#if 0
4177 case 1001: 3697 case 1002:
4178 break; /* X11 mouse highlighting */ 3698 case 1003:
4179#endif 3699 if (state)
3700 {
3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3703 vt_emask_mouse = PointerMotionMask;
3704 }
3705 else
3706 vt_emask_mouse = NoEventMask;
3707 vt_select_input ();
3708 break;
4180 case 1010: /* scroll to bottom on TTY output inhibit */ 3709 case 1010: /* scroll to bottom on TTY output inhibit */
4181 set_option (Opt_scrollTtyOutput, !state); 3710 set_option (Opt_scrollTtyOutput, !state);
4182 break; 3711 break;
4183 case 1011: /* scroll to bottom on key press */ 3712 case 1011: /* scroll to bottom on key press */
4184 set_option (Opt_scrollTtyKeypress, state); 3713 set_option (Opt_scrollTtyKeypress, state);
4185 break; 3714 break;
4186 case 1047: /* secondary screen w/ clearing last */ 3715 case 1047: /* secondary screen w/ clearing last */
4187 if (OPTION (Opt_secondaryScreen)) 3716 if (option (Opt_secondaryScreen))
4188 if (current_screen != PRIMARY) 3717 if (current_screen != PRIMARY)
4189 scr_erase_screen (2); 3718 scr_erase_screen (2);
4190 scr_change_screen (state); 3719 scr_change_screen (state);
4191 break; 3720 break;
4192 case 1049: /* secondary screen w/ clearing first */ 3721 case 1049: /* secondary screen w/ clearing first */
4193 scr_change_screen (state); 3722 scr_change_screen (state);
4194 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 3725 scr_erase_screen (2);
4197 break; 3726 break;
4198 default: 3727 default:
4199 break; 3728 break;
… …
4327 scr_color (Color_bg, Color_bg); 3856 scr_color (Color_bg, Color_bg);
4328 break; 3857 break;
4329 3858
4330 //case 50: // not variable spacing 3859 //case 50: // not variable spacing
4331 3860
4332#if ENABLE_FRILLS 3861#if !ENABLE_MINIMAL
4333 case 90: 3862 case 90:
4334 case 91: /* set bright fg color */ 3863 case 91: /* set bright fg color */
4335 case 92: 3864 case 92:
4336 case 93: 3865 case 93:
4337 case 94: 3866 case 94:
… …
4361rxvt_term::process_graphics () 3890rxvt_term::process_graphics ()
4362{ 3891{
4363 unicode_t ch, cmd = cmd_getc (); 3892 unicode_t ch, cmd = cmd_getc ();
4364 3893
4365 if (cmd == 'Q') 3894 if (cmd == 'Q')
3895 {
4366 { /* query graphics */ 3896 /* query graphics */
4367 tt_printf ("\033G0\012"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
4368 return; 3898 return;
4369 } 3899 }
4370 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
4371 do 3901 do
… …
4421 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4422 3952
4423 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 3954 v_buflen += len;
4425 3955
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
4427} 3957}
4428 3958
4429void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4430{ 3960{
4431 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3961 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4436 3966
4437 if (v_buflen == 0) 3967 if (v_buflen == 0)
4438 { 3968 {
4439 free (v_buffer); 3969 free (v_buffer);
4440 v_buffer = 0; 3970 v_buffer = 0;
4441 v_buflen = 0;
4442 3971
4443 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4444 return; 3973 return;
4445 } 3974 }
4446 3975
4447 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4448 } 3977 }
4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4450 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4451} 3980}
4452 3981
4453/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4454 3983

Diff Legend

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