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.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.379 by root, Fri Dec 14 02:29:48 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
96 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
98 97
99 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
227# if !UNICODE3 225# if !UNICODE3
228 if (ch >= 0x10000) 226 if (ch >= 0x10000)
229 ch = 0xfffd; 227 ch = 0xfffd;
230# endif 228# endif
231 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
233 } 233 }
234 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
235 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
237 242
238 free (fname); 243 free (fname);
239 244
… …
292 297
293 return -1; 298 return -1;
294} 299}
295#endif 300#endif
296 301
297/*{{{ Convert the keypress event into a string */
298void 302void
299rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
300{ 304{
301 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
302 unsigned int newlen; 306 unsigned int newlen;
303 KeySym keysym; 307 KeySym keysym;
304 int valid_keysym; 308 int valid_keysym;
305 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
306 315
307 /* 316 /*
308 * 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
309 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
310 * 319 *
… …
490# if ISO_14755 499# if ISO_14755
491 iso14755_51 (0); 500 iso14755_51 (0);
492# endif 501# endif
493 return; 502 return;
494 } 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 }
495 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
496 { 513 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
499# if ISO_14755 516# if ISO_14755
… …
501# endif 518# endif
502 return; 519 return;
503 } 520 }
504 else 521 else
505 { 522 {
506# if ENABLE_OVERLAY 523# if ISO_14755
507 scr_overlay_off (); 524 scr_overlay_off ();
508# endif 525# endif
509 iso14755buf = 0; 526 iso14755buf = 0;
510 } 527 }
511 } 528 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
515 { 532 {
516 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 534# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 537# endif
521 } 538 }
522#endif 539#endif
523 540
524#ifdef PRINTPIPE 541#ifdef PRINTPIPE
525 if (keysym == XK_Print) 542 if (keysym == XK_Print)
526 { 543 {
527 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
528 return; 545 return;
… …
530#endif 547#endif
531 548
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 550 {
534 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
535 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
536 switch (keysym) 584 switch (keysym)
537 { 585 {
538#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
539 case XK_BackSpace: 587 case XK_BackSpace:
540 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
545 } 593 }
546 else 594 else
547 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
548 break; 596 break;
549#endif 597#endif
550#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
551# ifdef XK_KP_Prior
552 case XK_KP_Delete:
553 /* allow shift to override */
554 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
555 {
556 strcpy (kbuf, "\033On");
557 break;
558 }
559 /* FALLTHROUGH */
560# endif
561 case XK_Delete: 599 case XK_Delete:
562 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
563 break; 601 break;
564#endif 602#endif
565 case XK_Tab: 603 case XK_Tab:
566 if (shft) 604 if (shft)
567 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
577#endif 615#endif
578 newlen = 0; 616 newlen = 0;
579 } 617 }
580 break; 618 break;
581 619
582#ifdef XK_KP_Left
583 case XK_KP_Up: /* \033Ox or standard */
584 case XK_KP_Down: /* \033Or or standard */
585 case XK_KP_Right: /* \033Ov or standard */
586 case XK_KP_Left: /* \033Ot or standard */
587 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
588 {
589 strcpy (kbuf, "\033OZ");
590 kbuf[2] = "txvr"[keysym - XK_KP_Left];
591 break;
592 }
593 else
594 /* translate to std. cursor key */
595 keysym = XK_Left + (keysym - XK_KP_Left);
596 /* FALLTHROUGH */
597#endif
598 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
599 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
600 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
601 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
602 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
612 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
613 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
614 break; 636 break;
615 637
616#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
617# ifdef XK_KP_Prior
618 case XK_KP_Prior:
619 /* allow shift to override */
620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
621 {
622 strcpy (kbuf, "\033Oy");
623 break;
624 }
625 /* FALLTHROUGH */
626# endif
627 case XK_Prior: 639 case XK_Prior:
628 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
629 break; 641 break;
630# ifdef XK_KP_Next
631 case XK_KP_Next:
632 /* allow shift to override */
633 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
634 {
635 strcpy (kbuf, "\033Os");
636 break;
637 }
638 /* FALLTHROUGH */
639# endif
640 case XK_Next: 642 case XK_Next:
641 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
642 break; 644 break;
643#endif 645#endif
644 case XK_KP_Enter: 646 case XK_KP_Enter:
645 /* allow shift to override */ 647 /* allow shift to override */
646 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
647 { 649 {
648 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
649 break; 651 break;
650 } 652 }
651 653
… …
663 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
664 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
665 } 667 }
666 break; 668 break;
667 669
668#ifdef XK_KP_Begin
669 case XK_KP_Begin:
670 strcpy (kbuf, "\033Ou");
671 break;
672
673#endif
674 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
675 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
676 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
677 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
678 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
694 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
695 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
696 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
697 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
698 /* allow shift to override */ 694 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
700 { 696 {
701 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
702 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
703 } 699 }
704 else 700 else
… …
710 706
711 case XK_Find: 707 case XK_Find:
712 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
713 break; 709 break;
714 710
715#ifdef XK_KP_End
716 case XK_KP_Insert:
717 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
719 {
720 strcpy (kbuf, "\033Op");
721 break;
722 }
723 /* FALLTHROUGH */
724#endif
725 case XK_Insert: 711 case XK_Insert:
726 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
727 break; 713 break;
728#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
729 case DXK_Remove: 715 case DXK_Remove:
… …
733 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
734 break; 720 break;
735 case XK_Select: 721 case XK_Select:
736 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
737 break; 723 break;
738#ifdef XK_KP_End
739 case XK_KP_End:
740 /* allow shift to override */
741 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
742 {
743 strcpy (kbuf, "\033Oq");
744 break;
745 }
746 /* FALLTHROUGH */
747#endif
748 case XK_End: 724 case XK_End:
749 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
750 break; 726 break;
751#ifdef XK_KP_Home
752 case XK_KP_Home:
753 /* allow shift to override */
754 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
755 {
756 strcpy (kbuf, "\033Ow");
757 break;
758 }
759 /* FALLTHROUGH */
760#endif
761 case XK_Home: 727 case XK_Home:
762 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
763 break; 729 break;
764 730
765#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
867 return; 833 return;
868 834
869 if (len <= 0) 835 if (len <= 0)
870 return; /* not mapped */ 836 return; /* not mapped */
871 837
872 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 839 if (view_start)
874 { 840 {
875 view_start = 0; 841 view_start = 0;
876 want_refresh = 1; 842 want_refresh = 1;
877 } 843 }
… …
901 tt_write (&ch, 1); 867 tt_write (&ch, 1);
902 } 868 }
903 869
904 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
905} 871}
906/*}}} */ 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}
907 949
908#if defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
909unsigned int 951unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 953{
… …
941void 983void
942rxvt_term::flush () 984rxvt_term::flush ()
943{ 985{
944 flush_ev.stop (); 986 flush_ev.stop ();
945 987
946#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
947 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
948 { 990 {
949 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
950 scr_clear ();
951 scr_touch (false); 992 scr_touch (false);
952 } 993 }
953#endif 994#endif
954 995
955 if (want_refresh) 996 if (want_refresh)
… …
1001 1042
1002 display->flush (); 1043 display->flush ();
1003} 1044}
1004 1045
1005void 1046void
1006rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1007{ 1048{
1008 make_current (); 1049 make_current ();
1009 1050
1010 display->flush (); 1051 display->flush ();
1011 1052
1012 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.is_active ())
1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1014} 1055}
1015 1056
1016void 1057void
1017rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1018{ 1059{
1019 make_current (); 1060 make_current ();
1020 1061
1021 refresh_limit = 1;
1022 refresh_count = 0; 1062 refresh_count = 0;
1023 flush (); 1063 flush ();
1024} 1064}
1025 1065
1026#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1027void 1067void
1028rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1029{ 1069{
1030 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1031 want_refresh = 1; 1071 want_refresh = 1;
1032
1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1034} 1072}
1035#endif 1073#endif
1036 1074
1037#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1038void 1076void
1039rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1040{ 1078{
1041 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1042 { 1080 {
1043 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1044 want_refresh = 1; 1082 want_refresh = 1;
1045 w.start (w.at + TEXT_BLINK_INTERVAL);
1046 } 1083 }
1084 else
1085 w.stop ();
1047} 1086}
1048#endif 1087#endif
1049 1088
1050#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1051void 1090void
1052rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1053{ 1092{
1054 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1055 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1056 {
1057 want_refresh = 1; 1095 want_refresh = 1;
1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
1059 } 1097 w.stop ();
1060} 1098}
1061#endif 1099#endif
1062 1100
1063#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1064void 1102void
1065rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1104{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1068 { 1106 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1108 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1109 }
1110 else
1111 w.stop ();
1073} 1112}
1074#endif 1113#endif
1075 1114
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1116void
1078rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1118{
1080 if (mouse_slip_wheel_speed == 0 1119 if (scr_page (mouse_slip_wheel_speed < 0 ? DN : UP, abs (mouse_slip_wheel_speed)))
1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1120 want_refresh = 1;
1082 : scr_page (UP, mouse_slip_wheel_speed)) 1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1083 { 1123 {
1084 if (view_start == top_row || view_start == 0)
1085 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1086 1125 w.stop ();
1087 want_refresh = 1;
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1126 }
1090} 1127}
1091#endif 1128#endif
1092 1129
1093#if HAVE_SCHED_YIELD 1130#if LINUX_YIELD_HACK
1094static struct event_handler 1131static struct event_handler
1095{ 1132{
1096 check_watcher cw_yield; 1133 ev::prepare yield_ev;
1097 1134
1098 void yield (check_watcher &w) 1135 void yield_cb (ev::prepare &w, int revents)
1099 { 1136 {
1100 sched_yield (); 1137 // this should really be sched_yield(), but the linux guys thought
1138 // that giving a process calling sched_yield () less cpu time than
1139 // ones with high nice levels is a useful thing to do. It surely is is
1140 // allowed by the sus... as is returning ENOSYS.
1141
1142 struct timespec ts = { 0, 0 };
1143 nanosleep (&ts, 0);
1144
1101 w.stop (); 1145 w.stop ();
1102 } 1146 }
1103 1147
1104 event_handler () 1148 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1149 : yield_ev (this, &event_handler::yield_cb)
1106 { 1150 {
1107 } 1151 }
1108} event_handler; 1152} event_handler;
1109#endif 1153#endif
1110 1154
… …
1130 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1131 return true; 1175 return true;
1132 } 1176 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1177 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1178 {
1135#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1136 if (display->is_local) 1180 if (display->is_local)
1137 event_handler.cw_yield.start (); 1181 event_handler.yield_ev.start ();
1138#endif 1182#endif
1139 } 1183 }
1140 else 1184 else
1141 { 1185 {
1142 pty_ev.stop (); 1186 pty_ev.stop ();
1143 1187
1144 if (!OPTION (Opt_hold)) 1188 if (!option (Opt_hold))
1145 destroy (); 1189 destroy ();
1146 } 1190 }
1147 1191
1148 return false; 1192 return false;
1149} 1193}
1150 1194
1151void 1195void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
1153{ 1197{
1154 make_current (); 1198 make_current ();
1155 1199
1156 if (revents & EVENT_READ) 1200 if (revents & ev::READ)
1157 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
1158 while (pty_fill ()) 1202 while (pty_fill ())
1159 if (cmd_parse ()) 1203 if (cmd_parse ())
1160 break; 1204 break;
1161 1205
1162 if (revents & EVENT_WRITE) 1206 if (revents & ev::WRITE)
1163 pty_write (); 1207 pty_write ();
1164} 1208}
1165 1209
1166void 1210void
1167rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1168{ 1212{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1213 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1214 recolour_cursor ();
1171 1215
1172#ifdef POINTER_BLANK 1216#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1217 hidden_pointer = 0;
1174 1218
1175 if (OPTION (Opt_pointerBlank)) 1219 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1220 pointer_ev.start (pointerBlankDelay);
1177#endif 1221#endif
1178} 1222}
1179 1223
1180#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1181void 1225void
1182rxvt_term::pointer_blank () 1226rxvt_term::pointer_blank ()
1183{ 1227{
1184 if (!OPTION (Opt_pointerBlank)) 1228 if (!option (Opt_pointerBlank))
1185 return; 1229 return;
1186 1230
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1231 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 1232 XFlush (dpy);
1189 1233
1190 hidden_pointer = 1; 1234 hidden_pointer = 1;
1191} 1235}
1192 1236
1193void 1237void
1194rxvt_term::pointer_cb (time_watcher &w) 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
1195{ 1239{
1196 make_current (); 1240 make_current ();
1197 1241
1198 pointer_blank (); 1242 pointer_blank ();
1199} 1243}
… …
1202void 1246void
1203rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
1204{ 1248{
1205 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1206 int x, y; 1250 int x, y;
1251 int code = 32;
1207 1252
1208 x = ev.x; 1253 x = Pixel2Col (ev.x);
1209 y = ev.y; 1254 y = Pixel2Row (ev.y);
1210 pixel_position (&x, &y); 1255 if (ev.type == MotionNotify)
1256 {
1257 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1211 1263
1212 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1213 button_number = 3; 1265 button_number = 3;
1214 else 1266 else
1215 { 1267 {
… …
1261 x + 1, 1313 x + 1,
1262 y + 1); 1314 y + 1);
1263#endif 1315#endif
1264 1316
1265 tt_printf ("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1266 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1267 (32 + x + 1), 1319 (32 + x + 1),
1268 (32 + y + 1)); 1320 (32 + y + 1));
1269} 1321}
1270
1271#ifdef USING_W11LIB
1272void
1273rxvt_W11_process_x_event (XEvent *ev)
1274{
1275 rxvt_t *r = rxvt_get_r ();
1276
1277 x_cb (*ev);
1278}
1279#endif
1280 1322
1281/*{{{ process an X event */ 1323/*{{{ process an X event */
1282void 1324void
1283rxvt_term::x_cb (XEvent &ev) 1325rxvt_term::x_cb (XEvent &ev)
1284{ 1326{
1285 make_current (); 1327 make_current ();
1286 1328
1287 dDisp; 1329 dLocal (Display *, dpy);
1288 1330
1289 if (ev.xany.window == vt 1331 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT) 1332 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1333 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return; 1334 return;
… …
1297 unsigned int unused_mask; 1339 unsigned int unused_mask;
1298 1340
1299 switch (ev.type) 1341 switch (ev.type)
1300 { 1342 {
1301 case KeyPress: 1343 case KeyPress:
1302#if ISO_14755 1344 key_press (ev.xkey);
1303 if (!(iso14755buf & ISO_14755_52))
1304#endif
1305 lookup_key (ev.xkey);
1306
1307 break; 1345 break;
1308 1346
1309 case KeyRelease: 1347 case KeyRelease:
1310 { 1348 key_release (ev.xkey);
1311#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1312 KeySym keysym;
1313
1314 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1315#endif
1316
1317#if ENABLE_FRILLS || ISO_14755
1318 // ISO 14755 support
1319 if (iso14755buf)
1320 if (iso14755buf & ISO_14755_52)
1321 {
1322# if ENABLE_OVERLAY
1323 scr_overlay_off ();
1324# endif
1325# if ISO_14755
1326 // iso14755 part 5.2 handling: release time
1327 // first: controls
1328 if ((ev.xkey.state & ControlMask)
1329 && ((keysym >= 0x40 && keysym <= 0x5f)
1330 || (keysym >= 0x61 && keysym <= 0x7f)))
1331 {
1332 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1338 if (i[0] == keysym)
1339 {
1340 iso14755buf = ISO_14755_51 | i[1];
1341 commit_iso14755 ();
1342 goto skip_switch;
1343 }
1344
1345 scr_bell ();
1346# endif
1347 iso14755buf = 0;
1348 break;
1349 }
1350 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1351 {
1352# if ENABLE_OVERLAY
1353 scr_overlay_off ();
1354# endif
1355 if (iso14755buf & ISO_14755_51)
1356 commit_iso14755 ();
1357#if ISO_14755
1358 else if (iso14755buf & ISO_14755_STARTED)
1359 {
1360 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1361
1362 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1363 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1364 }
1365# endif
1366 else
1367 iso14755buf = 0;
1368 }
1369#endif
1370
1371 if (ev.xany.window == vt
1372 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1373 break;
1374
1375#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1376 if (!(ev.xkey.state & ControlMask))
1377 slip_wheel_ev.stop ();
1378 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1379 mouse_slip_wheel_speed = 0;
1380#endif
1381 break; 1349 break;
1382 }
1383 1350
1384 case ButtonPress: 1351 case ButtonPress:
1385 button_press (ev.xbutton); 1352 button_press (ev.xbutton);
1386 break; 1353 break;
1387 1354
… …
1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1369 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1403 destroy (); 1370 destroy ();
1404 } 1371 }
1405#if ENABLE_EWMH 1372#if ENABLE_EWMH
1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1407 XSendEvent (disp, ev.xclient.window = display->root, 1374 XSendEvent (dpy, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask, 1375 False, SubstructureRedirectMask | SubstructureNotifyMask,
1409 &ev); 1376 &ev);
1410#endif 1377#endif
1411 } 1378 }
1412 } 1379 }
… …
1418 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1385 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1419 focus_out (); 1386 focus_out ();
1420 } 1387 }
1421#endif 1388#endif
1422 } 1389 }
1423 break;
1424
1425 case MappingNotify:
1426 XRefreshKeyboardMapping (&ev.xmapping);
1427 break; 1390 break;
1428 1391
1429 /* 1392 /*
1430 * XXX: this is not the _current_ arrangement 1393 * XXX: this is not the _current_ arrangement
1431 * Here's my conclusion: 1394 * Here's my conclusion:
… …
1450 break; 1413 break;
1451 } 1414 }
1452 break; 1415 break;
1453 1416
1454 case FocusIn: 1417 case FocusIn:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1455 focus_in (); 1421 focus_in ();
1456 break; 1422 break;
1457 1423
1458 case FocusOut: 1424 case FocusOut:
1425 if (ev.xfocus.detail != NotifyInferior
1426 && ev.xfocus.detail != NotifyPointer
1427 && ev.xfocus.mode != NotifyGrab)
1459 focus_out (); 1428 focus_out ();
1460 break; 1429 break;
1461 1430
1462 case ConfigureNotify: 1431 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */
1463 if (ev.xconfigure.window == parent[0]) 1435 if (ev.xconfigure.window == parent[0])
1464 { 1436 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1438 ;
1467 1439
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1441 {
1470 seen_resize = 1; 1442 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 } 1444 }
1473 1445 else
1446 {
1447#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 update_background ();
1450#endif
1451 }
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475
1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1477 if (OPTION (Opt_transparent))
1478 check_our_parents ();
1479#endif
1480 } 1453 }
1481 break; 1454 break;
1482 1455
1483 case PropertyNotify: 1456 case PropertyNotify:
1484 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1502 break; 1475 break;
1503 1476
1504 case MapNotify: 1477 case MapNotify:
1505 mapped = 1; 1478 mapped = 1;
1506#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start ();
1508#endif 1481#endif
1509 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 break; 1483 break;
1511 1484
1512 case UnmapNotify: 1485 case UnmapNotify:
… …
1514#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1515 text_blink_ev.stop (); 1488 text_blink_ev.stop ();
1516#endif 1489#endif
1517 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1491 break;
1519
1520#ifdef TRANSPARENT
1521 case ReparentNotify:
1522 rootwin_cb (ev);
1523 break;
1524#endif /* TRANSPARENT */
1525 1492
1526 case GraphicsExpose: 1493 case GraphicsExpose:
1527 case Expose: 1494 case Expose:
1528 if (ev.xany.window == vt) 1495 if (ev.xany.window == vt)
1529 { 1496 {
1530 do 1497 do
1498 {
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1499 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1500 ev.xexpose.width, ev.xexpose.height, False);
1501 }
1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1502 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534 1503
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536 1505
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 {
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1540 1510 }
1541 want_refresh = 1; 1511 want_refresh = 1;
1542 } 1512 }
1543 else 1513 else
1544 { 1514 {
1545 XEvent unused_event; 1515 XEvent unused_event;
1546 1516
1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1517 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548 ; 1518 ;
1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1519 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550 ; 1520 ;
1551 1521
1552 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1553 { 1523 {
1554 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1555 scrollbar_show (0); 1525 scrollbar_show (0);
1556 } 1526 }
1557
1558#ifdef TRANSPARENT
1559 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window);
1561#endif
1562 } 1527 }
1563 break; 1528 break;
1564 1529
1565 case MotionNotify: 1530 case MotionNotify:
1566#ifdef POINTER_BLANK 1531#ifdef POINTER_BLANK
1567 if (hidden_pointer) 1532 if (hidden_pointer)
1568 pointer_unblank (); 1533 pointer_unblank ();
1569#endif 1534#endif
1535 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1536 || priv_modes & PrivMode_MouseAnyEvent)
1537 mouse_report (ev.xbutton);
1570 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1538 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1571 break; 1539 break;
1572 1540
1573 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1574 { 1542 {
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1543 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1544 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577 ; // nop 1545 ; // nop
1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1546 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1547 {
1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581 ; 1549 ;
1582 1550
1583 XQueryPointer (disp, vt, 1551 XQueryPointer (dpy, vt,
1584 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1554 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1555 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
… …
1608 int dist; 1576 int dist;
1609 1577
1610 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1612 */ 1580 */
1613 if (!sel_scroll_ev.active) 1581 if (!sel_scroll_ev.is_active ())
1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1615 1583
1616 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1617 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1618 */ 1586 */
1619 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
… …
1641 else 1609 else
1642 { 1610 {
1643 /* we are within the text window, so we 1611 /* we are within the text window, so we
1644 * shouldn't be scrolling 1612 * shouldn't be scrolling
1645 */ 1613 */
1646 if (sel_scroll_ev.active)
1647 sel_scroll_ev.stop(); 1614 sel_scroll_ev.stop();
1648 } 1615 }
1649#endif 1616#endif
1650#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1651 } 1618 }
1652#endif 1619#endif
1653 } 1620 }
1654 } 1621 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656 { 1623 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1624 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658 MotionNotify, &ev)) 1625 MotionNotify, &ev))
1659 ; 1626 ;
1660 1627
1661 XQueryPointer (disp, scrollBar.win, 1628 XQueryPointer (dpy, scrollBar.win,
1662 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1631 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1632 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1634 scrollbar_size ());
1668 want_refresh = 1; 1635 want_refresh = 1;
1669 refresh_limit = 0;
1670 scrollbar_show (1); 1636 scrollbar_show (1);
1671 } 1637 }
1672 break; 1638 break;
1673 } 1639 }
1674 1640
1675skip_switch: ;
1676
1677#if defined(CURSOR_BLINK) 1641#if defined(CURSOR_BLINK)
1678 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1642 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1679 { 1643 {
1680 if (hidden_cursor) 1644 if (hidden_cursor)
1681 { 1645 {
1682 hidden_cursor = 0; 1646 hidden_cursor = 0;
1683 want_refresh = 1; 1647 want_refresh = 1;
1684 } 1648 }
1685 1649
1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1650 cursor_blink_ev.again ();
1687 } 1651 }
1688#endif 1652#endif
1689 1653
1690#if defined(POINTER_BLANK) 1654#if defined(POINTER_BLANK)
1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1655 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1692 { 1656 {
1693 if (ev.type == MotionNotify 1657 if (ev.type == MotionNotify
1694 || ev.type == ButtonPress 1658 || ev.type == ButtonPress
1695 || ev.type == ButtonRelease) 1659 || ev.type == ButtonRelease)
1696 if (hidden_pointer) 1660 if (hidden_pointer)
… …
1708 if (!focus) 1672 if (!focus)
1709 { 1673 {
1710 focus = 1; 1674 focus = 1;
1711 want_refresh = 1; 1675 want_refresh = 1;
1712 1676
1713 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1677 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1678
1715#if USE_XIM 1679#if USE_XIM
1716 if (Input_Context != NULL) 1680 if (Input_Context != NULL)
1717 { 1681 {
1718 IMSetStatusPosition (); 1682 IMSetPosition ();
1719 XSetICFocus (Input_Context); 1683 XSetICFocus (Input_Context);
1720 } 1684 }
1721#endif 1685#endif
1722#if CURSOR_BLINK 1686#if CURSOR_BLINK
1723 if (OPTION (Opt_cursorBlink)) 1687 if (option (Opt_cursorBlink))
1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1725#endif 1689#endif
1726#if OFF_FOCUS_FADING 1690#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade]) 1691 if (rs[Rs_fade])
1728 { 1692 {
1729 pix_colors = pix_colors_focused; 1693 pix_colors = pix_colors_focused;
1730 scr_recolour (); 1694 scr_recolour ();
1731 } 1695 }
1732#endif 1696#endif
1697#if ENABLE_FRILLS
1698 if (option (Opt_urgentOnBell))
1699 {
1700 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1701 {
1702 h->flags &= ~XUrgencyHint;
1703 XSetWMHints (dpy, parent[0], h);
1704 }
1705 }
1706#endif
1733 } 1707 }
1734} 1708}
1735 1709
1736void 1710void
1737rxvt_term::focus_out () 1711rxvt_term::focus_out ()
… …
1745 1719
1746#if ENABLE_FRILLS || ISO_14755 1720#if ENABLE_FRILLS || ISO_14755
1747 if (iso14755buf) 1721 if (iso14755buf)
1748 { 1722 {
1749 iso14755buf = 0; 1723 iso14755buf = 0;
1750# if ENABLE_OVERLAY 1724# if ISO_14755
1751 scr_overlay_off (); 1725 scr_overlay_off ();
1752# endif 1726# endif
1753 } 1727 }
1754#endif 1728#endif
1755#if USE_XIM 1729#if USE_XIM
1756 if (Input_Context != NULL) 1730 if (Input_Context != NULL)
1757 XUnsetICFocus (Input_Context); 1731 XUnsetICFocus (Input_Context);
1758#endif 1732#endif
1759#if CURSOR_BLINK 1733#if CURSOR_BLINK
1760 if (OPTION (Opt_cursorBlink)) 1734 if (option (Opt_cursorBlink))
1761 cursor_blink_ev.stop (); 1735 cursor_blink_ev.stop ();
1736
1762 hidden_cursor = 0; 1737 hidden_cursor = 0;
1763#endif 1738#endif
1764#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1765 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1766 { 1741 {
… …
1769 } 1744 }
1770#endif 1745#endif
1771 } 1746 }
1772} 1747}
1773 1748
1774#if TRANSPARENT 1749void
1750rxvt_term::update_fade_color (unsigned int idx)
1751{
1752#if OFF_FOCUS_FADING
1753 if (rs[Rs_fade])
1754 {
1755 rgba c;
1756 pix_colors [Color_fade].get (c);
1757 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1758 }
1759#endif
1760}
1761
1762#if ENABLE_TRANSPARENCY || ENABLE_PERL
1775void 1763void
1776rxvt_term::rootwin_cb (XEvent &ev) 1764rxvt_term::rootwin_cb (XEvent &ev)
1777{ 1765{
1778 make_current (); 1766 make_current ();
1779 1767
1768 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1769 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1770 return;
1771
1772# if ENABLE_TRANSPARENCY
1780 switch (ev.type) 1773 switch (ev.type)
1781 { 1774 {
1782 case PropertyNotify: 1775 case PropertyNotify:
1783 /* 1776 /*
1784 * if user used some Esetroot compatible prog to set the root bg, 1777 * if user used some Esetroot compatible prog to set the root bg,
1785 * use the property to determine the pixmap. We use it later on. 1778 * use the property to determine the pixmap. We use it later on.
1786 */ 1779 */
1787 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1780 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1788 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1781 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1789 return; 1782 {
1790 1783 bgPixmap.set_root_pixmap ();
1791 /* FALLTHROUGH */ 1784 update_background ();
1792 case ReparentNotify: 1785 }
1793 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1794 want_refresh = want_full_refresh = 1;
1795 break; 1786 break;
1796 } 1787 }
1788# endif
1797} 1789}
1798#endif 1790#endif
1799 1791
1800void 1792void
1801rxvt_term::button_press (XButtonEvent &ev) 1793rxvt_term::button_press (XButtonEvent &ev)
… …
1856 mouse_report (ev); 1848 mouse_report (ev);
1857 } 1849 }
1858#else 1850#else
1859 MEvent.button = ev.button; 1851 MEvent.button = ev.button;
1860 mouse_report (ev); 1852 mouse_report (ev);
1861#endif /* MOUSE_REPORT_DOUBLECLICK */ 1853#endif /* MOUSE_REPORT_DOUBLECLICK */
1862 1854
1863 } 1855 }
1864 else 1856 else
1865 { 1857 {
1866 if (ev.button != MEvent.button) 1858 if (ev.button != MEvent.button)
… …
1960 tt_printf ("\033[5~"); 1952 tt_printf ("\033[5~");
1961 break; 1953 break;
1962 } 1954 }
1963 } 1955 }
1964 else 1956 else
1965#endif /* NO_SCROLLBAR_REPORT */ 1957#endif /* NO_SCROLLBAR_REPORT */
1966 1958
1967 { 1959 {
1968 char upordown = 0; 1960 char upordown = 0;
1969 1961
1970 if (scrollBar.style == R_SB_NEXT) 1962 if (scrollBar.style == R_SB_NEXT)
1971 { 1963 {
1972 if (scrollbarnext_upButton (ev.y)) 1964 if (scrollbarnext_upButton (ev.y))
1973 upordown = -1; /* up */ 1965 upordown = -1; /* up */
… …
1979 if (scrollbarrxvt_upButton (ev.y)) 1971 if (scrollbarrxvt_upButton (ev.y))
1980 upordown = -1; /* up */ 1972 upordown = -1; /* up */
1981 else if (scrollbarrxvt_dnButton (ev.y)) 1973 else if (scrollbarrxvt_dnButton (ev.y))
1982 upordown = 1; /* down */ 1974 upordown = 1; /* down */
1983 } 1975 }
1976
1984 if (upordown) 1977 if (upordown)
1985 { 1978 {
1986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1980 if (!cont_scroll_ev.is_active ())
1987 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1988#endif 1982#endif
1989 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
1990 { 1984 {
1991 if (upordown < 0) 1985 if (upordown < 0)
1992 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
2072 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
2073 scrollbar_show (0); 2067 scrollbar_show (0);
2074 } 2068 }
2075 2069
2076#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2071 sel_scroll_ev.stop();
2079#endif 2072#endif
2080 2073
2081 if (ev.window == vt) 2074 if (ev.window == vt)
2082 { 2075 {
2083 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2076 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2107 mouse_report (ev); 2100 mouse_report (ev);
2108 } 2101 }
2109#else /* MOUSE_REPORT_DOUBLECLICK */ 2102#else /* MOUSE_REPORT_DOUBLECLICK */
2110 MEvent.button = AnyButton; 2103 MEvent.button = AnyButton;
2111 mouse_report (ev); 2104 mouse_report (ev);
2112#endif /* MOUSE_REPORT_DOUBLECLICK */ 2105#endif /* MOUSE_REPORT_DOUBLECLICK */
2113 return; 2106 return;
2114 } 2107 }
2115 2108
2116 /* 2109 /*
2117 * dumb hack to compensate for the failure of click-and-drag 2110 * dumb hack to compensate for the failure of click-and-drag
… …
2129 selection_make (ev.time); 2122 selection_make (ev.time);
2130 break; 2123 break;
2131 2124
2132 case Button2: 2125 case Button2:
2133 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2126 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2127 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2135 break; 2128 break;
2136 2129
2137#ifdef MOUSE_WHEEL 2130#ifdef MOUSE_WHEEL
2138 case Button4: 2131 case Button4:
2139 case Button5: 2132 case Button5:
… …
2143 2136
2144 v = ev.button == Button4 ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
2145 2138
2146 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
2147 i = 1; 2140 i = 1;
2148 else if (OPTION (Opt_mouseWheelScrollPage)) 2141 else if (option (Opt_mouseWheelScrollPage))
2149 i = nrow - 1; 2142 i = nrow - 1;
2150 else 2143 else
2151 i = 5; 2144 i = 5;
2152 2145
2153# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
… …
2155 { 2148 {
2156 mouse_slip_wheel_speed += v ? -1 : 1; 2149 mouse_slip_wheel_speed += v ? -1 : 1;
2157 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2158 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2159 2152
2160 if (slip_wheel_ev.at < NOW) 2153 if (!slip_wheel_ev.is_active ())
2161 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2162
2163 slip_wheel_ev.start ();
2164 } 2155 }
2165 else 2156 else
2166 { 2157 {
2167# endif 2158# endif
2168 scr_page (v, i); 2159 scr_page (v, i);
… …
2174 break; 2165 break;
2175#endif 2166#endif
2176 } 2167 }
2177 } 2168 }
2178} 2169}
2179
2180#ifdef TRANSPARENT
2181#if TINTING
2182/* taken from aterm-0.4.2 */
2183
2184typedef uint32_t RUINT32T;
2185
2186void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2187{
2188 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i;
2194
2195 Visual *visual = display->visual;
2196
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198
2199 /* for convenience */
2200 mask_r = visual->red_mask;
2201 mask_g = visual->green_mask;
2202 mask_b = visual->blue_mask;
2203
2204 /* boring lookup table pre-initialization */
2205 switch (srcImage->bits_per_pixel) {
2206 case 15:
2207 if ((mask_r != 0x7c00) ||
2208 (mask_g != 0x03e0) ||
2209 (mask_b != 0x001f))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2212 lookup_r = lookup;
2213 lookup_g = lookup+32;
2214 lookup_b = lookup+32+32;
2215 sh_r = 10;
2216 sh_g = 5;
2217 sh_b = 0;
2218 break;
2219 case 16:
2220 if ((mask_r != 0xf800) ||
2221 (mask_g != 0x07e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+64;
2228 sh_r = 11;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 24:
2233 if ((mask_r != 0xff0000) ||
2234 (mask_g != 0x00ff00) ||
2235 (mask_b != 0x0000ff))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2238 lookup_r = lookup;
2239 lookup_g = lookup+256;
2240 lookup_b = lookup+256+256;
2241 sh_r = 16;
2242 sh_g = 8;
2243 sh_b = 0;
2244 break;
2245 case 32:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 default:
2259 return; /* we do not support this color depth */
2260 }
2261
2262 /* prepare limits for color transformation (each channel is handled separately) */
2263 if (shade < 0) {
2264 shade = -shade;
2265 if (shade < 0) shade = 0;
2266 if (shade > 100) shade = 100;
2267
2268 lower_lim_r = 65535-rm;
2269 lower_lim_g = 65535-gm;
2270 lower_lim_b = 65535-bm;
2271
2272 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2273 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2274 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2275
2276 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2277 } else {
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2282
2283 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2284 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2285 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2286 }
2287
2288 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2289 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2290 {
2291 unsigned int tmp;
2292
2293 tmp = lower_lim_r;
2294 lower_lim_r = lower_lim_b;
2295 lower_lim_b = tmp;
2296
2297 tmp = upper_lim_r;
2298 upper_lim_r = upper_lim_b;
2299 upper_lim_b = tmp;
2300 }
2301
2302 /* fill our lookup tables */
2303 for (i = 0; i <= mask_r>>sh_r; i++)
2304 {
2305 RUINT32T tmp;
2306 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2307 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2308 lookup_r[i] = (tmp/65535)<<sh_r;
2309 }
2310 for (i = 0; i <= mask_g>>sh_g; i++)
2311 {
2312 RUINT32T tmp;
2313 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2314 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2315 lookup_g[i] = (tmp/65535)<<sh_g;
2316 }
2317 for (i = 0; i <= mask_b>>sh_b; i++)
2318 {
2319 RUINT32T tmp;
2320 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2321 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2322 lookup_b[i] = (tmp/65535)<<sh_b;
2323 }
2324
2325 /* apply table to input image (replacing colors by newly calculated ones) */
2326 switch (srcImage->bits_per_pixel)
2327 {
2328 case 15:
2329 {
2330 unsigned short *p1, *pf, *p, *pl;
2331 p1 = (unsigned short *) srcImage->data;
2332 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0x7c00)>>10] |
2340 lookup_g[(*p & 0x03e0)>> 5] |
2341 lookup_b[(*p & 0x001f)];
2342 }
2343 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2344 }
2345 break;
2346 }
2347 case 16:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0xf800)>>11] |
2359 lookup_g[(*p & 0x07e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 24:
2367 {
2368 unsigned char *p1, *pf, *p, *pl;
2369 p1 = (unsigned char *) srcImage->data;
2370 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width * 3;
2375 for (; p < pl; p += 3)
2376 {
2377 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2378 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2379 p[2] = lookup_r[(p[2] & 0x0000ff)];
2380 }
2381 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 32:
2386 {
2387 RUINT32T *p1, *pf, *p, *pl;
2388 p1 = (RUINT32T *) srcImage->data;
2389 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
2396 {
2397 *p = lookup_r[(*p & 0xff0000)>>16] |
2398 lookup_g[(*p & 0x00ff00)>> 8] |
2399 lookup_b[(*p & 0x0000ff)] |
2400 (*p & ~0xffffff);
2401 }
2402 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 }
2407
2408 free (lookup);
2409}
2410#endif
2411
2412/*
2413 * Check our parents are still who we think they are.
2414 * Do transparency updates if required
2415 */
2416int
2417rxvt_term::check_our_parents ()
2418{
2419 int i, pchanged, aformat, have_pixmap, rootdepth;
2420 unsigned long nitems, bytes_after;
2421 Atom atype;
2422 unsigned char *prop = NULL;
2423 Window root, oldp, *list;
2424 Pixmap rootpixmap = None;
2425 XWindowAttributes wattr, wrootattr;
2426 dDisp;
2427
2428 pchanged = 0;
2429
2430 if (!OPTION (Opt_transparent))
2431 return pchanged; /* Don't try any more */
2432
2433 XGetWindowAttributes (disp, display->root, &wrootattr);
2434 rootdepth = wrootattr.depth;
2435
2436 XGetWindowAttributes (disp, parent[0], &wattr);
2437
2438 if (rootdepth != wattr.depth)
2439 {
2440 if (am_transparent)
2441 {
2442 pchanged = 1;
2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2444 am_transparent = am_pixmap_trans = 0;
2445 }
2446
2447 return pchanged; /* Don't try any more */
2448 }
2449
2450 /* Get all X ops out of the queue so that our information is up-to-date. */
2451 XSync (disp, False);
2452
2453 /*
2454 * Make the frame window set by the window manager have
2455 * the root background. Some window managers put multiple nested frame
2456 * windows for each client, so we have to take care about that.
2457 */
2458 i = (xa[XA_XROOTPMAP_ID]
2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461 &nitems, &bytes_after, &prop) == Success);
2462
2463 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success);
2468
2469 if (!i || prop == NULL
2470#if TINTING
2471 || !rs[Rs_color + Color_tint]
2472#endif
2473 )
2474 have_pixmap = 0;
2475 else
2476 {
2477 have_pixmap = 1;
2478 rootpixmap = *(Pixmap *)prop;
2479 XFree (prop);
2480 }
2481
2482 if (have_pixmap)
2483 {
2484 /*
2485 * Copy display->root pixmap transparency
2486 */
2487 int sx, sy, nx, ny;
2488 unsigned int nw, nh;
2489 Window cr;
2490 XImage *image;
2491 GC gc;
2492 XGCValues gcvalue;
2493
2494 XTranslateCoordinates (disp, parent[0], display->root,
2495 0, 0, &sx, &sy, &cr);
2496 nw = (unsigned int)szHint.width;
2497 nh = (unsigned int)szHint.height;
2498 nx = ny = 0;
2499
2500 if (sx < 0)
2501 {
2502 nw += sx;
2503 nx = -sx;
2504 sx = 0;
2505 }
2506
2507 if (sy < 0)
2508 {
2509 nh += sy;
2510 ny = -sy;
2511 sy = 0;
2512 }
2513
2514 min_it (nw, (unsigned int) (wrootattr.width - sx));
2515 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516
2517 XSync (disp, False);
2518 allowedxerror = -1;
2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520
2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2522 /* XXX: may need a delay here? */
2523 allowedxerror = 0;
2524
2525 if (image == NULL)
2526 {
2527 if (am_transparent && am_pixmap_trans)
2528 {
2529 pchanged = 1;
2530 if (pixmap != None)
2531 {
2532 XFreePixmap (disp, pixmap);
2533 pixmap = None;
2534 }
2535 }
2536
2537 am_pixmap_trans = 0;
2538 }
2539 else
2540 {
2541 if (pixmap != None)
2542 XFreePixmap (disp, pixmap);
2543
2544#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint))
2546 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2551
2552 ShadeXImage (display, image, shade, rm, gm, bm);
2553 }
2554#endif
2555
2556 pixmap = XCreatePixmap (disp, vt,
2557 szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2559 XPutImage (disp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (disp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2564 XClearWindow (disp, parent[0]);
2565
2566 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1;
2568
2569 am_transparent = am_pixmap_trans = 1;
2570 }
2571 }
2572
2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2575 else
2576 {
2577 unsigned int n;
2578 /*
2579 * InheritPixmap transparency
2580 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 {
2583 oldp = parent[i];
2584 XQueryTree (disp, parent[i - 1], &root,
2585 &parent[i], &list, &n);
2586 XFree (list);
2587
2588 if (parent[i] == display->root)
2589 {
2590 if (oldp != None)
2591 pchanged = 1;
2592
2593 break;
2594 }
2595
2596 if (oldp != parent[i])
2597 pchanged = 1;
2598 }
2599
2600 n = 0;
2601
2602 if (pchanged)
2603 {
2604 for (; n < (unsigned int)i; n++)
2605 {
2606 XGetWindowAttributes (disp, parent[n], &wattr);
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break;
2611 }
2612 }
2613 }
2614
2615 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2616 {
2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2619 am_transparent = 0;
2620 /* XXX: also turn off Opt_transparent? */
2621 }
2622 else
2623 {
2624 for (n = 0; n < (unsigned int)i; n++)
2625 {
2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2627 XClearWindow (disp, parent[n]);
2628 }
2629
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2631 am_transparent = 1;
2632 }
2633
2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 parent[i] = None;
2636 }
2637
2638 if (scrollBar.win)
2639 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle ();
2642 scrollbar_show (0);
2643 }
2644
2645 if (am_transparent)
2646 {
2647 want_refresh = want_full_refresh = 1;
2648 if (am_pixmap_trans)
2649 flush ();
2650 }
2651
2652 return pchanged;
2653}
2654#endif
2655 2170
2656/*}}} */ 2171/*}}} */
2657 2172
2658bool 2173bool
2659rxvt_term::cmd_parse () 2174rxvt_term::cmd_parse ()
… …
2708 if (ch == C0_LF) 2223 if (ch == C0_LF)
2709 nlines++; 2224 nlines++;
2710 2225
2711 refresh_count++; 2226 refresh_count++;
2712 2227
2713 if (!OPTION (Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2714 || (refresh_count >= refresh_limit * (nrow - 1)))
2715 { 2229 {
2716 refreshnow = true;
2717 refresh_count = 0; 2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 {
2234 refreshnow = true;
2718 ch = NOCHAR; 2235 ch = NOCHAR;
2719 break; 2236 break;
2237 }
2720 } 2238 }
2721 2239
2722 // scr_add_lines only works for nlines <= nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2723 if (nlines >= nrow - 1) 2241 if (nlines >= nrow - 1)
2724 { 2242 {
… …
2752 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2753 scr_add_lines (buf, str - buf, nlines); 2271 scr_add_lines (buf, str - buf, nlines);
2754 2272
2755 /* 2273 /*
2756 * If there have been a lot of new lines, then update the screen 2274 * If there have been a lot of new lines, then update the screen
2757 * What the heck I'll cheat and only refresh less than every page-full. 2275 * What the heck we'll cheat and only refresh less than every page-full.
2758 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2759 * is incremented here because we must be doing flat-out scrolling.
2760 */ 2277 */
2761 if (refreshnow) 2278 if (refreshnow)
2762 { 2279 {
2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764 refresh_limit++;
2765 else
2766 {
2767 flag = true; 2280 flag = true;
2768 scr_refresh (); 2281 scr_refresh ();
2769 want_refresh = 1; 2282 want_refresh = 1;
2770 }
2771 } 2283 }
2772 2284
2773 } 2285 }
2774 else 2286 else
2775 { 2287 {
… …
2924 { 2436 {
2925 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
2926 break; /* done = 1 */ 2438 break; /* done = 1 */
2927 } 2439 }
2928 } 2440 }
2929 2441
2930 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
2931 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
2932 { 2444 {
2933 done = 1; 2445 done = 1;
2934 break; 2446 break;
… …
2936 } 2448 }
2937 } 2449 }
2938 2450
2939 pclose_printer (fd); 2451 pclose_printer (fd);
2940} 2452}
2941#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
2942/*}}} */ 2454/*}}} */
2943 2455
2944/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
2945enum { 2457enum {
2946 C1_40 = 0x40, 2458 C1_40 = 0x40,
… …
2996 process_dcs_seq (); 2508 process_dcs_seq ();
2997 break; 2509 break;
2998 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
2999 process_csi_seq (); 2511 process_csi_seq ();
3000 break; 2512 break;
3001 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
3002 process_osc_seq (); 2514 process_osc_seq ();
3003 break; 2515 break;
3004#endif 2516#endif
3005 } 2517 }
3006} 2518}
… …
3096 scr_charset_set (2, (unsigned int)cmd_getc ()); 2608 scr_charset_set (2, (unsigned int)cmd_getc ());
3097 break; 2609 break;
3098 case '+': 2610 case '+':
3099 scr_charset_set (3, (unsigned int)cmd_getc ()); 2611 scr_charset_set (3, (unsigned int)cmd_getc ());
3100 break; 2612 break;
3101#if ENABLE_FRILLS 2613#if !ENABLE_MINIMAL
3102 case '6': 2614 case '6':
3103 scr_backindex (); 2615 scr_backindex ();
3104 break; 2616 break;
3105#endif 2617#endif
3106 case '7': 2618 case '7':
3107 scr_cursor (SAVE); 2619 scr_cursor (SAVE);
3108 break; 2620 break;
3109 case '8': 2621 case '8':
3110 scr_cursor (RESTORE); 2622 scr_cursor (RESTORE);
3111 break; 2623 break;
3112#if ENABLE_FRILLS 2624#if !ENABLE_MINIMAL
3113 case '9': 2625 case '9':
3114 scr_forwardindex (); 2626 scr_forwardindex ();
3115 break; 2627 break;
3116#endif 2628#endif
3117 case '=': 2629 case '=':
… …
3232rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
3233{ 2745{
3234 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
3235 unsigned int nargs, p; 2747 unsigned int nargs, p;
3236 int n, ndef; 2748 int n, ndef;
3237 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
3238 2750
3239 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
3240 arg[--nargs] = 0;
3241 2752
3242 priv = 0; 2753 priv = 0;
3243 ch = cmd_getc (); 2754 ch = cmd_getc ();
3244 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
2756 {
3245 { /* '<' '=' '>' '?' */ 2757 /* '<' '=' '>' '?' */
3246 priv = ch; 2758 priv = ch;
3247 ch = cmd_getc (); 2759 ch = cmd_getc ();
3248 } 2760 }
3249 2761
3250 /* read any numerical arguments */ 2762 /* read any numerical arguments */
… …
3289 switch (priv) 2801 switch (priv)
3290 { 2802 {
3291 case '>': 2803 case '>':
3292 if (ch == CSI_DA) /* secondary device attributes */ 2804 if (ch == CSI_DA) /* secondary device attributes */
3293 { 2805 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2806 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2807 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296 // 2808 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2809 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2810 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3299 // that we do not support xterm mouse reporting (should be 95 when we do). 2811 // versions.
3300 // 2812 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2813 tt_printf ("\033[>%d;95;0c", 'U');
3302 } 2814 }
3303 break; 2815 break;
3304 case '?': 2816 case '?':
3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3306 process_terminal_mode (ch, priv, nargs, arg); 2818 process_terminal_mode (ch, priv, nargs, arg);
… …
3433 break; 2945 break;
3434 case 6: /* CPR requested */ 2946 case 6: /* CPR requested */
3435 scr_report_position (); 2947 scr_report_position ();
3436 break; 2948 break;
3437 case 7: /* unofficial extension */ 2949 case 7: /* unofficial extension */
3438 if (OPTION (Opt_insecure)) 2950 if (option (Opt_insecure))
3439 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2951 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3440 break; 2952 break;
3441 case 8: /* unofficial extension */ 2953 case 8: /* unofficial extension */
3442 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2954 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3443 break; 2955 break;
… …
3510 break; 3022 break;
3511 case CSI_75: 3023 case CSI_75:
3512 scr_cursor (RESTORE); 3024 scr_cursor (RESTORE);
3513 break; 3025 break;
3514 3026
3515#if ENABLE_FRILLS 3027#if !ENABLE_MINIMAL
3516 case CSI_74: 3028 case CSI_74:
3517 process_window_ops (arg, nargs); 3029 process_window_ops (arg, nargs);
3518 break; 3030 break;
3519#endif 3031#endif
3520 3032
… …
3527 break; 3039 break;
3528 } 3040 }
3529} 3041}
3530/*}}} */ 3042/*}}} */
3531 3043
3532#if ENABLE_FRILLS 3044#if !ENABLE_MINIMAL
3533/* ARGSUSED */ 3045/* ARGSUSED */
3534void 3046void
3535rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3047rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536{ 3048{
3537 int x, y; 3049 int x, y;
3538 XWindowAttributes wattr; 3050 XWindowAttributes wattr;
3539 Window wdummy; 3051 Window wdummy;
3540 dDisp; 3052
3053 dLocal (Display *, dpy);
3541 3054
3542 if (nargs == 0) 3055 if (nargs == 0)
3543 return; 3056 return;
3544 3057
3545 switch (args[0]) 3058 switch (args[0])
3546 { 3059 {
3547 /* 3060 /*
3548 * commands 3061 * commands
3549 */ 3062 */
3550 case 1: /* deiconify window */ 3063 case 1: /* deiconify window */
3551 XMapWindow (disp, parent[0]); 3064 XMapWindow (dpy, parent[0]);
3552 break; 3065 break;
3553 case 2: /* iconify window */ 3066 case 2: /* iconify window */
3554 XIconifyWindow (disp, parent[0], display->screen); 3067 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3068 break;
3556 case 3: /* set position (pixels) */ 3069 case 3: /* set position (pixels) */
3557 XMoveWindow (disp, parent[0], args[1], args[2]); 3070 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3071 break;
3559 case 4: /* set size (pixels) */ 3072 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3073 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3074 break;
3562 case 5: /* raise window */ 3075 case 5: /* raise window */
3563 XRaiseWindow (disp, parent[0]); 3076 XRaiseWindow (dpy, parent[0]);
3564 break; 3077 break;
3565 case 6: /* lower window */ 3078 case 6: /* lower window */
3566 XLowerWindow (disp, parent[0]); 3079 XLowerWindow (dpy, parent[0]);
3567 break; 3080 break;
3568 case 7: /* refresh window */ 3081 case 7: /* refresh window */
3569 scr_touch (true); 3082 scr_touch (true);
3570 break; 3083 break;
3571 case 8: /* set size (chars) */ 3084 case 8: /* set size (chars) */
… …
3578 if (args[0] >= 24) /* set height (chars) */ 3091 if (args[0] >= 24) /* set height (chars) */
3579 set_widthheight ((unsigned int)width, 3092 set_widthheight ((unsigned int)width,
3580 (unsigned int) (args[1] * fheight)); 3093 (unsigned int) (args[1] * fheight));
3581 break; 3094 break;
3582 3095
3583
3584 /* 3096 /*
3585 * reports - some output format copied from XTerm 3097 * reports - some output format copied from XTerm
3586 */ 3098 */
3587 case 11: /* report window state */ 3099 case 11: /* report window state */
3588 XGetWindowAttributes (disp, parent[0], &wattr); 3100 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3101 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590 break; 3102 break;
3591 case 13: /* report window position */ 3103 case 13: /* report window position */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 XTranslateCoordinates (disp, parent[0], wattr.root, 3105 XTranslateCoordinates (dpy, parent[0], wattr.root,
3594 -wattr.border_width, -wattr.border_width, 3106 -wattr.border_width, -wattr.border_width,
3595 &x, &y, &wdummy); 3107 &x, &y, &wdummy);
3596 tt_printf ("\033[3;%d;%dt", x, y); 3108 tt_printf ("\033[3;%d;%dt", x, y);
3597 break; 3109 break;
3598 case 14: /* report window size (pixels) */ 3110 case 14: /* report window size (pixels) */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3111 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3112 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601 break; 3113 break;
3602 case 18: /* report text area size (chars) */ 3114 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3115 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break; 3116 break;
… …
3606 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3118 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607 break; 3119 break;
3608 case 20: /* report icon label */ 3120 case 20: /* report icon label */
3609 { 3121 {
3610 char *s; 3122 char *s;
3611 XGetIconName (disp, parent[0], &s); 3123 XGetIconName (dpy, parent[0], &s);
3612 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3124 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3613 XFree (s); 3125 XFree (s);
3614 } 3126 }
3615 break; 3127 break;
3616 case 21: /* report window title */ 3128 case 21: /* report window title */
3617 { 3129 {
3618 char *s; 3130 char *s;
3619 XFetchName (disp, parent[0], &s); 3131 XFetchName (dpy, parent[0], &s);
3620 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3132 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3133 XFree (s);
3622 } 3134 }
3623 break; 3135 break;
3624 } 3136 }
3625} 3137}
… …
3652 seen_esc = true; 3164 seen_esc = true;
3653 continue; 3165 continue;
3654 } 3166 }
3655 else if (ch == C0_BEL || ch == CHAR_ST) 3167 else if (ch == C0_BEL || ch == CHAR_ST)
3656 break; 3168 break;
3169 else if (ch == C0_SYN)
3170 ch = cmd_get8 ();
3657 else if (ch < 0x20) 3171 else if (ch < 0x20)
3658 return NULL; /* other control character - exit */ 3172 return NULL; /* other control character - exit */
3659 3173
3660 seen_esc = false; 3174 seen_esc = false;
3661 3175
3662 if (n >= STRING_MAX - 1) 3176 if (n >= STRING_MAX - 1)
3663 // stop at some sane length 3177 // stop at some sane length
3664 return NULL; 3178 return NULL;
3665 3179
3666 if (ch == C0_SYN)
3667 string[n++] = cmd_get8 ();
3668 else
3669 string[n++] = ch; 3180 string[n++] = ch;
3670 } 3181 }
3671 3182
3672 string[n++] = '\0'; 3183 string[n++] = '\0';
3673 3184
3674 ends_how = (ch == 0x5c ? C0_ESC : ch); 3185 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3725void 3236void
3726rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3237rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727{ 3238{
3728 if (str[0] == '?' && !str[1]) 3239 if (str[0] == '?' && !str[1])
3729 { 3240 {
3730 unsigned short r, g, b; 3241 rgba c;
3731 pix_colors_focused[color].get (display, r, g, b); 3242 pix_colors_focused[color].get (c);
3243
3244#if XFT
3245 if (c.a != rgba::MAX_CC)
3246 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3247 else
3248#endif
3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3249 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733 } 3250 }
3734 else 3251 else
3735 set_window_color (color, str); 3252 set_window_color (color, str);
3736} 3253}
3737 3254
… …
3743{ 3260{
3744 int color; 3261 int color;
3745 char *buf, *name; 3262 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3263 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3264 int saveop = op;
3748 dDisp; 3265
3266 dLocal (Display *, dpy);
3749 3267
3750 assert (str != NULL); 3268 assert (str != NULL);
3269
3270 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3271 return;
3272
3751 switch (op) 3273 switch (op)
3752 { 3274 {
3753 case XTerm_name: 3275 case XTerm_name:
3754 set_title (str); 3276 set_title (str);
3755 /* FALLTHROUGH */ 3277 /* FALLTHROUGH */
… …
3769 unsigned long bytes_after; 3291 unsigned long bytes_after;
3770 unsigned char *value = 0; 3292 unsigned char *value = 0;
3771 const char *str = ""; 3293 const char *str = "";
3772 3294
3773 if (prop 3295 if (prop
3774 && XGetWindowProperty (disp, parent[0], 3296 && XGetWindowProperty (dpy, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3297 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3298 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3299 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3300 && actual_type != None
3779 && actual_format == 8) 3301 && actual_format == 8)
3780 str = (const char *)(value); 3302 str = (const char *)(value);
3781 3303
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3304 tt_printf ("\033]%d;%s%c", op, str, resp);
3783 3305
3784 XFree (value); 3306 XFree (value);
3785 } 3307 }
3786 else 3308 else
3787 { 3309 {
… …
3791 { 3313 {
3792 *eq = 0; 3314 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3315 set_utf8_property (display->atom (str), eq + 1);
3794 } 3316 }
3795 else 3317 else
3796 XDeleteProperty (disp, parent[0], 3318 XDeleteProperty (dpy, parent[0],
3797 display->atom (str)); 3319 display->atom (str));
3798 } 3320 }
3799 break; 3321 break;
3800 3322
3801 case XTerm_Color: 3323 case XTerm_Color:
… …
3811 break; 3333 break;
3812 3334
3813 if ((buf = strchr (name, ';')) != NULL) 3335 if ((buf = strchr (name, ';')) != NULL)
3814 *buf++ = '\0'; 3336 *buf++ = '\0';
3815 3337
3816 if (name[0] == '?' && !name[1]) 3338 process_color_seq (op, color, name, resp);
3817 {
3818 unsigned short r, g, b;
3819 pix_colors_focused[color].get (display, r, g, b);
3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821 }
3822 else
3823 set_window_color (color, name);
3824 } 3339 }
3825 break; 3340 break;
3826 case XTerm_Color00: 3341 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3342 process_color_seq (op, Color_fg, str, resp);
3828 break; 3343 break;
3829 case XTerm_Color01: 3344 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3345 process_color_seq (op, Color_bg, str, resp);
3831 break; 3346 break;
3832#ifndef NO_CURSORCOLOR 3347#ifndef NO_CURSORCOLOR
3833 case XTerm_Color_cursor: 3348 case XTerm_Color_cursor:
3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3349 process_color_seq (op, Color_cursor, str, resp);
3835 break; 3350 break;
3836#endif 3351#endif
3837 case XTerm_Color_pointer_fg: 3352 case XTerm_Color_pointer_fg:
3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3353 process_color_seq (op, Color_pointer_fg, str, resp);
3839 break; 3354 break;
3840 case XTerm_Color_pointer_bg: 3355 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3356 process_color_seq (op, Color_pointer_bg, str, resp);
3842 break; 3357 break;
3843#ifndef NO_BOLD_UNDERLINE_REVERSE 3358#ifndef NO_BOLD_UNDERLINE_REVERSE
3844 case XTerm_Color_RV: 3359 case XTerm_Color_RV:
3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3360 process_color_seq (op, Color_RV, str, resp);
3846 break; 3361 break;
3847 case Rxvt_Color_BD: 3362 case Rxvt_Color_BD:
3848 case URxvt_Color_BD: 3363 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp); 3364 process_color_seq (op, Color_BD, str, resp);
3850 break; 3365 break;
3851 case Rxvt_Color_UL: 3366 case Rxvt_Color_UL:
3852 case URxvt_Color_UL: 3367 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp); 3368 process_color_seq (op, Color_UL, str, resp);
3854 break; 3369 break;
3855 case URxvt_Color_IT: 3370 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3371 process_color_seq (op, Color_IT, str, resp);
3857 break; 3372 break;
3858#endif 3373#endif
3859#if TRANSPARENT && TINTING 3374#if ENABLE_TRANSPARENCY
3860 case URxvt_Color_tint: 3375 case URxvt_Color_tint:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3376 process_color_seq (op, Color_tint, str, resp);
3862 check_our_parents (); 3377 {
3863 if (am_transparent) 3378 bool changed = false;
3864 want_full_refresh = want_refresh = 1; 3379 if (ISSET_PIXCOLOR (Color_tint))
3865 break; 3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3866#endif 3381 else
3382 changed = bgPixmap.unset_tint ();
3383 if (changed)
3384 update_background ();
3385 }
3867 3386
3387 break;
3388#endif
3389
3390#if BG_IMAGE_FROM_FILE
3868 case Rxvt_Pixmap: 3391 case Rxvt_Pixmap:
3869 { 3392 if (!strcmp (str, "?"))
3870 if (*str != ';')
3871 { 3393 {
3872#if XPM_BACKGROUND 3394 char str[256];
3873 scale_pixmap (""); /* reset to default scaling */ 3395
3874 set_bgPixmap (str); /* change pixmap */ 3396 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3875 scr_touch (true); 3397 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3876#endif 3398 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3399 process_xterm_seq (XTerm_title, str, CHAR_ST);
3877 } 3400 }
3878 3401 else
3402 {
3879 int changed = 0; 3403 int changed = 0;
3880 3404
3881 while ((str = strchr (str, ';')) != NULL) 3405 if (*str != ';')
3882 { 3406 {
3407 /* reset to default scaling :*/
3408 bgPixmap.unset_geometry ();
3409 if (bgPixmap.set_file (str)) /* change pixmap */
3410 changed++;
3411 str = strchr (str, ';');
3412 if (str == NULL)
3413 bgPixmap.set_defaultGeometry ();
3414 }
3415 while (str)
3416 {
3883 str++; 3417 str++;
3884#if XPM_BACKGROUND 3418 if (bgPixmap.set_geometry (str))
3885 changed += scale_pixmap (str); 3419 changed++;
3886#endif 3420 str = strchr (str, ';');
3887 } 3421 }
3888
3889 if (changed) 3422 if (changed)
3890 { 3423 update_background ();
3891#ifdef XPM_BACKGROUND
3892 resize_pixmap ();
3893 scr_touch (true);
3894#endif
3895 } 3424 }
3896 }
3897 break; 3425 break;
3426#endif
3898 3427
3899 case Rxvt_restoreFG: 3428 case Rxvt_restoreFG:
3900 set_window_color (Color_fg, str); 3429 set_window_color (Color_fg, str);
3901 break; 3430 break;
3902 case Rxvt_restoreBG: 3431 case Rxvt_restoreBG:
… …
3927 case URxvt_italicFont: 3456 case URxvt_italicFont:
3928 case URxvt_boldItalicFont: 3457 case URxvt_boldItalicFont:
3929#endif 3458#endif
3930 if (query) 3459 if (query)
3931 tt_printf ("\33]%d;%-.250s%c", saveop, 3460 tt_printf ("\33]%d;%-.250s%c", saveop,
3932 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3461 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3933 ? fontset[op - URxvt_font]->fontdesc : "", 3462 ? fontset[op - URxvt_font]->fontdesc : "",
3934 resp); 3463 resp);
3935 else 3464 else
3936 { 3465 {
3937 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3466 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3940 allocated.push_back ((void *)res); 3469 allocated.push_back ((void *)res);
3941 set_fonts (); 3470 set_fonts ();
3942 } 3471 }
3943 break; 3472 break;
3944 3473
3945#if ENABLE_FRILLS 3474 case URxvt_version:
3475 if (query)
3476 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3477 op,
3478 rs[Rs_name], VERSION[0], VERSION[2],
3479 resp);
3480 break;
3481
3482#if !ENABLE_MINIMAL
3946 case URxvt_locale: 3483 case URxvt_locale:
3947 if (query) 3484 if (query)
3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3485 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3949 else 3486 else
3950 { 3487 {
3951 set_locale (str); 3488 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8); 3489 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale (); 3490 init_xlocale ();
… …
3968 break; 3505 break;
3969#endif 3506#endif
3970 3507
3971#if ENABLE_PERL 3508#if ENABLE_PERL
3972 case URxvt_perl: 3509 case URxvt_perl:
3973 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3510 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3974 ; // no responses yet 3511 ; // no responses yet
3975 break; 3512 break;
3976#endif 3513#endif
3977 } 3514 }
3978} 3515}
… …
4016{ 3553{
4017 unsigned int i, j; 3554 unsigned int i, j;
4018 int state; 3555 int state;
4019 3556
4020 static const struct 3557 static const struct
4021 { 3558 {
4022 const int argval; 3559 const int argval;
4023 const unsigned long bit; 3560 const unsigned long bit;
4024 }
4025
4026 argtopriv[] = { 3561 } argtopriv[] = {
4027 { 1, PrivMode_aplCUR }, 3562 { 1, PrivMode_aplCUR },
4028 { 2, PrivMode_vt52 }, 3563 { 2, PrivMode_vt52 },
4029 { 3, PrivMode_132 }, 3564 { 3, PrivMode_132 },
4030 { 4, PrivMode_smoothScroll }, 3565 { 4, PrivMode_smoothScroll },
4031 { 5, PrivMode_rVideo }, 3566 { 5, PrivMode_rVideo },
… …
4047 { 66, PrivMode_aplKP }, 3582 { 66, PrivMode_aplKP },
4048#ifndef NO_BACKSPACE_KEY 3583#ifndef NO_BACKSPACE_KEY
4049 { 67, PrivMode_BackSpace }, 3584 { 67, PrivMode_BackSpace },
4050#endif 3585#endif
4051 { 1000, PrivMode_MouseX11 }, 3586 { 1000, PrivMode_MouseX11 },
4052 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
4053 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
4054 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4055 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4056 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
4057 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
4058 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
4059 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
4094 scr_touch (true); 3628 scr_touch (true);
4095 break; 3629 break;
4096#endif 3630#endif
4097 case 1048: /* alternative cursor save */ 3631 case 1048: /* alternative cursor save */
4098 case 1049: 3632 case 1049:
4099 if (OPTION (Opt_secondaryScreen)) 3633 if (option (Opt_secondaryScreen))
4100 if (mode == 0) 3634 if (mode == 0)
4101 scr_cursor (RESTORE); 3635 scr_cursor (RESTORE);
4102 else if (mode == 1) 3636 else if (mode == 1)
4103 scr_cursor (SAVE); 3637 scr_cursor (SAVE);
4104 break; 3638 break;
… …
4133 scr_autowrap (state); 3667 scr_autowrap (state);
4134 break; 3668 break;
4135 /* case 8: - auto repeat, can't do on a per window basis */ 3669 /* case 8: - auto repeat, can't do on a per window basis */
4136 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
4137 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
4138 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4139 break; 3673 break;
4140#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
4141 case scrollBar_esc: 3675 case scrollBar_esc:
4142 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
4143 { 3677 {
… …
4156 break; 3690 break;
4157 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
4158 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
4159 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
4160 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4161 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4162 break; 3696 break;
4163#if 0
4164 case 1001: 3697 case 1002:
4165 break; /* X11 mouse highlighting */ 3698 case 1003:
4166#endif 3699 if (state)
3700 {
3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3703 vt_emask_mouse = PointerMotionMask;
3704 }
3705 else
3706 vt_emask_mouse = NoEventMask;
3707 vt_select_input ();
3708 break;
4167 case 1010: /* scroll to bottom on TTY output inhibit */ 3709 case 1010: /* scroll to bottom on TTY output inhibit */
4168 set_option (Opt_scrollTtyOutput, !state); 3710 set_option (Opt_scrollTtyOutput, !state);
4169 break; 3711 break;
4170 case 1011: /* scroll to bottom on key press */ 3712 case 1011: /* scroll to bottom on key press */
4171 set_option (Opt_scrollTtyKeypress, state); 3713 set_option (Opt_scrollTtyKeypress, state);
4172 break; 3714 break;
4173 case 1047: /* secondary screen w/ clearing last */ 3715 case 1047: /* secondary screen w/ clearing last */
4174 if (OPTION (Opt_secondaryScreen)) 3716 if (option (Opt_secondaryScreen))
4175 if (current_screen != PRIMARY) 3717 if (current_screen != PRIMARY)
4176 scr_erase_screen (2); 3718 scr_erase_screen (2);
4177 scr_change_screen (state); 3719 scr_change_screen (state);
4178 break; 3720 break;
4179 case 1049: /* secondary screen w/ clearing first */ 3721 case 1049: /* secondary screen w/ clearing first */
4180 scr_change_screen (state); 3722 scr_change_screen (state);
4181 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4182 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4183 scr_erase_screen (2); 3725 scr_erase_screen (2);
4184 break; 3726 break;
4185 default: 3727 default:
4186 break; 3728 break;
… …
4314 scr_color (Color_bg, Color_bg); 3856 scr_color (Color_bg, Color_bg);
4315 break; 3857 break;
4316 3858
4317 //case 50: // not variable spacing 3859 //case 50: // not variable spacing
4318 3860
4319#if ENABLE_FRILLS 3861#if !ENABLE_MINIMAL
4320 case 90: 3862 case 90:
4321 case 91: /* set bright fg color */ 3863 case 91: /* set bright fg color */
4322 case 92: 3864 case 92:
4323 case 93: 3865 case 93:
4324 case 94: 3866 case 94:
… …
4348rxvt_term::process_graphics () 3890rxvt_term::process_graphics ()
4349{ 3891{
4350 unicode_t ch, cmd = cmd_getc (); 3892 unicode_t ch, cmd = cmd_getc ();
4351 3893
4352 if (cmd == 'Q') 3894 if (cmd == 'Q')
3895 {
4353 { /* query graphics */ 3896 /* query graphics */
4354 tt_printf ("\033G0\012"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
4355 return; 3898 return;
4356 } 3899 }
4357 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
4358 do 3901 do
… …
4408 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4409 3952
4410 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
4411 v_buflen += len; 3954 v_buflen += len;
4412 3955
4413 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
4414} 3957}
4415 3958
4416void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4417{ 3960{
4418 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3961 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4423 3966
4424 if (v_buflen == 0) 3967 if (v_buflen == 0)
4425 { 3968 {
4426 free (v_buffer); 3969 free (v_buffer);
4427 v_buffer = 0; 3970 v_buffer = 0;
4428 v_buflen = 0;
4429 3971
4430 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4431 return; 3973 return;
4432 } 3974 }
4433 3975
4434 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4435 } 3977 }
4436 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4437 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4438} 3980}
4439 3981
4440/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4441 3983

Diff Legend

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