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.275 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.379 by root, Fri Dec 14 02:29:48 2007 UTC

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

Diff Legend

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