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.276 by root, Fri Jan 20 11:02:46 2006 UTC vs.
Revision 1.382 by root, Fri Dec 14 06:04:56 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)
… …
1013 } 1041 }
1014 1042
1015 display->flush (); 1043 display->flush ();
1016} 1044}
1017 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1018void 1047void
1019rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1049{
1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1052
1053 display->flush ();
1054}
1055
1056void
1057rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1058{
1021 make_current (); 1059 make_current ();
1022 1060
1023 display->flush ();
1024
1025 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1027}
1028
1029void
1030rxvt_term::flush_cb (time_watcher &w)
1031{
1032 make_current ();
1033
1034 refresh_limit = 1;
1035 refresh_count = 0; 1061 refresh_count = 0;
1036 flush (); 1062 flush ();
1037} 1063}
1038 1064
1039#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1040void 1066void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1068{
1043 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1070 want_refresh = 1;
1045 1071 refresh_check ();
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); 1083 refresh_check ();
1059 } 1084 }
1085 else
1086 w.stop ();
1060} 1087}
1061#endif 1088#endif
1062 1089
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1091void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1093{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1069 { 1096 {
1070 want_refresh = 1; 1097 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1072 } 1099 }
1100 else
1101 w.stop ();
1073} 1102}
1074#endif 1103#endif
1075 1104
1076#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1077void 1106void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1108{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1110 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1112 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1085 } 1114 }
1115 else
1116 w.stop ();
1086} 1117}
1087#endif 1118#endif
1088 1119
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1121void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1123{
1093 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed))
1096 { 1125 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1; 1126 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1102 } 1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1134 }
1103} 1135}
1104#endif 1136#endif
1105 1137
1106#if HAVE_SCHED_YIELD 1138#if LINUX_YIELD_HACK
1107static struct event_handler 1139static struct event_handler
1108{ 1140{
1109 check_watcher cw_yield; 1141 ev::prepare yield_ev;
1110 1142
1111 void yield (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1112 { 1144 {
1113 sched_yield (); 1145 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than
1147 // ones with high nice levels is a useful thing to do. It surely is is
1148 // allowed by the sus... as is returning ENOSYS.
1149
1150 struct timespec ts = { 0, 0 };
1151 nanosleep (&ts, 0);
1152
1114 w.stop (); 1153 w.stop ();
1115 } 1154 }
1116 1155
1117 event_handler () 1156 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1157 : yield_ev (this, &event_handler::yield_cb)
1119 { 1158 {
1120 } 1159 }
1121} event_handler; 1160} event_handler;
1122#endif 1161#endif
1123 1162
… …
1143 cmdbuf_endp += r; 1182 cmdbuf_endp += r;
1144 return true; 1183 return true;
1145 } 1184 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1185 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1186 {
1148#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1149 if (display->is_local) 1188 if (display->is_local)
1150 event_handler.cw_yield.start (); 1189 event_handler.yield_ev.start ();
1151#endif 1190#endif
1152 } 1191 }
1153 else 1192 else
1154 { 1193 {
1155 pty_ev.stop (); 1194 pty_ev.stop ();
1156 1195
1157 if (!OPTION (Opt_hold)) 1196 if (!option (Opt_hold))
1158 destroy (); 1197 destroy ();
1159 } 1198 }
1160 1199
1161 return false; 1200 return false;
1162} 1201}
1163 1202
1164void 1203void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1205{
1167 make_current (); 1206 make_current ();
1168 1207
1169 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1210 while (pty_fill ())
1172 if (cmd_parse ()) 1211 if (cmd_parse ())
1173 break; 1212 break;
1174 1213
1175 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1176 pty_write (); 1215 pty_write ();
1177} 1216}
1178 1217
1179void 1218void
1180rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
1181{ 1220{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1221 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1222 recolour_cursor ();
1184 1223
1185#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1225 hidden_pointer = 0;
1187 1226
1188 if (OPTION (Opt_pointerBlank)) 1227 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1228 pointer_ev.start (pointerBlankDelay);
1190#endif 1229#endif
1191} 1230}
1192 1231
1193#ifdef POINTER_BLANK 1232#ifdef POINTER_BLANK
1194void 1233void
1195rxvt_term::pointer_blank () 1234rxvt_term::pointer_blank ()
1196{ 1235{
1197 if (!OPTION (Opt_pointerBlank)) 1236 if (!option (Opt_pointerBlank))
1198 return; 1237 return;
1199 1238
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1239 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1240 XFlush (dpy);
1202 1241
1203 hidden_pointer = 1; 1242 hidden_pointer = 1;
1204} 1243}
1205 1244
1206void 1245void
1207rxvt_term::pointer_cb (time_watcher &w) 1246rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1247{
1209 make_current (); 1248 make_current ();
1210 1249
1211 pointer_blank (); 1250 pointer_blank ();
1212} 1251}
… …
1215void 1254void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1255rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1256{
1218 int button_number, key_state = 0; 1257 int button_number, key_state = 0;
1219 int x, y; 1258 int x, y;
1259 int code = 32;
1220 1260
1221 x = ev.x; 1261 x = Pixel2Col (ev.x);
1222 y = ev.y; 1262 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1263 if (ev.type == MotionNotify)
1264 {
1265 if (x == mouse_row && y == mouse_col)
1266 return;
1267 mouse_row = x;
1268 mouse_col = y;
1269 code += 32;
1270 }
1224 1271
1225 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
1226 button_number = 3; 1273 button_number = 3;
1227 else 1274 else
1228 { 1275 {
… …
1274 x + 1, 1321 x + 1,
1275 y + 1); 1322 y + 1);
1276#endif 1323#endif
1277 1324
1278 tt_printf ("\033[M%c%c%c", 1325 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1326 (code + button_number + key_state),
1280 (32 + x + 1), 1327 (32 + x + 1),
1281 (32 + y + 1)); 1328 (32 + y + 1));
1282} 1329}
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 1330
1294/*{{{ process an X event */ 1331/*{{{ process an X event */
1295void 1332void
1296rxvt_term::x_cb (XEvent &ev) 1333rxvt_term::x_cb (XEvent &ev)
1297{ 1334{
1298 make_current (); 1335 make_current ();
1299 1336
1300 dDisp; 1337 dLocal (Display *, dpy);
1301 1338
1302 if (ev.xany.window == vt 1339 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1340 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1341 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1342 return;
… …
1310 unsigned int unused_mask; 1347 unsigned int unused_mask;
1311 1348
1312 switch (ev.type) 1349 switch (ev.type)
1313 { 1350 {
1314 case KeyPress: 1351 case KeyPress:
1315#if ISO_14755 1352 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1353 break;
1321 1354
1322 case KeyRelease: 1355 case KeyRelease:
1323 { 1356 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; 1357 break;
1395 }
1396 1358
1397 case ButtonPress: 1359 case ButtonPress:
1398 button_press (ev.xbutton); 1360 button_press (ev.xbutton);
1399 break; 1361 break;
1400 1362
1401 case ButtonRelease: 1363 case ButtonRelease:
1402 button_release (ev.xbutton); 1364 button_release (ev.xbutton);
1403 break; 1365 break;
1404 1366
1405 case ClientMessage: 1367 case ClientMessage:
1406 if (ev.xclient.format == 32) 1368 if (ev.xclient.format == 32
1369 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1407 { 1370 {
1408 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1371 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1409 { 1372 {
1410 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1373 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1411 { 1374 {
1375 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1376 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, ev, DT_END))) 1377 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1378 destroy ();
1379 }
1380#if ENABLE_EWMH
1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1382 XSendEvent (dpy, ev.xclient.window = display->root,
1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1384 &ev);
1385#endif
1414 } 1386 }
1415#if ENABLE_EWMH
1416 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1417 XSendEvent (disp, ev.xclient.window = display->root,
1418 False, SubstructureRedirectMask | SubstructureNotifyMask,
1419 &ev);
1420#endif
1421 } 1387 }
1422#if ENABLE_XEMBED 1388#if ENABLE_XEMBED
1423 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) 1389 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1424 { 1390 {
1425 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1391 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
… …
1427 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1428 focus_out (); 1394 focus_out ();
1429 } 1395 }
1430#endif 1396#endif
1431 } 1397 }
1432 break;
1433
1434 case MappingNotify:
1435 XRefreshKeyboardMapping (&ev.xmapping);
1436 break; 1398 break;
1437 1399
1438 /* 1400 /*
1439 * XXX: this is not the _current_ arrangement 1401 * XXX: this is not the _current_ arrangement
1440 * Here's my conclusion: 1402 * Here's my conclusion:
… …
1459 break; 1421 break;
1460 } 1422 }
1461 break; 1423 break;
1462 1424
1463 case FocusIn: 1425 case FocusIn:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1429 focus_in ();
1465 break; 1430 break;
1466 1431
1467 case FocusOut: 1432 case FocusOut:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1468 focus_out (); 1436 focus_out ();
1469 break; 1437 break;
1470 1438
1471 case ConfigureNotify: 1439 case ConfigureNotify:
1440 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height); */
1472 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1473 { 1444 {
1474 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1475 ; 1446 ;
1476 1447
1477 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1478 { 1449 {
1479 seen_resize = 1; 1450 seen_resize = 1;
1480 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1481 } 1452 }
1482 1453 else
1454 {
1455#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ())
1457 update_background ();
1458#endif
1459 }
1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1460 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1484
1485#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1486 if (OPTION (Opt_transparent))
1487 check_our_parents ();
1488#endif
1489 } 1461 }
1490 break; 1462 break;
1491 1463
1492 case PropertyNotify: 1464 case PropertyNotify:
1465 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1466 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1494 && ev.xproperty.state == PropertyNewValue) 1467 && ev.xproperty.state == PropertyNewValue)
1495 selection_property (ev.xproperty.window, ev.xproperty.atom); 1468 selection_property (ev.xproperty.window, ev.xproperty.atom);
1496 1469
1497 break; 1470 break;
1498 1471
1499 case SelectionClear: 1472 case SelectionClear:
1500 selection_clear (); 1473 selection_clear ();
… …
1510 break; 1483 break;
1511 1484
1512 case MapNotify: 1485 case MapNotify:
1513 mapped = 1; 1486 mapped = 1;
1514#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1488 text_blink_ev.start ();
1516#endif 1489#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1491 break;
1519 1492
1520 case UnmapNotify: 1493 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1496 text_blink_ev.stop ();
1524#endif 1497#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1499 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1500
1534 case GraphicsExpose: 1501 case GraphicsExpose:
1535 case Expose: 1502 case Expose:
1536 if (ev.xany.window == vt) 1503 if (ev.xany.window == vt)
1537 { 1504 {
1538 do 1505 do
1506 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1507 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1508 ev.xexpose.width, ev.xexpose.height, False);
1509 }
1541 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1510 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1511
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1512 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1513
1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1514 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1515 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1516 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1517 ev.xexpose.width, ev.xexpose.height, False);
1518 }
1548 1519
1549 want_refresh = 1; 1520 want_refresh = 1;
1550 } 1521 }
1551 else 1522 else
1552 { 1523 {
1553 XEvent unused_event; 1524 XEvent unused_event;
1554 1525
1555 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1527 ;
1557 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1529 ;
1559 1530
1560 if (isScrollbarWindow (ev.xany.window)) 1531 if (isScrollbarWindow (ev.xany.window))
1561 { 1532 {
1562 scrollBar.setIdle (); 1533 scrollBar.setIdle ();
1563 scrollbar_show (0); 1534 scrollbar_show (0);
1564 } 1535 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (disp, ev.xany.window);
1569#endif
1570 } 1536 }
1571 break; 1537 break;
1572 1538
1573 case MotionNotify: 1539 case MotionNotify:
1574#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1541 if (hidden_pointer)
1576 pointer_unblank (); 1542 pointer_unblank ();
1577#endif 1543#endif
1544 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1545 || priv_modes & PrivMode_MouseAnyEvent)
1546 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1548 break;
1580 1549
1581 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1582 { 1551 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1552 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1553 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop 1554 ; // nop
1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1555 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1587 { 1556 {
1588 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1557 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1589 ; 1558 ;
1590 1559
1591 XQueryPointer (disp, vt, 1560 XQueryPointer (dpy, vt,
1592 &unused_root, &unused_child, 1561 &unused_root, &unused_child,
1593 &unused_root_x, &unused_root_y, 1562 &unused_root_x, &unused_root_y,
1594 &ev.xbutton.x, &ev.xbutton.y, 1563 &ev.xbutton.x, &ev.xbutton.y,
1595 &ev.xbutton.state); 1564 &ev.xbutton.state);
1596#ifdef MOUSE_THRESHOLD 1565#ifdef MOUSE_THRESHOLD
… …
1616 int dist; 1585 int dist;
1617 1586
1618 /* don't clobber the current delay if we are 1587 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1588 * already in the middle of scrolling.
1620 */ 1589 */
1621 if (!sel_scroll_ev.active) 1590 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1591 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1592
1624 /* save the event params so we can highlight 1593 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1594 * the selection in the pending-scroll loop
1626 */ 1595 */
1627 selection_save_x = ev.xbutton.x; 1596 selection_save_x = ev.xbutton.x;
… …
1649 else 1618 else
1650 { 1619 {
1651 /* we are within the text window, so we 1620 /* we are within the text window, so we
1652 * shouldn't be scrolling 1621 * shouldn't be scrolling
1653 */ 1622 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1623 sel_scroll_ev.stop();
1656 } 1624 }
1657#endif 1625#endif
1658#ifdef MOUSE_THRESHOLD 1626#ifdef MOUSE_THRESHOLD
1659 } 1627 }
1660#endif 1628#endif
1661 } 1629 }
1662 } 1630 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1631 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1664 { 1632 {
1665 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1633 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1634 MotionNotify, &ev))
1667 ; 1635 ;
1668 1636
1669 XQueryPointer (disp, scrollBar.win, 1637 XQueryPointer (dpy, scrollBar.win,
1670 &unused_root, &unused_child, 1638 &unused_root, &unused_child,
1671 &unused_root_x, &unused_root_y, 1639 &unused_root_x, &unused_root_y,
1672 &ev.xbutton.x, &ev.xbutton.y, 1640 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1641 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1643 scrollbar_size ());
1676 want_refresh = 1; 1644 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1645 scrollbar_show (1);
1679 } 1646 }
1680 break; 1647 break;
1681 } 1648 }
1682 1649
1683skip_switch: ;
1684
1685#if defined(CURSOR_BLINK) 1650#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1651 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1687 { 1652 {
1688 if (hidden_cursor) 1653 if (hidden_cursor)
1689 { 1654 {
1690 hidden_cursor = 0; 1655 hidden_cursor = 0;
1691 want_refresh = 1; 1656 want_refresh = 1;
1692 } 1657 }
1693 1658
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1659 cursor_blink_ev.again ();
1695 } 1660 }
1696#endif 1661#endif
1697 1662
1698#if defined(POINTER_BLANK) 1663#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1664 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 { 1665 {
1701 if (ev.type == MotionNotify 1666 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress 1667 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease) 1668 || ev.type == ButtonRelease)
1704 if (hidden_pointer) 1669 if (hidden_pointer)
… …
1706 1671
1707 if (ev.type == KeyPress && hidden_pointer == 0) 1672 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank (); 1673 pointer_blank ();
1709 } 1674 }
1710#endif 1675#endif
1676
1677 refresh_check ();
1711} 1678}
1712 1679
1713void 1680void
1714rxvt_term::focus_in () 1681rxvt_term::focus_in ()
1715{ 1682{
1716 if (!focus) 1683 if (!focus)
1717 { 1684 {
1718 focus = 1; 1685 focus = 1;
1719 want_refresh = 1; 1686 want_refresh = 1;
1720 1687
1721 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1688 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722 1689
1723#if USE_XIM 1690#if USE_XIM
1724 if (Input_Context != NULL) 1691 if (Input_Context != NULL)
1725 { 1692 {
1726 IMSetStatusPosition (); 1693 IMSetPosition ();
1727 XSetICFocus (Input_Context); 1694 XSetICFocus (Input_Context);
1728 } 1695 }
1729#endif 1696#endif
1730#if CURSOR_BLINK 1697#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink)) 1698 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1699 cursor_blink_ev.again ();
1733#endif 1700#endif
1734#if OFF_FOCUS_FADING 1701#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1702 if (rs[Rs_fade])
1736 { 1703 {
1737 pix_colors = pix_colors_focused; 1704 pix_colors = pix_colors_focused;
1738 scr_recolour (); 1705 scr_recolour ();
1739 } 1706 }
1740#endif 1707#endif
1708#if ENABLE_FRILLS
1709 if (option (Opt_urgentOnBell))
1710 {
1711 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1712 {
1713 h->flags &= ~XUrgencyHint;
1714 XSetWMHints (dpy, parent[0], h);
1715 }
1716 }
1717#endif
1741 } 1718 }
1742} 1719}
1743 1720
1744void 1721void
1745rxvt_term::focus_out () 1722rxvt_term::focus_out ()
… …
1753 1730
1754#if ENABLE_FRILLS || ISO_14755 1731#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf) 1732 if (iso14755buf)
1756 { 1733 {
1757 iso14755buf = 0; 1734 iso14755buf = 0;
1758# if ENABLE_OVERLAY 1735# if ISO_14755
1759 scr_overlay_off (); 1736 scr_overlay_off ();
1760# endif 1737# endif
1761 } 1738 }
1762#endif 1739#endif
1763#if USE_XIM 1740#if USE_XIM
1764 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context); 1742 XUnsetICFocus (Input_Context);
1766#endif 1743#endif
1767#if CURSOR_BLINK 1744#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1745 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1746 cursor_blink_ev.stop ();
1747
1770 hidden_cursor = 0; 1748 hidden_cursor = 0;
1771#endif 1749#endif
1772#if OFF_FOCUS_FADING 1750#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1751 if (rs[Rs_fade])
1774 { 1752 {
… …
1777 } 1755 }
1778#endif 1756#endif
1779 } 1757 }
1780} 1758}
1781 1759
1782#if TRANSPARENT 1760void
1761rxvt_term::update_fade_color (unsigned int idx)
1762{
1763#if OFF_FOCUS_FADING
1764 if (rs[Rs_fade])
1765 {
1766 rgba c;
1767 pix_colors [Color_fade].get (c);
1768 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1769 }
1770#endif
1771}
1772
1773#if ENABLE_TRANSPARENCY || ENABLE_PERL
1783void 1774void
1784rxvt_term::rootwin_cb (XEvent &ev) 1775rxvt_term::rootwin_cb (XEvent &ev)
1785{ 1776{
1786 make_current (); 1777 make_current ();
1787 1778
1779 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1780 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1781 return;
1782
1783# if ENABLE_TRANSPARENCY
1788 switch (ev.type) 1784 switch (ev.type)
1789 { 1785 {
1790 case PropertyNotify: 1786 case PropertyNotify:
1791 /* 1787 /*
1792 * if user used some Esetroot compatible prog to set the root bg, 1788 * if user used some Esetroot compatible prog to set the root bg,
1793 * use the property to determine the pixmap. We use it later on. 1789 * use the property to determine the pixmap. We use it later on.
1794 */ 1790 */
1795 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1791 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1796 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1792 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1797 return; 1793 {
1798 1794 bgPixmap.set_root_pixmap ();
1799 /* FALLTHROUGH */ 1795 update_background ();
1800 case ReparentNotify: 1796 }
1801 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1802 want_refresh = want_full_refresh = 1;
1803 break; 1797 break;
1804 } 1798 }
1799# endif
1800
1801 refresh_check ();
1805} 1802}
1806#endif 1803#endif
1807 1804
1808void 1805void
1809rxvt_term::button_press (XButtonEvent &ev) 1806rxvt_term::button_press (XButtonEvent &ev)
… …
1818 /* 1815 /*
1819 * VT window processing of button press 1816 * VT window processing of button press
1820 */ 1817 */
1821 if (ev.window == vt) 1818 if (ev.window == vt)
1822 { 1819 {
1820 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1821 return;
1822
1823#if ISO_14755 1823#if ISO_14755
1824 // 5.4 1824 // 5.4
1825 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1825 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1826 { 1826 {
1827 iso14755_54 (ev.x, ev.y); 1827 iso14755_54 (ev.x, ev.y);
… …
1861 mouse_report (ev); 1861 mouse_report (ev);
1862 } 1862 }
1863#else 1863#else
1864 MEvent.button = ev.button; 1864 MEvent.button = ev.button;
1865 mouse_report (ev); 1865 mouse_report (ev);
1866#endif /* MOUSE_REPORT_DOUBLECLICK */ 1866#endif /* MOUSE_REPORT_DOUBLECLICK */
1867 1867
1868 } 1868 }
1869 else 1869 else
1870 { 1870 {
1871 if (ev.button != MEvent.button) 1871 if (ev.button != MEvent.button)
1872 MEvent.clicks = 0; 1872 MEvent.clicks = 0;
1873 1873
1874 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 switch (ev.button) 1874 switch (ev.button)
1876 { 1875 {
1877 case Button1: 1876 case Button1:
1878 /* allow meta + click to select rectangular areas */ 1877 /* allow meta + click to select rectangular areas */
1879 /* should be done in screen.C */ 1878 /* should be done in screen.C */
1880#if ENABLE_FRILLS 1879#if ENABLE_FRILLS
1881 selection.rect = !!(ev.state & ModMetaMask); 1880 selection.rect = !!(ev.state & ModMetaMask);
1882#else 1881#else
1883 selection.rect = false; 1882 selection.rect = false;
1884#endif 1883#endif
1885 1884
1886 /* allow shift+left click to extend selection */ 1885 /* allow shift+left click to extend selection */
1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1886 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1888 { 1887 {
1889 if (MEvent.button == Button1 && clickintime) 1888 if (MEvent.button == Button1 && clickintime)
1890 selection_rotate (ev.x, ev.y); 1889 selection_rotate (ev.x, ev.y);
1891 else 1890 else
1892 selection_extend (ev.x, ev.y, 1); 1891 selection_extend (ev.x, ev.y, 1);
1893 } 1892 }
1894 else 1893 else
1895 { 1894 {
1896 if (MEvent.button == Button1 && clickintime) 1895 if (MEvent.button == Button1 && clickintime)
1897 MEvent.clicks++; 1896 MEvent.clicks++;
1898 else 1897 else
1899 MEvent.clicks = 1; 1898 MEvent.clicks = 1;
1900 1899
1901 selection_click (MEvent.clicks, ev.x, ev.y); 1900 selection_click (MEvent.clicks, ev.x, ev.y);
1902 } 1901 }
1903 1902
1904 MEvent.button = Button1; 1903 MEvent.button = Button1;
1905 break; 1904 break;
1906 1905
1907 case Button3: 1906 case Button3:
1908 if (MEvent.button == Button3 && clickintime) 1907 if (MEvent.button == Button3 && clickintime)
1909 selection_rotate (ev.x, ev.y); 1908 selection_rotate (ev.x, ev.y);
1910 else 1909 else
1911 selection_extend (ev.x, ev.y, 1); 1910 selection_extend (ev.x, ev.y, 1);
1912 1911
1913 MEvent.button = Button3; 1912 MEvent.button = Button3;
1914 break; 1913 break;
1915 } 1914 }
1916 } 1915 }
1917 1916
1918 MEvent.time = ev.time; 1917 MEvent.time = ev.time;
1919 return; 1918 return;
1920 } 1919 }
1921 1920
… …
1966 tt_printf ("\033[5~"); 1965 tt_printf ("\033[5~");
1967 break; 1966 break;
1968 } 1967 }
1969 } 1968 }
1970 else 1969 else
1971#endif /* NO_SCROLLBAR_REPORT */ 1970#endif /* NO_SCROLLBAR_REPORT */
1972 1971
1973 { 1972 {
1974 char upordown = 0; 1973 char upordown = 0;
1975 1974
1976 if (scrollBar.style == R_SB_NEXT) 1975 if (scrollBar.style == R_SB_NEXT)
1977 { 1976 {
1978 if (scrollbarnext_upButton (ev.y)) 1977 if (scrollbarnext_upButton (ev.y))
1979 upordown = -1; /* up */ 1978 upordown = -1; /* up */
… …
1985 if (scrollbarrxvt_upButton (ev.y)) 1984 if (scrollbarrxvt_upButton (ev.y))
1986 upordown = -1; /* up */ 1985 upordown = -1; /* up */
1987 else if (scrollbarrxvt_dnButton (ev.y)) 1986 else if (scrollbarrxvt_dnButton (ev.y))
1988 upordown = 1; /* down */ 1987 upordown = 1; /* down */
1989 } 1988 }
1989
1990 if (upordown) 1990 if (upordown)
1991 { 1991 {
1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1993 if (!cont_scroll_ev.is_active ())
1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1994 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1994#endif 1995#endif
1995 if (scr_page (upordown < 0 ? UP : DN, 1)) 1996 if (scr_page (upordown < 0 ? UP : DN, 1))
1996 { 1997 {
1997 if (upordown < 0) 1998 if (upordown < 0)
1998 scrollBar.setUp (); 1999 scrollBar.setUp ();
… …
2078 scrollBar.setIdle (); 2079 scrollBar.setIdle ();
2079 scrollbar_show (0); 2080 scrollbar_show (0);
2080 } 2081 }
2081 2082
2082#ifdef SELECTION_SCROLLING 2083#ifdef SELECTION_SCROLLING
2083 if (sel_scroll_ev.active)
2084 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
2085#endif 2085#endif
2086 2086
2087 if (ev.window == vt) 2087 if (ev.window == vt)
2088 { 2088 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2090 return;
2091
2089#if ISO_14755 2092#if ISO_14755
2090 // 5.4 2093 // 5.4
2091 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2094 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2092 return; 2095 return;
2093#endif 2096#endif
2097
2094 if (reportmode) 2098 if (reportmode)
2095 { 2099 {
2096 /* mouse report from vt window */ 2100 /* mouse report from vt window */
2097 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
2098 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
2109 mouse_report (ev); 2113 mouse_report (ev);
2110 } 2114 }
2111#else /* MOUSE_REPORT_DOUBLECLICK */ 2115#else /* MOUSE_REPORT_DOUBLECLICK */
2112 MEvent.button = AnyButton; 2116 MEvent.button = AnyButton;
2113 mouse_report (ev); 2117 mouse_report (ev);
2114#endif /* MOUSE_REPORT_DOUBLECLICK */ 2118#endif /* MOUSE_REPORT_DOUBLECLICK */
2115 return; 2119 return;
2116 } 2120 }
2117 2121
2118 /* 2122 /*
2119 * dumb hack to compensate for the failure of click-and-drag 2123 * dumb hack to compensate for the failure of click-and-drag
… …
2122 if (priv_modes & PrivMode_mouse_report 2126 if (priv_modes & PrivMode_mouse_report
2123 && bypass_keystate 2127 && bypass_keystate
2124 && ev.button == Button1 && MEvent.clicks <= 1) 2128 && ev.button == Button1 && MEvent.clicks <= 1)
2125 selection_extend (ev.x, ev.y, 0); 2129 selection_extend (ev.x, ev.y, 0);
2126 2130
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128 return;
2129
2130 switch (ev.button) 2131 switch (ev.button)
2131 { 2132 {
2132 case Button1: 2133 case Button1:
2133 case Button3: 2134 case Button3:
2134 selection_make (ev.time); 2135 selection_make (ev.time);
2135 break; 2136 break;
2136 2137
2137 case Button2: 2138 case Button2:
2138 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2139 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2140 break; 2141 break;
2141 2142
2142#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
2143 case Button4: 2144 case Button4:
2144 case Button5: 2145 case Button5:
… …
2148 2149
2149 v = ev.button == Button4 ? UP : DN; 2150 v = ev.button == Button4 ? UP : DN;
2150 2151
2151 if (ev.state & ShiftMask) 2152 if (ev.state & ShiftMask)
2152 i = 1; 2153 i = 1;
2153 else if (OPTION (Opt_mouseWheelScrollPage)) 2154 else if (option (Opt_mouseWheelScrollPage))
2154 i = nrow - 1; 2155 i = nrow - 1;
2155 else 2156 else
2156 i = 5; 2157 i = 5;
2157 2158
2158# ifdef MOUSE_SLIP_WHEELING 2159# ifdef MOUSE_SLIP_WHEELING
… …
2160 { 2161 {
2161 mouse_slip_wheel_speed += v ? -1 : 1; 2162 mouse_slip_wheel_speed += v ? -1 : 1;
2162 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2163 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2164 2165
2165 if (slip_wheel_ev.at < NOW) 2166 if (!slip_wheel_ev.is_active ())
2166 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2167 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2167
2168 slip_wheel_ev.start ();
2169 } 2168 }
2170 else 2169 else
2171 { 2170 {
2172# endif 2171# endif
2173 scr_page (v, i); 2172 scr_page (v, i);
… …
2179 break; 2178 break;
2180#endif 2179#endif
2181 } 2180 }
2182 } 2181 }
2183} 2182}
2184
2185#ifdef TRANSPARENT
2186#if TINTING
2187/* taken from aterm-0.4.2 */
2188
2189typedef uint32_t RUINT32T;
2190
2191void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2192{
2193 int sh_r, sh_g, sh_b;
2194 RUINT32T mask_r, mask_g, mask_b;
2195 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2196 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2197 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2198 int i;
2199
2200 Visual *visual = display->visual;
2201
2202 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2203
2204 /* for convenience */
2205 mask_r = visual->red_mask;
2206 mask_g = visual->green_mask;
2207 mask_b = visual->blue_mask;
2208
2209 /* boring lookup table pre-initialization */
2210 switch (srcImage->bits_per_pixel) {
2211 case 15:
2212 if ((mask_r != 0x7c00) ||
2213 (mask_g != 0x03e0) ||
2214 (mask_b != 0x001f))
2215 return;
2216 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2217 lookup_r = lookup;
2218 lookup_g = lookup+32;
2219 lookup_b = lookup+32+32;
2220 sh_r = 10;
2221 sh_g = 5;
2222 sh_b = 0;
2223 break;
2224 case 16:
2225 if ((mask_r != 0xf800) ||
2226 (mask_g != 0x07e0) ||
2227 (mask_b != 0x001f))
2228 return;
2229 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2230 lookup_r = lookup;
2231 lookup_g = lookup+32;
2232 lookup_b = lookup+32+64;
2233 sh_r = 11;
2234 sh_g = 5;
2235 sh_b = 0;
2236 break;
2237 case 24:
2238 if ((mask_r != 0xff0000) ||
2239 (mask_g != 0x00ff00) ||
2240 (mask_b != 0x0000ff))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2243 lookup_r = lookup;
2244 lookup_g = lookup+256;
2245 lookup_b = lookup+256+256;
2246 sh_r = 16;
2247 sh_g = 8;
2248 sh_b = 0;
2249 break;
2250 case 32:
2251 if ((mask_r != 0xff0000) ||
2252 (mask_g != 0x00ff00) ||
2253 (mask_b != 0x0000ff))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2256 lookup_r = lookup;
2257 lookup_g = lookup+256;
2258 lookup_b = lookup+256+256;
2259 sh_r = 16;
2260 sh_g = 8;
2261 sh_b = 0;
2262 break;
2263 default:
2264 return; /* we do not support this color depth */
2265 }
2266
2267 /* prepare limits for color transformation (each channel is handled separately) */
2268 if (shade < 0) {
2269 shade = -shade;
2270 if (shade < 0) shade = 0;
2271 if (shade > 100) shade = 100;
2272
2273 lower_lim_r = 65535-rm;
2274 lower_lim_g = 65535-gm;
2275 lower_lim_b = 65535-bm;
2276
2277 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2278 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2279 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2280
2281 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2282 } else {
2283 if (shade < 0) shade = 0;
2284 if (shade > 100) shade = 100;
2285
2286 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2287
2288 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2289 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2290 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2291 }
2292
2293 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2294 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2295 {
2296 unsigned int tmp;
2297
2298 tmp = lower_lim_r;
2299 lower_lim_r = lower_lim_b;
2300 lower_lim_b = tmp;
2301
2302 tmp = upper_lim_r;
2303 upper_lim_r = upper_lim_b;
2304 upper_lim_b = tmp;
2305 }
2306
2307 /* fill our lookup tables */
2308 for (i = 0; i <= mask_r>>sh_r; i++)
2309 {
2310 RUINT32T tmp;
2311 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2312 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2313 lookup_r[i] = (tmp/65535)<<sh_r;
2314 }
2315 for (i = 0; i <= mask_g>>sh_g; i++)
2316 {
2317 RUINT32T tmp;
2318 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2319 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2320 lookup_g[i] = (tmp/65535)<<sh_g;
2321 }
2322 for (i = 0; i <= mask_b>>sh_b; i++)
2323 {
2324 RUINT32T tmp;
2325 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2326 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2327 lookup_b[i] = (tmp/65535)<<sh_b;
2328 }
2329
2330 /* apply table to input image (replacing colors by newly calculated ones) */
2331 switch (srcImage->bits_per_pixel)
2332 {
2333 case 15:
2334 {
2335 unsigned short *p1, *pf, *p, *pl;
2336 p1 = (unsigned short *) srcImage->data;
2337 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2338 while (p1 < pf)
2339 {
2340 p = p1;
2341 pl = p1 + srcImage->width;
2342 for (; p < pl; p++)
2343 {
2344 *p = lookup_r[(*p & 0x7c00)>>10] |
2345 lookup_g[(*p & 0x03e0)>> 5] |
2346 lookup_b[(*p & 0x001f)];
2347 }
2348 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2349 }
2350 break;
2351 }
2352 case 16:
2353 {
2354 unsigned short *p1, *pf, *p, *pl;
2355 p1 = (unsigned short *) srcImage->data;
2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357 while (p1 < pf)
2358 {
2359 p = p1;
2360 pl = p1 + srcImage->width;
2361 for (; p < pl; p++)
2362 {
2363 *p = lookup_r[(*p & 0xf800)>>11] |
2364 lookup_g[(*p & 0x07e0)>> 5] |
2365 lookup_b[(*p & 0x001f)];
2366 }
2367 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2368 }
2369 break;
2370 }
2371 case 24:
2372 {
2373 unsigned char *p1, *pf, *p, *pl;
2374 p1 = (unsigned char *) srcImage->data;
2375 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2376 while (p1 < pf)
2377 {
2378 p = p1;
2379 pl = p1 + srcImage->width * 3;
2380 for (; p < pl; p += 3)
2381 {
2382 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2383 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2384 p[2] = lookup_r[(p[2] & 0x0000ff)];
2385 }
2386 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2387 }
2388 break;
2389 }
2390 case 32:
2391 {
2392 RUINT32T *p1, *pf, *p, *pl;
2393 p1 = (RUINT32T *) srcImage->data;
2394 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width;
2400 for (; p < pl; p++)
2401 {
2402 *p = lookup_r[(*p & 0xff0000)>>16] |
2403 lookup_g[(*p & 0x00ff00)>> 8] |
2404 lookup_b[(*p & 0x0000ff)] |
2405 (*p & ~0xffffff);
2406 }
2407 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 }
2412
2413 free (lookup);
2414}
2415#endif
2416
2417/*
2418 * Check our parents are still who we think they are.
2419 * Do transparency updates if required
2420 */
2421int
2422rxvt_term::check_our_parents ()
2423{
2424 int i, pchanged, aformat, have_pixmap, rootdepth;
2425 unsigned long nitems, bytes_after;
2426 Atom atype;
2427 unsigned char *prop = NULL;
2428 Window root, oldp, *list;
2429 Pixmap rootpixmap = None;
2430 XWindowAttributes wattr, wrootattr;
2431 dDisp;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (disp, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (disp, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (disp, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !rs[Rs_color + Color_tint]
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (disp, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (disp, False);
2523 allowedxerror = -1;
2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (disp, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (disp, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 unsigned short rm, gm, bm;
2553 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2554
2555 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2556
2557 ShadeXImage (display, image, shade, rm, gm, bm);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (disp, vt,
2562 szHint.width, szHint.height, image->depth);
2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2564 XPutImage (disp, pixmap, gc, image, 0, 0,
2565 nx, ny, image->width, image->height);
2566 XFreeGC (disp, gc);
2567 XDestroyImage (image);
2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2569 XClearWindow (disp, parent[0]);
2570
2571 if (!am_transparent || !am_pixmap_trans)
2572 pchanged = 1;
2573
2574 am_transparent = am_pixmap_trans = 1;
2575 }
2576 }
2577
2578 if (am_pixmap_trans)
2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2580 else
2581 {
2582 unsigned int n;
2583 /*
2584 * InheritPixmap transparency
2585 */
2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2587 {
2588 oldp = parent[i];
2589 XQueryTree (disp, parent[i - 1], &root,
2590 &parent[i], &list, &n);
2591 XFree (list);
2592
2593 if (parent[i] == display->root)
2594 {
2595 if (oldp != None)
2596 pchanged = 1;
2597
2598 break;
2599 }
2600
2601 if (oldp != parent[i])
2602 pchanged = 1;
2603 }
2604
2605 n = 0;
2606
2607 if (pchanged)
2608 {
2609 for (; n < (unsigned int)i; n++)
2610 {
2611 XGetWindowAttributes (disp, parent[n], &wattr);
2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2613 {
2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2615 break;
2616 }
2617 }
2618 }
2619
2620 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2621 {
2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2624 am_transparent = 0;
2625 /* XXX: also turn off Opt_transparent? */
2626 }
2627 else
2628 {
2629#if WAIT_FOR_WM
2630 /* wait (an arbitrary period) for the WM to do its thing
2631 * needed for fvwm2.2.2 (and before?) */
2632 sleep (1);
2633#endif
2634 for (n = 0; n < (unsigned int)i; n++)
2635 {
2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]);
2638 }
2639
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 am_transparent = 1;
2642 }
2643
2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2660 }
2661
2662 return pchanged;
2663}
2664#endif
2665 2183
2666/*}}} */ 2184/*}}} */
2667 2185
2668bool 2186bool
2669rxvt_term::cmd_parse () 2187rxvt_term::cmd_parse ()
… …
2718 if (ch == C0_LF) 2236 if (ch == C0_LF)
2719 nlines++; 2237 nlines++;
2720 2238
2721 refresh_count++; 2239 refresh_count++;
2722 2240
2723 if (!OPTION (Opt_jumpScroll) 2241 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2725 { 2242 {
2726 refreshnow = true;
2727 refresh_count = 0; 2243 refresh_count = 0;
2244
2245 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2246 {
2247 refreshnow = true;
2728 ch = NOCHAR; 2248 ch = NOCHAR;
2729 break; 2249 break;
2250 }
2730 } 2251 }
2731 2252
2732 // scr_add_lines only works for nlines <= nrow - 1. 2253 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2254 if (nlines >= nrow - 1)
2734 { 2255 {
… …
2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2283 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2763 scr_add_lines (buf, str - buf, nlines); 2284 scr_add_lines (buf, str - buf, nlines);
2764 2285
2765 /* 2286 /*
2766 * If there have been a lot of new lines, then update the screen 2287 * If there have been a lot of new lines, then update the screen
2767 * What the heck I'll cheat and only refresh less than every page-full. 2288 * What the heck we'll cheat and only refresh less than every page-full.
2768 * the number of pages between refreshes is refresh_limit, which 2289 * if skipScroll is enabled.
2769 * is incremented here because we must be doing flat-out scrolling.
2770 */ 2290 */
2771 if (refreshnow) 2291 if (refreshnow)
2772 { 2292 {
2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2774 refresh_limit++;
2775 else
2776 {
2777 flag = true; 2293 flag = true;
2778 scr_refresh (); 2294 scr_refresh ();
2779 want_refresh = 1; 2295 want_refresh = 1;
2780 }
2781 } 2296 }
2782 2297
2783 } 2298 }
2784 else 2299 else
2785 { 2300 {
… …
2795 } 2310 }
2796 2311
2797 ch = NOCHAR; 2312 ch = NOCHAR;
2798 } 2313 }
2799 } 2314 }
2315
2316 refresh_check ();
2800 2317
2801 return flag; 2318 return flag;
2802} 2319}
2803 2320
2804// read the next character 2321// read the next character
… …
2934 { 2451 {
2935 if ((buf[len++] = cmd_getc ()) == 'i') 2452 if ((buf[len++] = cmd_getc ()) == 'i')
2936 break; /* done = 1 */ 2453 break; /* done = 1 */
2937 } 2454 }
2938 } 2455 }
2939 2456
2940 for (i = 0; i < len; i++) 2457 for (i = 0; i < len; i++)
2941 if (putc (buf[i], fd) == EOF) 2458 if (putc (buf[i], fd) == EOF)
2942 { 2459 {
2943 done = 1; 2460 done = 1;
2944 break; 2461 break;
… …
2946 } 2463 }
2947 } 2464 }
2948 2465
2949 pclose_printer (fd); 2466 pclose_printer (fd);
2950} 2467}
2951#endif /* PRINTPIPE */ 2468#endif /* PRINTPIPE */
2952/*}}} */ 2469/*}}} */
2953 2470
2954/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
2955enum { 2472enum {
2956 C1_40 = 0x40, 2473 C1_40 = 0x40,
… …
3006 process_dcs_seq (); 2523 process_dcs_seq ();
3007 break; 2524 break;
3008 case 0x9b: /* CSI */ 2525 case 0x9b: /* CSI */
3009 process_csi_seq (); 2526 process_csi_seq ();
3010 break; 2527 break;
3011 case 0x9d: /* CSI */ 2528 case 0x9d: /* OSC */
3012 process_osc_seq (); 2529 process_osc_seq ();
3013 break; 2530 break;
3014#endif 2531#endif
3015 } 2532 }
3016} 2533}
… …
3106 scr_charset_set (2, (unsigned int)cmd_getc ()); 2623 scr_charset_set (2, (unsigned int)cmd_getc ());
3107 break; 2624 break;
3108 case '+': 2625 case '+':
3109 scr_charset_set (3, (unsigned int)cmd_getc ()); 2626 scr_charset_set (3, (unsigned int)cmd_getc ());
3110 break; 2627 break;
3111#if ENABLE_FRILLS 2628#if !ENABLE_MINIMAL
3112 case '6': 2629 case '6':
3113 scr_backindex (); 2630 scr_backindex ();
3114 break; 2631 break;
3115#endif 2632#endif
3116 case '7': 2633 case '7':
3117 scr_cursor (SAVE); 2634 scr_cursor (SAVE);
3118 break; 2635 break;
3119 case '8': 2636 case '8':
3120 scr_cursor (RESTORE); 2637 scr_cursor (RESTORE);
3121 break; 2638 break;
3122#if ENABLE_FRILLS 2639#if !ENABLE_MINIMAL
3123 case '9': 2640 case '9':
3124 scr_forwardindex (); 2641 scr_forwardindex ();
3125 break; 2642 break;
3126#endif 2643#endif
3127 case '=': 2644 case '=':
… …
3242rxvt_term::process_csi_seq () 2759rxvt_term::process_csi_seq ()
3243{ 2760{
3244 unicode_t ch, priv, i; 2761 unicode_t ch, priv, i;
3245 unsigned int nargs, p; 2762 unsigned int nargs, p;
3246 int n, ndef; 2763 int n, ndef;
3247 int arg[ESC_ARGS]; 2764 int arg[ESC_ARGS] = { };
3248 2765
3249 for (nargs = ESC_ARGS; nargs > 0;) 2766 nargs = 0;
3250 arg[--nargs] = 0;
3251 2767
3252 priv = 0; 2768 priv = 0;
3253 ch = cmd_getc (); 2769 ch = cmd_getc ();
3254 if (ch >= '<' && ch <= '?') 2770 if (ch >= '<' && ch <= '?')
2771 {
3255 { /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' */
3256 priv = ch; 2773 priv = ch;
3257 ch = cmd_getc (); 2774 ch = cmd_getc ();
3258 } 2775 }
3259 2776
3260 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
3289 ndef = get_byte_array_bit (csi_defaults, i); 2806 ndef = get_byte_array_bit (csi_defaults, i);
3290 for (p = 0; p < nargs; p++) 2807 for (p = 0; p < nargs; p++)
3291 if (arg[p] == -1) 2808 if (arg[p] == -1)
3292 arg[p] = ndef; 2809 arg[p] = ndef;
3293 2810
3294#ifdef DEBUG_CMD
3295 fprintf (stderr, "CSI ");
3296 for (p = 0; p < nargs; p++)
3297 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3298 fprintf (stderr, "%c\n", ch);
3299#endif
3300
3301 /* 2811 /*
3302 * private mode handling 2812 * private mode handling
3303 */ 2813 */
3304 if (priv) 2814 if (priv)
3305 { 2815 {
3306 switch (priv) 2816 switch (priv)
3307 { 2817 {
3308 case '>': 2818 case '>':
3309 if (ch == CSI_DA) /* secondary device attributes */ 2819 if (ch == CSI_DA) /* secondary device attributes */
3310 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2820 {
2821 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2822 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2823 //
2824 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2825 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2826 // versions.
2827 //
2828 tt_printf ("\033[>%d;95;0c", 'U');
2829 }
3311 break; 2830 break;
3312 case '?': 2831 case '?':
3313 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3314 process_terminal_mode (ch, priv, nargs, arg); 2833 process_terminal_mode (ch, priv, nargs, arg);
3315 break; 2834 break;
… …
3441 break; 2960 break;
3442 case 6: /* CPR requested */ 2961 case 6: /* CPR requested */
3443 scr_report_position (); 2962 scr_report_position ();
3444 break; 2963 break;
3445 case 7: /* unofficial extension */ 2964 case 7: /* unofficial extension */
3446 if (OPTION (Opt_insecure)) 2965 if (option (Opt_insecure))
3447 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2966 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3448 break; 2967 break;
3449 case 8: /* unofficial extension */ 2968 case 8: /* unofficial extension */
3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2969 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3451 break; 2970 break;
… …
3518 break; 3037 break;
3519 case CSI_75: 3038 case CSI_75:
3520 scr_cursor (RESTORE); 3039 scr_cursor (RESTORE);
3521 break; 3040 break;
3522 3041
3523#if ENABLE_FRILLS 3042#if !ENABLE_MINIMAL
3524 case CSI_74: 3043 case CSI_74:
3525 process_window_ops (arg, nargs); 3044 process_window_ops (arg, nargs);
3526 break; 3045 break;
3527#endif 3046#endif
3528 3047
… …
3535 break; 3054 break;
3536 } 3055 }
3537} 3056}
3538/*}}} */ 3057/*}}} */
3539 3058
3540#if ENABLE_FRILLS 3059#if !ENABLE_MINIMAL
3541/* ARGSUSED */ 3060/* ARGSUSED */
3542void 3061void
3543rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3062rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544{ 3063{
3545 int x, y; 3064 int x, y;
3546 XWindowAttributes wattr; 3065 XWindowAttributes wattr;
3547 Window wdummy; 3066 Window wdummy;
3548 dDisp; 3067
3068 dLocal (Display *, dpy);
3549 3069
3550 if (nargs == 0) 3070 if (nargs == 0)
3551 return; 3071 return;
3552 3072
3553 switch (args[0]) 3073 switch (args[0])
3554 { 3074 {
3555 /* 3075 /*
3556 * commands 3076 * commands
3557 */ 3077 */
3558 case 1: /* deiconify window */ 3078 case 1: /* deiconify window */
3559 XMapWindow (disp, parent[0]); 3079 XMapWindow (dpy, parent[0]);
3560 break; 3080 break;
3561 case 2: /* iconify window */ 3081 case 2: /* iconify window */
3562 XIconifyWindow (disp, parent[0], display->screen); 3082 XIconifyWindow (dpy, parent[0], display->screen);
3563 break; 3083 break;
3564 case 3: /* set position (pixels) */ 3084 case 3: /* set position (pixels) */
3565 XMoveWindow (disp, parent[0], args[1], args[2]); 3085 XMoveWindow (dpy, parent[0], args[1], args[2]);
3566 break; 3086 break;
3567 case 4: /* set size (pixels) */ 3087 case 4: /* set size (pixels) */
3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3088 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569 break; 3089 break;
3570 case 5: /* raise window */ 3090 case 5: /* raise window */
3571 XRaiseWindow (disp, parent[0]); 3091 XRaiseWindow (dpy, parent[0]);
3572 break; 3092 break;
3573 case 6: /* lower window */ 3093 case 6: /* lower window */
3574 XLowerWindow (disp, parent[0]); 3094 XLowerWindow (dpy, parent[0]);
3575 break; 3095 break;
3576 case 7: /* refresh window */ 3096 case 7: /* refresh window */
3577 scr_touch (true); 3097 scr_touch (true);
3578 break; 3098 break;
3579 case 8: /* set size (chars) */ 3099 case 8: /* set size (chars) */
… …
3586 if (args[0] >= 24) /* set height (chars) */ 3106 if (args[0] >= 24) /* set height (chars) */
3587 set_widthheight ((unsigned int)width, 3107 set_widthheight ((unsigned int)width,
3588 (unsigned int) (args[1] * fheight)); 3108 (unsigned int) (args[1] * fheight));
3589 break; 3109 break;
3590 3110
3591
3592 /* 3111 /*
3593 * reports - some output format copied from XTerm 3112 * reports - some output format copied from XTerm
3594 */ 3113 */
3595 case 11: /* report window state */ 3114 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3116 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3117 break;
3599 case 13: /* report window position */ 3118 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3119 XGetWindowAttributes (dpy, parent[0], &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3120 XTranslateCoordinates (dpy, parent[0], wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3121 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3122 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3123 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3124 break;
3606 case 14: /* report window size (pixels) */ 3125 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3126 XGetWindowAttributes (dpy, parent[0], &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3127 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3128 break;
3610 case 18: /* report text area size (chars) */ 3129 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3130 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3131 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3133 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3134 break;
3616 case 20: /* report icon label */ 3135 case 20: /* report icon label */
3617 { 3136 {
3618 char *s; 3137 char *s;
3619 XGetIconName (disp, parent[0], &s); 3138 XGetIconName (dpy, parent[0], &s);
3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3139 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3140 XFree (s);
3622 } 3141 }
3623 break; 3142 break;
3624 case 21: /* report window title */ 3143 case 21: /* report window title */
3625 { 3144 {
3626 char *s; 3145 char *s;
3627 XFetchName (disp, parent[0], &s); 3146 XFetchName (dpy, parent[0], &s);
3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3147 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3148 XFree (s);
3630 } 3149 }
3631 break; 3150 break;
3632 } 3151 }
3633} 3152}
… …
3660 seen_esc = true; 3179 seen_esc = true;
3661 continue; 3180 continue;
3662 } 3181 }
3663 else if (ch == C0_BEL || ch == CHAR_ST) 3182 else if (ch == C0_BEL || ch == CHAR_ST)
3664 break; 3183 break;
3184 else if (ch == C0_SYN)
3185 ch = cmd_get8 ();
3665 else if (ch < 0x20) 3186 else if (ch < 0x20)
3666 return NULL; /* other control character - exit */ 3187 return NULL; /* other control character - exit */
3667 3188
3668 seen_esc = false; 3189 seen_esc = false;
3669 3190
3670 if (n >= STRING_MAX - 1) 3191 if (n >= STRING_MAX - 1)
3671 // stop at some sane length 3192 // stop at some sane length
3672 return NULL; 3193 return NULL;
3673 3194
3674 if (ch == C0_SYN)
3675 string[n++] = cmd_get8 ();
3676 else
3677 string[n++] = ch; 3195 string[n++] = ch;
3678 } 3196 }
3679 3197
3680 string[n++] = '\0'; 3198 string[n++] = '\0';
3681 3199
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3200 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3733void 3251void
3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3252rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3253{
3736 if (str[0] == '?' && !str[1]) 3254 if (str[0] == '?' && !str[1])
3737 { 3255 {
3738 unsigned short r, g, b; 3256 rgba c;
3739 pix_colors_focused[color].get (display, r, g, b); 3257 pix_colors_focused[color].get (c);
3258
3259#if XFT
3260 if (c.a != rgba::MAX_CC)
3261 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3262 else
3263#endif
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3264 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3741 } 3265 }
3742 else 3266 else
3743 set_window_color (color, str); 3267 set_window_color (color, str);
3744} 3268}
3745 3269
… …
3751{ 3275{
3752 int color; 3276 int color;
3753 char *buf, *name; 3277 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3278 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3279 int saveop = op;
3756 dDisp; 3280
3281 dLocal (Display *, dpy);
3757 3282
3758 assert (str != NULL); 3283 assert (str != NULL);
3284
3285 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3286 return;
3287
3759 switch (op) 3288 switch (op)
3760 { 3289 {
3761 case XTerm_name: 3290 case XTerm_name:
3762 set_title (str); 3291 set_title (str);
3763 /* FALLTHROUGH */ 3292 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3306 unsigned long bytes_after;
3778 unsigned char *value = 0; 3307 unsigned char *value = 0;
3779 const char *str = ""; 3308 const char *str = "";
3780 3309
3781 if (prop 3310 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3311 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3312 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3313 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3314 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3315 && actual_type != None
3787 && actual_format == 8) 3316 && actual_format == 8)
3788 str = (const char *)(value); 3317 str = (const char *)(value);
3789 3318
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3319 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3320
3792 XFree (value); 3321 XFree (value);
3793 } 3322 }
3794 else 3323 else
3795 { 3324 {
… …
3799 { 3328 {
3800 *eq = 0; 3329 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3330 set_utf8_property (display->atom (str), eq + 1);
3802 } 3331 }
3803 else 3332 else
3804 XDeleteProperty (disp, parent[0], 3333 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3334 display->atom (str));
3806 } 3335 }
3807 break; 3336 break;
3808 3337
3809 case XTerm_Color: 3338 case XTerm_Color:
… …
3819 break; 3348 break;
3820 3349
3821 if ((buf = strchr (name, ';')) != NULL) 3350 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3351 *buf++ = '\0';
3823 3352
3824 if (name[0] == '?' && !name[1]) 3353 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color, name);
3832 } 3354 }
3833 break; 3355 break;
3834 case XTerm_Color00: 3356 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3357 process_color_seq (op, Color_fg, str, resp);
3836 break; 3358 break;
3837 case XTerm_Color01: 3359 case XTerm_Color01:
3838 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3360 process_color_seq (op, Color_bg, str, resp);
3839 break; 3361 break;
3840#ifndef NO_CURSORCOLOR 3362#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3363 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3364 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3365 break;
3844#endif 3366#endif
3845 case XTerm_Color_pointer_fg: 3367 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3368 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3369 break;
3848 case XTerm_Color_pointer_bg: 3370 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3371 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3372 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3373#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_RV: 3374 case XTerm_Color_RV:
3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3375 process_color_seq (op, Color_RV, str, resp);
3854 break; 3376 break;
3855 case Rxvt_Color_BD: 3377 case Rxvt_Color_BD:
3856 case URxvt_Color_BD: 3378 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp); 3379 process_color_seq (op, Color_BD, str, resp);
3858 break; 3380 break;
3859 case Rxvt_Color_UL: 3381 case Rxvt_Color_UL:
3860 case URxvt_Color_UL: 3382 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp); 3383 process_color_seq (op, Color_UL, str, resp);
3862 break; 3384 break;
3863 case URxvt_Color_IT: 3385 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3386 process_color_seq (op, Color_IT, str, resp);
3865 break; 3387 break;
3866#endif 3388#endif
3867#if TRANSPARENT && TINTING 3389#if ENABLE_TRANSPARENCY
3868 case URxvt_Color_tint: 3390 case URxvt_Color_tint:
3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3391 process_color_seq (op, Color_tint, str, resp);
3870 check_our_parents (); 3392 {
3871 if (am_transparent) 3393 bool changed = false;
3872 want_full_refresh = want_refresh = 1; 3394 if (ISSET_PIXCOLOR (Color_tint))
3873 break; 3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3874#endif 3396 else
3397 changed = bgPixmap.unset_tint ();
3398 if (changed)
3399 update_background ();
3400 }
3875 3401
3402 break;
3403#endif
3404
3405#if BG_IMAGE_FROM_FILE
3876 case Rxvt_Pixmap: 3406 case Rxvt_Pixmap:
3877 { 3407 if (!strcmp (str, "?"))
3878 if (*str != ';')
3879 { 3408 {
3880#if XPM_BACKGROUND 3409 char str[256];
3881 scale_pixmap (""); /* reset to default scaling */ 3410
3882 set_bgPixmap (str); /* change pixmap */ 3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3883 scr_touch (true); 3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3884#endif 3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3414 process_xterm_seq (XTerm_title, str, CHAR_ST);
3885 } 3415 }
3886 3416 else
3417 {
3887 int changed = 0; 3418 int changed = 0;
3888 3419
3889 while ((str = strchr (str, ';')) != NULL) 3420 if (*str != ';')
3890 { 3421 {
3422 /* reset to default scaling :*/
3423 bgPixmap.unset_geometry ();
3424 if (bgPixmap.set_file (str)) /* change pixmap */
3425 changed++;
3426 str = strchr (str, ';');
3427 if (str == NULL)
3428 bgPixmap.set_defaultGeometry ();
3429 }
3430 while (str)
3431 {
3891 str++; 3432 str++;
3892#if XPM_BACKGROUND 3433 if (bgPixmap.set_geometry (str))
3893 changed += scale_pixmap (str); 3434 changed++;
3894#endif 3435 str = strchr (str, ';');
3895 } 3436 }
3896
3897 if (changed) 3437 if (changed)
3898 { 3438 update_background ();
3899#ifdef XPM_BACKGROUND
3900 resize_pixmap ();
3901 scr_touch (true);
3902#endif
3903 } 3439 }
3904 }
3905 break; 3440 break;
3441#endif
3906 3442
3907 case Rxvt_restoreFG: 3443 case Rxvt_restoreFG:
3908 set_window_color (Color_fg, str); 3444 set_window_color (Color_fg, str);
3909 break; 3445 break;
3910 case Rxvt_restoreBG: 3446 case Rxvt_restoreBG:
… …
3935 case URxvt_italicFont: 3471 case URxvt_italicFont:
3936 case URxvt_boldItalicFont: 3472 case URxvt_boldItalicFont:
3937#endif 3473#endif
3938 if (query) 3474 if (query)
3939 tt_printf ("\33]%d;%-.250s%c", saveop, 3475 tt_printf ("\33]%d;%-.250s%c", saveop,
3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3476 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3941 ? fontset[op - URxvt_font]->fontdesc : "", 3477 ? fontset[op - URxvt_font]->fontdesc : "",
3942 resp); 3478 resp);
3943 else 3479 else
3944 { 3480 {
3945 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3481 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3948 allocated.push_back ((void *)res); 3484 allocated.push_back ((void *)res);
3949 set_fonts (); 3485 set_fonts ();
3950 } 3486 }
3951 break; 3487 break;
3952 3488
3953#if ENABLE_FRILLS 3489 case URxvt_version:
3490 if (query)
3491 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3492 op,
3493 rs[Rs_name], VERSION[0], VERSION[2],
3494 resp);
3495 break;
3496
3497#if !ENABLE_MINIMAL
3954 case URxvt_locale: 3498 case URxvt_locale:
3955 if (query) 3499 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3500 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3957 else 3501 else
3958 { 3502 {
3959 set_locale (str); 3503 set_locale (str);
3960 pty->set_utf8_mode (enc_utf8); 3504 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 3505 init_xlocale ();
… …
3976 break; 3520 break;
3977#endif 3521#endif
3978 3522
3979#if ENABLE_PERL 3523#if ENABLE_PERL
3980 case URxvt_perl: 3524 case URxvt_perl:
3981 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3525 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3982 ; // no responses yet 3526 ; // no responses yet
3983 break; 3527 break;
3984#endif 3528#endif
3985 } 3529 }
3986} 3530}
… …
4024{ 3568{
4025 unsigned int i, j; 3569 unsigned int i, j;
4026 int state; 3570 int state;
4027 3571
4028 static const struct 3572 static const struct
4029 { 3573 {
4030 const int argval; 3574 const int argval;
4031 const unsigned long bit; 3575 const unsigned long bit;
4032 }
4033
4034 argtopriv[] = { 3576 } argtopriv[] = {
4035 { 1, PrivMode_aplCUR }, 3577 { 1, PrivMode_aplCUR },
4036 { 2, PrivMode_vt52 }, 3578 { 2, PrivMode_vt52 },
4037 { 3, PrivMode_132 }, 3579 { 3, PrivMode_132 },
4038 { 4, PrivMode_smoothScroll }, 3580 { 4, PrivMode_smoothScroll },
4039 { 5, PrivMode_rVideo }, 3581 { 5, PrivMode_rVideo },
… …
4055 { 66, PrivMode_aplKP }, 3597 { 66, PrivMode_aplKP },
4056#ifndef NO_BACKSPACE_KEY 3598#ifndef NO_BACKSPACE_KEY
4057 { 67, PrivMode_BackSpace }, 3599 { 67, PrivMode_BackSpace },
4058#endif 3600#endif
4059 { 1000, PrivMode_MouseX11 }, 3601 { 1000, PrivMode_MouseX11 },
4060 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3602 { 1002, PrivMode_MouseBtnEvent },
4061 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3603 { 1003, PrivMode_MouseAnyEvent },
4062 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4063 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4064 { 1011, PrivMode_Keypress }, // rxvt extension 3605 { 1011, PrivMode_Keypress }, // rxvt extension
4065 // 1035 enable modifiers for alt, numlock NYI 3606 // 1035 enable modifiers for alt, numlock NYI
4066 // 1036 send ESC for meta keys NYI 3607 // 1036 send ESC for meta keys NYI
4067 // 1037 send DEL for keypad delete NYI 3608 // 1037 send DEL for keypad delete NYI
… …
4102 scr_touch (true); 3643 scr_touch (true);
4103 break; 3644 break;
4104#endif 3645#endif
4105 case 1048: /* alternative cursor save */ 3646 case 1048: /* alternative cursor save */
4106 case 1049: 3647 case 1049:
4107 if (OPTION (Opt_secondaryScreen)) 3648 if (option (Opt_secondaryScreen))
4108 if (mode == 0) 3649 if (mode == 0)
4109 scr_cursor (RESTORE); 3650 scr_cursor (RESTORE);
4110 else if (mode == 1) 3651 else if (mode == 1)
4111 scr_cursor (SAVE); 3652 scr_cursor (SAVE);
4112 break; 3653 break;
… …
4141 scr_autowrap (state); 3682 scr_autowrap (state);
4142 break; 3683 break;
4143 /* case 8: - auto repeat, can't do on a per window basis */ 3684 /* case 8: - auto repeat, can't do on a per window basis */
4144 case 9: /* X10 mouse reporting */ 3685 case 9: /* X10 mouse reporting */
4145 if (state) /* orthogonal */ 3686 if (state) /* orthogonal */
4146 priv_modes &= ~PrivMode_MouseX11; 3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4147 break; 3688 break;
4148#ifdef scrollBar_esc 3689#ifdef scrollBar_esc
4149 case scrollBar_esc: 3690 case scrollBar_esc:
4150 if (scrollbar_mapping (state)) 3691 if (scrollbar_mapping (state))
4151 { 3692 {
… …
4164 break; 3705 break;
4165 /* case 66: - application key pad */ 3706 /* case 66: - application key pad */
4166 /* case 67: - backspace key */ 3707 /* case 67: - backspace key */
4167 case 1000: /* X11 mouse reporting */ 3708 case 1000: /* X11 mouse reporting */
4168 if (state) /* orthogonal */ 3709 if (state) /* orthogonal */
4169 priv_modes &= ~PrivMode_MouseX10; 3710 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4170 break; 3711 break;
4171#if 0
4172 case 1001: 3712 case 1002:
4173 break; /* X11 mouse highlighting */ 3713 case 1003:
4174#endif 3714 if (state)
3715 {
3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3717 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3718 vt_emask_mouse = PointerMotionMask;
3719 }
3720 else
3721 vt_emask_mouse = NoEventMask;
3722 vt_select_input ();
3723 break;
4175 case 1010: /* scroll to bottom on TTY output inhibit */ 3724 case 1010: /* scroll to bottom on TTY output inhibit */
4176 set_option (Opt_scrollTtyOutput, !state); 3725 set_option (Opt_scrollTtyOutput, !state);
4177 break; 3726 break;
4178 case 1011: /* scroll to bottom on key press */ 3727 case 1011: /* scroll to bottom on key press */
4179 set_option (Opt_scrollTtyKeypress, state); 3728 set_option (Opt_scrollTtyKeypress, state);
4180 break; 3729 break;
4181 case 1047: /* secondary screen w/ clearing last */ 3730 case 1047: /* secondary screen w/ clearing last */
4182 if (OPTION (Opt_secondaryScreen)) 3731 if (option (Opt_secondaryScreen))
4183 if (current_screen != PRIMARY) 3732 if (current_screen != PRIMARY)
4184 scr_erase_screen (2); 3733 scr_erase_screen (2);
4185 scr_change_screen (state); 3734 scr_change_screen (state);
4186 break; 3735 break;
4187 case 1049: /* secondary screen w/ clearing first */ 3736 case 1049: /* secondary screen w/ clearing first */
4188 scr_change_screen (state); 3737 scr_change_screen (state);
4189 if (OPTION (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
4190 if (current_screen != PRIMARY) 3739 if (current_screen != PRIMARY)
4191 scr_erase_screen (2); 3740 scr_erase_screen (2);
4192 break; 3741 break;
4193 default: 3742 default:
4194 break; 3743 break;
… …
4322 scr_color (Color_bg, Color_bg); 3871 scr_color (Color_bg, Color_bg);
4323 break; 3872 break;
4324 3873
4325 //case 50: // not variable spacing 3874 //case 50: // not variable spacing
4326 3875
4327#if ENABLE_FRILLS 3876#if !ENABLE_MINIMAL
4328 case 90: 3877 case 90:
4329 case 91: /* set bright fg color */ 3878 case 91: /* set bright fg color */
4330 case 92: 3879 case 92:
4331 case 93: 3880 case 93:
4332 case 94: 3881 case 94:
… …
4356rxvt_term::process_graphics () 3905rxvt_term::process_graphics ()
4357{ 3906{
4358 unicode_t ch, cmd = cmd_getc (); 3907 unicode_t ch, cmd = cmd_getc ();
4359 3908
4360 if (cmd == 'Q') 3909 if (cmd == 'Q')
3910 {
4361 { /* query graphics */ 3911 /* query graphics */
4362 tt_printf ("\033G0\012"); /* no graphics */ 3912 tt_printf ("\033G0\012"); /* no graphics */
4363 return; 3913 return;
4364 } 3914 }
4365 /* swallow other graphics sequences until terminating ':' */ 3915 /* swallow other graphics sequences until terminating ':' */
4366 do 3916 do
… …
4416 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3966 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4417 3967
4418 memcpy (v_buffer + v_buflen, data, len); 3968 memcpy (v_buffer + v_buflen, data, len);
4419 v_buflen += len; 3969 v_buflen += len;
4420 3970
4421 pty_ev.set (EVENT_READ | EVENT_WRITE); 3971 pty_ev.set (ev::READ | ev::WRITE);
4422} 3972}
4423 3973
4424void rxvt_term::pty_write () 3974void rxvt_term::pty_write ()
4425{ 3975{
4426 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3976 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4431 3981
4432 if (v_buflen == 0) 3982 if (v_buflen == 0)
4433 { 3983 {
4434 free (v_buffer); 3984 free (v_buffer);
4435 v_buffer = 0; 3985 v_buffer = 0;
4436 v_buflen = 0;
4437 3986
4438 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4439 return; 3988 return;
4440 } 3989 }
4441 3990
4442 memmove (v_buffer, v_buffer + written, v_buflen); 3991 memmove (v_buffer, v_buffer + written, v_buflen);
4443 } 3992 }
4444 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3993 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4445 pty_ev.set (EVENT_READ); 3994 pty_ev.set (ev::READ);
4446} 3995}
4447 3996
4448/*----------------------- end-of-file (C source) -----------------------*/ 3997/*----------------------- end-of-file (C source) -----------------------*/
4449 3998

Diff Legend

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