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.304 by root, Tue Jan 31 22:01:25 2006 UTC vs.
Revision 1.398 by root, Sat Jan 26 12:12:37 2008 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 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * 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 34 * 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 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
203 203
204 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
206 206
207 if (y >= 0) 207 if (y >= 0)
208 { 208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
221 ch = *chr++; 221 ch = *chr++;
222 222
223 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
226# if !UNICODE3 226# if !UNICODE_3
227 if (ch >= 0x10000) 227 if (ch >= 0x10000)
228 ch = 0xfffd; 228 ch = 0xfffd;
229# endif 229# endif
230 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231 231
… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303/*{{{ Convert the keypress event into a string */
304void 303void
305rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
306{ 305{
307 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
308 unsigned int newlen; 307 unsigned int newlen;
309 KeySym keysym; 308 KeySym keysym;
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
496# if ISO_14755 500# if ISO_14755
497 iso14755_51 (0); 501 iso14755_51 (0);
498# endif 502# endif
499 return; 503 return;
500 } 504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
511 return;
512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
505# if ISO_14755 517# if ISO_14755
… …
507# endif 519# endif
508 return; 520 return;
509 } 521 }
510 else 522 else
511 { 523 {
512# if ENABLE_OVERLAY 524# if ISO_14755
513 scr_overlay_off (); 525 scr_overlay_off ();
514# endif 526# endif
515 iso14755buf = 0; 527 iso14755buf = 0;
516 } 528 }
517 } 529 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
521 { 533 {
522 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 535# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 538# endif
527 } 539 }
528#endif 540#endif
529 541
530#ifdef PRINTPIPE 542#ifdef PRINTPIPE
531 if (keysym == XK_Print) 543 if (keysym == XK_Print)
532 { 544 {
533 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
534 return; 546 return;
… …
536#endif 548#endif
537 549
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 551 {
540 { 552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 554 newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 };
572
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
542 switch (keysym) 585 switch (keysym)
543 { 586 {
544#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 588 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 589 if (priv_modes & PrivMode_HaveBackSpace)
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 592 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 593 kbuf[1] = '\0';
551 } 594 }
552 else 595 else
553 strcpy (kbuf, key_backspace); 596 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 597 break;
555#endif 598#endif
556#ifndef NO_DELETE_KEY 599#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete: 600 case XK_Delete:
568 strcpy (kbuf, key_delete); 601 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 602 break;
570#endif 603#endif
571 case XK_Tab: 604 case XK_Tab:
572 if (shft) 605 if (shft)
573 strcpy (kbuf, "\033[Z"); 606 strcpy (kbuf, "\033[Z");
… …
583#endif 616#endif
584 newlen = 0; 617 newlen = 0;
585 } 618 }
586 break; 619 break;
587 620
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */ 621 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 622 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 623 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 624 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 625 strcpy (kbuf, "\033[Z");
… …
618 else if (priv_modes & PrivMode_aplCUR) 635 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 636 kbuf[1] = 'O';
620 break; 637 break;
621 638
622#ifndef UNSHIFTED_SCROLLKEYS 639#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior: 640 case XK_Prior:
634 strcpy (kbuf, "\033[5~"); 641 strcpy (kbuf, "\033[5~");
635 break; 642 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next: 643 case XK_Next:
647 strcpy (kbuf, "\033[6~"); 644 strcpy (kbuf, "\033[6~");
648 break; 645 break;
649#endif 646#endif
650 case XK_KP_Enter: 647 case XK_KP_Enter:
651 /* allow shift to override */ 648 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 649 if (kp)
653 { 650 {
654 strcpy (kbuf, "\033OM"); 651 strcpy (kbuf, "\033OM");
655 break; 652 break;
656 } 653 }
657 654
… …
669 kbuf[0] = '\015'; 666 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 667 kbuf[1] = '\0';
671 } 668 }
672 break; 669 break;
673 670
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */ 671 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 672 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 673 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 674 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 675 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 691 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 692 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 693 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 694 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 695 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 696 if (kp)
706 { 697 {
707 strcpy (kbuf, "\033Oj"); 698 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 699 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 700 }
710 else 701 else
… …
716 707
717 case XK_Find: 708 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 709 strcpy (kbuf, "\033[1~");
719 break; 710 break;
720 711
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert: 712 case XK_Insert:
732 strcpy (kbuf, "\033[2~"); 713 strcpy (kbuf, "\033[2~");
733 break; 714 break;
734#ifdef DXK_Remove /* support for DEC remove like key */ 715#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove: 716 case DXK_Remove:
… …
739 strcpy (kbuf, "\033[3~"); 720 strcpy (kbuf, "\033[3~");
740 break; 721 break;
741 case XK_Select: 722 case XK_Select:
742 strcpy (kbuf, "\033[4~"); 723 strcpy (kbuf, "\033[4~");
743 break; 724 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End: 725 case XK_End:
755 strcpy (kbuf, KS_END); 726 strcpy (kbuf, KS_END);
756 break; 727 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home: 728 case XK_Home:
768 strcpy (kbuf, KS_HOME); 729 strcpy (kbuf, KS_HOME);
769 break; 730 break;
770 731
771#define FKEY(n, fkey) \ 732#define FKEY(n, fkey) \
… …
873 return; 834 return;
874 835
875 if (len <= 0) 836 if (len <= 0)
876 return; /* not mapped */ 837 return; /* not mapped */
877 838
878 if (OPTION (Opt_scrollTtyKeypress)) 839 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 840 if (view_start)
880 { 841 {
881 view_start = 0; 842 view_start = 0;
882 want_refresh = 1; 843 want_refresh = 1;
883 } 844 }
… …
907 tt_write (&ch, 1); 868 tt_write (&ch, 1);
908 } 869 }
909 870
910 tt_write (kbuf, (unsigned int)len); 871 tt_write (kbuf, (unsigned int)len);
911} 872}
912/*}}} */ 873
874void
875rxvt_term::key_release (XKeyEvent &ev)
876{
877#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
878 KeySym keysym;
879
880 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
881#endif
882
883#if ENABLE_FRILLS || ISO_14755
884 // ISO 14755 support
885 if (iso14755buf)
886 if (iso14755buf & ISO_14755_52)
887 {
888# if ISO_14755
889 scr_overlay_off ();
890# endif
891# if ISO_14755
892 // iso14755 part 5.2 handling: release time
893 // first: controls
894 if ((ev.state & ControlMask)
895 && ((keysym >= 0x40 && keysym <= 0x5f)
896 || (keysym >= 0x61 && keysym <= 0x7f)))
897 {
898 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
899 commit_iso14755 ();
900
901 return;
902 }
903
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
905 if (i[0] == keysym)
906 {
907 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 ();
909
910 return;
911 }
912
913 scr_bell ();
914# endif
915 iso14755buf = 0;
916
917 return;
918 }
919 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
920 {
921# if ISO_14755
922 scr_overlay_off ();
923# endif
924 if (iso14755buf & ISO_14755_51)
925 commit_iso14755 ();
926#if ISO_14755
927 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
928 {
929 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
930
931 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
932 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
933 }
934# endif
935 else
936 iso14755buf = 0;
937 }
938#endif
939
940 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
941 return;
942
943#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
944 if (!(ev.state & ControlMask))
945 slip_wheel_ev.stop ();
946 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0;
948#endif
949}
913 950
914#if defined (KEYSYM_RESOURCE) 951#if defined (KEYSYM_RESOURCE)
915unsigned int 952unsigned int
916rxvt_term::cmd_write (const char *str, unsigned int count) 953rxvt_term::cmd_write (const char *str, unsigned int count)
917{ 954{
… …
947void 984void
948rxvt_term::flush () 985rxvt_term::flush ()
949{ 986{
950 flush_ev.stop (); 987 flush_ev.stop ();
951 988
952#ifdef TRANSPARENT 989#ifdef HAVE_BG_PIXMAP
953 if (want_full_refresh) 990 if (bgPixmap.check_clearChanged ())
954 { 991 {
955 want_full_refresh = 0; 992// scr_clear (true); This needs to be researched further!
956 scr_clear ();
957 scr_touch (false); 993 scr_touch (false);
958 } 994 }
959#endif 995#endif
960 996
961 if (want_refresh) 997 if (want_refresh)
… …
1006 } 1042 }
1007 1043
1008 display->flush (); 1044 display->flush ();
1009} 1045}
1010 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
1011void 1048void
1012rxvt_term::check_cb (check_watcher &w) 1049rxvt_term::refresh_check ()
1050{
1051 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1053
1054 display->flush ();
1055}
1056
1057void
1058rxvt_term::flush_cb (ev::timer &w, int revents)
1013{ 1059{
1014 make_current (); 1060 make_current ();
1015 1061
1016 display->flush ();
1017
1018 if (want_refresh && !flush_ev.active)
1019 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1020}
1021
1022void
1023rxvt_term::flush_cb (time_watcher &w)
1024{
1025 make_current ();
1026
1027 refresh_limit = 1;
1028 refresh_count = 0; 1062 refresh_count = 0;
1029 flush (); 1063 flush ();
1030} 1064}
1031 1065
1032#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1033void 1067void
1034rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1035{ 1069{
1036 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1037 want_refresh = 1; 1071 want_refresh = 1;
1038 1072 refresh_check ();
1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
1040} 1073}
1041#endif 1074#endif
1042 1075
1043#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1044void 1077void
1045rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
1046{ 1079{
1047 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1048 { 1081 {
1049 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1050 want_refresh = 1; 1083 want_refresh = 1;
1051 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
1052 } 1085 }
1086 else
1087 w.stop ();
1053} 1088}
1054#endif 1089#endif
1055 1090
1056#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1057void 1092void
1058rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1059{ 1094{
1060 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
1061 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1062 { 1097 {
1063 want_refresh = 1; 1098 want_refresh = 1;
1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1065 } 1100 }
1101 else
1102 w.stop ();
1066} 1103}
1067#endif 1104#endif
1068 1105
1069#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1070void 1107void
1071rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1072{ 1109{
1073 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1074 { 1111 {
1075 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1076 want_refresh = 1; 1113 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1078 } 1115 }
1116 else
1117 w.stop ();
1079} 1118}
1080#endif 1119#endif
1081 1120
1082#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1083void 1122void
1084rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1085{ 1124{
1086 if (mouse_slip_wheel_speed == 0 1125 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1087 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1088 : scr_page (UP, mouse_slip_wheel_speed))
1089 { 1126 {
1090 if (view_start == top_row || view_start == 0)
1091 mouse_slip_wheel_speed = 0;
1092
1093 want_refresh = 1; 1127 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1132 {
1133 mouse_slip_wheel_speed = 0;
1134 w.stop ();
1095 } 1135 }
1096} 1136}
1097#endif 1137#endif
1098 1138
1099#if LINUX_YIELD_HACK 1139#if LINUX_YIELD_HACK
1100static struct event_handler 1140static struct event_handler
1101{ 1141{
1102 check_watcher yield_ev; 1142 ev::prepare yield_ev;
1103 1143
1104 void yield_cb (check_watcher &w) 1144 void yield_cb (ev::prepare &w, int revents)
1105 { 1145 {
1106 // this should really be sched_yield(), but the linux guys thought 1146 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than 1147 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels is a useful thing to do. It surely is is 1148 // ones with high nice levels is a useful thing to do. It surely is is
1109 // allowed by the sus... as is returning ENOSYS. 1149 // allowed by the sus... as is returning ENOSYS.
… …
1152 } 1192 }
1153 else 1193 else
1154 { 1194 {
1155 pty_ev.stop (); 1195 pty_ev.stop ();
1156 1196
1157 if (!OPTION (Opt_hold)) 1197 if (!option (Opt_hold))
1158 destroy (); 1198 destroy ();
1159 } 1199 }
1160 1200
1161 return false; 1201 return false;
1162} 1202}
1163 1203
1164void 1204void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1205rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1206{
1167 make_current (); 1207 make_current ();
1168 1208
1169 if (revents & EVENT_READ) 1209 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1210 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1211 while (pty_fill ())
1172 if (cmd_parse ()) 1212 if (cmd_parse ())
1173 break; 1213 break;
1174 1214
1175 if (revents & EVENT_WRITE) 1215 if (revents & ev::WRITE)
1176 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1177} 1219}
1178 1220
1179void 1221void
1180rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1181{ 1223{
1182 XDefineCursor (xdisp, vt, TermWin_cursor); 1224 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1225 recolour_cursor ();
1184 1226
1185#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1228 hidden_pointer = 0;
1187 1229
1188 if (OPTION (Opt_pointerBlank)) 1230 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1231 pointer_ev.start (pointerBlankDelay);
1190#endif 1232#endif
1191} 1233}
1192 1234
1193#ifdef POINTER_BLANK 1235#ifdef POINTER_BLANK
1194void 1236void
1195rxvt_term::pointer_blank () 1237rxvt_term::pointer_blank ()
1196{ 1238{
1197 if (!OPTION (Opt_pointerBlank)) 1239 if (!option (Opt_pointerBlank))
1198 return; 1240 return;
1199 1241
1200 XDefineCursor (xdisp, vt, display->blank_cursor); 1242 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (xdisp); 1243 XFlush (dpy);
1202 1244
1203 hidden_pointer = 1; 1245 hidden_pointer = 1;
1204} 1246}
1205 1247
1206void 1248void
1207rxvt_term::pointer_cb (time_watcher &w) 1249rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1250{
1209 make_current (); 1251 make_current ();
1210 1252
1211 pointer_blank (); 1253 pointer_blank ();
1212} 1254}
… …
1215void 1257void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1258rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1259{
1218 int button_number, key_state = 0; 1260 int button_number, key_state = 0;
1219 int x, y; 1261 int x, y;
1262 int code = 32;
1220 1263
1221 x = ev.x; 1264 x = Pixel2Col (ev.x);
1222 y = ev.y; 1265 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1266 if (ev.type == MotionNotify)
1267 {
1268 if (x == mouse_row && y == mouse_col)
1269 return;
1270 mouse_row = x;
1271 mouse_col = y;
1272 code += 32;
1273 }
1224 1274
1225 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1226 button_number = 3; 1276 button_number = 3;
1227 else 1277 else
1228 { 1278 {
… …
1274 x + 1, 1324 x + 1,
1275 y + 1); 1325 y + 1);
1276#endif 1326#endif
1277 1327
1278 tt_printf ("\033[M%c%c%c", 1328 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1329 (code + button_number + key_state),
1280 (32 + x + 1), 1330 (32 + x + 1),
1281 (32 + y + 1)); 1331 (32 + y + 1));
1282} 1332}
1283 1333
1284/*{{{ process an X event */ 1334/*{{{ process an X event */
1285void 1335void
1286rxvt_term::x_cb (XEvent &ev) 1336rxvt_term::x_cb (XEvent &ev)
1287{ 1337{
1288 make_current (); 1338 make_current ();
1289 1339
1290 dLocal (Display *, xdisp); 1340 dLocal (Display *, dpy);
1291 1341
1292 if (ev.xany.window == vt 1342 if (ev.xany.window == vt
1293 && SHOULD_INVOKE (HOOK_X_EVENT) 1343 && SHOULD_INVOKE (HOOK_X_EVENT)
1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1344 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1295 return; 1345 return;
… …
1300 unsigned int unused_mask; 1350 unsigned int unused_mask;
1301 1351
1302 switch (ev.type) 1352 switch (ev.type)
1303 { 1353 {
1304 case KeyPress: 1354 case KeyPress:
1305#if ISO_14755 1355 key_press (ev.xkey);
1306 if (!(iso14755buf & ISO_14755_52))
1307#endif
1308 lookup_key (ev.xkey);
1309
1310 break; 1356 break;
1311 1357
1312 case KeyRelease: 1358 case KeyRelease:
1313 { 1359 key_release (ev.xkey);
1314#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1315 KeySym keysym;
1316
1317 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1318#endif
1319
1320#if ENABLE_FRILLS || ISO_14755
1321 // ISO 14755 support
1322 if (iso14755buf)
1323 if (iso14755buf & ISO_14755_52)
1324 {
1325# if ENABLE_OVERLAY
1326 scr_overlay_off ();
1327# endif
1328# if ISO_14755
1329 // iso14755 part 5.2 handling: release time
1330 // first: controls
1331 if ((ev.xkey.state & ControlMask)
1332 && ((keysym >= 0x40 && keysym <= 0x5f)
1333 || (keysym >= 0x61 && keysym <= 0x7f)))
1334 {
1335 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1336 commit_iso14755 ();
1337 goto skip_switch;
1338 }
1339
1340 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1341 if (i[0] == keysym)
1342 {
1343 iso14755buf = ISO_14755_51 | i[1];
1344 commit_iso14755 ();
1345 goto skip_switch;
1346 }
1347
1348 scr_bell ();
1349# endif
1350 iso14755buf = 0;
1351 break;
1352 }
1353 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1354 {
1355# if ENABLE_OVERLAY
1356 scr_overlay_off ();
1357# endif
1358 if (iso14755buf & ISO_14755_51)
1359 commit_iso14755 ();
1360#if ISO_14755
1361 else if (iso14755buf & ISO_14755_STARTED)
1362 {
1363 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1364
1365 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1366 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1367 }
1368# endif
1369 else
1370 iso14755buf = 0;
1371 }
1372#endif
1373
1374 if (ev.xany.window == vt
1375 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1376 break;
1377
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop ();
1381 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0;
1383#endif
1384 break; 1360 break;
1385 }
1386 1361
1387 case ButtonPress: 1362 case ButtonPress:
1388 button_press (ev.xbutton); 1363 button_press (ev.xbutton);
1389 break; 1364 break;
1390 1365
… …
1405 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1380 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1406 destroy (); 1381 destroy ();
1407 } 1382 }
1408#if ENABLE_EWMH 1383#if ENABLE_EWMH
1409 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1384 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1410 XSendEvent (xdisp, ev.xclient.window = display->root, 1385 XSendEvent (dpy, ev.xclient.window = display->root,
1411 False, SubstructureRedirectMask | SubstructureNotifyMask, 1386 False, SubstructureRedirectMask | SubstructureNotifyMask,
1412 &ev); 1387 &ev);
1413#endif 1388#endif
1414 } 1389 }
1415 } 1390 }
… …
1421 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1396 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1422 focus_out (); 1397 focus_out ();
1423 } 1398 }
1424#endif 1399#endif
1425 } 1400 }
1426 break;
1427
1428 case MappingNotify:
1429 XRefreshKeyboardMapping (&ev.xmapping);
1430 break; 1401 break;
1431 1402
1432 /* 1403 /*
1433 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1434 * Here's my conclusion: 1405 * Here's my conclusion:
… …
1453 break; 1424 break;
1454 } 1425 }
1455 break; 1426 break;
1456 1427
1457 case FocusIn: 1428 case FocusIn:
1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1458 focus_in (); 1432 focus_in ();
1459 break; 1433 break;
1460 1434
1461 case FocusOut: 1435 case FocusOut:
1436 if (ev.xfocus.detail != NotifyInferior
1437 && ev.xfocus.detail != NotifyPointer
1438 && ev.xfocus.mode != NotifyGrab)
1462 focus_out (); 1439 focus_out ();
1463 break; 1440 break;
1464 1441
1465 case ConfigureNotify: 1442 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height);*/
1466 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1467 { 1447 {
1468 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1469 ; 1449 ;
1470 1450
1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1472 { 1452 {
1473 seen_resize = 1; 1453 seen_resize = 1;
1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1475 } 1455 }
1456 else
1457 {
1458#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1466#endif
1467 }
1476 1468
1477 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1478
1479#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1480 if (OPTION (Opt_transparent))
1481 check_our_parents ();
1482#endif
1483 } 1470 }
1484 break; 1471 break;
1485 1472
1486 case PropertyNotify: 1473 case PropertyNotify:
1487 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1503 case SelectionRequest: 1490 case SelectionRequest:
1504 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1505 break; 1492 break;
1506 1493
1507 case MapNotify: 1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1508 mapped = 1; 1511 mapped = 1;
1509#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1513 text_blink_ev.start ();
1511#endif 1514#endif
1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1513 break; 1516 break;
1514 1517
1515 case UnmapNotify: 1518 case UnmapNotify:
… …
1517#ifdef TEXT_BLINK 1520#ifdef TEXT_BLINK
1518 text_blink_ev.stop (); 1521 text_blink_ev.stop ();
1519#endif 1522#endif
1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1523 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1521 break; 1524 break;
1522
1523#ifdef TRANSPARENT
1524 case ReparentNotify:
1525 rootwin_cb (ev);
1526 break;
1527#endif /* TRANSPARENT */
1528 1525
1529 case GraphicsExpose: 1526 case GraphicsExpose:
1530 case Expose: 1527 case Expose:
1531 if (ev.xany.window == vt) 1528 if (ev.xany.window == vt)
1532 { 1529 {
1533 do 1530 do
1531 {
1534 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1535 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1534 }
1536 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1537 1536
1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1539 1538
1540 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1543 }
1543 1544
1544 want_refresh = 1; 1545 want_refresh = 1;
1545 } 1546 }
1546 else 1547 else
1547 { 1548 {
1548 XEvent unused_event; 1549 XEvent unused_event;
1549 1550
1550 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1551 ; 1552 ;
1552 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1553 ; 1554 ;
1554 1555
1555 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1556 { 1557 {
1557 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1558 scrollbar_show (0); 1559 scrollbar_show (0);
1559 } 1560 }
1560
1561#ifdef TRANSPARENT
1562 if (am_transparent && ev.xany.window == parent[0])
1563 XClearWindow (xdisp, ev.xany.window);
1564#endif
1565 } 1561 }
1566 break; 1562 break;
1567 1563
1568 case MotionNotify: 1564 case MotionNotify:
1569#ifdef POINTER_BLANK 1565#ifdef POINTER_BLANK
1570 if (hidden_pointer) 1566 if (hidden_pointer)
1571 pointer_unblank (); 1567 pointer_unblank ();
1572#endif 1568#endif
1569 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1570 || priv_modes & PrivMode_MouseAnyEvent)
1571 mouse_report (ev.xbutton);
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1573 break;
1575 1574
1576 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1577 { 1576 {
1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1580 ; // nop 1579 ; // nop
1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1581 {
1583 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1584 ; 1583 ;
1585 1584
1586 XQueryPointer (xdisp, vt, 1585 XQueryPointer (dpy, vt,
1587 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1588 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1589 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1590 &ev.xbutton.state); 1589 &ev.xbutton.state);
1591#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1611 int dist; 1610 int dist;
1612 1611
1613 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1614 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1615 */ 1614 */
1616 if (!sel_scroll_ev.active) 1615 if (!sel_scroll_ev.is_active ())
1617 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1616 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1618 1617
1619 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1620 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1621 */ 1620 */
1622 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
… …
1644 else 1643 else
1645 { 1644 {
1646 /* we are within the text window, so we 1645 /* we are within the text window, so we
1647 * shouldn't be scrolling 1646 * shouldn't be scrolling
1648 */ 1647 */
1649 if (sel_scroll_ev.active)
1650 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1651 } 1649 }
1652#endif 1650#endif
1653#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1654 } 1652 }
1655#endif 1653#endif
1656 } 1654 }
1657 } 1655 }
1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1659 { 1657 {
1660 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1661 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1662 ; 1660 ;
1663 1661
1664 XQueryPointer (xdisp, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1665 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1666 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1667 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1666 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1668 scrollbar_size ());
1671 want_refresh = 1; 1669 want_refresh = 1;
1672 refresh_limit = 0;
1673 scrollbar_show (1); 1670 scrollbar_show (1);
1674 } 1671 }
1675 break; 1672 break;
1676 } 1673 }
1677 1674
1678skip_switch: ;
1679
1680#if defined(CURSOR_BLINK) 1675#if defined(CURSOR_BLINK)
1681 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1682 { 1677 {
1683 if (hidden_cursor) 1678 if (hidden_cursor)
1684 { 1679 {
1685 hidden_cursor = 0; 1680 hidden_cursor = 0;
1686 want_refresh = 1; 1681 want_refresh = 1;
1687 } 1682 }
1688 1683
1689 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1684 cursor_blink_ev.again ();
1690 } 1685 }
1691#endif 1686#endif
1692 1687
1693#if defined(POINTER_BLANK) 1688#if defined(POINTER_BLANK)
1694 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1695 { 1690 {
1696 if (ev.type == MotionNotify 1691 if (ev.type == MotionNotify
1697 || ev.type == ButtonPress 1692 || ev.type == ButtonPress
1698 || ev.type == ButtonRelease) 1693 || ev.type == ButtonRelease)
1699 if (hidden_pointer) 1694 if (hidden_pointer)
… …
1701 1696
1702 if (ev.type == KeyPress && hidden_pointer == 0) 1697 if (ev.type == KeyPress && hidden_pointer == 0)
1703 pointer_blank (); 1698 pointer_blank ();
1704 } 1699 }
1705#endif 1700#endif
1701
1702 refresh_check ();
1706} 1703}
1707 1704
1708void 1705void
1709rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1710{ 1707{
1711 if (!focus) 1708 if (!focus)
1712 { 1709 {
1713 focus = 1; 1710 focus = 1;
1714 want_refresh = 1; 1711 want_refresh = 1;
1715 1712
1716 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1717 1714
1718#if USE_XIM 1715#if USE_XIM
1719 if (Input_Context != NULL) 1716 if (Input_Context != NULL)
1720 { 1717 {
1721 IMSetStatusPosition (); 1718 IMSetPosition ();
1722 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1723 } 1720 }
1724#endif 1721#endif
1725#if CURSOR_BLINK 1722#if CURSOR_BLINK
1726 if (OPTION (Opt_cursorBlink)) 1723 if (option (Opt_cursorBlink))
1727 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1724 cursor_blink_ev.again ();
1728#endif 1725#endif
1729#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1731 { 1728 {
1732 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
1733 scr_recolour (); 1730 scr_recolour ();
1734 } 1731 }
1735#endif 1732#endif
1733#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell))
1735 {
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif
1736 } 1743 }
1737} 1744}
1738 1745
1739void 1746void
1740rxvt_term::focus_out () 1747rxvt_term::focus_out ()
… …
1748 1755
1749#if ENABLE_FRILLS || ISO_14755 1756#if ENABLE_FRILLS || ISO_14755
1750 if (iso14755buf) 1757 if (iso14755buf)
1751 { 1758 {
1752 iso14755buf = 0; 1759 iso14755buf = 0;
1753# if ENABLE_OVERLAY 1760# if ISO_14755
1754 scr_overlay_off (); 1761 scr_overlay_off ();
1755# endif 1762# endif
1756 } 1763 }
1757#endif 1764#endif
1758#if USE_XIM 1765#if USE_XIM
1759 if (Input_Context != NULL) 1766 if (Input_Context != NULL)
1760 XUnsetICFocus (Input_Context); 1767 XUnsetICFocus (Input_Context);
1761#endif 1768#endif
1762#if CURSOR_BLINK 1769#if CURSOR_BLINK
1763 if (OPTION (Opt_cursorBlink)) 1770 if (option (Opt_cursorBlink))
1764 cursor_blink_ev.stop (); 1771 cursor_blink_ev.stop ();
1772
1765 hidden_cursor = 0; 1773 hidden_cursor = 0;
1766#endif 1774#endif
1767#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
1769 { 1777 {
… …
1772 } 1780 }
1773#endif 1781#endif
1774 } 1782 }
1775} 1783}
1776 1784
1777#if TRANSPARENT 1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1778void 1799void
1779rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1780{ 1801{
1781 make_current (); 1802 make_current ();
1782 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1783 switch (ev.type) 1809 switch (ev.type)
1784 { 1810 {
1785 case PropertyNotify: 1811 case PropertyNotify:
1786 /* 1812 /*
1787 * if user used some Esetroot compatible prog to set the root bg, 1813 * if user used some Esetroot compatible prog to set the root bg,
1788 * use the property to determine the pixmap. We use it later on. 1814 * use the property to determine the pixmap. We use it later on.
1789 */ 1815 */
1790 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1791 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1792 return; 1818 {
1819 bgPixmap.set_root_pixmap ();
1820 update_background ();
1821 }
1793 1822
1794 /* FALLTHROUGH */
1795 case ReparentNotify:
1796 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1797 want_refresh = want_full_refresh = 1;
1798 break; 1823 break;
1799 } 1824 }
1825# endif
1826
1827 refresh_check ();
1800} 1828}
1801#endif 1829#endif
1802 1830
1803void 1831void
1804rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1859 mouse_report (ev); 1887 mouse_report (ev);
1860 } 1888 }
1861#else 1889#else
1862 MEvent.button = ev.button; 1890 MEvent.button = ev.button;
1863 mouse_report (ev); 1891 mouse_report (ev);
1864#endif /* MOUSE_REPORT_DOUBLECLICK */ 1892#endif /* MOUSE_REPORT_DOUBLECLICK */
1865 1893
1866 } 1894 }
1867 else 1895 else
1868 { 1896 {
1869 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
… …
1917 } 1945 }
1918 1946
1919 /* 1947 /*
1920 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1921 */ 1949 */
1922 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1923 { 1951 {
1924 scrollBar.setIdle (); 1952 scrollBar.setIdle ();
1925 /* 1953 /*
1926 * Rxvt-style scrollbar: 1954 * Rxvt-style scrollbar:
1927 * move up if mouse is above slider 1955 * move up if mouse is above slider
… …
1963 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
1964 break; 1992 break;
1965 } 1993 }
1966 } 1994 }
1967 else 1995 else
1968#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1969 1997
1970 { 1998 {
1971 char upordown = 0; 1999 char upordown = 0;
1972 2000
1973 if (scrollBar.style == R_SB_NEXT) 2001 if (scrollBar.style == R_SB_NEXT)
1974 { 2002 {
1975 if (scrollbarnext_upButton (ev.y)) 2003 if (scrollbarnext_upButton (ev.y))
1976 upordown = -1; /* up */ 2004 upordown = -1; /* up */
… …
1982 if (scrollbarrxvt_upButton (ev.y)) 2010 if (scrollbarrxvt_upButton (ev.y))
1983 upordown = -1; /* up */ 2011 upordown = -1; /* up */
1984 else if (scrollbarrxvt_dnButton (ev.y)) 2012 else if (scrollbarrxvt_dnButton (ev.y))
1985 upordown = 1; /* down */ 2013 upordown = 1; /* down */
1986 } 2014 }
2015
1987 if (upordown) 2016 if (upordown)
1988 { 2017 {
1989#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ())
1990 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1991#endif 2021#endif
1992 if (scr_page (upordown < 0 ? UP : DN, 1)) 2022 if (scr_page (upordown < 0 ? UP : DN, 1))
1993 { 2023 {
1994 if (upordown < 0) 2024 if (upordown < 0)
1995 scrollBar.setUp (); 2025 scrollBar.setUp ();
… …
1999 } 2029 }
2000 else 2030 else
2001 switch (ev.button) 2031 switch (ev.button)
2002 { 2032 {
2003 case Button2: 2033 case Button2:
2004 switch (scrollbar_align) 2034 switch (scrollBar.align)
2005 { 2035 {
2006 case R_SB_ALIGN_TOP: 2036 case R_SB_ALIGN_TOP:
2007 csrO = 0; 2037 csrO = 0;
2008 break; 2038 break;
2009 case R_SB_ALIGN_CENTRE: 2039 case R_SB_ALIGN_CENTRE:
… …
2021 2051
2022 scrollBar.setMotion (); 2052 scrollBar.setMotion ();
2023 break; 2053 break;
2024 2054
2025 case Button1: 2055 case Button1:
2026 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2056 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2027 csrO = ev.y - scrollBar.top; 2057 csrO = ev.y - scrollBar.top;
2028 /* FALLTHROUGH */ 2058 /* FALLTHROUGH */
2029 2059
2030 case Button3: 2060 case Button3:
2031 if (scrollBar.style != R_SB_XTERM) 2061 if (scrollBar.style != R_SB_XTERM)
… …
2075 scrollBar.setIdle (); 2105 scrollBar.setIdle ();
2076 scrollbar_show (0); 2106 scrollbar_show (0);
2077 } 2107 }
2078 2108
2079#ifdef SELECTION_SCROLLING 2109#ifdef SELECTION_SCROLLING
2080 if (sel_scroll_ev.active)
2081 sel_scroll_ev.stop(); 2110 sel_scroll_ev.stop();
2082#endif 2111#endif
2083 2112
2084 if (ev.window == vt) 2113 if (ev.window == vt)
2085 { 2114 {
2086 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2115 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2110 mouse_report (ev); 2139 mouse_report (ev);
2111 } 2140 }
2112#else /* MOUSE_REPORT_DOUBLECLICK */ 2141#else /* MOUSE_REPORT_DOUBLECLICK */
2113 MEvent.button = AnyButton; 2142 MEvent.button = AnyButton;
2114 mouse_report (ev); 2143 mouse_report (ev);
2115#endif /* MOUSE_REPORT_DOUBLECLICK */ 2144#endif /* MOUSE_REPORT_DOUBLECLICK */
2116 return; 2145 return;
2117 } 2146 }
2118 2147
2119 /* 2148 /*
2120 * dumb hack to compensate for the failure of click-and-drag 2149 * dumb hack to compensate for the failure of click-and-drag
… …
2132 selection_make (ev.time); 2161 selection_make (ev.time);
2133 break; 2162 break;
2134 2163
2135 case Button2: 2164 case Button2:
2136 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2165 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2137 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2166 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2138 break; 2167 break;
2139 2168
2140#ifdef MOUSE_WHEEL 2169#ifdef MOUSE_WHEEL
2141 case Button4: 2170 case Button4:
2142 case Button5: 2171 case Button5:
… …
2146 2175
2147 v = ev.button == Button4 ? UP : DN; 2176 v = ev.button == Button4 ? UP : DN;
2148 2177
2149 if (ev.state & ShiftMask) 2178 if (ev.state & ShiftMask)
2150 i = 1; 2179 i = 1;
2151 else if (OPTION (Opt_mouseWheelScrollPage)) 2180 else if (option (Opt_mouseWheelScrollPage))
2152 i = nrow - 1; 2181 i = nrow - 1;
2153 else 2182 else
2154 i = 5; 2183 i = 5;
2155 2184
2156# ifdef MOUSE_SLIP_WHEELING 2185# ifdef MOUSE_SLIP_WHEELING
… …
2158 { 2187 {
2159 mouse_slip_wheel_speed += v ? -1 : 1; 2188 mouse_slip_wheel_speed += v ? -1 : 1;
2160 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2189 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2161 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2190 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2162 2191
2163 if (slip_wheel_ev.at < NOW) 2192 if (!slip_wheel_ev.is_active ())
2164 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2193 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2165
2166 slip_wheel_ev.start ();
2167 } 2194 }
2168 else 2195 else
2196# endif
2169 { 2197 {
2170# endif
2171 scr_page (v, i); 2198 scr_page (v, i);
2172 scrollbar_show (1); 2199 scrollbar_show (1);
2173# ifdef MOUSE_SLIP_WHEELING
2174 } 2200 }
2175# endif
2176 } 2201 }
2177 break; 2202 break;
2178#endif 2203#endif
2179 } 2204 }
2180 } 2205 }
2181} 2206}
2182
2183#ifdef TRANSPARENT
2184#if TINTING
2185/* taken from aterm-0.4.2 */
2186
2187typedef uint32_t RUINT32T;
2188
2189void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2190{
2191 int sh_r, sh_g, sh_b;
2192 RUINT32T mask_r, mask_g, mask_b;
2193 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2194 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2195 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2196 int i;
2197
2198 Visual *visual = term->visual;
2199
2200 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2201
2202 /* for convenience */
2203 mask_r = visual->red_mask;
2204 mask_g = visual->green_mask;
2205 mask_b = visual->blue_mask;
2206
2207 /* boring lookup table pre-initialization */
2208 switch (srcImage->bits_per_pixel) {
2209 case 15:
2210 if ((mask_r != 0x7c00) ||
2211 (mask_g != 0x03e0) ||
2212 (mask_b != 0x001f))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2215 lookup_r = lookup;
2216 lookup_g = lookup+32;
2217 lookup_b = lookup+32+32;
2218 sh_r = 10;
2219 sh_g = 5;
2220 sh_b = 0;
2221 break;
2222 case 16:
2223 if ((mask_r != 0xf800) ||
2224 (mask_g != 0x07e0) ||
2225 (mask_b != 0x001f))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2228 lookup_r = lookup;
2229 lookup_g = lookup+32;
2230 lookup_b = lookup+32+64;
2231 sh_r = 11;
2232 sh_g = 5;
2233 sh_b = 0;
2234 break;
2235 case 24:
2236 if ((mask_r != 0xff0000) ||
2237 (mask_g != 0x00ff00) ||
2238 (mask_b != 0x0000ff))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2241 lookup_r = lookup;
2242 lookup_g = lookup+256;
2243 lookup_b = lookup+256+256;
2244 sh_r = 16;
2245 sh_g = 8;
2246 sh_b = 0;
2247 break;
2248 case 32:
2249 if ((mask_r != 0xff0000) ||
2250 (mask_g != 0x00ff00) ||
2251 (mask_b != 0x0000ff))
2252 return;
2253 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2254 lookup_r = lookup;
2255 lookup_g = lookup+256;
2256 lookup_b = lookup+256+256;
2257 sh_r = 16;
2258 sh_g = 8;
2259 sh_b = 0;
2260 break;
2261 default:
2262 return; /* we do not support this color depth */
2263 }
2264
2265 /* prepare limits for color transformation (each channel is handled separately) */
2266 if (shade < 0) {
2267 shade = -shade;
2268 if (shade < 0) shade = 0;
2269 if (shade > 100) shade = 100;
2270
2271 lower_lim_r = 65535-rm;
2272 lower_lim_g = 65535-gm;
2273 lower_lim_b = 65535-bm;
2274
2275 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2276 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2277 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2278
2279 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2280 } else {
2281 if (shade < 0) shade = 0;
2282 if (shade > 100) shade = 100;
2283
2284 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2285
2286 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2287 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2288 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2289 }
2290
2291 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2292 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2293 {
2294 unsigned int tmp;
2295
2296 tmp = lower_lim_r;
2297 lower_lim_r = lower_lim_b;
2298 lower_lim_b = tmp;
2299
2300 tmp = upper_lim_r;
2301 upper_lim_r = upper_lim_b;
2302 upper_lim_b = tmp;
2303 }
2304
2305 /* fill our lookup tables */
2306 for (i = 0; i <= mask_r>>sh_r; i++)
2307 {
2308 RUINT32T tmp;
2309 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2310 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2311 lookup_r[i] = (tmp/65535)<<sh_r;
2312 }
2313 for (i = 0; i <= mask_g>>sh_g; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2317 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2318 lookup_g[i] = (tmp/65535)<<sh_g;
2319 }
2320 for (i = 0; i <= mask_b>>sh_b; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2324 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2325 lookup_b[i] = (tmp/65535)<<sh_b;
2326 }
2327
2328 /* apply table to input image (replacing colors by newly calculated ones) */
2329 switch (srcImage->bits_per_pixel)
2330 {
2331 case 15:
2332 {
2333 unsigned short *p1, *pf, *p, *pl;
2334 p1 = (unsigned short *) srcImage->data;
2335 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2336 while (p1 < pf)
2337 {
2338 p = p1;
2339 pl = p1 + srcImage->width;
2340 for (; p < pl; p++)
2341 {
2342 *p = lookup_r[(*p & 0x7c00)>>10] |
2343 lookup_g[(*p & 0x03e0)>> 5] |
2344 lookup_b[(*p & 0x001f)];
2345 }
2346 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2347 }
2348 break;
2349 }
2350 case 16:
2351 {
2352 unsigned short *p1, *pf, *p, *pl;
2353 p1 = (unsigned short *) srcImage->data;
2354 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2355 while (p1 < pf)
2356 {
2357 p = p1;
2358 pl = p1 + srcImage->width;
2359 for (; p < pl; p++)
2360 {
2361 *p = lookup_r[(*p & 0xf800)>>11] |
2362 lookup_g[(*p & 0x07e0)>> 5] |
2363 lookup_b[(*p & 0x001f)];
2364 }
2365 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2366 }
2367 break;
2368 }
2369 case 24:
2370 {
2371 unsigned char *p1, *pf, *p, *pl;
2372 p1 = (unsigned char *) srcImage->data;
2373 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2374 while (p1 < pf)
2375 {
2376 p = p1;
2377 pl = p1 + srcImage->width * 3;
2378 for (; p < pl; p += 3)
2379 {
2380 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2381 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2382 p[2] = lookup_r[(p[2] & 0x0000ff)];
2383 }
2384 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2385 }
2386 break;
2387 }
2388 case 32:
2389 {
2390 RUINT32T *p1, *pf, *p, *pl;
2391 p1 = (RUINT32T *) srcImage->data;
2392 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2393
2394 while (p1 < pf)
2395 {
2396 p = p1;
2397 pl = p1 + srcImage->width;
2398 for (; p < pl; p++)
2399 {
2400 *p = lookup_r[(*p & 0xff0000)>>16] |
2401 lookup_g[(*p & 0x00ff00)>> 8] |
2402 lookup_b[(*p & 0x0000ff)] |
2403 (*p & ~0xffffff);
2404 }
2405 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 }
2410
2411 free (lookup);
2412}
2413#endif
2414
2415/*
2416 * Check our parents are still who we think they are.
2417 * Do transparency updates if required
2418 */
2419int
2420rxvt_term::check_our_parents ()
2421{
2422 int i, pchanged, aformat, have_pixmap, rootdepth;
2423 unsigned long nitems, bytes_after;
2424 Atom atype;
2425 unsigned char *prop = NULL;
2426 Window root, oldp, *list;
2427 Pixmap rootpixmap = None;
2428 XWindowAttributes wattr, wrootattr;
2429
2430 pchanged = 0;
2431
2432 if (!OPTION (Opt_transparent))
2433 return pchanged; /* Don't try any more */
2434
2435 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2436 rootdepth = wrootattr.depth;
2437
2438 XGetWindowAttributes (xdisp, parent[0], &wattr);
2439
2440 if (rootdepth != wattr.depth)
2441 {
2442 if (am_transparent)
2443 {
2444 pchanged = 1;
2445 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2446 am_transparent = am_pixmap_trans = 0;
2447 }
2448
2449 return pchanged; /* Don't try any more */
2450 }
2451
2452 /* Get all X ops out of the queue so that our information is up-to-date. */
2453 XSync (xdisp, False);
2454
2455 /*
2456 * Make the frame window set by the window manager have
2457 * the root background. Some window managers put multiple nested frame
2458 * windows for each client, so we have to take care about that.
2459 */
2460 i = (xa[XA_XROOTPMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success);
2464
2465 if (!i || prop == NULL)
2466 i = (xa[XA_ESETROOT_PMAP_ID]
2467 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2469 &nitems, &bytes_after, &prop) == Success);
2470
2471 if (!i || prop == NULL
2472#if TINTING
2473 || !ISSET_PIXCOLOR (Color_tint)
2474#endif
2475 )
2476 have_pixmap = 0;
2477 else
2478 {
2479 have_pixmap = 1;
2480 rootpixmap = *(Pixmap *)prop;
2481 XFree (prop);
2482 }
2483
2484 if (have_pixmap)
2485 {
2486 /*
2487 * Copy display->root pixmap transparency
2488 */
2489 int sx, sy, nx, ny;
2490 unsigned int nw, nh;
2491 Window cr;
2492 XImage *image;
2493 GC gc;
2494 XGCValues gcvalue;
2495
2496 XTranslateCoordinates (xdisp, parent[0], display->root,
2497 0, 0, &sx, &sy, &cr);
2498 nw = (unsigned int)szHint.width;
2499 nh = (unsigned int)szHint.height;
2500 nx = ny = 0;
2501
2502 if (sx < 0)
2503 {
2504 nw += sx;
2505 nx = -sx;
2506 sx = 0;
2507 }
2508
2509 if (sy < 0)
2510 {
2511 nh += sy;
2512 ny = -sy;
2513 sy = 0;
2514 }
2515
2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2518
2519 XSync (xdisp, False);
2520 allowedxerror = -1;
2521 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2522
2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2524 /* XXX: may need a delay here? */
2525 allowedxerror = 0;
2526
2527 if (image == NULL)
2528 {
2529 if (am_transparent && am_pixmap_trans)
2530 {
2531 pchanged = 1;
2532 if (pixmap != None)
2533 {
2534 XFreePixmap (xdisp, pixmap);
2535 pixmap = None;
2536 }
2537 }
2538
2539 am_pixmap_trans = 0;
2540 }
2541 else
2542 {
2543 if (pixmap != None)
2544 XFreePixmap (xdisp, pixmap);
2545
2546#if TINTING
2547 if (ISSET_PIXCOLOR (Color_tint))
2548 {
2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2550
2551 rgba c;
2552 pix_colors_focused [Color_tint].get (c);
2553
2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2555 }
2556#endif
2557
2558 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2559 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2560 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2561 nx, ny, image->width, image->height);
2562 XFreeGC (xdisp, gc);
2563 XDestroyImage (image);
2564 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2565 XClearWindow (xdisp, parent[0]);
2566
2567 if (!am_transparent || !am_pixmap_trans)
2568 pchanged = 1;
2569
2570 am_transparent = am_pixmap_trans = 1;
2571 }
2572 }
2573
2574 if (am_pixmap_trans)
2575 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2576 else
2577 {
2578 unsigned int n;
2579 /*
2580 * InheritPixmap transparency
2581 */
2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 {
2584 oldp = parent[i];
2585 XQueryTree (xdisp, parent[i - 1], &root, &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 for (; n < (unsigned int)i; n++)
2604 {
2605 XGetWindowAttributes (xdisp, parent[n], &wattr);
2606
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break;
2611 }
2612 }
2613
2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2615 {
2616 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2617 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2618 am_transparent = 0;
2619 /* XXX: also turn off Opt_transparent? */
2620 }
2621 else
2622 {
2623 for (n = 0; n < (unsigned int)i; n++)
2624 {
2625 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2626 XClearWindow (xdisp, parent[n]);
2627 }
2628
2629 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2630 am_transparent = 1;
2631 }
2632
2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2634 parent[i] = None;
2635 }
2636
2637 if (scrollBar.win)
2638 {
2639 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2640 scrollBar.setIdle ();
2641 scrollbar_show (0);
2642 }
2643
2644 if (am_transparent)
2645 {
2646 want_refresh = want_full_refresh = 1;
2647 if (am_pixmap_trans)
2648 flush ();
2649 }
2650
2651 return pchanged;
2652}
2653#endif
2654 2207
2655/*}}} */ 2208/*}}} */
2656 2209
2657bool 2210bool
2658rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
… …
2707 if (ch == C0_LF) 2260 if (ch == C0_LF)
2708 nlines++; 2261 nlines++;
2709 2262
2710 refresh_count++; 2263 refresh_count++;
2711 2264
2712 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2713 || (refresh_count >= refresh_limit * (nrow - 1)))
2714 { 2266 {
2715 refreshnow = true;
2716 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 {
2271 refreshnow = true;
2717 ch = NOCHAR; 2272 ch = NOCHAR;
2718 break; 2273 break;
2274 }
2719 } 2275 }
2720 2276
2721 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2722 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2723 { 2279 {
… …
2751 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2752 scr_add_lines (buf, str - buf, nlines); 2308 scr_add_lines (buf, str - buf, nlines);
2753 2309
2754 /* 2310 /*
2755 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2756 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2757 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2758 * is incremented here because we must be doing flat-out scrolling.
2759 */ 2314 */
2760 if (refreshnow) 2315 if (refreshnow)
2761 { 2316 {
2762 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2763 refresh_limit++;
2764 else
2765 {
2766 flag = true; 2317 flag = true;
2767 scr_refresh (); 2318 scr_refresh ();
2768 want_refresh = 1; 2319 want_refresh = 1;
2769 }
2770 } 2320 }
2771 2321
2772 } 2322 }
2773 else 2323 else
2774 { 2324 {
… …
2923 { 2473 {
2924 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2925 break; /* done = 1 */ 2475 break; /* done = 1 */
2926 } 2476 }
2927 } 2477 }
2928 2478
2929 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2930 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2931 { 2481 {
2932 done = 1; 2482 done = 1;
2933 break; 2483 break;
… …
2935 } 2485 }
2936 } 2486 }
2937 2487
2938 pclose_printer (fd); 2488 pclose_printer (fd);
2939} 2489}
2940#endif /* PRINTPIPE */ 2490#endif /* PRINTPIPE */
2941/*}}} */ 2491/*}}} */
2942 2492
2943/* *INDENT-OFF* */ 2493/* *INDENT-OFF* */
2944enum { 2494enum {
2945 C1_40 = 0x40, 2495 C1_40 = 0x40,
… …
2995 process_dcs_seq (); 2545 process_dcs_seq ();
2996 break; 2546 break;
2997 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
2998 process_csi_seq (); 2548 process_csi_seq ();
2999 break; 2549 break;
3000 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
3001 process_osc_seq (); 2551 process_osc_seq ();
3002 break; 2552 break;
3003#endif 2553#endif
3004 } 2554 }
3005} 2555}
… …
3231rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3232{ 2782{
3233 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3234 unsigned int nargs, p; 2784 unsigned int nargs, p;
3235 int n, ndef; 2785 int n, ndef;
3236 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3237 2787
3238 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3239 arg[--nargs] = 0;
3240 2789
3241 priv = 0; 2790 priv = 0;
3242 ch = cmd_getc (); 2791 ch = cmd_getc ();
3243 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
2793 {
3244 { /* '<' '=' '>' '?' */ 2794 /* '<' '=' '>' '?' */
3245 priv = ch; 2795 priv = ch;
3246 ch = cmd_getc (); 2796 ch = cmd_getc ();
3247 } 2797 }
3248 2798
3249 /* read any numerical arguments */ 2799 /* read any numerical arguments */
… …
3288 switch (priv) 2838 switch (priv)
3289 { 2839 {
3290 case '>': 2840 case '>':
3291 if (ch == CSI_DA) /* secondary device attributes */ 2841 if (ch == CSI_DA) /* secondary device attributes */
3292 { 2842 {
3293 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2843 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3294 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2844 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3295 // 2845 //
3296 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2846 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3297 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2847 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3298 // that we do not support xterm mouse reporting (should be 95 when we do). 2848 // versions.
3299 // 2849 //
3300 tt_printf ("\033[>%d;94;0c", 'U'); 2850 tt_printf ("\033[>%d;95;0c", 'U');
3301 } 2851 }
3302 break; 2852 break;
2853
3303 case '?': 2854 case '?':
3304 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2855 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3305 process_terminal_mode (ch, priv, nargs, arg); 2856 process_terminal_mode (ch, priv, nargs, arg);
3306 break; 2857 break;
3307 } 2858 }
… …
3432 break; 2983 break;
3433 case 6: /* CPR requested */ 2984 case 6: /* CPR requested */
3434 scr_report_position (); 2985 scr_report_position ();
3435 break; 2986 break;
3436 case 7: /* unofficial extension */ 2987 case 7: /* unofficial extension */
3437 if (OPTION (Opt_insecure)) 2988 if (option (Opt_insecure))
3438 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2989 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3439 break; 2990 break;
3440 case 8: /* unofficial extension */ 2991 case 8: /* unofficial extension */
3441 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2992 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3442 break; 2993 break;
… …
3535{ 3086{
3536 int x, y; 3087 int x, y;
3537 XWindowAttributes wattr; 3088 XWindowAttributes wattr;
3538 Window wdummy; 3089 Window wdummy;
3539 3090
3540 dLocal (Display *, xdisp); 3091 dLocal (Display *, dpy);
3541 3092
3542 if (nargs == 0) 3093 if (nargs == 0)
3543 return; 3094 return;
3544 3095
3545 switch (args[0]) 3096 switch (args[0])
3546 { 3097 {
3547 /* 3098 /*
3548 * commands 3099 * commands
3549 */ 3100 */
3550 case 1: /* deiconify window */ 3101 case 1: /* deiconify window */
3551 XMapWindow (xdisp, parent[0]); 3102 XMapWindow (dpy, parent[0]);
3552 break; 3103 break;
3553 case 2: /* iconify window */ 3104 case 2: /* iconify window */
3554 XIconifyWindow (xdisp, parent[0], display->screen); 3105 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3106 break;
3556 case 3: /* set position (pixels) */ 3107 case 3: /* set position (pixels) */
3557 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3108 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3109 break;
3559 case 4: /* set size (pixels) */ 3110 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3111 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3112 break;
3562 case 5: /* raise window */ 3113 case 5: /* raise window */
3563 XRaiseWindow (xdisp, parent[0]); 3114 XRaiseWindow (dpy, parent[0]);
3564 break; 3115 break;
3565 case 6: /* lower window */ 3116 case 6: /* lower window */
3566 XLowerWindow (xdisp, parent[0]); 3117 XLowerWindow (dpy, parent[0]);
3567 break; 3118 break;
3568 case 7: /* refresh window */ 3119 case 7: /* refresh window */
3569 scr_touch (true); 3120 scr_touch (true);
3570 break; 3121 break;
3571 case 8: /* set size (chars) */ 3122 case 8: /* set size (chars) */
… …
3582 3133
3583 /* 3134 /*
3584 * reports - some output format copied from XTerm 3135 * reports - some output format copied from XTerm
3585 */ 3136 */
3586 case 11: /* report window state */ 3137 case 11: /* report window state */
3587 XGetWindowAttributes (xdisp, parent[0], &wattr); 3138 XGetWindowAttributes (dpy, parent[0], &wattr);
3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3139 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3589 break; 3140 break;
3590 case 13: /* report window position */ 3141 case 13: /* report window position */
3591 XGetWindowAttributes (xdisp, parent[0], &wattr); 3142 XGetWindowAttributes (dpy, parent[0], &wattr);
3592 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3143 XTranslateCoordinates (dpy, parent[0], wattr.root,
3593 -wattr.border_width, -wattr.border_width, 3144 -wattr.border_width, -wattr.border_width,
3594 &x, &y, &wdummy); 3145 &x, &y, &wdummy);
3595 tt_printf ("\033[3;%d;%dt", x, y); 3146 tt_printf ("\033[3;%d;%dt", x, y);
3596 break; 3147 break;
3597 case 14: /* report window size (pixels) */ 3148 case 14: /* report window size (pixels) */
3598 XGetWindowAttributes (xdisp, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent[0], &wattr);
3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3150 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3600 break; 3151 break;
3601 case 18: /* report text area size (chars) */ 3152 case 18: /* report text area size (chars) */
3602 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3153 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3603 break; 3154 break;
… …
3605 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3156 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3606 break; 3157 break;
3607 case 20: /* report icon label */ 3158 case 20: /* report icon label */
3608 { 3159 {
3609 char *s; 3160 char *s;
3610 XGetIconName (xdisp, parent[0], &s); 3161 XGetIconName (dpy, parent[0], &s);
3611 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3162 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3612 XFree (s); 3163 XFree (s);
3613 } 3164 }
3614 break; 3165 break;
3615 case 21: /* report window title */ 3166 case 21: /* report window title */
3616 { 3167 {
3617 char *s; 3168 char *s;
3618 XFetchName (xdisp, parent[0], &s); 3169 XFetchName (dpy, parent[0], &s);
3619 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3170 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3171 XFree (s);
3621 } 3172 }
3622 break; 3173 break;
3623 } 3174 }
3624} 3175}
… …
3651 seen_esc = true; 3202 seen_esc = true;
3652 continue; 3203 continue;
3653 } 3204 }
3654 else if (ch == C0_BEL || ch == CHAR_ST) 3205 else if (ch == C0_BEL || ch == CHAR_ST)
3655 break; 3206 break;
3207 else if (ch == C0_SYN)
3208 ch = cmd_get8 ();
3656 else if (ch < 0x20) 3209 else if (ch < 0x20)
3657 return NULL; /* other control character - exit */ 3210 return NULL; /* other control character - exit */
3658 3211
3659 seen_esc = false; 3212 seen_esc = false;
3660 3213
3661 if (n >= STRING_MAX - 1) 3214 if (n >= STRING_MAX - 1)
3662 // stop at some sane length 3215 // stop at some sane length
3663 return NULL; 3216 return NULL;
3664 3217
3665 if (ch == C0_SYN)
3666 string[n++] = cmd_get8 ();
3667 else
3668 string[n++] = ch; 3218 string[n++] = ch;
3669 } 3219 }
3670 3220
3671 string[n++] = '\0'; 3221 string[n++] = '\0';
3672 3222
3673 ends_how = (ch == 0x5c ? C0_ESC : ch); 3223 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3749 int color; 3299 int color;
3750 char *buf, *name; 3300 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3301 bool query = str[0] == '?' && !str[1];
3752 int saveop = op; 3302 int saveop = op;
3753 3303
3754 dLocal (Display *, xdisp); 3304 dLocal (Display *, dpy);
3755 3305
3756 assert (str != NULL); 3306 assert (str != NULL);
3307
3308 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3309 return;
3310
3757 switch (op) 3311 switch (op)
3758 { 3312 {
3759 case XTerm_name: 3313 case XTerm_name:
3760 set_title (str); 3314 set_title (str);
3761 /* FALLTHROUGH */ 3315 /* FALLTHROUGH */
… …
3775 unsigned long bytes_after; 3329 unsigned long bytes_after;
3776 unsigned char *value = 0; 3330 unsigned char *value = 0;
3777 const char *str = ""; 3331 const char *str = "";
3778 3332
3779 if (prop 3333 if (prop
3780 && XGetWindowProperty (xdisp, parent[0], 3334 && XGetWindowProperty (dpy, parent[0],
3781 prop, 0, 1<<16, 0, AnyPropertyType, 3335 prop, 0, 1<<16, 0, AnyPropertyType,
3782 &actual_type, &actual_format, 3336 &actual_type, &actual_format,
3783 &nitems, &bytes_after, &value) == Success 3337 &nitems, &bytes_after, &value) == Success
3784 && actual_type != None 3338 && actual_type != None
3785 && actual_format == 8) 3339 && actual_format == 8)
… …
3797 { 3351 {
3798 *eq = 0; 3352 *eq = 0;
3799 set_utf8_property (display->atom (str), eq + 1); 3353 set_utf8_property (display->atom (str), eq + 1);
3800 } 3354 }
3801 else 3355 else
3802 XDeleteProperty (xdisp, parent[0], 3356 XDeleteProperty (dpy, parent[0],
3803 display->atom (str)); 3357 display->atom (str));
3804 } 3358 }
3805 break; 3359 break;
3806 3360
3807 case XTerm_Color: 3361 case XTerm_Color:
… …
3820 *buf++ = '\0'; 3374 *buf++ = '\0';
3821 3375
3822 process_color_seq (op, color, name, resp); 3376 process_color_seq (op, color, name, resp);
3823 } 3377 }
3824 break; 3378 break;
3379 case Rxvt_restoreFG:
3825 case XTerm_Color00: 3380 case XTerm_Color00:
3826 process_color_seq (op, Color_fg, str, resp); 3381 process_color_seq (op, Color_fg, str, resp);
3827 break; 3382 break;
3383 case Rxvt_restoreBG:
3828 case XTerm_Color01: 3384 case XTerm_Color01:
3829 process_color_seq (op, Color_bg, str, resp); 3385 process_color_seq (op, Color_bg, str, resp);
3830 break; 3386 break;
3831#ifndef NO_CURSORCOLOR 3387#ifndef NO_CURSORCOLOR
3832 case XTerm_Color_cursor: 3388 case XTerm_Color_cursor:
… …
3853 break; 3409 break;
3854 case URxvt_Color_IT: 3410 case URxvt_Color_IT:
3855 process_color_seq (op, Color_IT, str, resp); 3411 process_color_seq (op, Color_IT, str, resp);
3856 break; 3412 break;
3857#endif 3413#endif
3858#if TRANSPARENT && TINTING 3414#if ENABLE_TRANSPARENCY
3859 case URxvt_Color_tint: 3415 case URxvt_Color_tint:
3860 process_color_seq (op, Color_tint, str, resp); 3416 process_color_seq (op, Color_tint, str, resp);
3417 {
3418 bool changed = false;
3861 3419
3862 check_our_parents (); 3420 if (ISSET_PIXCOLOR (Color_tint))
3421 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3422 else
3423 changed = bgPixmap.unset_tint ();
3863 3424
3864 if (am_transparent) 3425 if (changed)
3865 want_full_refresh = want_refresh = 1; 3426 update_background ();
3427 }
3866 3428
3867 break; 3429 break;
3868#endif 3430#endif
3869 3431
3432#if BG_IMAGE_FROM_FILE
3870 case Rxvt_Pixmap: 3433 case Rxvt_Pixmap:
3871 { 3434 if (!strcmp (str, "?"))
3872 if (*str != ';')
3873 { 3435 {
3874#if XPM_BACKGROUND 3436 char str[256];
3875 scale_pixmap (""); /* reset to default scaling */ 3437
3876 set_bgPixmap (str); /* change pixmap */ 3438 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3877 scr_touch (true); 3439 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3878#endif 3440 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3441 process_xterm_seq (XTerm_title, str, CHAR_ST);
3879 } 3442 }
3880 3443 else
3444 {
3881 int changed = 0; 3445 int changed = 0;
3882 3446
3883 while ((str = strchr (str, ';')) != NULL) 3447 if (*str != ';')
3884 { 3448 {
3449 /* reset to default scaling :*/
3450 bgPixmap.unset_geometry ();
3451 if (bgPixmap.set_file (str)) /* change pixmap */
3452 changed++;
3453 str = strchr (str, ';');
3454 if (str == NULL)
3455 bgPixmap.set_defaultGeometry ();
3456 }
3457
3458 while (str)
3459 {
3885 str++; 3460 str++;
3886#if XPM_BACKGROUND 3461 if (bgPixmap.set_geometry (str))
3887 changed += scale_pixmap (str); 3462 changed++;
3888#endif 3463 str = strchr (str, ';');
3889 } 3464 }
3890 3465
3891 if (changed) 3466 if (changed)
3892 { 3467 update_background ();
3893#ifdef XPM_BACKGROUND
3894 resize_pixmap ();
3895 scr_touch (true);
3896#endif
3897 } 3468 }
3898 }
3899 break; 3469 break;
3900 3470#endif
3901 case Rxvt_restoreFG:
3902 set_window_color (Color_fg, str);
3903 break;
3904 case Rxvt_restoreBG:
3905 set_window_color (Color_bg, str);
3906 break;
3907 3471
3908 case XTerm_logfile: 3472 case XTerm_logfile:
3909 // TODO, when secure mode? 3473 // TODO, when secure mode?
3910 break; 3474 break;
3911 3475
… …
3929 case URxvt_italicFont: 3493 case URxvt_italicFont:
3930 case URxvt_boldItalicFont: 3494 case URxvt_boldItalicFont:
3931#endif 3495#endif
3932 if (query) 3496 if (query)
3933 tt_printf ("\33]%d;%-.250s%c", saveop, 3497 tt_printf ("\33]%d;%-.250s%c", saveop,
3934 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3498 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3935 ? fontset[op - URxvt_font]->fontdesc : "", 3499 ? fontset[op - URxvt_font]->fontdesc : "",
3936 resp); 3500 resp);
3937 else 3501 else
3938 { 3502 {
3939 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3503 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3953 break; 3517 break;
3954 3518
3955#if !ENABLE_MINIMAL 3519#if !ENABLE_MINIMAL
3956 case URxvt_locale: 3520 case URxvt_locale:
3957 if (query) 3521 if (query)
3958 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3522 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3959 else 3523 else
3960 { 3524 {
3961 set_locale (str); 3525 set_locale (str);
3962 pty->set_utf8_mode (enc_utf8); 3526 pty->set_utf8_mode (enc_utf8);
3963 init_xlocale (); 3527 init_xlocale ();
… …
3978 break; 3542 break;
3979#endif 3543#endif
3980 3544
3981#if ENABLE_PERL 3545#if ENABLE_PERL
3982 case URxvt_perl: 3546 case URxvt_perl:
3983 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3547 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3984 ; // no responses yet 3548 ; // no responses yet
3985 break; 3549 break;
3986#endif 3550#endif
3987 } 3551 }
3988} 3552}
… …
4026{ 3590{
4027 unsigned int i, j; 3591 unsigned int i, j;
4028 int state; 3592 int state;
4029 3593
4030 static const struct 3594 static const struct
4031 { 3595 {
4032 const int argval; 3596 const int argval;
4033 const unsigned long bit; 3597 const unsigned long bit;
4034 }
4035
4036 argtopriv[] = { 3598 } argtopriv[] = {
4037 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR },
4038 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
4039 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 },
4040 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll },
4041 { 5, PrivMode_rVideo }, 3603 { 5, PrivMode_rVideo },
… …
4057 { 66, PrivMode_aplKP }, 3619 { 66, PrivMode_aplKP },
4058#ifndef NO_BACKSPACE_KEY 3620#ifndef NO_BACKSPACE_KEY
4059 { 67, PrivMode_BackSpace }, 3621 { 67, PrivMode_BackSpace },
4060#endif 3622#endif
4061 { 1000, PrivMode_MouseX11 }, 3623 { 1000, PrivMode_MouseX11 },
4062 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3624 { 1002, PrivMode_MouseBtnEvent },
4063 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3625 { 1003, PrivMode_MouseAnyEvent },
4064 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4065 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4066 { 1011, PrivMode_Keypress }, // rxvt extension 3627 { 1011, PrivMode_Keypress }, // rxvt extension
4067 // 1035 enable modifiers for alt, numlock NYI 3628 // 1035 enable modifiers for alt, numlock NYI
4068 // 1036 send ESC for meta keys NYI 3629 // 1036 send ESC for meta keys NYI
4069 // 1037 send DEL for keypad delete NYI 3630 // 1037 send DEL for keypad delete NYI
4070 { 1047, PrivMode_Screen }, 3631 { 1047, PrivMode_Screen },
4071 // 1048 save and restore cursor 3632 // 1048 save and restore cursor
4072 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4073 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste },
4074 }; 3636 };
4075 3637
4076 if (nargs == 0) 3638 if (nargs == 0)
4077 return; 3639 return;
4078 3640
… …
4104 scr_touch (true); 3666 scr_touch (true);
4105 break; 3667 break;
4106#endif 3668#endif
4107 case 1048: /* alternative cursor save */ 3669 case 1048: /* alternative cursor save */
4108 case 1049: 3670 case 1049:
4109 if (OPTION (Opt_secondaryScreen)) 3671 if (option (Opt_secondaryScreen))
4110 if (mode == 0) 3672 if (mode == 0)
4111 scr_cursor (RESTORE); 3673 scr_cursor (RESTORE);
4112 else if (mode == 1) 3674 else if (mode == 1)
4113 scr_cursor (SAVE); 3675 scr_cursor (SAVE);
4114 break; 3676 break;
… …
4126 */ 3688 */
4127 PrivMode (1, PrivMode_vt52); 3689 PrivMode (1, PrivMode_vt52);
4128 break; 3690 break;
4129 case 3: /* 80/132 */ 3691 case 3: /* 80/132 */
4130 if (priv_modes & PrivMode_132OK) 3692 if (priv_modes & PrivMode_132OK)
3693 {
3694 scr_poweron ();
4131 set_widthheight (((state ? 132 : 80) * fwidth), height); 3695 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3696 }
4132 break; 3697 break;
4133 case 4: /* smooth scrolling */ 3698 case 4: /* smooth scrolling */
4134 set_option (Opt_jumpScroll, !state); 3699 set_option (Opt_jumpScroll, !state);
4135 break; 3700 break;
4136 case 5: /* reverse video */ 3701 case 5: /* reverse video */
… …
4143 scr_autowrap (state); 3708 scr_autowrap (state);
4144 break; 3709 break;
4145 /* case 8: - auto repeat, can't do on a per window basis */ 3710 /* case 8: - auto repeat, can't do on a per window basis */
4146 case 9: /* X10 mouse reporting */ 3711 case 9: /* X10 mouse reporting */
4147 if (state) /* orthogonal */ 3712 if (state) /* orthogonal */
4148 priv_modes &= ~PrivMode_MouseX11; 3713 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4149 break; 3714 break;
4150#ifdef scrollBar_esc 3715#ifdef scrollBar_esc
4151 case scrollBar_esc: 3716 case scrollBar_esc:
4152 if (scrollbar_mapping (state)) 3717 if (scrollbar_mapping (state))
4153 { 3718 {
… …
4166 break; 3731 break;
4167 /* case 66: - application key pad */ 3732 /* case 66: - application key pad */
4168 /* case 67: - backspace key */ 3733 /* case 67: - backspace key */
4169 case 1000: /* X11 mouse reporting */ 3734 case 1000: /* X11 mouse reporting */
4170 if (state) /* orthogonal */ 3735 if (state) /* orthogonal */
4171 priv_modes &= ~PrivMode_MouseX10; 3736 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4172 break; 3737 break;
4173#if 0
4174 case 1001: 3738 case 1002:
4175 break; /* X11 mouse highlighting */ 3739 case 1003:
4176#endif 3740 if (state)
3741 {
3742 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3743 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3744 vt_emask_mouse = PointerMotionMask;
3745 }
3746 else
3747 vt_emask_mouse = NoEventMask;
3748 vt_select_input ();
3749 break;
4177 case 1010: /* scroll to bottom on TTY output inhibit */ 3750 case 1010: /* scroll to bottom on TTY output inhibit */
4178 set_option (Opt_scrollTtyOutput, !state); 3751 set_option (Opt_scrollTtyOutput, !state);
4179 break; 3752 break;
4180 case 1011: /* scroll to bottom on key press */ 3753 case 1011: /* scroll to bottom on key press */
4181 set_option (Opt_scrollTtyKeypress, state); 3754 set_option (Opt_scrollTtyKeypress, state);
4182 break; 3755 break;
4183 case 1047: /* secondary screen w/ clearing last */ 3756 case 1047: /* secondary screen w/ clearing last */
4184 if (OPTION (Opt_secondaryScreen)) 3757 if (option (Opt_secondaryScreen))
4185 if (current_screen != PRIMARY) 3758 if (current_screen != PRIMARY)
4186 scr_erase_screen (2); 3759 scr_erase_screen (2);
4187 scr_change_screen (state); 3760 scr_change_screen (state);
4188 break; 3761 break;
4189 case 1049: /* secondary screen w/ clearing first */ 3762 case 1049: /* secondary screen w/ clearing first */
4190 scr_change_screen (state); 3763 scr_change_screen (state);
4191 if (OPTION (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
4192 if (current_screen != PRIMARY) 3765 if (current_screen != PRIMARY)
4193 scr_erase_screen (2); 3766 scr_erase_screen (2);
4194 break; 3767 break;
4195 default: 3768 default:
4196 break; 3769 break;
… …
4358rxvt_term::process_graphics () 3931rxvt_term::process_graphics ()
4359{ 3932{
4360 unicode_t ch, cmd = cmd_getc (); 3933 unicode_t ch, cmd = cmd_getc ();
4361 3934
4362 if (cmd == 'Q') 3935 if (cmd == 'Q')
3936 {
4363 { /* query graphics */ 3937 /* query graphics */
4364 tt_printf ("\033G0\012"); /* no graphics */ 3938 tt_printf ("\033G0\012"); /* no graphics */
4365 return; 3939 return;
4366 } 3940 }
4367 /* swallow other graphics sequences until terminating ':' */ 3941 /* swallow other graphics sequences until terminating ':' */
4368 do 3942 do
… …
4418 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3992 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4419 3993
4420 memcpy (v_buffer + v_buflen, data, len); 3994 memcpy (v_buffer + v_buflen, data, len);
4421 v_buflen += len; 3995 v_buflen += len;
4422 3996
4423 pty_ev.set (EVENT_READ | EVENT_WRITE); 3997 pty_ev.set (ev::READ | ev::WRITE);
4424} 3998}
4425 3999
4426void rxvt_term::pty_write () 4000void rxvt_term::pty_write ()
4427{ 4001{
4428 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4002 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4433 4007
4434 if (v_buflen == 0) 4008 if (v_buflen == 0)
4435 { 4009 {
4436 free (v_buffer); 4010 free (v_buffer);
4437 v_buffer = 0; 4011 v_buffer = 0;
4438 v_buflen = 0;
4439 4012
4440 pty_ev.set (EVENT_READ); 4013 pty_ev.set (ev::READ);
4441 return; 4014 return;
4442 } 4015 }
4443 4016
4444 memmove (v_buffer, v_buffer + written, v_buflen); 4017 memmove (v_buffer, v_buffer + written, v_buflen);
4445 } 4018 }
4446 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4019 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4447 pty_ev.set (EVENT_READ); 4020 pty_ev.set (ev::READ);
4448} 4021}
4449 4022
4450/*----------------------- end-of-file (C source) -----------------------*/ 4023/*----------------------- end-of-file (C source) -----------------------*/
4451 4024

Diff Legend

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