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.272 by root, Thu Jan 19 16:22:12 2006 UTC vs.
Revision 1.375 by root, Tue Dec 11 21:10:46 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
101 97
102 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
230# if !UNICODE3 225# if !UNICODE3
231 if (ch >= 0x10000) 226 if (ch >= 0x10000)
232 ch = 0xfffd; 227 ch = 0xfffd;
233# endif 228# endif
234 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
236 } 233 }
237 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// }
238 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
240 242
241 free (fname); 243 free (fname);
242 244
… …
295 297
296 return -1; 298 return -1;
297} 299}
298#endif 300#endif
299 301
300/*{{{ Convert the keypress event into a string */
301void 302void
302rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
303{ 304{
304 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
305 unsigned int newlen; 306 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
498# endif 501# endif
499 return; 502 return;
500 } 503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
505# if ISO_14755 516# if ISO_14755
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
536#endif 547#endif
537 548
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 550 {
540 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
542 switch (keysym) 584 switch (keysym)
543 { 585 {
544#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 587 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
551 } 593 }
552 else 594 else
553 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 596 break;
555#endif 597#endif
556#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete: 599 case XK_Delete:
568 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 601 break;
570#endif 602#endif
571 case XK_Tab: 603 case XK_Tab:
572 if (shft) 604 if (shft)
573 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
583#endif 615#endif
584 newlen = 0; 616 newlen = 0;
585 } 617 }
586 break; 618 break;
587 619
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
618 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
620 break; 636 break;
621 637
622#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior: 639 case XK_Prior:
634 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
635 break; 641 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next: 642 case XK_Next:
647 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
648 break; 644 break;
649#endif 645#endif
650 case XK_KP_Enter: 646 case XK_KP_Enter:
651 /* allow shift to override */ 647 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
653 { 649 {
654 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
655 break; 651 break;
656 } 652 }
657 653
… …
669 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
671 } 667 }
672 break; 668 break;
673 669
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 694 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
706 { 696 {
707 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 699 }
710 else 700 else
… …
716 706
717 case XK_Find: 707 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
719 break; 709 break;
720 710
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert: 711 case XK_Insert:
732 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
733 break; 713 break;
734#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove: 715 case DXK_Remove:
… …
739 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
740 break; 720 break;
741 case XK_Select: 721 case XK_Select:
742 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
743 break; 723 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End: 724 case XK_End:
755 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
756 break; 726 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home: 727 case XK_Home:
768 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
769 break; 729 break;
770 730
771#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
873 return; 833 return;
874 834
875 if (len <= 0) 835 if (len <= 0)
876 return; /* not mapped */ 836 return; /* not mapped */
877 837
878 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 839 if (view_start)
880 { 840 {
881 view_start = 0; 841 view_start = 0;
882 want_refresh = 1; 842 want_refresh = 1;
883 } 843 }
… …
905 { 865 {
906 const char ch = C0_ESC; 866 const char ch = C0_ESC;
907 tt_write (&ch, 1); 867 tt_write (&ch, 1);
908 } 868 }
909 869
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
921} 871}
922/*}}} */ 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}
923 949
924#if defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
925unsigned int 951unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 953{
… …
957void 983void
958rxvt_term::flush () 984rxvt_term::flush ()
959{ 985{
960 flush_ev.stop (); 986 flush_ev.stop ();
961 987
962#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
963 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
964 { 990 {
965 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
966 scr_clear ();
967 scr_touch (false); 992 scr_touch (false);
968 } 993 }
969#endif 994#endif
970 995
971 if (want_refresh) 996 if (want_refresh)
… …
1017 1042
1018 display->flush (); 1043 display->flush ();
1019} 1044}
1020 1045
1021void 1046void
1022rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1023{ 1048{
1024 make_current (); 1049 make_current ();
1025 1050
1026 display->flush (); 1051 display->flush ();
1027 1052
1028 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !ev_is_active (&flush_ev))
1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1030} 1055}
1031 1056
1032void 1057void
1033rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1034{ 1059{
1035 make_current (); 1060 make_current ();
1036 1061
1037 refresh_limit = 1;
1038 refresh_count = 0; 1062 refresh_count = 0;
1039 flush (); 1063 flush ();
1040} 1064}
1041 1065
1042#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1043void 1067void
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1045{ 1069{
1046 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1071 want_refresh = 1;
1048
1049 w.start (w.at + BLINK_INTERVAL);
1050} 1072}
1051#endif 1073#endif
1052 1074
1053#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1054void 1076void
1055rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1056{ 1078{
1057 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1058 { 1080 {
1059 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1060 want_refresh = 1; 1082 want_refresh = 1;
1061 w.start (w.at + TEXT_BLINK_INTERVAL);
1062 } 1083 }
1084 else
1085 w.stop ();
1063} 1086}
1064#endif 1087#endif
1065 1088
1066#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1067void 1090void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1069{ 1092{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 {
1073 want_refresh = 1; 1095 want_refresh = 1;
1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
1075 } 1097 w.stop ();
1076} 1098}
1077#endif 1099#endif
1078 1100
1079#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1080void 1102void
1081rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1082{ 1104{
1083 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1084 { 1106 {
1085 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1086 want_refresh = 1; 1108 want_refresh = 1;
1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1088 } 1109 }
1110 else
1111 w.stop ();
1089} 1112}
1090#endif 1113#endif
1091 1114
1092#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1093void 1116void
1094rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1095{ 1118{
1096 if (mouse_slip_wheel_speed == 0 1119 if (mouse_slip_wheel_speed == 0
1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1098 : scr_page (UP, mouse_slip_wheel_speed)) 1121 : scr_page (UP, mouse_slip_wheel_speed))
1099 { 1122 {
1100 if (view_start == top_row || view_start == 0) 1123 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1102 1125
1103 want_refresh = 1; 1126 want_refresh = 1;
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1127 }
1128 else
1129 w.stop ();
1106} 1130}
1107#endif 1131#endif
1108 1132
1109#if HAVE_SCHED_YIELD 1133#if LINUX_YIELD_HACK
1110static struct event_handler 1134static struct event_handler
1111{ 1135{
1112 check_watcher cw_yield; 1136 ev::prepare yield_ev;
1113 1137
1114 void yield (check_watcher &w) 1138 void yield_cb (ev::prepare &w, int revents)
1115 { 1139 {
1116 sched_yield (); 1140 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than
1142 // ones with high nice levels is a useful thing to do. It surely is is
1143 // allowed by the sus... as is returning ENOSYS.
1144
1145 struct timespec ts = { 0, 0 };
1146 nanosleep (&ts, 0);
1147
1117 w.stop (); 1148 w.stop ();
1118 } 1149 }
1119 1150
1120 event_handler () 1151 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1152 : yield_ev (this, &event_handler::yield_cb)
1122 { 1153 {
1123 } 1154 }
1124} event_handler; 1155} event_handler;
1125#endif 1156#endif
1126 1157
… …
1146 cmdbuf_endp += r; 1177 cmdbuf_endp += r;
1147 return true; 1178 return true;
1148 } 1179 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1180 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1181 {
1151#if HAVE_SCHED_YIELD 1182#if LINUX_YIELD_HACK
1152 if (display->is_local) 1183 if (display->is_local)
1153 event_handler.cw_yield.start (); 1184 event_handler.yield_ev.start ();
1154#endif 1185#endif
1155 } 1186 }
1156 else 1187 else
1157 { 1188 {
1158 pty_ev.stop (); 1189 pty_ev.stop ();
1159 1190
1160 if (!OPTION (Opt_hold)) 1191 if (!option (Opt_hold))
1161 destroy (); 1192 destroy ();
1162 } 1193 }
1163 1194
1164 return false; 1195 return false;
1165} 1196}
1166 1197
1167void 1198void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1169{ 1200{
1170 make_current (); 1201 make_current ();
1171 1202
1172 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1173 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1174 while (pty_fill ()) 1205 while (pty_fill ())
1175 if (cmd_parse ()) 1206 if (cmd_parse ())
1176 break; 1207 break;
1177 1208
1178 if (revents & EVENT_WRITE) 1209 if (revents & ev::WRITE)
1179 pty_write (); 1210 pty_write ();
1180} 1211}
1181 1212
1182void 1213void
1183rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1184{ 1215{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1216 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1217 recolour_cursor ();
1187 1218
1188#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1220 hidden_pointer = 0;
1190 1221
1191 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1193#endif 1224#endif
1194} 1225}
1195 1226
1196#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1197void 1228void
1198rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1199{ 1230{
1200 if (!OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1201 return; 1232 return;
1202 1233
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1235 XFlush (dpy);
1205 1236
1206 hidden_pointer = 1; 1237 hidden_pointer = 1;
1207} 1238}
1208 1239
1209void 1240void
1210rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1211{ 1242{
1212 make_current (); 1243 make_current ();
1213 1244
1214 pointer_blank (); 1245 pointer_blank ();
1215} 1246}
… …
1218void 1249void
1219rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1220{ 1251{
1221 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1222 int x, y; 1253 int x, y;
1254 int code = 32;
1223 1255
1224 x = ev.x; 1256 x = Pixel2Col (ev.x);
1225 y = ev.y; 1257 y = Pixel2Row (ev.y);
1226 pixel_position (&x, &y); 1258 if (ev.type == MotionNotify)
1259 {
1260 if (x == mouse_row && y == mouse_col)
1261 return;
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1227 1266
1228 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1229 button_number = 3; 1268 button_number = 3;
1230 else 1269 else
1231 { 1270 {
… …
1277 x + 1, 1316 x + 1,
1278 y + 1); 1317 y + 1);
1279#endif 1318#endif
1280 1319
1281 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1282 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1283 (32 + x + 1), 1322 (32 + x + 1),
1284 (32 + y + 1)); 1323 (32 + y + 1));
1285} 1324}
1286
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296 1325
1297/*{{{ process an X event */ 1326/*{{{ process an X event */
1298void 1327void
1299rxvt_term::x_cb (XEvent &ev) 1328rxvt_term::x_cb (XEvent &ev)
1300{ 1329{
1301 make_current (); 1330 make_current ();
1302 1331
1303 dDisp; 1332 dLocal (Display *, dpy);
1304 1333
1305 if (ev.xany.window == vt 1334 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1335 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1336 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1337 return;
… …
1313 unsigned int unused_mask; 1342 unsigned int unused_mask;
1314 1343
1315 switch (ev.type) 1344 switch (ev.type)
1316 { 1345 {
1317 case KeyPress: 1346 case KeyPress:
1318#if ISO_14755 1347 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1348 break;
1324 1349
1325 case KeyRelease: 1350 case KeyRelease:
1326 { 1351 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1352 break;
1398 }
1399 1353
1400 case ButtonPress: 1354 case ButtonPress:
1401 button_press (ev.xbutton); 1355 button_press (ev.xbutton);
1402 break; 1356 break;
1403 1357
… …
1405 button_release (ev.xbutton); 1359 button_release (ev.xbutton);
1406 break; 1360 break;
1407 1361
1408 case ClientMessage: 1362 case ClientMessage:
1409 if (ev.xclient.format == 32 1363 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1364 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1365 {
1366 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1367 {
1368 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1369 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1370 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1371 {
1372 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1373 destroy ();
1374 }
1414#if ENABLE_EWMH 1375#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1376 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1377 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1378 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1379 &ev);
1380#endif
1381 }
1382 }
1383#if ENABLE_XEMBED
1384 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1385 {
1386 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1387 focus_in ();
1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1389 focus_out ();
1390 }
1419#endif 1391#endif
1420 } 1392 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break;
1457
1458 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1393 break;
1461 1394
1462 /* 1395 /*
1463 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1483 break; 1416 break;
1484 } 1417 }
1485 break; 1418 break;
1486 1419
1487 case FocusIn: 1420 case FocusIn:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1424 focus_in ();
1489 break; 1425 break;
1490 1426
1491 case FocusOut: 1427 case FocusOut:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1431 focus_out ();
1493 break; 1432 break;
1494 1433
1495 case ConfigureNotify: 1434 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1496 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1497 { 1439 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1441 ;
1500 1442
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1444 {
1503 seen_resize = 1; 1445 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1447 }
1506 1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 update_background ();
1453#endif
1454 }
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1510 if (OPTION (Opt_transparent))
1511 check_our_parents ();
1512#endif
1513 } 1456 }
1514 break; 1457 break;
1515 1458
1516 case PropertyNotify: 1459 case PropertyNotify:
1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1462 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1464
1521 break; 1465 break;
1522 1466
1523 case SelectionClear: 1467 case SelectionClear:
1524 selection_clear (); 1468 selection_clear ();
… …
1534 break; 1478 break;
1535 1479
1536 case MapNotify: 1480 case MapNotify:
1537 mapped = 1; 1481 mapped = 1;
1538#ifdef TEXT_BLINK 1482#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1483 text_blink_ev.start ();
1540#endif 1484#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1486 break;
1543 1487
1544 case UnmapNotify: 1488 case UnmapNotify:
… …
1546#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1547 text_blink_ev.stop (); 1491 text_blink_ev.stop ();
1548#endif 1492#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1494 break;
1551
1552#ifdef TRANSPARENT
1553 case ReparentNotify:
1554 rootwin_cb (ev);
1555 break;
1556#endif /* TRANSPARENT */
1557 1495
1558 case GraphicsExpose: 1496 case GraphicsExpose:
1559 case Expose: 1497 case Expose:
1560 if (ev.xany.window == vt) 1498 if (ev.xany.window == vt)
1561 { 1499 {
1562 do 1500 do
1501 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1504 }
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1506
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1508
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1572 1513 }
1573 want_refresh = 1; 1514 want_refresh = 1;
1574 } 1515 }
1575 else 1516 else
1576 { 1517 {
1577 XEvent unused_event; 1518 XEvent unused_event;
1578 1519
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1521 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1523 ;
1583 1524
1584 if (isScrollbarWindow (ev.xany.window)) 1525 if (isScrollbarWindow (ev.xany.window))
1585 { 1526 {
1586 scrollBar.setIdle (); 1527 scrollBar.setIdle ();
1587 scrollbar_show (0); 1528 scrollbar_show (0);
1588 } 1529 }
1589
1590#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window);
1593#endif
1594 } 1530 }
1595 break; 1531 break;
1596 1532
1597 case MotionNotify: 1533 case MotionNotify:
1598#ifdef POINTER_BLANK 1534#ifdef POINTER_BLANK
1599 if (hidden_pointer) 1535 if (hidden_pointer)
1600 pointer_unblank (); 1536 pointer_unblank ();
1601#endif 1537#endif
1538 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1539 || priv_modes & PrivMode_MouseAnyEvent)
1540 mouse_report (ev.xbutton);
1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1603 break; 1542 break;
1604 1543
1605 if (ev.xany.window == vt) 1544 if (ev.xany.window == vt)
1606 { 1545 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1546 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1547 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1548 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1549 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1550 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1552 ;
1614 1553
1615 XQueryPointer (disp, vt, 1554 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1555 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1556 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1557 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1558 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1559#ifdef MOUSE_THRESHOLD
… …
1640 int dist; 1579 int dist;
1641 1580
1642 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1643 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1644 */ 1583 */
1645 if (!sel_scroll_ev.active) 1584 if (!ev_is_active (&sel_scroll_ev))
1646 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1647 1586
1648 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1649 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1650 */ 1589 */
1651 selection_save_x = ev.xbutton.x; 1590 selection_save_x = ev.xbutton.x;
… …
1673 else 1612 else
1674 { 1613 {
1675 /* we are within the text window, so we 1614 /* we are within the text window, so we
1676 * shouldn't be scrolling 1615 * shouldn't be scrolling
1677 */ 1616 */
1678 if (sel_scroll_ev.active) 1617 if (ev_is_active (&sel_scroll_ev))
1679 sel_scroll_ev.stop(); 1618 sel_scroll_ev.stop();
1680 } 1619 }
1681#endif 1620#endif
1682#ifdef MOUSE_THRESHOLD 1621#ifdef MOUSE_THRESHOLD
1683 } 1622 }
1684#endif 1623#endif
1685 } 1624 }
1686 } 1625 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1626 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688 { 1627 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1628 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1629 MotionNotify, &ev))
1691 ; 1630 ;
1692 1631
1693 XQueryPointer (disp, scrollBar.win, 1632 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1633 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1634 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1635 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1636 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1637 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1638 scrollbar_size ());
1700 want_refresh = 1; 1639 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1640 scrollbar_show (1);
1703 } 1641 }
1704 break; 1642 break;
1705 } 1643 }
1706 1644
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1645#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1646 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1647 {
1712 if (hidden_cursor) 1648 if (hidden_cursor)
1713 { 1649 {
1714 hidden_cursor = 0; 1650 hidden_cursor = 0;
1715 want_refresh = 1; 1651 want_refresh = 1;
1716 } 1652 }
1717 1653
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1654 cursor_blink_ev.again ();
1719 } 1655 }
1720#endif 1656#endif
1721 1657
1722#if defined(POINTER_BLANK) 1658#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1659 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1660 {
1725 if (ev.type == MotionNotify 1661 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1662 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1663 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1664 if (hidden_pointer)
… …
1740 if (!focus) 1676 if (!focus)
1741 { 1677 {
1742 focus = 1; 1678 focus = 1;
1743 want_refresh = 1; 1679 want_refresh = 1;
1744 1680
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1681 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1682
1747#if USE_XIM 1683#if USE_XIM
1748 if (Input_Context != NULL) 1684 if (Input_Context != NULL)
1749 { 1685 {
1750 IMSetStatusPosition (); 1686 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1687 XSetICFocus (Input_Context);
1752 } 1688 }
1753#endif 1689#endif
1754#if CURSOR_BLINK 1690#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1691 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1692 cursor_blink_ev.again ();
1757#endif 1693#endif
1758#if OFF_FOCUS_FADING 1694#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1695 if (rs[Rs_fade])
1760 { 1696 {
1761 pix_colors = pix_colors_focused; 1697 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1698 scr_recolour ();
1763 } 1699 }
1764#endif 1700#endif
1701#if ENABLE_FRILLS
1702 if (option (Opt_urgentOnBell))
1703 {
1704 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1705 {
1706 h->flags &= ~XUrgencyHint;
1707 XSetWMHints (dpy, parent[0], h);
1708 }
1709 }
1710#endif
1765 } 1711 }
1766} 1712}
1767 1713
1768void 1714void
1769rxvt_term::focus_out () 1715rxvt_term::focus_out ()
… …
1777 1723
1778#if ENABLE_FRILLS || ISO_14755 1724#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf) 1725 if (iso14755buf)
1780 { 1726 {
1781 iso14755buf = 0; 1727 iso14755buf = 0;
1782# if ENABLE_OVERLAY 1728# if ISO_14755
1783 scr_overlay_off (); 1729 scr_overlay_off ();
1784# endif 1730# endif
1785 } 1731 }
1786#endif 1732#endif
1787#if USE_XIM 1733#if USE_XIM
1788 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1735 XUnsetICFocus (Input_Context);
1790#endif 1736#endif
1791#if CURSOR_BLINK 1737#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1738 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1739 cursor_blink_ev.stop ();
1740
1794 hidden_cursor = 0; 1741 hidden_cursor = 0;
1795#endif 1742#endif
1796#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1798 { 1745 {
… …
1801 } 1748 }
1802#endif 1749#endif
1803 } 1750 }
1804} 1751}
1805 1752
1806#if TRANSPARENT 1753void
1754rxvt_term::update_fade_color (unsigned int idx)
1755{
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 rgba c;
1760 pix_colors [Color_fade].get (c);
1761 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1762 }
1763#endif
1764}
1765
1766#if ENABLE_TRANSPARENCY || ENABLE_PERL
1807void 1767void
1808rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1769{
1810 make_current (); 1770 make_current ();
1811 1771
1772 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1773 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1774 return;
1775
1776# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1777 switch (ev.type)
1813 { 1778 {
1814 case PropertyNotify: 1779 case PropertyNotify:
1815 /* 1780 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1781 * if user used some Esetroot compatible prog to set the root bg,
1817 * use the property to determine the pixmap. We use it later on. 1782 * use the property to determine the pixmap. We use it later on.
1818 */ 1783 */
1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1784 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1785 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 return; 1786 {
1822 1787 bgPixmap.set_root_pixmap ();
1823 /* FALLTHROUGH */ 1788 update_background ();
1824 case ReparentNotify: 1789 }
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1826 want_refresh = want_full_refresh = 1;
1827 break; 1790 break;
1828 } 1791 }
1792# endif
1829} 1793}
1830#endif 1794#endif
1831 1795
1832void 1796void
1833rxvt_term::button_press (XButtonEvent &ev) 1797rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1806 /*
1843 * VT window processing of button press 1807 * VT window processing of button press
1844 */ 1808 */
1845 if (ev.window == vt) 1809 if (ev.window == vt)
1846 { 1810 {
1811 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1812 return;
1813
1847#if ISO_14755 1814#if ISO_14755
1848 // 5.4 1815 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1816 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1817 {
1851 iso14755_54 (ev.x, ev.y); 1818 iso14755_54 (ev.x, ev.y);
… …
1885 mouse_report (ev); 1852 mouse_report (ev);
1886 } 1853 }
1887#else 1854#else
1888 MEvent.button = ev.button; 1855 MEvent.button = ev.button;
1889 mouse_report (ev); 1856 mouse_report (ev);
1890#endif /* MOUSE_REPORT_DOUBLECLICK */ 1857#endif /* MOUSE_REPORT_DOUBLECLICK */
1891 1858
1892 } 1859 }
1893 else 1860 else
1894 { 1861 {
1895 if (ev.button != MEvent.button) 1862 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1863 MEvent.clicks = 0;
1897 1864
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1865 switch (ev.button)
1900 { 1866 {
1901 case Button1: 1867 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1868 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1869 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1870#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1871 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1872#else
1907 selection.rect = false; 1873 selection.rect = false;
1908#endif 1874#endif
1909 1875
1910 /* allow shift+left click to extend selection */ 1876 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1877 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1878 {
1913 if (MEvent.button == Button1 && clickintime) 1879 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1880 selection_rotate (ev.x, ev.y);
1915 else 1881 else
1916 selection_extend (ev.x, ev.y, 1); 1882 selection_extend (ev.x, ev.y, 1);
1917 } 1883 }
1918 else 1884 else
1919 { 1885 {
1920 if (MEvent.button == Button1 && clickintime) 1886 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1887 MEvent.clicks++;
1922 else 1888 else
1923 MEvent.clicks = 1; 1889 MEvent.clicks = 1;
1924 1890
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1891 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1892 }
1927 1893
1928 MEvent.button = Button1; 1894 MEvent.button = Button1;
1929 break; 1895 break;
1930 1896
1931 case Button3: 1897 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1898 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1899 selection_rotate (ev.x, ev.y);
1934 else 1900 else
1935 selection_extend (ev.x, ev.y, 1); 1901 selection_extend (ev.x, ev.y, 1);
1936 1902
1937 MEvent.button = Button3; 1903 MEvent.button = Button3;
1938 break; 1904 break;
1939 } 1905 }
1940 } 1906 }
1941 1907
1942 MEvent.time = ev.time; 1908 MEvent.time = ev.time;
1943 return; 1909 return;
1944 } 1910 }
1945 1911
… …
1990 tt_printf ("\033[5~"); 1956 tt_printf ("\033[5~");
1991 break; 1957 break;
1992 } 1958 }
1993 } 1959 }
1994 else 1960 else
1995#endif /* NO_SCROLLBAR_REPORT */ 1961#endif /* NO_SCROLLBAR_REPORT */
1996 1962
1997 { 1963 {
1998 char upordown = 0; 1964 char upordown = 0;
1999 1965
2000 if (scrollBar.style == R_SB_NEXT) 1966 if (scrollBar.style == R_SB_NEXT)
2001 { 1967 {
2002 if (scrollbarnext_upButton (ev.y)) 1968 if (scrollbarnext_upButton (ev.y))
2003 upordown = -1; /* up */ 1969 upordown = -1; /* up */
… …
2012 upordown = 1; /* down */ 1978 upordown = 1; /* down */
2013 } 1979 }
2014 if (upordown) 1980 if (upordown)
2015 { 1981 {
2016#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2017 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2018#endif 1984#endif
2019 if (scr_page (upordown < 0 ? UP : DN, 1)) 1985 if (scr_page (upordown < 0 ? UP : DN, 1))
2020 { 1986 {
2021 if (upordown < 0) 1987 if (upordown < 0)
2022 scrollBar.setUp (); 1988 scrollBar.setUp ();
… …
2102 scrollBar.setIdle (); 2068 scrollBar.setIdle ();
2103 scrollbar_show (0); 2069 scrollbar_show (0);
2104 } 2070 }
2105 2071
2106#ifdef SELECTION_SCROLLING 2072#ifdef SELECTION_SCROLLING
2107 if (sel_scroll_ev.active) 2073 if (ev_is_active (&sel_scroll_ev))
2108 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2109#endif 2075#endif
2110 2076
2111 if (ev.window == vt) 2077 if (ev.window == vt)
2112 { 2078 {
2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2080 return;
2081
2113#if ISO_14755 2082#if ISO_14755
2114 // 5.4 2083 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2084 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2085 return;
2117#endif 2086#endif
2087
2118 if (reportmode) 2088 if (reportmode)
2119 { 2089 {
2120 /* mouse report from vt window */ 2090 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2091 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2092 if (ev.button >= 4)
… …
2133 mouse_report (ev); 2103 mouse_report (ev);
2134 } 2104 }
2135#else /* MOUSE_REPORT_DOUBLECLICK */ 2105#else /* MOUSE_REPORT_DOUBLECLICK */
2136 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
2137 mouse_report (ev); 2107 mouse_report (ev);
2138#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
2139 return; 2109 return;
2140 } 2110 }
2141 2111
2142 /* 2112 /*
2143 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
… …
2146 if (priv_modes & PrivMode_mouse_report 2116 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2117 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2118 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2119 selection_extend (ev.x, ev.y, 0);
2150 2120
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2121 switch (ev.button)
2155 { 2122 {
2156 case Button1: 2123 case Button1:
2157 case Button3: 2124 case Button3:
2158 selection_make (ev.time); 2125 selection_make (ev.time);
2159 break; 2126 break;
2160 2127
2161 case Button2: 2128 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) 2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164 selection_request (ev.time);
2165
2166 break; 2131 break;
2167 2132
2168#ifdef MOUSE_WHEEL 2133#ifdef MOUSE_WHEEL
2169 case Button4: 2134 case Button4:
2170 case Button5: 2135 case Button5:
… …
2174 2139
2175 v = ev.button == Button4 ? UP : DN; 2140 v = ev.button == Button4 ? UP : DN;
2176 2141
2177 if (ev.state & ShiftMask) 2142 if (ev.state & ShiftMask)
2178 i = 1; 2143 i = 1;
2179 else if (OPTION (Opt_mouseWheelScrollPage)) 2144 else if (option (Opt_mouseWheelScrollPage))
2180 i = nrow - 1; 2145 i = nrow - 1;
2181 else 2146 else
2182 i = 5; 2147 i = 5;
2183 2148
2184# ifdef MOUSE_SLIP_WHEELING 2149# ifdef MOUSE_SLIP_WHEELING
… …
2186 { 2151 {
2187 mouse_slip_wheel_speed += v ? -1 : 1; 2152 mouse_slip_wheel_speed += v ? -1 : 1;
2188 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2189 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2190 2155
2191 if (slip_wheel_ev.at < NOW) 2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2192 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2193
2194 slip_wheel_ev.start ();
2195 } 2157 }
2196 else 2158 else
2197 { 2159 {
2198# endif 2160# endif
2199 scr_page (v, i); 2161 scr_page (v, i);
… …
2205 break; 2167 break;
2206#endif 2168#endif
2207 } 2169 }
2208 } 2170 }
2209} 2171}
2210
2211#ifdef TRANSPARENT
2212#if TINTING
2213/* taken from aterm-0.4.2 */
2214
2215typedef uint32_t RUINT32T;
2216
2217void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2218{
2219 int sh_r, sh_g, sh_b;
2220 RUINT32T mask_r, mask_g, mask_b;
2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2224 int i;
2225
2226 Visual *visual = display->visual;
2227
2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2229
2230 /* for convenience */
2231 mask_r = visual->red_mask;
2232 mask_g = visual->green_mask;
2233 mask_b = visual->blue_mask;
2234
2235 /* boring lookup table pre-initialization */
2236 switch (srcImage->bits_per_pixel) {
2237 case 15:
2238 if ((mask_r != 0x7c00) ||
2239 (mask_g != 0x03e0) ||
2240 (mask_b != 0x001f))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2243 lookup_r = lookup;
2244 lookup_g = lookup+32;
2245 lookup_b = lookup+32+32;
2246 sh_r = 10;
2247 sh_g = 5;
2248 sh_b = 0;
2249 break;
2250 case 16:
2251 if ((mask_r != 0xf800) ||
2252 (mask_g != 0x07e0) ||
2253 (mask_b != 0x001f))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2256 lookup_r = lookup;
2257 lookup_g = lookup+32;
2258 lookup_b = lookup+32+64;
2259 sh_r = 11;
2260 sh_g = 5;
2261 sh_b = 0;
2262 break;
2263 case 24:
2264 if ((mask_r != 0xff0000) ||
2265 (mask_g != 0x00ff00) ||
2266 (mask_b != 0x0000ff))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2269 lookup_r = lookup;
2270 lookup_g = lookup+256;
2271 lookup_b = lookup+256+256;
2272 sh_r = 16;
2273 sh_g = 8;
2274 sh_b = 0;
2275 break;
2276 case 32:
2277 if ((mask_r != 0xff0000) ||
2278 (mask_g != 0x00ff00) ||
2279 (mask_b != 0x0000ff))
2280 return;
2281 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2282 lookup_r = lookup;
2283 lookup_g = lookup+256;
2284 lookup_b = lookup+256+256;
2285 sh_r = 16;
2286 sh_g = 8;
2287 sh_b = 0;
2288 break;
2289 default:
2290 return; /* we do not support this color depth */
2291 }
2292
2293 /* prepare limits for color transformation (each channel is handled separately) */
2294 if (shade < 0) {
2295 shade = -shade;
2296 if (shade < 0) shade = 0;
2297 if (shade > 100) shade = 100;
2298
2299 lower_lim_r = 65535-rm;
2300 lower_lim_g = 65535-gm;
2301 lower_lim_b = 65535-bm;
2302
2303 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2304 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2305 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2306
2307 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2308 } else {
2309 if (shade < 0) shade = 0;
2310 if (shade > 100) shade = 100;
2311
2312 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2313
2314 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2315 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2316 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2317 }
2318
2319 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2320 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2321 {
2322 unsigned int tmp;
2323
2324 tmp = lower_lim_r;
2325 lower_lim_r = lower_lim_b;
2326 lower_lim_b = tmp;
2327
2328 tmp = upper_lim_r;
2329 upper_lim_r = upper_lim_b;
2330 upper_lim_b = tmp;
2331 }
2332
2333 /* fill our lookup tables */
2334 for (i = 0; i <= mask_r>>sh_r; i++)
2335 {
2336 RUINT32T tmp;
2337 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2338 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2339 lookup_r[i] = (tmp/65535)<<sh_r;
2340 }
2341 for (i = 0; i <= mask_g>>sh_g; i++)
2342 {
2343 RUINT32T tmp;
2344 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2345 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2346 lookup_g[i] = (tmp/65535)<<sh_g;
2347 }
2348 for (i = 0; i <= mask_b>>sh_b; i++)
2349 {
2350 RUINT32T tmp;
2351 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2352 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2353 lookup_b[i] = (tmp/65535)<<sh_b;
2354 }
2355
2356 /* apply table to input image (replacing colors by newly calculated ones) */
2357 switch (srcImage->bits_per_pixel)
2358 {
2359 case 15:
2360 {
2361 unsigned short *p1, *pf, *p, *pl;
2362 p1 = (unsigned short *) srcImage->data;
2363 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364 while (p1 < pf)
2365 {
2366 p = p1;
2367 pl = p1 + srcImage->width;
2368 for (; p < pl; p++)
2369 {
2370 *p = lookup_r[(*p & 0x7c00)>>10] |
2371 lookup_g[(*p & 0x03e0)>> 5] |
2372 lookup_b[(*p & 0x001f)];
2373 }
2374 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2375 }
2376 break;
2377 }
2378 case 16:
2379 {
2380 unsigned short *p1, *pf, *p, *pl;
2381 p1 = (unsigned short *) srcImage->data;
2382 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2383 while (p1 < pf)
2384 {
2385 p = p1;
2386 pl = p1 + srcImage->width;
2387 for (; p < pl; p++)
2388 {
2389 *p = lookup_r[(*p & 0xf800)>>11] |
2390 lookup_g[(*p & 0x07e0)>> 5] |
2391 lookup_b[(*p & 0x001f)];
2392 }
2393 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2394 }
2395 break;
2396 }
2397 case 24:
2398 {
2399 unsigned char *p1, *pf, *p, *pl;
2400 p1 = (unsigned char *) srcImage->data;
2401 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2402 while (p1 < pf)
2403 {
2404 p = p1;
2405 pl = p1 + srcImage->width * 3;
2406 for (; p < pl; p += 3)
2407 {
2408 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2409 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2410 p[2] = lookup_r[(p[2] & 0x0000ff)];
2411 }
2412 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 case 32:
2417 {
2418 RUINT32T *p1, *pf, *p, *pl;
2419 p1 = (RUINT32T *) srcImage->data;
2420 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2421
2422 while (p1 < pf)
2423 {
2424 p = p1;
2425 pl = p1 + srcImage->width;
2426 for (; p < pl; p++)
2427 {
2428 *p = lookup_r[(*p & 0xff0000)>>16] |
2429 lookup_g[(*p & 0x00ff00)>> 8] |
2430 lookup_b[(*p & 0x0000ff)] |
2431 (*p & ~0xffffff);
2432 }
2433 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2434 }
2435 break;
2436 }
2437 }
2438
2439 free (lookup);
2440}
2441#endif
2442
2443/*
2444 * Check our parents are still who we think they are.
2445 * Do transparency updates if required
2446 */
2447int
2448rxvt_term::check_our_parents ()
2449{
2450 int i, pchanged, aformat, have_pixmap, rootdepth;
2451 unsigned long nitems, bytes_after;
2452 Atom atype;
2453 unsigned char *prop = NULL;
2454 Window root, oldp, *list;
2455 Pixmap rootpixmap = None;
2456 XWindowAttributes wattr, wrootattr;
2457 dDisp;
2458
2459 pchanged = 0;
2460
2461 if (!OPTION (Opt_transparent))
2462 return pchanged; /* Don't try any more */
2463
2464 XGetWindowAttributes (disp, display->root, &wrootattr);
2465 rootdepth = wrootattr.depth;
2466
2467 XGetWindowAttributes (disp, parent[0], &wattr);
2468
2469 if (rootdepth != wattr.depth)
2470 {
2471 if (am_transparent)
2472 {
2473 pchanged = 1;
2474 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2475 am_transparent = am_pixmap_trans = 0;
2476 }
2477
2478 return pchanged; /* Don't try any more */
2479 }
2480
2481 /* Get all X ops out of the queue so that our information is up-to-date. */
2482 XSync (disp, False);
2483
2484 /*
2485 * Make the frame window set by the window manager have
2486 * the root background. Some window managers put multiple nested frame
2487 * windows for each client, so we have to take care about that.
2488 */
2489 i = (xa[XA_XROOTPMAP_ID]
2490 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2491 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2492 &nitems, &bytes_after, &prop) == Success);
2493
2494 if (!i || prop == NULL)
2495 i = (xa[XA_ESETROOT_PMAP_ID]
2496 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2497 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2498 &nitems, &bytes_after, &prop) == Success);
2499
2500 if (!i || prop == NULL
2501#if TINTING
2502 || !rs[Rs_color + Color_tint]
2503#endif
2504 )
2505 have_pixmap = 0;
2506 else
2507 {
2508 have_pixmap = 1;
2509 rootpixmap = *(Pixmap *)prop;
2510 XFree (prop);
2511 }
2512
2513 if (have_pixmap)
2514 {
2515 /*
2516 * Copy display->root pixmap transparency
2517 */
2518 int sx, sy, nx, ny;
2519 unsigned int nw, nh;
2520 Window cr;
2521 XImage *image;
2522 GC gc;
2523 XGCValues gcvalue;
2524
2525 XTranslateCoordinates (disp, parent[0], display->root,
2526 0, 0, &sx, &sy, &cr);
2527 nw = (unsigned int)szHint.width;
2528 nh = (unsigned int)szHint.height;
2529 nx = ny = 0;
2530
2531 if (sx < 0)
2532 {
2533 nw += sx;
2534 nx = -sx;
2535 sx = 0;
2536 }
2537
2538 if (sy < 0)
2539 {
2540 nh += sy;
2541 ny = -sy;
2542 sy = 0;
2543 }
2544
2545 min_it (nw, (unsigned int) (wrootattr.width - sx));
2546 min_it (nh, (unsigned int) (wrootattr.height - sy));
2547
2548 XSync (disp, False);
2549 allowedxerror = -1;
2550 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2551
2552 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2553 /* XXX: may need a delay here? */
2554 allowedxerror = 0;
2555
2556 if (image == NULL)
2557 {
2558 if (am_transparent && am_pixmap_trans)
2559 {
2560 pchanged = 1;
2561 if (pixmap != None)
2562 {
2563 XFreePixmap (disp, pixmap);
2564 pixmap = None;
2565 }
2566 }
2567
2568 am_pixmap_trans = 0;
2569 }
2570 else
2571 {
2572 if (pixmap != None)
2573 XFreePixmap (disp, pixmap);
2574
2575#if TINTING
2576 if (ISSET_PIXCOLOR (Color_tint))
2577 {
2578 unsigned short rm, gm, bm;
2579 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580
2581 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2582
2583 ShadeXImage (display, image, shade, rm, gm, bm);
2584 }
2585#endif
2586
2587 pixmap = XCreatePixmap (disp, vt,
2588 szHint.width, szHint.height, image->depth);
2589 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2590 XPutImage (disp, pixmap, gc, image, 0, 0,
2591 nx, ny, image->width, image->height);
2592 XFreeGC (disp, gc);
2593 XDestroyImage (image);
2594 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2595 XClearWindow (disp, parent[0]);
2596
2597 if (!am_transparent || !am_pixmap_trans)
2598 pchanged = 1;
2599
2600 am_transparent = am_pixmap_trans = 1;
2601 }
2602 }
2603
2604 if (am_pixmap_trans)
2605 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2606 else
2607 {
2608 unsigned int n;
2609 /*
2610 * InheritPixmap transparency
2611 */
2612 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2613 {
2614 oldp = parent[i];
2615 XQueryTree (disp, parent[i - 1], &root,
2616 &parent[i], &list, &n);
2617 XFree (list);
2618
2619 if (parent[i] == display->root)
2620 {
2621 if (oldp != None)
2622 pchanged = 1;
2623
2624 break;
2625 }
2626
2627 if (oldp != parent[i])
2628 pchanged = 1;
2629 }
2630
2631 n = 0;
2632
2633 if (pchanged)
2634 {
2635 for (; n < (unsigned int)i; n++)
2636 {
2637 XGetWindowAttributes (disp, parent[n], &wattr);
2638 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2639 {
2640 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2641 break;
2642 }
2643 }
2644 }
2645
2646 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2647 {
2648 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2649 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2650 am_transparent = 0;
2651 /* XXX: also turn off Opt_transparent? */
2652 }
2653 else
2654 {
2655#if WAIT_FOR_WM
2656 /* wait (an arbitrary period) for the WM to do its thing
2657 * needed for fvwm2.2.2 (and before?) */
2658 sleep (1);
2659#endif
2660 for (n = 0; n < (unsigned int)i; n++)
2661 {
2662 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2663 XClearWindow (disp, parent[n]);
2664 }
2665
2666 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2667 am_transparent = 1;
2668 }
2669
2670 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2671 parent[i] = None;
2672 }
2673
2674 if (scrollBar.win)
2675 {
2676 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2677 scrollBar.setIdle ();
2678 scrollbar_show (0);
2679 }
2680
2681 if (am_transparent)
2682 {
2683 want_refresh = want_full_refresh = 1;
2684 if (am_pixmap_trans)
2685 flush ();
2686 }
2687
2688 return pchanged;
2689}
2690#endif
2691 2172
2692/*}}} */ 2173/*}}} */
2693 2174
2694bool 2175bool
2695rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
… …
2744 if (ch == C0_LF) 2225 if (ch == C0_LF)
2745 nlines++; 2226 nlines++;
2746 2227
2747 refresh_count++; 2228 refresh_count++;
2748 2229
2749 if (!OPTION (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2750 || (refresh_count >= refresh_limit * (nrow - 1)))
2751 { 2231 {
2752 refreshnow = true;
2753 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2754 ch = NOCHAR; 2237 ch = NOCHAR;
2755 break; 2238 break;
2239 }
2756 } 2240 }
2757 2241
2758 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2759 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2760 { 2244 {
… …
2788 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2790 2274
2791 /* 2275 /*
2792 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2793 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2794 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2795 * is incremented here because we must be doing flat-out scrolling.
2796 */ 2279 */
2797 if (refreshnow) 2280 if (refreshnow)
2798 { 2281 {
2799 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2800 refresh_limit++;
2801 else
2802 {
2803 flag = true; 2282 flag = true;
2804 scr_refresh (); 2283 scr_refresh ();
2805 want_refresh = 1; 2284 want_refresh = 1;
2806 }
2807 } 2285 }
2808 2286
2809 } 2287 }
2810 else 2288 else
2811 { 2289 {
… …
2827 return flag; 2305 return flag;
2828} 2306}
2829 2307
2830// read the next character 2308// read the next character
2831wchar_t 2309wchar_t
2832rxvt_term::next_char () 2310rxvt_term::next_char () NOTHROW
2833{ 2311{
2834 while (cmdbuf_ptr < cmdbuf_endp) 2312 while (cmdbuf_ptr < cmdbuf_endp)
2835 { 2313 {
2836 // assume 7-bit to be ascii ALWAYS 2314 // assume 7-bit to be ascii ALWAYS
2837 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2858 return NOCHAR; 2336 return NOCHAR;
2859} 2337}
2860 2338
2861// read the next octet 2339// read the next octet
2862uint32_t 2340uint32_t
2863rxvt_term::next_octet () 2341rxvt_term::next_octet () NOTHROW
2864{ 2342{
2865 return cmdbuf_ptr < cmdbuf_endp 2343 return cmdbuf_ptr < cmdbuf_endp
2866 ? (unsigned char)*cmdbuf_ptr++ 2344 ? (unsigned char)*cmdbuf_ptr++
2867 : NOCHAR; 2345 : NOCHAR;
2868} 2346}
2347
2348static class out_of_input out_of_input;
2869 2349
2870/* rxvt_cmd_getc () - Return next input character */ 2350/* rxvt_cmd_getc () - Return next input character */
2871/* 2351/*
2872 * Return the next input character after first passing any keyboard input 2352 * Return the next input character after first passing any keyboard input
2873 * to the command. 2353 * to the command.
2874 */ 2354 */
2875wchar_t 2355wchar_t
2876rxvt_term::cmd_getc () 2356rxvt_term::cmd_getc () THROW ((class out_of_input))
2877{ 2357{
2878 wchar_t c = next_char (); 2358 wchar_t c = next_char ();
2879 2359
2880 if (c == NOCHAR) 2360 if (c == NOCHAR)
2881 throw out_of_input; 2361 throw out_of_input;
2882 2362
2883 return c; 2363 return c;
2884} 2364}
2885 2365
2886uint32_t 2366uint32_t
2887rxvt_term::cmd_get8 () 2367rxvt_term::cmd_get8 () THROW ((class out_of_input))
2888{ 2368{
2889 uint32_t c = next_octet (); 2369 uint32_t c = next_octet ();
2890 2370
2891 if (c == NOCHAR) 2371 if (c == NOCHAR)
2892 throw out_of_input; 2372 throw out_of_input;
… …
2958 { 2438 {
2959 if ((buf[len++] = cmd_getc ()) == 'i') 2439 if ((buf[len++] = cmd_getc ()) == 'i')
2960 break; /* done = 1 */ 2440 break; /* done = 1 */
2961 } 2441 }
2962 } 2442 }
2963 2443
2964 for (i = 0; i < len; i++) 2444 for (i = 0; i < len; i++)
2965 if (putc (buf[i], fd) == EOF) 2445 if (putc (buf[i], fd) == EOF)
2966 { 2446 {
2967 done = 1; 2447 done = 1;
2968 break; 2448 break;
… …
2970 } 2450 }
2971 } 2451 }
2972 2452
2973 pclose_printer (fd); 2453 pclose_printer (fd);
2974} 2454}
2975#endif /* PRINTPIPE */ 2455#endif /* PRINTPIPE */
2976/*}}} */ 2456/*}}} */
2977 2457
2978/* *INDENT-OFF* */ 2458/* *INDENT-OFF* */
2979enum { 2459enum {
2980 C1_40 = 0x40, 2460 C1_40 = 0x40,
… …
3030 process_dcs_seq (); 2510 process_dcs_seq ();
3031 break; 2511 break;
3032 case 0x9b: /* CSI */ 2512 case 0x9b: /* CSI */
3033 process_csi_seq (); 2513 process_csi_seq ();
3034 break; 2514 break;
3035 case 0x9d: /* CSI */ 2515 case 0x9d: /* OSC */
3036 process_osc_seq (); 2516 process_osc_seq ();
3037 break; 2517 break;
3038#endif 2518#endif
3039 } 2519 }
3040} 2520}
… …
3130 scr_charset_set (2, (unsigned int)cmd_getc ()); 2610 scr_charset_set (2, (unsigned int)cmd_getc ());
3131 break; 2611 break;
3132 case '+': 2612 case '+':
3133 scr_charset_set (3, (unsigned int)cmd_getc ()); 2613 scr_charset_set (3, (unsigned int)cmd_getc ());
3134 break; 2614 break;
3135#if ENABLE_FRILLS 2615#if !ENABLE_MINIMAL
3136 case '6': 2616 case '6':
3137 scr_backindex (); 2617 scr_backindex ();
3138 break; 2618 break;
3139#endif 2619#endif
3140 case '7': 2620 case '7':
3141 scr_cursor (SAVE); 2621 scr_cursor (SAVE);
3142 break; 2622 break;
3143 case '8': 2623 case '8':
3144 scr_cursor (RESTORE); 2624 scr_cursor (RESTORE);
3145 break; 2625 break;
3146#if ENABLE_FRILLS 2626#if !ENABLE_MINIMAL
3147 case '9': 2627 case '9':
3148 scr_forwardindex (); 2628 scr_forwardindex ();
3149 break; 2629 break;
3150#endif 2630#endif
3151 case '=': 2631 case '=':
… …
3266rxvt_term::process_csi_seq () 2746rxvt_term::process_csi_seq ()
3267{ 2747{
3268 unicode_t ch, priv, i; 2748 unicode_t ch, priv, i;
3269 unsigned int nargs, p; 2749 unsigned int nargs, p;
3270 int n, ndef; 2750 int n, ndef;
3271 int arg[ESC_ARGS]; 2751 int arg[ESC_ARGS] = { };
3272 2752
3273 for (nargs = ESC_ARGS; nargs > 0;) 2753 nargs = 0;
3274 arg[--nargs] = 0;
3275 2754
3276 priv = 0; 2755 priv = 0;
3277 ch = cmd_getc (); 2756 ch = cmd_getc ();
3278 if (ch >= '<' && ch <= '?') 2757 if (ch >= '<' && ch <= '?')
2758 {
3279 { /* '<' '=' '>' '?' */ 2759 /* '<' '=' '>' '?' */
3280 priv = ch; 2760 priv = ch;
3281 ch = cmd_getc (); 2761 ch = cmd_getc ();
3282 } 2762 }
3283 2763
3284 /* read any numerical arguments */ 2764 /* read any numerical arguments */
… …
3313 ndef = get_byte_array_bit (csi_defaults, i); 2793 ndef = get_byte_array_bit (csi_defaults, i);
3314 for (p = 0; p < nargs; p++) 2794 for (p = 0; p < nargs; p++)
3315 if (arg[p] == -1) 2795 if (arg[p] == -1)
3316 arg[p] = ndef; 2796 arg[p] = ndef;
3317 2797
3318#ifdef DEBUG_CMD
3319 fprintf (stderr, "CSI ");
3320 for (p = 0; p < nargs; p++)
3321 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3322 fprintf (stderr, "%c\n", ch);
3323#endif
3324
3325 /* 2798 /*
3326 * private mode handling 2799 * private mode handling
3327 */ 2800 */
3328 if (priv) 2801 if (priv)
3329 { 2802 {
3330 switch (priv) 2803 switch (priv)
3331 { 2804 {
3332 case '>': 2805 case '>':
3333 if (ch == CSI_DA) /* secondary device attributes */ 2806 if (ch == CSI_DA) /* secondary device attributes */
3334 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2807 {
2808 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2809 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2810 //
2811 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2812 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2813 // versions.
2814 //
2815 tt_printf ("\033[>%d;95;0c", 'U');
2816 }
3335 break; 2817 break;
3336 case '?': 2818 case '?':
3337 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2819 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3338 process_terminal_mode (ch, priv, nargs, arg); 2820 process_terminal_mode (ch, priv, nargs, arg);
3339 break; 2821 break;
… …
3465 break; 2947 break;
3466 case 6: /* CPR requested */ 2948 case 6: /* CPR requested */
3467 scr_report_position (); 2949 scr_report_position ();
3468 break; 2950 break;
3469 case 7: /* unofficial extension */ 2951 case 7: /* unofficial extension */
3470 if (OPTION (Opt_insecure)) 2952 if (option (Opt_insecure))
3471 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2953 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3472 break; 2954 break;
3473 case 8: /* unofficial extension */ 2955 case 8: /* unofficial extension */
3474 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2956 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3475 break; 2957 break;
… …
3542 break; 3024 break;
3543 case CSI_75: 3025 case CSI_75:
3544 scr_cursor (RESTORE); 3026 scr_cursor (RESTORE);
3545 break; 3027 break;
3546 3028
3547#if ENABLE_FRILLS 3029#if !ENABLE_MINIMAL
3548 case CSI_74: 3030 case CSI_74:
3549 process_window_ops (arg, nargs); 3031 process_window_ops (arg, nargs);
3550 break; 3032 break;
3551#endif 3033#endif
3552 3034
… …
3559 break; 3041 break;
3560 } 3042 }
3561} 3043}
3562/*}}} */ 3044/*}}} */
3563 3045
3564#if ENABLE_FRILLS 3046#if !ENABLE_MINIMAL
3565/* ARGSUSED */ 3047/* ARGSUSED */
3566void 3048void
3567rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3049rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3568{ 3050{
3569 int x, y; 3051 int x, y;
3570 XWindowAttributes wattr; 3052 XWindowAttributes wattr;
3571 Window wdummy; 3053 Window wdummy;
3572 dDisp; 3054
3055 dLocal (Display *, dpy);
3573 3056
3574 if (nargs == 0) 3057 if (nargs == 0)
3575 return; 3058 return;
3576 3059
3577 switch (args[0]) 3060 switch (args[0])
3578 { 3061 {
3579 /* 3062 /*
3580 * commands 3063 * commands
3581 */ 3064 */
3582 case 1: /* deiconify window */ 3065 case 1: /* deiconify window */
3583 XMapWindow (disp, parent[0]); 3066 XMapWindow (dpy, parent[0]);
3584 break; 3067 break;
3585 case 2: /* iconify window */ 3068 case 2: /* iconify window */
3586 XIconifyWindow (disp, parent[0], display->screen); 3069 XIconifyWindow (dpy, parent[0], display->screen);
3587 break; 3070 break;
3588 case 3: /* set position (pixels) */ 3071 case 3: /* set position (pixels) */
3589 XMoveWindow (disp, parent[0], args[1], args[2]); 3072 XMoveWindow (dpy, parent[0], args[1], args[2]);
3590 break; 3073 break;
3591 case 4: /* set size (pixels) */ 3074 case 4: /* set size (pixels) */
3592 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3075 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3593 break; 3076 break;
3594 case 5: /* raise window */ 3077 case 5: /* raise window */
3595 XRaiseWindow (disp, parent[0]); 3078 XRaiseWindow (dpy, parent[0]);
3596 break; 3079 break;
3597 case 6: /* lower window */ 3080 case 6: /* lower window */
3598 XLowerWindow (disp, parent[0]); 3081 XLowerWindow (dpy, parent[0]);
3599 break; 3082 break;
3600 case 7: /* refresh window */ 3083 case 7: /* refresh window */
3601 scr_touch (true); 3084 scr_touch (true);
3602 break; 3085 break;
3603 case 8: /* set size (chars) */ 3086 case 8: /* set size (chars) */
… …
3610 if (args[0] >= 24) /* set height (chars) */ 3093 if (args[0] >= 24) /* set height (chars) */
3611 set_widthheight ((unsigned int)width, 3094 set_widthheight ((unsigned int)width,
3612 (unsigned int) (args[1] * fheight)); 3095 (unsigned int) (args[1] * fheight));
3613 break; 3096 break;
3614 3097
3615
3616 /* 3098 /*
3617 * reports - some output format copied from XTerm 3099 * reports - some output format copied from XTerm
3618 */ 3100 */
3619 case 11: /* report window state */ 3101 case 11: /* report window state */
3620 XGetWindowAttributes (disp, parent[0], &wattr); 3102 XGetWindowAttributes (dpy, parent[0], &wattr);
3621 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3103 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3622 break; 3104 break;
3623 case 13: /* report window position */ 3105 case 13: /* report window position */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3106 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 XTranslateCoordinates (disp, parent[0], wattr.root, 3107 XTranslateCoordinates (dpy, parent[0], wattr.root,
3626 -wattr.border_width, -wattr.border_width, 3108 -wattr.border_width, -wattr.border_width,
3627 &x, &y, &wdummy); 3109 &x, &y, &wdummy);
3628 tt_printf ("\033[3;%d;%dt", x, y); 3110 tt_printf ("\033[3;%d;%dt", x, y);
3629 break; 3111 break;
3630 case 14: /* report window size (pixels) */ 3112 case 14: /* report window size (pixels) */
3631 XGetWindowAttributes (disp, parent[0], &wattr); 3113 XGetWindowAttributes (dpy, parent[0], &wattr);
3632 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3114 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3633 break; 3115 break;
3634 case 18: /* report text area size (chars) */ 3116 case 18: /* report text area size (chars) */
3635 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3117 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3636 break; 3118 break;
… …
3638 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3120 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3639 break; 3121 break;
3640 case 20: /* report icon label */ 3122 case 20: /* report icon label */
3641 { 3123 {
3642 char *s; 3124 char *s;
3643 XGetIconName (disp, parent[0], &s); 3125 XGetIconName (dpy, parent[0], &s);
3644 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3126 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3127 XFree (s);
3646 } 3128 }
3647 break; 3129 break;
3648 case 21: /* report window title */ 3130 case 21: /* report window title */
3649 { 3131 {
3650 char *s; 3132 char *s;
3651 XFetchName (disp, parent[0], &s); 3133 XFetchName (dpy, parent[0], &s);
3652 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3134 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3653 XFree (s); 3135 XFree (s);
3654 } 3136 }
3655 break; 3137 break;
3656 } 3138 }
3657} 3139}
… …
3684 seen_esc = true; 3166 seen_esc = true;
3685 continue; 3167 continue;
3686 } 3168 }
3687 else if (ch == C0_BEL || ch == CHAR_ST) 3169 else if (ch == C0_BEL || ch == CHAR_ST)
3688 break; 3170 break;
3171 else if (ch == C0_SYN)
3172 ch = cmd_get8 ();
3689 else if (ch < 0x20) 3173 else if (ch < 0x20)
3690 return NULL; /* other control character - exit */ 3174 return NULL; /* other control character - exit */
3691 3175
3692 seen_esc = false; 3176 seen_esc = false;
3693 3177
3694 if (n >= STRING_MAX - 1) 3178 if (n >= STRING_MAX - 1)
3695 // stop at some sane length 3179 // stop at some sane length
3696 return NULL; 3180 return NULL;
3697 3181
3698 if (ch == C0_SYN)
3699 string[n++] = cmd_get8 ();
3700 else
3701 string[n++] = ch; 3182 string[n++] = ch;
3702 } 3183 }
3703 3184
3704 string[n++] = '\0'; 3185 string[n++] = '\0';
3705 3186
3706 ends_how = (ch == 0x5c ? C0_ESC : ch); 3187 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3757void 3238void
3758rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3239rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3759{ 3240{
3760 if (str[0] == '?' && !str[1]) 3241 if (str[0] == '?' && !str[1])
3761 { 3242 {
3762 unsigned short r, g, b; 3243 rgba c;
3763 pix_colors_focused[color].get (display, r, g, b); 3244 pix_colors_focused[color].get (c);
3245
3246#if XFT
3247 if (c.a != rgba::MAX_CC)
3248 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3249 else
3250#endif
3764 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3251 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3765 } 3252 }
3766 else 3253 else
3767 set_window_color (color, str); 3254 set_window_color (color, str);
3768} 3255}
3769 3256
… …
3775{ 3262{
3776 int color; 3263 int color;
3777 char *buf, *name; 3264 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3265 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3266 int saveop = op;
3780 dDisp; 3267
3268 dLocal (Display *, dpy);
3781 3269
3782 assert (str != NULL); 3270 assert (str != NULL);
3271
3272 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3273 return;
3274
3783 switch (op) 3275 switch (op)
3784 { 3276 {
3785 case XTerm_name: 3277 case XTerm_name:
3786 set_title (str); 3278 set_title (str);
3787 /* FALLTHROUGH */ 3279 /* FALLTHROUGH */
… …
3801 unsigned long bytes_after; 3293 unsigned long bytes_after;
3802 unsigned char *value = 0; 3294 unsigned char *value = 0;
3803 const char *str = ""; 3295 const char *str = "";
3804 3296
3805 if (prop 3297 if (prop
3806 && XGetWindowProperty (disp, parent[0], 3298 && XGetWindowProperty (dpy, parent[0],
3807 prop, 0, 1<<16, 0, AnyPropertyType, 3299 prop, 0, 1<<16, 0, AnyPropertyType,
3808 &actual_type, &actual_format, 3300 &actual_type, &actual_format,
3809 &nitems, &bytes_after, &value) == Success 3301 &nitems, &bytes_after, &value) == Success
3810 && actual_type != None 3302 && actual_type != None
3811 && actual_format == 8) 3303 && actual_format == 8)
3812 str = (const char *)(value); 3304 str = (const char *)(value);
3813 3305
3814 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3306 tt_printf ("\033]%d;%s%c", op, str, resp);
3815 3307
3816 XFree (value); 3308 XFree (value);
3817 } 3309 }
3818 else 3310 else
3819 { 3311 {
… …
3823 { 3315 {
3824 *eq = 0; 3316 *eq = 0;
3825 set_utf8_property (display->atom (str), eq + 1); 3317 set_utf8_property (display->atom (str), eq + 1);
3826 } 3318 }
3827 else 3319 else
3828 XDeleteProperty (disp, parent[0], 3320 XDeleteProperty (dpy, parent[0],
3829 display->atom (str)); 3321 display->atom (str));
3830 } 3322 }
3831 break; 3323 break;
3832 3324
3833 case XTerm_Color: 3325 case XTerm_Color:
… …
3843 break; 3335 break;
3844 3336
3845 if ((buf = strchr (name, ';')) != NULL) 3337 if ((buf = strchr (name, ';')) != NULL)
3846 *buf++ = '\0'; 3338 *buf++ = '\0';
3847 3339
3848 if (name[0] == '?' && !name[1]) 3340 process_color_seq (op, color, name, resp);
3849 {
3850 unsigned short r, g, b;
3851 pix_colors_focused[color].get (display, r, g, b);
3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853 }
3854 else
3855 set_window_color (color, name);
3856 } 3341 }
3857 break; 3342 break;
3858 case XTerm_Color00: 3343 case XTerm_Color00:
3859 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3344 process_color_seq (op, Color_fg, str, resp);
3860 break; 3345 break;
3861 case XTerm_Color01: 3346 case XTerm_Color01:
3862 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3347 process_color_seq (op, Color_bg, str, resp);
3863 break; 3348 break;
3864#ifndef NO_CURSORCOLOR 3349#ifndef NO_CURSORCOLOR
3865 case XTerm_Color_cursor: 3350 case XTerm_Color_cursor:
3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3351 process_color_seq (op, Color_cursor, str, resp);
3867 break; 3352 break;
3868#endif 3353#endif
3869 case XTerm_Color_pointer_fg: 3354 case XTerm_Color_pointer_fg:
3870 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3355 process_color_seq (op, Color_pointer_fg, str, resp);
3871 break; 3356 break;
3872 case XTerm_Color_pointer_bg: 3357 case XTerm_Color_pointer_bg:
3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3358 process_color_seq (op, Color_pointer_bg, str, resp);
3874 break; 3359 break;
3875#ifndef NO_BOLD_UNDERLINE_REVERSE 3360#ifndef NO_BOLD_UNDERLINE_REVERSE
3876 case XTerm_Color_RV: 3361 case XTerm_Color_RV:
3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3362 process_color_seq (op, Color_RV, str, resp);
3878 break; 3363 break;
3879 case Rxvt_Color_BD: 3364 case Rxvt_Color_BD:
3880 case URxvt_Color_BD: 3365 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp); 3366 process_color_seq (op, Color_BD, str, resp);
3882 break; 3367 break;
3883 case Rxvt_Color_UL: 3368 case Rxvt_Color_UL:
3884 case URxvt_Color_UL: 3369 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp); 3370 process_color_seq (op, Color_UL, str, resp);
3886 break; 3371 break;
3887 case URxvt_Color_IT: 3372 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3373 process_color_seq (op, Color_IT, str, resp);
3889 break; 3374 break;
3890#endif 3375#endif
3891#if TRANSPARENT && TINTING 3376#if ENABLE_TRANSPARENCY
3892 case URxvt_Color_tint: 3377 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3378 process_color_seq (op, Color_tint, str, resp);
3894 check_our_parents (); 3379 {
3895 if (am_transparent) 3380 bool changed = false;
3896 want_full_refresh = want_refresh = 1; 3381 if (ISSET_PIXCOLOR (Color_tint))
3897 break; 3382 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3898#endif 3383 else
3384 changed = bgPixmap.unset_tint ();
3385 if (changed)
3386 update_background ();
3387 }
3899 3388
3389 break;
3390#endif
3391
3392#if BG_IMAGE_FROM_FILE
3900 case Rxvt_Pixmap: 3393 case Rxvt_Pixmap:
3901 { 3394 if (!strcmp (str, "?"))
3902 if (*str != ';')
3903 { 3395 {
3904#if XPM_BACKGROUND 3396 char str[256];
3905 scale_pixmap (""); /* reset to default scaling */ 3397
3906 set_bgPixmap (str); /* change pixmap */ 3398 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3907 scr_touch (true); 3399 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3908#endif 3400 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3401 process_xterm_seq (XTerm_title, str, CHAR_ST);
3909 } 3402 }
3910 3403 else
3404 {
3911 int changed = 0; 3405 int changed = 0;
3912 3406
3913 while ((str = strchr (str, ';')) != NULL) 3407 if (*str != ';')
3914 { 3408 {
3409 /* reset to default scaling :*/
3410 bgPixmap.unset_geometry ();
3411 if (bgPixmap.set_file (str)) /* change pixmap */
3412 changed++;
3413 str = strchr (str, ';');
3414 if (str == NULL)
3415 bgPixmap.set_defaultGeometry ();
3416 }
3417 while (str)
3418 {
3915 str++; 3419 str++;
3916#if XPM_BACKGROUND 3420 if (bgPixmap.set_geometry (str))
3917 changed += scale_pixmap (str); 3421 changed++;
3918#endif 3422 str = strchr (str, ';');
3919 } 3423 }
3920
3921 if (changed) 3424 if (changed)
3922 { 3425 update_background ();
3923#ifdef XPM_BACKGROUND
3924 resize_pixmap ();
3925 scr_touch (true);
3926#endif
3927 } 3426 }
3928 }
3929 break; 3427 break;
3428#endif
3930 3429
3931 case Rxvt_restoreFG: 3430 case Rxvt_restoreFG:
3932 set_window_color (Color_fg, str); 3431 set_window_color (Color_fg, str);
3933 break; 3432 break;
3934 case Rxvt_restoreBG: 3433 case Rxvt_restoreBG:
… …
3959 case URxvt_italicFont: 3458 case URxvt_italicFont:
3960 case URxvt_boldItalicFont: 3459 case URxvt_boldItalicFont:
3961#endif 3460#endif
3962 if (query) 3461 if (query)
3963 tt_printf ("\33]%d;%-.250s%c", saveop, 3462 tt_printf ("\33]%d;%-.250s%c", saveop,
3964 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3463 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965 ? fontset[op - URxvt_font]->fontdesc : "", 3464 ? fontset[op - URxvt_font]->fontdesc : "",
3966 resp); 3465 resp);
3967 else 3466 else
3968 { 3467 {
3969 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3468 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3972 allocated.push_back ((void *)res); 3471 allocated.push_back ((void *)res);
3973 set_fonts (); 3472 set_fonts ();
3974 } 3473 }
3975 break; 3474 break;
3976 3475
3977#if ENABLE_FRILLS 3476 case URxvt_version:
3477 if (query)
3478 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3479 op,
3480 rs[Rs_name], VERSION[0], VERSION[2],
3481 resp);
3482 break;
3483
3484#if !ENABLE_MINIMAL
3978 case URxvt_locale: 3485 case URxvt_locale:
3979 if (query) 3486 if (query)
3980 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3487 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3981 else 3488 else
3982 { 3489 {
3983 set_locale (str); 3490 set_locale (str);
3984 pty->set_utf8_mode (enc_utf8); 3491 pty->set_utf8_mode (enc_utf8);
3985 init_xlocale (); 3492 init_xlocale ();
… …
4000 break; 3507 break;
4001#endif 3508#endif
4002 3509
4003#if ENABLE_PERL 3510#if ENABLE_PERL
4004 case URxvt_perl: 3511 case URxvt_perl:
4005 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4006 ; // no responses yet 3513 ; // no responses yet
4007 break; 3514 break;
4008#endif 3515#endif
4009 } 3516 }
4010} 3517}
… …
4042 return state; 3549 return state;
4043} 3550}
4044 3551
4045/* we're not using priv _yet_ */ 3552/* we're not using priv _yet_ */
4046void 3553void
4047rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3554rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4048{ 3555{
4049 unsigned int i, j; 3556 unsigned int i, j;
4050 int state; 3557 int state;
4051 3558
4052 static const struct 3559 static const struct
4053 { 3560 {
4054 const int argval; 3561 const int argval;
4055 const unsigned long bit; 3562 const unsigned long bit;
4056 }
4057
4058 argtopriv[] = { 3563 } argtopriv[] = {
4059 { 1, PrivMode_aplCUR }, 3564 { 1, PrivMode_aplCUR },
4060 { 2, PrivMode_vt52 }, 3565 { 2, PrivMode_vt52 },
4061 { 3, PrivMode_132 }, 3566 { 3, PrivMode_132 },
4062 { 4, PrivMode_smoothScroll }, 3567 { 4, PrivMode_smoothScroll },
4063 { 5, PrivMode_rVideo }, 3568 { 5, PrivMode_rVideo },
… …
4079 { 66, PrivMode_aplKP }, 3584 { 66, PrivMode_aplKP },
4080#ifndef NO_BACKSPACE_KEY 3585#ifndef NO_BACKSPACE_KEY
4081 { 67, PrivMode_BackSpace }, 3586 { 67, PrivMode_BackSpace },
4082#endif 3587#endif
4083 { 1000, PrivMode_MouseX11 }, 3588 { 1000, PrivMode_MouseX11 },
4084 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3589 { 1002, PrivMode_MouseBtnEvent },
4085 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3590 { 1003, PrivMode_MouseAnyEvent },
4086 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4087 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4088 { 1011, PrivMode_Keypress }, // rxvt extension 3592 { 1011, PrivMode_Keypress }, // rxvt extension
4089 // 1035 enable modifiers for alt, numlock NYI 3593 // 1035 enable modifiers for alt, numlock NYI
4090 // 1036 send ESC for meta keys NYI 3594 // 1036 send ESC for meta keys NYI
4091 // 1037 send DEL for keypad delete NYI 3595 // 1037 send DEL for keypad delete NYI
… …
4126 scr_touch (true); 3630 scr_touch (true);
4127 break; 3631 break;
4128#endif 3632#endif
4129 case 1048: /* alternative cursor save */ 3633 case 1048: /* alternative cursor save */
4130 case 1049: 3634 case 1049:
4131 if (OPTION (Opt_secondaryScreen)) 3635 if (option (Opt_secondaryScreen))
4132 if (mode == 0) 3636 if (mode == 0)
4133 scr_cursor (RESTORE); 3637 scr_cursor (RESTORE);
4134 else if (mode == 1) 3638 else if (mode == 1)
4135 scr_cursor (SAVE); 3639 scr_cursor (SAVE);
4136 break; 3640 break;
… …
4165 scr_autowrap (state); 3669 scr_autowrap (state);
4166 break; 3670 break;
4167 /* case 8: - auto repeat, can't do on a per window basis */ 3671 /* case 8: - auto repeat, can't do on a per window basis */
4168 case 9: /* X10 mouse reporting */ 3672 case 9: /* X10 mouse reporting */
4169 if (state) /* orthogonal */ 3673 if (state) /* orthogonal */
4170 priv_modes &= ~PrivMode_MouseX11; 3674 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4171 break; 3675 break;
4172#ifdef scrollBar_esc 3676#ifdef scrollBar_esc
4173 case scrollBar_esc: 3677 case scrollBar_esc:
4174 if (scrollbar_mapping (state)) 3678 if (scrollbar_mapping (state))
4175 { 3679 {
… …
4188 break; 3692 break;
4189 /* case 66: - application key pad */ 3693 /* case 66: - application key pad */
4190 /* case 67: - backspace key */ 3694 /* case 67: - backspace key */
4191 case 1000: /* X11 mouse reporting */ 3695 case 1000: /* X11 mouse reporting */
4192 if (state) /* orthogonal */ 3696 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX10; 3697 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4194 break; 3698 break;
4195#if 0
4196 case 1001: 3699 case 1002:
4197 break; /* X11 mouse highlighting */ 3700 case 1003:
4198#endif 3701 if (state)
3702 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3705 vt_emask_mouse = PointerMotionMask;
3706 }
3707 else
3708 vt_emask_mouse = NoEventMask;
3709 vt_select_input ();
3710 break;
4199 case 1010: /* scroll to bottom on TTY output inhibit */ 3711 case 1010: /* scroll to bottom on TTY output inhibit */
4200 set_option (Opt_scrollTtyOutput, !state); 3712 set_option (Opt_scrollTtyOutput, !state);
4201 break; 3713 break;
4202 case 1011: /* scroll to bottom on key press */ 3714 case 1011: /* scroll to bottom on key press */
4203 set_option (Opt_scrollTtyKeypress, state); 3715 set_option (Opt_scrollTtyKeypress, state);
4204 break; 3716 break;
4205 case 1047: /* secondary screen w/ clearing last */ 3717 case 1047: /* secondary screen w/ clearing last */
4206 if (OPTION (Opt_secondaryScreen)) 3718 if (option (Opt_secondaryScreen))
4207 if (current_screen != PRIMARY) 3719 if (current_screen != PRIMARY)
4208 scr_erase_screen (2); 3720 scr_erase_screen (2);
4209 scr_change_screen (state); 3721 scr_change_screen (state);
4210 break; 3722 break;
4211 case 1049: /* secondary screen w/ clearing first */ 3723 case 1049: /* secondary screen w/ clearing first */
4212 scr_change_screen (state); 3724 scr_change_screen (state);
4213 if (OPTION (Opt_secondaryScreen)) 3725 if (option (Opt_secondaryScreen))
4214 if (current_screen != PRIMARY) 3726 if (current_screen != PRIMARY)
4215 scr_erase_screen (2); 3727 scr_erase_screen (2);
4216 break; 3728 break;
4217 default: 3729 default:
4218 break; 3730 break;
… …
4346 scr_color (Color_bg, Color_bg); 3858 scr_color (Color_bg, Color_bg);
4347 break; 3859 break;
4348 3860
4349 //case 50: // not variable spacing 3861 //case 50: // not variable spacing
4350 3862
4351#if ENABLE_FRILLS 3863#if !ENABLE_MINIMAL
4352 case 90: 3864 case 90:
4353 case 91: /* set bright fg color */ 3865 case 91: /* set bright fg color */
4354 case 92: 3866 case 92:
4355 case 93: 3867 case 93:
4356 case 94: 3868 case 94:
… …
4380rxvt_term::process_graphics () 3892rxvt_term::process_graphics ()
4381{ 3893{
4382 unicode_t ch, cmd = cmd_getc (); 3894 unicode_t ch, cmd = cmd_getc ();
4383 3895
4384 if (cmd == 'Q') 3896 if (cmd == 'Q')
3897 {
4385 { /* query graphics */ 3898 /* query graphics */
4386 tt_printf ("\033G0\012"); /* no graphics */ 3899 tt_printf ("\033G0\012"); /* no graphics */
4387 return; 3900 return;
4388 } 3901 }
4389 /* swallow other graphics sequences until terminating ':' */ 3902 /* swallow other graphics sequences until terminating ':' */
4390 do 3903 do
… …
4440 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3953 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4441 3954
4442 memcpy (v_buffer + v_buflen, data, len); 3955 memcpy (v_buffer + v_buflen, data, len);
4443 v_buflen += len; 3956 v_buflen += len;
4444 3957
4445 pty_ev.set (EVENT_READ | EVENT_WRITE); 3958 pty_ev.set (ev::READ | ev::WRITE);
4446} 3959}
4447 3960
4448void rxvt_term::pty_write () 3961void rxvt_term::pty_write ()
4449{ 3962{
4450 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3963 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4455 3968
4456 if (v_buflen == 0) 3969 if (v_buflen == 0)
4457 { 3970 {
4458 free (v_buffer); 3971 free (v_buffer);
4459 v_buffer = 0; 3972 v_buffer = 0;
4460 v_buflen = 0;
4461 3973
4462 pty_ev.set (EVENT_READ); 3974 pty_ev.set (ev::READ);
4463 return; 3975 return;
4464 } 3976 }
4465 3977
4466 memmove (v_buffer, v_buffer + written, v_buflen); 3978 memmove (v_buffer, v_buffer + written, v_buflen);
4467 } 3979 }
4468 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3980 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4469 pty_ev.set (EVENT_READ); 3981 pty_ev.set (ev::READ);
4470} 3982}
4471 3983
4472/*----------------------- end-of-file (C source) -----------------------*/ 3984/*----------------------- end-of-file (C source) -----------------------*/
4473 3985

Diff Legend

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