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.373 by root, Tue Dec 11 15:42:51 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
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.again ();
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 }
1063} 1084}
1064#endif 1085#endif
1065 1086
1066#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1067void 1088void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1069{ 1090{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 {
1073 want_refresh = 1; 1093 want_refresh = 1;
1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
1075 } 1095 w.stop ();
1076} 1096}
1077#endif 1097#endif
1078 1098
1079#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1080void 1100void
1081rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1082{ 1102{
1083 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1084 { 1104 {
1085 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1086 want_refresh = 1; 1106 want_refresh = 1;
1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1088 } 1107 }
1108 else
1109 w.stop ();
1089} 1110}
1090#endif 1111#endif
1091 1112
1092#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1093void 1114void
1094rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1095{ 1116{
1096 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1098 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
1099 { 1120 {
1100 if (view_start == top_row || view_start == 0) 1121 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0; 1122 mouse_slip_wheel_speed = 0;
1102 1123
1103 want_refresh = 1; 1124 want_refresh = 1;
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1125 }
1126 else
1127 w.stop ();
1106} 1128}
1107#endif 1129#endif
1108 1130
1109#if HAVE_SCHED_YIELD 1131#if LINUX_YIELD_HACK
1110static struct event_handler 1132static struct event_handler
1111{ 1133{
1112 check_watcher cw_yield; 1134 ev::prepare yield_ev;
1113 1135
1114 void yield (check_watcher &w) 1136 void yield_cb (ev::prepare &w, int revents)
1115 { 1137 {
1116 sched_yield (); 1138 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS.
1142
1143 struct timespec ts = { 0, 0 };
1144 nanosleep (&ts, 0);
1145
1117 w.stop (); 1146 w.stop ();
1118 } 1147 }
1119 1148
1120 event_handler () 1149 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1150 : yield_ev (this, &event_handler::yield_cb)
1122 { 1151 {
1123 } 1152 }
1124} event_handler; 1153} event_handler;
1125#endif 1154#endif
1126 1155
… …
1146 cmdbuf_endp += r; 1175 cmdbuf_endp += r;
1147 return true; 1176 return true;
1148 } 1177 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1179 {
1151#if HAVE_SCHED_YIELD 1180#if LINUX_YIELD_HACK
1152 if (display->is_local) 1181 if (display->is_local)
1153 event_handler.cw_yield.start (); 1182 event_handler.yield_ev.start ();
1154#endif 1183#endif
1155 } 1184 }
1156 else 1185 else
1157 { 1186 {
1158 pty_ev.stop (); 1187 pty_ev.stop ();
1159 1188
1160 if (!OPTION (Opt_hold)) 1189 if (!option (Opt_hold))
1161 destroy (); 1190 destroy ();
1162 } 1191 }
1163 1192
1164 return false; 1193 return false;
1165} 1194}
1166 1195
1167void 1196void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1169{ 1198{
1170 make_current (); 1199 make_current ();
1171 1200
1172 if (revents & EVENT_READ) 1201 if (revents & ev::READ)
1173 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1174 while (pty_fill ()) 1203 while (pty_fill ())
1175 if (cmd_parse ()) 1204 if (cmd_parse ())
1176 break; 1205 break;
1177 1206
1178 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1179 pty_write (); 1208 pty_write ();
1180} 1209}
1181 1210
1182void 1211void
1183rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1184{ 1213{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1215 recolour_cursor ();
1187 1216
1188#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1218 hidden_pointer = 0;
1190 1219
1191 if (OPTION (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1193#endif 1222#endif
1194} 1223}
1195 1224
1196#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1197void 1226void
1198rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
1199{ 1228{
1200 if (!OPTION (Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
1201 return; 1230 return;
1202 1231
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1233 XFlush (dpy);
1205 1234
1206 hidden_pointer = 1; 1235 hidden_pointer = 1;
1207} 1236}
1208 1237
1209void 1238void
1210rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1211{ 1240{
1212 make_current (); 1241 make_current ();
1213 1242
1214 pointer_blank (); 1243 pointer_blank ();
1215} 1244}
… …
1218void 1247void
1219rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1220{ 1249{
1221 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1222 int x, y; 1251 int x, y;
1252 int code = 32;
1223 1253
1224 x = ev.x; 1254 x = Pixel2Col (ev.x);
1225 y = ev.y; 1255 y = Pixel2Row (ev.y);
1226 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260 mouse_row = x;
1261 mouse_col = y;
1262 code += 32;
1263 }
1227 1264
1228 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
1229 button_number = 3; 1266 button_number = 3;
1230 else 1267 else
1231 { 1268 {
… …
1277 x + 1, 1314 x + 1,
1278 y + 1); 1315 y + 1);
1279#endif 1316#endif
1280 1317
1281 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
1282 (32 + button_number + key_state), 1319 (code + button_number + key_state),
1283 (32 + x + 1), 1320 (32 + x + 1),
1284 (32 + y + 1)); 1321 (32 + y + 1));
1285} 1322}
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 1323
1297/*{{{ process an X event */ 1324/*{{{ process an X event */
1298void 1325void
1299rxvt_term::x_cb (XEvent &ev) 1326rxvt_term::x_cb (XEvent &ev)
1300{ 1327{
1301 make_current (); 1328 make_current ();
1302 1329
1303 dDisp; 1330 dLocal (Display *, dpy);
1304 1331
1305 if (ev.xany.window == vt 1332 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1333 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1334 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1335 return;
… …
1313 unsigned int unused_mask; 1340 unsigned int unused_mask;
1314 1341
1315 switch (ev.type) 1342 switch (ev.type)
1316 { 1343 {
1317 case KeyPress: 1344 case KeyPress:
1318#if ISO_14755 1345 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1346 break;
1324 1347
1325 case KeyRelease: 1348 case KeyRelease:
1326 { 1349 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; 1350 break;
1398 }
1399 1351
1400 case ButtonPress: 1352 case ButtonPress:
1401 button_press (ev.xbutton); 1353 button_press (ev.xbutton);
1402 break; 1354 break;
1403 1355
… …
1405 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1406 break; 1358 break;
1407 1359
1408 case ClientMessage: 1360 case ClientMessage:
1409 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1362 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1363 {
1364 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1365 {
1366 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1367 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1369 {
1370 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1371 destroy ();
1372 }
1414#if ENABLE_EWMH 1373#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1374 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1375 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1376 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1377 &ev);
1378#endif
1379 }
1380 }
1381#if ENABLE_XEMBED
1382 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1383 {
1384 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1385 focus_in ();
1386 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1387 focus_out ();
1388 }
1419#endif 1389#endif
1420 } 1390 }
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; 1391 break;
1461 1392
1462 /* 1393 /*
1463 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1483 break; 1414 break;
1484 } 1415 }
1485 break; 1416 break;
1486 1417
1487 case FocusIn: 1418 case FocusIn:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1422 focus_in ();
1489 break; 1423 break;
1490 1424
1491 case FocusOut: 1425 case FocusOut:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1429 focus_out ();
1493 break; 1430 break;
1494 1431
1495 case ConfigureNotify: 1432 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1496 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1497 { 1437 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1439 ;
1500 1440
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1442 {
1503 seen_resize = 1; 1443 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1445 }
1506 1446 else
1447 {
1448#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ())
1450 update_background ();
1451#endif
1452 }
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 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 } 1454 }
1514 break; 1455 break;
1515 1456
1516 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1462
1521 break; 1463 break;
1522 1464
1523 case SelectionClear: 1465 case SelectionClear:
1524 selection_clear (); 1466 selection_clear ();
… …
1534 break; 1476 break;
1535 1477
1536 case MapNotify: 1478 case MapNotify:
1537 mapped = 1; 1479 mapped = 1;
1538#ifdef TEXT_BLINK 1480#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1481 text_blink_ev.again ();
1540#endif 1482#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1484 break;
1543 1485
1544 case UnmapNotify: 1486 case UnmapNotify:
… …
1546#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1547 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1548#endif 1490#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1492 break;
1551
1552#ifdef TRANSPARENT
1553 case ReparentNotify:
1554 rootwin_cb (ev);
1555 break;
1556#endif /* TRANSPARENT */
1557 1493
1558 case GraphicsExpose: 1494 case GraphicsExpose:
1559 case Expose: 1495 case Expose:
1560 if (ev.xany.window == vt) 1496 if (ev.xany.window == vt)
1561 { 1497 {
1562 do 1498 do
1499 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1504
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1506
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1572 1511 }
1573 want_refresh = 1; 1512 want_refresh = 1;
1574 } 1513 }
1575 else 1514 else
1576 { 1515 {
1577 XEvent unused_event; 1516 XEvent unused_event;
1578 1517
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1519 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1521 ;
1583 1522
1584 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1585 { 1524 {
1586 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1587 scrollbar_show (0); 1526 scrollbar_show (0);
1588 } 1527 }
1589
1590#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window);
1593#endif
1594 } 1528 }
1595 break; 1529 break;
1596 1530
1597 case MotionNotify: 1531 case MotionNotify:
1598#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1599 if (hidden_pointer) 1533 if (hidden_pointer)
1600 pointer_unblank (); 1534 pointer_unblank ();
1601#endif 1535#endif
1536 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1537 || priv_modes & PrivMode_MouseAnyEvent)
1538 mouse_report (ev.xbutton);
1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1603 break; 1540 break;
1604 1541
1605 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1606 { 1543 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1544 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1545 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1546 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1547 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1548 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1549 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1550 ;
1614 1551
1615 XQueryPointer (disp, vt, 1552 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1553 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1554 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1555 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1556 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1557#ifdef MOUSE_THRESHOLD
… …
1640 int dist; 1577 int dist;
1641 1578
1642 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1643 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1644 */ 1581 */
1645 if (!sel_scroll_ev.active) 1582 if (!ev_is_active (&sel_scroll_ev))
1646 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1647 1584
1648 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1649 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1650 */ 1587 */
1651 selection_save_x = ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
… …
1673 else 1610 else
1674 { 1611 {
1675 /* we are within the text window, so we 1612 /* we are within the text window, so we
1676 * shouldn't be scrolling 1613 * shouldn't be scrolling
1677 */ 1614 */
1678 if (sel_scroll_ev.active) 1615 if (ev_is_active (&sel_scroll_ev))
1679 sel_scroll_ev.stop(); 1616 sel_scroll_ev.stop();
1680 } 1617 }
1681#endif 1618#endif
1682#ifdef MOUSE_THRESHOLD 1619#ifdef MOUSE_THRESHOLD
1683 } 1620 }
1684#endif 1621#endif
1685 } 1622 }
1686 } 1623 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688 { 1625 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1627 MotionNotify, &ev))
1691 ; 1628 ;
1692 1629
1693 XQueryPointer (disp, scrollBar.win, 1630 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1631 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1632 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1633 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1634 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1636 scrollbar_size ());
1700 want_refresh = 1; 1637 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1638 scrollbar_show (1);
1703 } 1639 }
1704 break; 1640 break;
1705 } 1641 }
1706 1642
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1643#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1644 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1645 {
1712 if (hidden_cursor) 1646 if (hidden_cursor)
1713 { 1647 {
1714 hidden_cursor = 0; 1648 hidden_cursor = 0;
1715 want_refresh = 1; 1649 want_refresh = 1;
1716 } 1650 }
1717 1651
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1652 cursor_blink_ev.again ();
1719 } 1653 }
1720#endif 1654#endif
1721 1655
1722#if defined(POINTER_BLANK) 1656#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1657 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1658 {
1725 if (ev.type == MotionNotify 1659 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1660 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1661 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1662 if (hidden_pointer)
… …
1740 if (!focus) 1674 if (!focus)
1741 { 1675 {
1742 focus = 1; 1676 focus = 1;
1743 want_refresh = 1; 1677 want_refresh = 1;
1744 1678
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1679 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1680
1747#if USE_XIM 1681#if USE_XIM
1748 if (Input_Context != NULL) 1682 if (Input_Context != NULL)
1749 { 1683 {
1750 IMSetStatusPosition (); 1684 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1685 XSetICFocus (Input_Context);
1752 } 1686 }
1753#endif 1687#endif
1754#if CURSOR_BLINK 1688#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1689 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1757#endif 1691#endif
1758#if OFF_FOCUS_FADING 1692#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1693 if (rs[Rs_fade])
1760 { 1694 {
1761 pix_colors = pix_colors_focused; 1695 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1696 scr_recolour ();
1763 } 1697 }
1764#endif 1698#endif
1699#if ENABLE_FRILLS
1700 if (option (Opt_urgentOnBell))
1701 {
1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1703 {
1704 h->flags &= ~XUrgencyHint;
1705 XSetWMHints (dpy, parent[0], h);
1706 }
1707 }
1708#endif
1765 } 1709 }
1766} 1710}
1767 1711
1768void 1712void
1769rxvt_term::focus_out () 1713rxvt_term::focus_out ()
… …
1777 1721
1778#if ENABLE_FRILLS || ISO_14755 1722#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf) 1723 if (iso14755buf)
1780 { 1724 {
1781 iso14755buf = 0; 1725 iso14755buf = 0;
1782# if ENABLE_OVERLAY 1726# if ISO_14755
1783 scr_overlay_off (); 1727 scr_overlay_off ();
1784# endif 1728# endif
1785 } 1729 }
1786#endif 1730#endif
1787#if USE_XIM 1731#if USE_XIM
1788 if (Input_Context != NULL) 1732 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1733 XUnsetICFocus (Input_Context);
1790#endif 1734#endif
1791#if CURSOR_BLINK 1735#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1737 cursor_blink_ev.stop ();
1738
1794 hidden_cursor = 0; 1739 hidden_cursor = 0;
1795#endif 1740#endif
1796#if OFF_FOCUS_FADING 1741#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1742 if (rs[Rs_fade])
1798 { 1743 {
… …
1801 } 1746 }
1802#endif 1747#endif
1803 } 1748 }
1804} 1749}
1805 1750
1806#if TRANSPARENT 1751void
1752rxvt_term::update_fade_color (unsigned int idx)
1753{
1754#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade])
1756 {
1757 rgba c;
1758 pix_colors [Color_fade].get (c);
1759 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1760 }
1761#endif
1762}
1763
1764#if ENABLE_TRANSPARENCY || ENABLE_PERL
1807void 1765void
1808rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1767{
1810 make_current (); 1768 make_current ();
1811 1769
1770 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1771 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1772 return;
1773
1774# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1775 switch (ev.type)
1813 { 1776 {
1814 case PropertyNotify: 1777 case PropertyNotify:
1815 /* 1778 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1779 * if user used some Esetroot compatible prog to set the root bg,
1817 * use the property to determine the pixmap. We use it later on. 1780 * use the property to determine the pixmap. We use it later on.
1818 */ 1781 */
1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 return; 1784 {
1822 1785 bgPixmap.set_root_pixmap ();
1823 /* FALLTHROUGH */ 1786 update_background ();
1824 case ReparentNotify: 1787 }
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1826 want_refresh = want_full_refresh = 1;
1827 break; 1788 break;
1828 } 1789 }
1790# endif
1829} 1791}
1830#endif 1792#endif
1831 1793
1832void 1794void
1833rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1804 /*
1843 * VT window processing of button press 1805 * VT window processing of button press
1844 */ 1806 */
1845 if (ev.window == vt) 1807 if (ev.window == vt)
1846 { 1808 {
1809 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1810 return;
1811
1847#if ISO_14755 1812#if ISO_14755
1848 // 5.4 1813 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1814 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1815 {
1851 iso14755_54 (ev.x, ev.y); 1816 iso14755_54 (ev.x, ev.y);
… …
1885 mouse_report (ev); 1850 mouse_report (ev);
1886 } 1851 }
1887#else 1852#else
1888 MEvent.button = ev.button; 1853 MEvent.button = ev.button;
1889 mouse_report (ev); 1854 mouse_report (ev);
1890#endif /* MOUSE_REPORT_DOUBLECLICK */ 1855#endif /* MOUSE_REPORT_DOUBLECLICK */
1891 1856
1892 } 1857 }
1893 else 1858 else
1894 { 1859 {
1895 if (ev.button != MEvent.button) 1860 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1861 MEvent.clicks = 0;
1897 1862
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1863 switch (ev.button)
1900 { 1864 {
1901 case Button1: 1865 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1866 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1867 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1868#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1869 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1870#else
1907 selection.rect = false; 1871 selection.rect = false;
1908#endif 1872#endif
1909 1873
1910 /* allow shift+left click to extend selection */ 1874 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1875 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1876 {
1913 if (MEvent.button == Button1 && clickintime) 1877 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1878 selection_rotate (ev.x, ev.y);
1915 else 1879 else
1916 selection_extend (ev.x, ev.y, 1); 1880 selection_extend (ev.x, ev.y, 1);
1917 } 1881 }
1918 else 1882 else
1919 { 1883 {
1920 if (MEvent.button == Button1 && clickintime) 1884 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1885 MEvent.clicks++;
1922 else 1886 else
1923 MEvent.clicks = 1; 1887 MEvent.clicks = 1;
1924 1888
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1889 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1890 }
1927 1891
1928 MEvent.button = Button1; 1892 MEvent.button = Button1;
1929 break; 1893 break;
1930 1894
1931 case Button3: 1895 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1896 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1934 else 1898 else
1935 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1936 1900
1937 MEvent.button = Button3; 1901 MEvent.button = Button3;
1938 break; 1902 break;
1939 } 1903 }
1940 } 1904 }
1941 1905
1942 MEvent.time = ev.time; 1906 MEvent.time = ev.time;
1943 return; 1907 return;
1944 } 1908 }
1945 1909
… …
1990 tt_printf ("\033[5~"); 1954 tt_printf ("\033[5~");
1991 break; 1955 break;
1992 } 1956 }
1993 } 1957 }
1994 else 1958 else
1995#endif /* NO_SCROLLBAR_REPORT */ 1959#endif /* NO_SCROLLBAR_REPORT */
1996 1960
1997 { 1961 {
1998 char upordown = 0; 1962 char upordown = 0;
1999 1963
2000 if (scrollBar.style == R_SB_NEXT) 1964 if (scrollBar.style == R_SB_NEXT)
2001 { 1965 {
2002 if (scrollbarnext_upButton (ev.y)) 1966 if (scrollbarnext_upButton (ev.y))
2003 upordown = -1; /* up */ 1967 upordown = -1; /* up */
… …
2012 upordown = 1; /* down */ 1976 upordown = 1; /* down */
2013 } 1977 }
2014 if (upordown) 1978 if (upordown)
2015 { 1979 {
2016#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2017 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2018#endif 1982#endif
2019 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
2020 { 1984 {
2021 if (upordown < 0) 1985 if (upordown < 0)
2022 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
2102 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
2103 scrollbar_show (0); 2067 scrollbar_show (0);
2104 } 2068 }
2105 2069
2106#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
2107 if (sel_scroll_ev.active) 2071 if (ev_is_active (&sel_scroll_ev))
2108 sel_scroll_ev.stop(); 2072 sel_scroll_ev.stop();
2109#endif 2073#endif
2110 2074
2111 if (ev.window == vt) 2075 if (ev.window == vt)
2112 { 2076 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2078 return;
2079
2113#if ISO_14755 2080#if ISO_14755
2114 // 5.4 2081 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2083 return;
2117#endif 2084#endif
2085
2118 if (reportmode) 2086 if (reportmode)
2119 { 2087 {
2120 /* mouse report from vt window */ 2088 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
2133 mouse_report (ev); 2101 mouse_report (ev);
2134 } 2102 }
2135#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
2136 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
2137 mouse_report (ev); 2105 mouse_report (ev);
2138#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
2139 return; 2107 return;
2140 } 2108 }
2141 2109
2142 /* 2110 /*
2143 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
… …
2146 if (priv_modes & PrivMode_mouse_report 2114 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2115 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2116 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2117 selection_extend (ev.x, ev.y, 0);
2150 2118
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2119 switch (ev.button)
2155 { 2120 {
2156 case Button1: 2121 case Button1:
2157 case Button3: 2122 case Button3:
2158 selection_make (ev.time); 2123 selection_make (ev.time);
2159 break; 2124 break;
2160 2125
2161 case Button2: 2126 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) 2127 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? 2128 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164 selection_request (ev.time);
2165
2166 break; 2129 break;
2167 2130
2168#ifdef MOUSE_WHEEL 2131#ifdef MOUSE_WHEEL
2169 case Button4: 2132 case Button4:
2170 case Button5: 2133 case Button5:
… …
2174 2137
2175 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2176 2139
2177 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2178 i = 1; 2141 i = 1;
2179 else if (OPTION (Opt_mouseWheelScrollPage)) 2142 else if (option (Opt_mouseWheelScrollPage))
2180 i = nrow - 1; 2143 i = nrow - 1;
2181 else 2144 else
2182 i = 5; 2145 i = 5;
2183 2146
2184# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
… …
2186 { 2149 {
2187 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2188 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2189 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2190 2153
2191 if (slip_wheel_ev.at < NOW) 2154 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 } 2155 }
2196 else 2156 else
2197 { 2157 {
2198# endif 2158# endif
2199 scr_page (v, i); 2159 scr_page (v, i);
… …
2205 break; 2165 break;
2206#endif 2166#endif
2207 } 2167 }
2208 } 2168 }
2209} 2169}
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 2170
2692/*}}} */ 2171/*}}} */
2693 2172
2694bool 2173bool
2695rxvt_term::cmd_parse () 2174rxvt_term::cmd_parse ()
… …
2744 if (ch == C0_LF) 2223 if (ch == C0_LF)
2745 nlines++; 2224 nlines++;
2746 2225
2747 refresh_count++; 2226 refresh_count++;
2748 2227
2749 if (!OPTION (Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2750 || (refresh_count >= refresh_limit * (nrow - 1)))
2751 { 2229 {
2752 refreshnow = true;
2753 refresh_count = 0; 2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 {
2234 refreshnow = true;
2754 ch = NOCHAR; 2235 ch = NOCHAR;
2755 break; 2236 break;
2237 }
2756 } 2238 }
2757 2239
2758 // scr_add_lines only works for nlines <= nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2759 if (nlines >= nrow - 1) 2241 if (nlines >= nrow - 1)
2760 { 2242 {
… …
2788 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, str - buf, nlines); 2271 scr_add_lines (buf, str - buf, nlines);
2790 2272
2791 /* 2273 /*
2792 * If there have been a lot of new lines, then update the screen 2274 * If there have been a lot of new lines, then update the screen
2793 * What the heck I'll cheat and only refresh less than every page-full. 2275 * What the heck we'll cheat and only refresh less than every page-full.
2794 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2795 * is incremented here because we must be doing flat-out scrolling.
2796 */ 2277 */
2797 if (refreshnow) 2278 if (refreshnow)
2798 { 2279 {
2799 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2800 refresh_limit++;
2801 else
2802 {
2803 flag = true; 2280 flag = true;
2804 scr_refresh (); 2281 scr_refresh ();
2805 want_refresh = 1; 2282 want_refresh = 1;
2806 }
2807 } 2283 }
2808 2284
2809 } 2285 }
2810 else 2286 else
2811 { 2287 {
… …
2827 return flag; 2303 return flag;
2828} 2304}
2829 2305
2830// read the next character 2306// read the next character
2831wchar_t 2307wchar_t
2832rxvt_term::next_char () 2308rxvt_term::next_char () NOTHROW
2833{ 2309{
2834 while (cmdbuf_ptr < cmdbuf_endp) 2310 while (cmdbuf_ptr < cmdbuf_endp)
2835 { 2311 {
2836 // assume 7-bit to be ascii ALWAYS 2312 // assume 7-bit to be ascii ALWAYS
2837 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2313 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2858 return NOCHAR; 2334 return NOCHAR;
2859} 2335}
2860 2336
2861// read the next octet 2337// read the next octet
2862uint32_t 2338uint32_t
2863rxvt_term::next_octet () 2339rxvt_term::next_octet () NOTHROW
2864{ 2340{
2865 return cmdbuf_ptr < cmdbuf_endp 2341 return cmdbuf_ptr < cmdbuf_endp
2866 ? (unsigned char)*cmdbuf_ptr++ 2342 ? (unsigned char)*cmdbuf_ptr++
2867 : NOCHAR; 2343 : NOCHAR;
2868} 2344}
2345
2346static class out_of_input out_of_input;
2869 2347
2870/* rxvt_cmd_getc () - Return next input character */ 2348/* rxvt_cmd_getc () - Return next input character */
2871/* 2349/*
2872 * Return the next input character after first passing any keyboard input 2350 * Return the next input character after first passing any keyboard input
2873 * to the command. 2351 * to the command.
2874 */ 2352 */
2875wchar_t 2353wchar_t
2876rxvt_term::cmd_getc () 2354rxvt_term::cmd_getc () THROW ((class out_of_input))
2877{ 2355{
2878 wchar_t c = next_char (); 2356 wchar_t c = next_char ();
2879 2357
2880 if (c == NOCHAR) 2358 if (c == NOCHAR)
2881 throw out_of_input; 2359 throw out_of_input;
2882 2360
2883 return c; 2361 return c;
2884} 2362}
2885 2363
2886uint32_t 2364uint32_t
2887rxvt_term::cmd_get8 () 2365rxvt_term::cmd_get8 () THROW ((class out_of_input))
2888{ 2366{
2889 uint32_t c = next_octet (); 2367 uint32_t c = next_octet ();
2890 2368
2891 if (c == NOCHAR) 2369 if (c == NOCHAR)
2892 throw out_of_input; 2370 throw out_of_input;
… …
2958 { 2436 {
2959 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
2960 break; /* done = 1 */ 2438 break; /* done = 1 */
2961 } 2439 }
2962 } 2440 }
2963 2441
2964 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
2965 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
2966 { 2444 {
2967 done = 1; 2445 done = 1;
2968 break; 2446 break;
… …
2970 } 2448 }
2971 } 2449 }
2972 2450
2973 pclose_printer (fd); 2451 pclose_printer (fd);
2974} 2452}
2975#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
2976/*}}} */ 2454/*}}} */
2977 2455
2978/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
2979enum { 2457enum {
2980 C1_40 = 0x40, 2458 C1_40 = 0x40,
… …
3030 process_dcs_seq (); 2508 process_dcs_seq ();
3031 break; 2509 break;
3032 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
3033 process_csi_seq (); 2511 process_csi_seq ();
3034 break; 2512 break;
3035 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
3036 process_osc_seq (); 2514 process_osc_seq ();
3037 break; 2515 break;
3038#endif 2516#endif
3039 } 2517 }
3040} 2518}
… …
3130 scr_charset_set (2, (unsigned int)cmd_getc ()); 2608 scr_charset_set (2, (unsigned int)cmd_getc ());
3131 break; 2609 break;
3132 case '+': 2610 case '+':
3133 scr_charset_set (3, (unsigned int)cmd_getc ()); 2611 scr_charset_set (3, (unsigned int)cmd_getc ());
3134 break; 2612 break;
3135#if ENABLE_FRILLS 2613#if !ENABLE_MINIMAL
3136 case '6': 2614 case '6':
3137 scr_backindex (); 2615 scr_backindex ();
3138 break; 2616 break;
3139#endif 2617#endif
3140 case '7': 2618 case '7':
3141 scr_cursor (SAVE); 2619 scr_cursor (SAVE);
3142 break; 2620 break;
3143 case '8': 2621 case '8':
3144 scr_cursor (RESTORE); 2622 scr_cursor (RESTORE);
3145 break; 2623 break;
3146#if ENABLE_FRILLS 2624#if !ENABLE_MINIMAL
3147 case '9': 2625 case '9':
3148 scr_forwardindex (); 2626 scr_forwardindex ();
3149 break; 2627 break;
3150#endif 2628#endif
3151 case '=': 2629 case '=':
… …
3266rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
3267{ 2745{
3268 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
3269 unsigned int nargs, p; 2747 unsigned int nargs, p;
3270 int n, ndef; 2748 int n, ndef;
3271 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
3272 2750
3273 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
3274 arg[--nargs] = 0;
3275 2752
3276 priv = 0; 2753 priv = 0;
3277 ch = cmd_getc (); 2754 ch = cmd_getc ();
3278 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
2756 {
3279 { /* '<' '=' '>' '?' */ 2757 /* '<' '=' '>' '?' */
3280 priv = ch; 2758 priv = ch;
3281 ch = cmd_getc (); 2759 ch = cmd_getc ();
3282 } 2760 }
3283 2761
3284 /* read any numerical arguments */ 2762 /* read any numerical arguments */
… …
3313 ndef = get_byte_array_bit (csi_defaults, i); 2791 ndef = get_byte_array_bit (csi_defaults, i);
3314 for (p = 0; p < nargs; p++) 2792 for (p = 0; p < nargs; p++)
3315 if (arg[p] == -1) 2793 if (arg[p] == -1)
3316 arg[p] = ndef; 2794 arg[p] = ndef;
3317 2795
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 /* 2796 /*
3326 * private mode handling 2797 * private mode handling
3327 */ 2798 */
3328 if (priv) 2799 if (priv)
3329 { 2800 {
3330 switch (priv) 2801 switch (priv)
3331 { 2802 {
3332 case '>': 2803 case '>':
3333 if (ch == CSI_DA) /* secondary device attributes */ 2804 if (ch == CSI_DA) /* secondary device attributes */
3334 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2805 {
2806 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2807 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2808 //
2809 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2810 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2811 // versions.
2812 //
2813 tt_printf ("\033[>%d;95;0c", 'U');
2814 }
3335 break; 2815 break;
3336 case '?': 2816 case '?':
3337 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3338 process_terminal_mode (ch, priv, nargs, arg); 2818 process_terminal_mode (ch, priv, nargs, arg);
3339 break; 2819 break;
… …
3465 break; 2945 break;
3466 case 6: /* CPR requested */ 2946 case 6: /* CPR requested */
3467 scr_report_position (); 2947 scr_report_position ();
3468 break; 2948 break;
3469 case 7: /* unofficial extension */ 2949 case 7: /* unofficial extension */
3470 if (OPTION (Opt_insecure)) 2950 if (option (Opt_insecure))
3471 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2951 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3472 break; 2952 break;
3473 case 8: /* unofficial extension */ 2953 case 8: /* unofficial extension */
3474 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2954 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3475 break; 2955 break;
… …
3542 break; 3022 break;
3543 case CSI_75: 3023 case CSI_75:
3544 scr_cursor (RESTORE); 3024 scr_cursor (RESTORE);
3545 break; 3025 break;
3546 3026
3547#if ENABLE_FRILLS 3027#if !ENABLE_MINIMAL
3548 case CSI_74: 3028 case CSI_74:
3549 process_window_ops (arg, nargs); 3029 process_window_ops (arg, nargs);
3550 break; 3030 break;
3551#endif 3031#endif
3552 3032
… …
3559 break; 3039 break;
3560 } 3040 }
3561} 3041}
3562/*}}} */ 3042/*}}} */
3563 3043
3564#if ENABLE_FRILLS 3044#if !ENABLE_MINIMAL
3565/* ARGSUSED */ 3045/* ARGSUSED */
3566void 3046void
3567rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3047rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3568{ 3048{
3569 int x, y; 3049 int x, y;
3570 XWindowAttributes wattr; 3050 XWindowAttributes wattr;
3571 Window wdummy; 3051 Window wdummy;
3572 dDisp; 3052
3053 dLocal (Display *, dpy);
3573 3054
3574 if (nargs == 0) 3055 if (nargs == 0)
3575 return; 3056 return;
3576 3057
3577 switch (args[0]) 3058 switch (args[0])
3578 { 3059 {
3579 /* 3060 /*
3580 * commands 3061 * commands
3581 */ 3062 */
3582 case 1: /* deiconify window */ 3063 case 1: /* deiconify window */
3583 XMapWindow (disp, parent[0]); 3064 XMapWindow (dpy, parent[0]);
3584 break; 3065 break;
3585 case 2: /* iconify window */ 3066 case 2: /* iconify window */
3586 XIconifyWindow (disp, parent[0], display->screen); 3067 XIconifyWindow (dpy, parent[0], display->screen);
3587 break; 3068 break;
3588 case 3: /* set position (pixels) */ 3069 case 3: /* set position (pixels) */
3589 XMoveWindow (disp, parent[0], args[1], args[2]); 3070 XMoveWindow (dpy, parent[0], args[1], args[2]);
3590 break; 3071 break;
3591 case 4: /* set size (pixels) */ 3072 case 4: /* set size (pixels) */
3592 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3073 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3593 break; 3074 break;
3594 case 5: /* raise window */ 3075 case 5: /* raise window */
3595 XRaiseWindow (disp, parent[0]); 3076 XRaiseWindow (dpy, parent[0]);
3596 break; 3077 break;
3597 case 6: /* lower window */ 3078 case 6: /* lower window */
3598 XLowerWindow (disp, parent[0]); 3079 XLowerWindow (dpy, parent[0]);
3599 break; 3080 break;
3600 case 7: /* refresh window */ 3081 case 7: /* refresh window */
3601 scr_touch (true); 3082 scr_touch (true);
3602 break; 3083 break;
3603 case 8: /* set size (chars) */ 3084 case 8: /* set size (chars) */
… …
3610 if (args[0] >= 24) /* set height (chars) */ 3091 if (args[0] >= 24) /* set height (chars) */
3611 set_widthheight ((unsigned int)width, 3092 set_widthheight ((unsigned int)width,
3612 (unsigned int) (args[1] * fheight)); 3093 (unsigned int) (args[1] * fheight));
3613 break; 3094 break;
3614 3095
3615
3616 /* 3096 /*
3617 * reports - some output format copied from XTerm 3097 * reports - some output format copied from XTerm
3618 */ 3098 */
3619 case 11: /* report window state */ 3099 case 11: /* report window state */
3620 XGetWindowAttributes (disp, parent[0], &wattr); 3100 XGetWindowAttributes (dpy, parent[0], &wattr);
3621 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3101 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3622 break; 3102 break;
3623 case 13: /* report window position */ 3103 case 13: /* report window position */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 XTranslateCoordinates (disp, parent[0], wattr.root, 3105 XTranslateCoordinates (dpy, parent[0], wattr.root,
3626 -wattr.border_width, -wattr.border_width, 3106 -wattr.border_width, -wattr.border_width,
3627 &x, &y, &wdummy); 3107 &x, &y, &wdummy);
3628 tt_printf ("\033[3;%d;%dt", x, y); 3108 tt_printf ("\033[3;%d;%dt", x, y);
3629 break; 3109 break;
3630 case 14: /* report window size (pixels) */ 3110 case 14: /* report window size (pixels) */
3631 XGetWindowAttributes (disp, parent[0], &wattr); 3111 XGetWindowAttributes (dpy, parent[0], &wattr);
3632 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3112 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3633 break; 3113 break;
3634 case 18: /* report text area size (chars) */ 3114 case 18: /* report text area size (chars) */
3635 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3115 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3636 break; 3116 break;
… …
3638 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3118 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3639 break; 3119 break;
3640 case 20: /* report icon label */ 3120 case 20: /* report icon label */
3641 { 3121 {
3642 char *s; 3122 char *s;
3643 XGetIconName (disp, parent[0], &s); 3123 XGetIconName (dpy, parent[0], &s);
3644 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3124 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3125 XFree (s);
3646 } 3126 }
3647 break; 3127 break;
3648 case 21: /* report window title */ 3128 case 21: /* report window title */
3649 { 3129 {
3650 char *s; 3130 char *s;
3651 XFetchName (disp, parent[0], &s); 3131 XFetchName (dpy, parent[0], &s);
3652 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3132 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3653 XFree (s); 3133 XFree (s);
3654 } 3134 }
3655 break; 3135 break;
3656 } 3136 }
3657} 3137}
… …
3684 seen_esc = true; 3164 seen_esc = true;
3685 continue; 3165 continue;
3686 } 3166 }
3687 else if (ch == C0_BEL || ch == CHAR_ST) 3167 else if (ch == C0_BEL || ch == CHAR_ST)
3688 break; 3168 break;
3169 else if (ch == C0_SYN)
3170 ch = cmd_get8 ();
3689 else if (ch < 0x20) 3171 else if (ch < 0x20)
3690 return NULL; /* other control character - exit */ 3172 return NULL; /* other control character - exit */
3691 3173
3692 seen_esc = false; 3174 seen_esc = false;
3693 3175
3694 if (n >= STRING_MAX - 1) 3176 if (n >= STRING_MAX - 1)
3695 // stop at some sane length 3177 // stop at some sane length
3696 return NULL; 3178 return NULL;
3697 3179
3698 if (ch == C0_SYN)
3699 string[n++] = cmd_get8 ();
3700 else
3701 string[n++] = ch; 3180 string[n++] = ch;
3702 } 3181 }
3703 3182
3704 string[n++] = '\0'; 3183 string[n++] = '\0';
3705 3184
3706 ends_how = (ch == 0x5c ? C0_ESC : ch); 3185 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3757void 3236void
3758rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3237rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3759{ 3238{
3760 if (str[0] == '?' && !str[1]) 3239 if (str[0] == '?' && !str[1])
3761 { 3240 {
3762 unsigned short r, g, b; 3241 rgba c;
3763 pix_colors_focused[color].get (display, r, g, b); 3242 pix_colors_focused[color].get (c);
3243
3244#if XFT
3245 if (c.a != rgba::MAX_CC)
3246 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3247 else
3248#endif
3764 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3249 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3765 } 3250 }
3766 else 3251 else
3767 set_window_color (color, str); 3252 set_window_color (color, str);
3768} 3253}
3769 3254
… …
3775{ 3260{
3776 int color; 3261 int color;
3777 char *buf, *name; 3262 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3263 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3264 int saveop = op;
3780 dDisp; 3265
3266 dLocal (Display *, dpy);
3781 3267
3782 assert (str != NULL); 3268 assert (str != NULL);
3269
3270 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3271 return;
3272
3783 switch (op) 3273 switch (op)
3784 { 3274 {
3785 case XTerm_name: 3275 case XTerm_name:
3786 set_title (str); 3276 set_title (str);
3787 /* FALLTHROUGH */ 3277 /* FALLTHROUGH */
… …
3801 unsigned long bytes_after; 3291 unsigned long bytes_after;
3802 unsigned char *value = 0; 3292 unsigned char *value = 0;
3803 const char *str = ""; 3293 const char *str = "";
3804 3294
3805 if (prop 3295 if (prop
3806 && XGetWindowProperty (disp, parent[0], 3296 && XGetWindowProperty (dpy, parent[0],
3807 prop, 0, 1<<16, 0, AnyPropertyType, 3297 prop, 0, 1<<16, 0, AnyPropertyType,
3808 &actual_type, &actual_format, 3298 &actual_type, &actual_format,
3809 &nitems, &bytes_after, &value) == Success 3299 &nitems, &bytes_after, &value) == Success
3810 && actual_type != None 3300 && actual_type != None
3811 && actual_format == 8) 3301 && actual_format == 8)
3812 str = (const char *)(value); 3302 str = (const char *)(value);
3813 3303
3814 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3304 tt_printf ("\033]%d;%s%c", op, str, resp);
3815 3305
3816 XFree (value); 3306 XFree (value);
3817 } 3307 }
3818 else 3308 else
3819 { 3309 {
… …
3823 { 3313 {
3824 *eq = 0; 3314 *eq = 0;
3825 set_utf8_property (display->atom (str), eq + 1); 3315 set_utf8_property (display->atom (str), eq + 1);
3826 } 3316 }
3827 else 3317 else
3828 XDeleteProperty (disp, parent[0], 3318 XDeleteProperty (dpy, parent[0],
3829 display->atom (str)); 3319 display->atom (str));
3830 } 3320 }
3831 break; 3321 break;
3832 3322
3833 case XTerm_Color: 3323 case XTerm_Color:
… …
3843 break; 3333 break;
3844 3334
3845 if ((buf = strchr (name, ';')) != NULL) 3335 if ((buf = strchr (name, ';')) != NULL)
3846 *buf++ = '\0'; 3336 *buf++ = '\0';
3847 3337
3848 if (name[0] == '?' && !name[1]) 3338 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 } 3339 }
3857 break; 3340 break;
3858 case XTerm_Color00: 3341 case XTerm_Color00:
3859 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3342 process_color_seq (op, Color_fg, str, resp);
3860 break; 3343 break;
3861 case XTerm_Color01: 3344 case XTerm_Color01:
3862 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3345 process_color_seq (op, Color_bg, str, resp);
3863 break; 3346 break;
3864#ifndef NO_CURSORCOLOR 3347#ifndef NO_CURSORCOLOR
3865 case XTerm_Color_cursor: 3348 case XTerm_Color_cursor:
3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3349 process_color_seq (op, Color_cursor, str, resp);
3867 break; 3350 break;
3868#endif 3351#endif
3869 case XTerm_Color_pointer_fg: 3352 case XTerm_Color_pointer_fg:
3870 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3353 process_color_seq (op, Color_pointer_fg, str, resp);
3871 break; 3354 break;
3872 case XTerm_Color_pointer_bg: 3355 case XTerm_Color_pointer_bg:
3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3356 process_color_seq (op, Color_pointer_bg, str, resp);
3874 break; 3357 break;
3875#ifndef NO_BOLD_UNDERLINE_REVERSE 3358#ifndef NO_BOLD_UNDERLINE_REVERSE
3876 case XTerm_Color_RV: 3359 case XTerm_Color_RV:
3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3360 process_color_seq (op, Color_RV, str, resp);
3878 break; 3361 break;
3879 case Rxvt_Color_BD: 3362 case Rxvt_Color_BD:
3880 case URxvt_Color_BD: 3363 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp); 3364 process_color_seq (op, Color_BD, str, resp);
3882 break; 3365 break;
3883 case Rxvt_Color_UL: 3366 case Rxvt_Color_UL:
3884 case URxvt_Color_UL: 3367 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp); 3368 process_color_seq (op, Color_UL, str, resp);
3886 break; 3369 break;
3887 case URxvt_Color_IT: 3370 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3371 process_color_seq (op, Color_IT, str, resp);
3889 break; 3372 break;
3890#endif 3373#endif
3891#if TRANSPARENT && TINTING 3374#if ENABLE_TRANSPARENCY
3892 case URxvt_Color_tint: 3375 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3376 process_color_seq (op, Color_tint, str, resp);
3894 check_our_parents (); 3377 {
3895 if (am_transparent) 3378 bool changed = false;
3896 want_full_refresh = want_refresh = 1; 3379 if (ISSET_PIXCOLOR (Color_tint))
3897 break; 3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3898#endif 3381 else
3382 changed = bgPixmap.unset_tint ();
3383 if (changed)
3384 update_background ();
3385 }
3899 3386
3387 break;
3388#endif
3389
3390#if BG_IMAGE_FROM_FILE
3900 case Rxvt_Pixmap: 3391 case Rxvt_Pixmap:
3901 { 3392 if (!strcmp (str, "?"))
3902 if (*str != ';')
3903 { 3393 {
3904#if XPM_BACKGROUND 3394 char str[256];
3905 scale_pixmap (""); /* reset to default scaling */ 3395
3906 set_bgPixmap (str); /* change pixmap */ 3396 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3907 scr_touch (true); 3397 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3908#endif 3398 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3399 process_xterm_seq (XTerm_title, str, CHAR_ST);
3909 } 3400 }
3910 3401 else
3402 {
3911 int changed = 0; 3403 int changed = 0;
3912 3404
3913 while ((str = strchr (str, ';')) != NULL) 3405 if (*str != ';')
3914 { 3406 {
3407 /* reset to default scaling :*/
3408 bgPixmap.unset_geometry ();
3409 if (bgPixmap.set_file (str)) /* change pixmap */
3410 changed++;
3411 str = strchr (str, ';');
3412 if (str == NULL)
3413 bgPixmap.set_defaultGeometry ();
3414 }
3415 while (str)
3416 {
3915 str++; 3417 str++;
3916#if XPM_BACKGROUND 3418 if (bgPixmap.set_geometry (str))
3917 changed += scale_pixmap (str); 3419 changed++;
3918#endif 3420 str = strchr (str, ';');
3919 } 3421 }
3920
3921 if (changed) 3422 if (changed)
3922 { 3423 update_background ();
3923#ifdef XPM_BACKGROUND
3924 resize_pixmap ();
3925 scr_touch (true);
3926#endif
3927 } 3424 }
3928 }
3929 break; 3425 break;
3426#endif
3930 3427
3931 case Rxvt_restoreFG: 3428 case Rxvt_restoreFG:
3932 set_window_color (Color_fg, str); 3429 set_window_color (Color_fg, str);
3933 break; 3430 break;
3934 case Rxvt_restoreBG: 3431 case Rxvt_restoreBG:
… …
3959 case URxvt_italicFont: 3456 case URxvt_italicFont:
3960 case URxvt_boldItalicFont: 3457 case URxvt_boldItalicFont:
3961#endif 3458#endif
3962 if (query) 3459 if (query)
3963 tt_printf ("\33]%d;%-.250s%c", saveop, 3460 tt_printf ("\33]%d;%-.250s%c", saveop,
3964 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3461 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965 ? fontset[op - URxvt_font]->fontdesc : "", 3462 ? fontset[op - URxvt_font]->fontdesc : "",
3966 resp); 3463 resp);
3967 else 3464 else
3968 { 3465 {
3969 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3466 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3972 allocated.push_back ((void *)res); 3469 allocated.push_back ((void *)res);
3973 set_fonts (); 3470 set_fonts ();
3974 } 3471 }
3975 break; 3472 break;
3976 3473
3977#if ENABLE_FRILLS 3474 case URxvt_version:
3475 if (query)
3476 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3477 op,
3478 rs[Rs_name], VERSION[0], VERSION[2],
3479 resp);
3480 break;
3481
3482#if !ENABLE_MINIMAL
3978 case URxvt_locale: 3483 case URxvt_locale:
3979 if (query) 3484 if (query)
3980 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3485 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3981 else 3486 else
3982 { 3487 {
3983 set_locale (str); 3488 set_locale (str);
3984 pty->set_utf8_mode (enc_utf8); 3489 pty->set_utf8_mode (enc_utf8);
3985 init_xlocale (); 3490 init_xlocale ();
… …
4000 break; 3505 break;
4001#endif 3506#endif
4002 3507
4003#if ENABLE_PERL 3508#if ENABLE_PERL
4004 case URxvt_perl: 3509 case URxvt_perl:
4005 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3510 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4006 ; // no responses yet 3511 ; // no responses yet
4007 break; 3512 break;
4008#endif 3513#endif
4009 } 3514 }
4010} 3515}
… …
4042 return state; 3547 return state;
4043} 3548}
4044 3549
4045/* we're not using priv _yet_ */ 3550/* we're not using priv _yet_ */
4046void 3551void
4047rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3552rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4048{ 3553{
4049 unsigned int i, j; 3554 unsigned int i, j;
4050 int state; 3555 int state;
4051 3556
4052 static const struct 3557 static const struct
4053 { 3558 {
4054 const int argval; 3559 const int argval;
4055 const unsigned long bit; 3560 const unsigned long bit;
4056 }
4057
4058 argtopriv[] = { 3561 } argtopriv[] = {
4059 { 1, PrivMode_aplCUR }, 3562 { 1, PrivMode_aplCUR },
4060 { 2, PrivMode_vt52 }, 3563 { 2, PrivMode_vt52 },
4061 { 3, PrivMode_132 }, 3564 { 3, PrivMode_132 },
4062 { 4, PrivMode_smoothScroll }, 3565 { 4, PrivMode_smoothScroll },
4063 { 5, PrivMode_rVideo }, 3566 { 5, PrivMode_rVideo },
… …
4079 { 66, PrivMode_aplKP }, 3582 { 66, PrivMode_aplKP },
4080#ifndef NO_BACKSPACE_KEY 3583#ifndef NO_BACKSPACE_KEY
4081 { 67, PrivMode_BackSpace }, 3584 { 67, PrivMode_BackSpace },
4082#endif 3585#endif
4083 { 1000, PrivMode_MouseX11 }, 3586 { 1000, PrivMode_MouseX11 },
4084 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
4085 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
4086 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4087 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4088 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
4089 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
4090 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
4091 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
4126 scr_touch (true); 3628 scr_touch (true);
4127 break; 3629 break;
4128#endif 3630#endif
4129 case 1048: /* alternative cursor save */ 3631 case 1048: /* alternative cursor save */
4130 case 1049: 3632 case 1049:
4131 if (OPTION (Opt_secondaryScreen)) 3633 if (option (Opt_secondaryScreen))
4132 if (mode == 0) 3634 if (mode == 0)
4133 scr_cursor (RESTORE); 3635 scr_cursor (RESTORE);
4134 else if (mode == 1) 3636 else if (mode == 1)
4135 scr_cursor (SAVE); 3637 scr_cursor (SAVE);
4136 break; 3638 break;
… …
4165 scr_autowrap (state); 3667 scr_autowrap (state);
4166 break; 3668 break;
4167 /* case 8: - auto repeat, can't do on a per window basis */ 3669 /* case 8: - auto repeat, can't do on a per window basis */
4168 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
4169 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
4170 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4171 break; 3673 break;
4172#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
4173 case scrollBar_esc: 3675 case scrollBar_esc:
4174 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
4175 { 3677 {
… …
4188 break; 3690 break;
4189 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
4190 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
4191 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
4192 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4194 break; 3696 break;
4195#if 0
4196 case 1001: 3697 case 1002:
4197 break; /* X11 mouse highlighting */ 3698 case 1003:
4198#endif 3699 if (state)
3700 {
3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3703 vt_emask_mouse = PointerMotionMask;
3704 }
3705 else
3706 vt_emask_mouse = NoEventMask;
3707 vt_select_input ();
3708 break;
4199 case 1010: /* scroll to bottom on TTY output inhibit */ 3709 case 1010: /* scroll to bottom on TTY output inhibit */
4200 set_option (Opt_scrollTtyOutput, !state); 3710 set_option (Opt_scrollTtyOutput, !state);
4201 break; 3711 break;
4202 case 1011: /* scroll to bottom on key press */ 3712 case 1011: /* scroll to bottom on key press */
4203 set_option (Opt_scrollTtyKeypress, state); 3713 set_option (Opt_scrollTtyKeypress, state);
4204 break; 3714 break;
4205 case 1047: /* secondary screen w/ clearing last */ 3715 case 1047: /* secondary screen w/ clearing last */
4206 if (OPTION (Opt_secondaryScreen)) 3716 if (option (Opt_secondaryScreen))
4207 if (current_screen != PRIMARY) 3717 if (current_screen != PRIMARY)
4208 scr_erase_screen (2); 3718 scr_erase_screen (2);
4209 scr_change_screen (state); 3719 scr_change_screen (state);
4210 break; 3720 break;
4211 case 1049: /* secondary screen w/ clearing first */ 3721 case 1049: /* secondary screen w/ clearing first */
4212 scr_change_screen (state); 3722 scr_change_screen (state);
4213 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4214 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4215 scr_erase_screen (2); 3725 scr_erase_screen (2);
4216 break; 3726 break;
4217 default: 3727 default:
4218 break; 3728 break;
… …
4346 scr_color (Color_bg, Color_bg); 3856 scr_color (Color_bg, Color_bg);
4347 break; 3857 break;
4348 3858
4349 //case 50: // not variable spacing 3859 //case 50: // not variable spacing
4350 3860
4351#if ENABLE_FRILLS 3861#if !ENABLE_MINIMAL
4352 case 90: 3862 case 90:
4353 case 91: /* set bright fg color */ 3863 case 91: /* set bright fg color */
4354 case 92: 3864 case 92:
4355 case 93: 3865 case 93:
4356 case 94: 3866 case 94:
… …
4380rxvt_term::process_graphics () 3890rxvt_term::process_graphics ()
4381{ 3891{
4382 unicode_t ch, cmd = cmd_getc (); 3892 unicode_t ch, cmd = cmd_getc ();
4383 3893
4384 if (cmd == 'Q') 3894 if (cmd == 'Q')
3895 {
4385 { /* query graphics */ 3896 /* query graphics */
4386 tt_printf ("\033G0\012"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
4387 return; 3898 return;
4388 } 3899 }
4389 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
4390 do 3901 do
… …
4440 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4441 3952
4442 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
4443 v_buflen += len; 3954 v_buflen += len;
4444 3955
4445 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
4446} 3957}
4447 3958
4448void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4449{ 3960{
4450 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3961 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4455 3966
4456 if (v_buflen == 0) 3967 if (v_buflen == 0)
4457 { 3968 {
4458 free (v_buffer); 3969 free (v_buffer);
4459 v_buffer = 0; 3970 v_buffer = 0;
4460 v_buflen = 0;
4461 3971
4462 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4463 return; 3973 return;
4464 } 3974 }
4465 3975
4466 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4467 } 3977 }
4468 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4469 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4470} 3980}
4471 3981
4472/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4473 3983

Diff Legend

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