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.305 by root, Thu Feb 2 18:04:45 2006 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 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
… …
279 } 279 }
280 280
281 iso14755buf = 0; 281 iso14755buf = 0;
282} 282}
283 283
284int 284static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
286{ 286{
287 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
290 { 290 {
… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
304void 339void
305rxvt_term::lookup_key (XKeyEvent &ev) 340rxvt_term::key_press (XKeyEvent &ev)
306{ 341{
307 int ctrl, meta, shft, len; 342 int ctrl, meta, shft, len;
308 unsigned int newlen;
309 KeySym keysym; 343 KeySym keysym;
310 int valid_keysym; 344 int valid_keysym;
311 char kbuf[KBUFSZ]; 345 char kbuf[KBUFSZ];
346
347#if ISO_14755
348 if (iso14755buf & ISO_14755_52)
349 return;
350#endif
312 351
313 /* 352 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 353 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 354 * escape sequence to toggle the Keypad.
316 * 355 *
… …
496# if ISO_14755 535# if ISO_14755
497 iso14755_51 (0); 536 iso14755_51 (0);
498# endif 537# endif
499 return; 538 return;
500 } 539 }
540 else if (keysym == XK_BackSpace)
541 {
542 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
543# if ISO_14755
544 iso14755_51 (iso14755buf & ISO_14755_MASK);
545# endif
546 return;
547 }
501 else if ((hv = hex_keyval (ev)) >= 0) 548 else if ((hv = hex_keyval (ev)) >= 0)
502 { 549 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 550 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51; 551 | hv | ISO_14755_51;
505# if ISO_14755 552# if ISO_14755
… …
507# endif 554# endif
508 return; 555 return;
509 } 556 }
510 else 557 else
511 { 558 {
512# if ENABLE_OVERLAY 559# if ISO_14755
513 scr_overlay_off (); 560 scr_overlay_off ();
514# endif 561# endif
515 iso14755buf = 0; 562 iso14755buf = 0;
516 } 563 }
517 } 564 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 565 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 566 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 567 if (!(iso14755buf & ISO_14755_STARTED))
521 { 568 {
522 iso14755buf |= ISO_14755_STARTED; 569 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 570# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 571 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 572 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 573# endif
527 } 574 }
528#endif 575#endif
529 576
530#ifdef PRINTPIPE 577#ifdef PRINTPIPE
531 if (keysym == XK_Print) 578 if (keysym == XK_Print)
532 { 579 {
533 scr_printscreen (ctrl | shft); 580 scr_printscreen (ctrl | shft);
534 return; 581 return;
535 } 582 }
536#endif 583#endif
537 584
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 585 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 586 {
540 { 587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 588 unsigned int newlen = 1;
542 switch (keysym) 589
590 switch (translate_keypad (keysym, kp))
543 { 591 {
544#ifndef NO_BACKSPACE_KEY 592#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 593 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 594 if (priv_modes & PrivMode_HaveBackSpace)
547 { 595 {
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 596 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 597 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 598 kbuf[1] = '\0';
551 } 599 }
552 else 600 else
553 strcpy (kbuf, key_backspace); 601 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 602 break;
555#endif 603#endif
556#ifndef NO_DELETE_KEY 604#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: 605 case XK_Delete:
568 strcpy (kbuf, key_delete); 606 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 607 break;
570#endif 608#endif
571 case XK_Tab: 609 case XK_Tab:
572 if (shft) 610 if (shft)
573 strcpy (kbuf, "\033[Z"); 611 strcpy (kbuf, "\033[Z");
… …
583#endif 621#endif
584 newlen = 0; 622 newlen = 0;
585 } 623 }
586 break; 624 break;
587 625
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" */ 626 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 627 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 628 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 629 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 630 strcpy (kbuf, "\033[Z");
… …
618 else if (priv_modes & PrivMode_aplCUR) 640 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 641 kbuf[1] = 'O';
620 break; 642 break;
621 643
622#ifndef UNSHIFTED_SCROLLKEYS 644#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: 645 case XK_Prior:
634 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
635 break; 647 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: 648 case XK_Next:
647 strcpy (kbuf, "\033[6~"); 649 strcpy (kbuf, "\033[6~");
648 break; 650 break;
649#endif 651#endif
650 case XK_KP_Enter: 652 case XK_KP_Enter:
651 /* allow shift to override */ 653 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 654 if (kp)
653 { 655 {
654 strcpy (kbuf, "\033OM"); 656 strcpy (kbuf, "\033OM");
655 break; 657 break;
656 } 658 }
657 659
… …
669 kbuf[0] = '\015'; 671 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 672 kbuf[1] = '\0';
671 } 673 }
672 break; 674 break;
673 675
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" */ 676 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 677 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 678 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 679 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 680 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 696 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 697 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 698 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 699 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 700 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 701 if (kp)
706 { 702 {
707 strcpy (kbuf, "\033Oj"); 703 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 704 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 705 }
710 else 706 else
… …
716 712
717 case XK_Find: 713 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 714 strcpy (kbuf, "\033[1~");
719 break; 715 break;
720 716
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: 717 case XK_Insert:
732 strcpy (kbuf, "\033[2~"); 718 strcpy (kbuf, "\033[2~");
733 break; 719 break;
734#ifdef DXK_Remove /* support for DEC remove like key */ 720#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove: 721 case DXK_Remove:
… …
739 strcpy (kbuf, "\033[3~"); 725 strcpy (kbuf, "\033[3~");
740 break; 726 break;
741 case XK_Select: 727 case XK_Select:
742 strcpy (kbuf, "\033[4~"); 728 strcpy (kbuf, "\033[4~");
743 break; 729 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: 730 case XK_End:
755 strcpy (kbuf, KS_END); 731 strcpy (kbuf, KS_END);
756 break; 732 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: 733 case XK_Home:
768 strcpy (kbuf, KS_HOME); 734 strcpy (kbuf, KS_HOME);
769 break; 735 break;
770 736
771#define FKEY(n, fkey) \ 737#define FKEY(n, fkey) \
… …
828 break; 794 break;
829 } 795 }
830 796
831 if (newlen) 797 if (newlen)
832 len = strlen (kbuf); 798 len = strlen (kbuf);
833 }
834 799
835 /* 800 /*
836 * Pass meta for all function keys, if 'meta' option set 801 * Pass meta for all function keys, if 'meta' option set
837 */ 802 */
838#ifdef META8_OPTION 803#ifdef META8_OPTION
… …
873 return; 838 return;
874 839
875 if (len <= 0) 840 if (len <= 0)
876 return; /* not mapped */ 841 return; /* not mapped */
877 842
878 if (OPTION (Opt_scrollTtyKeypress)) 843 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 844 if (view_start)
880 { 845 {
881 view_start = 0; 846 view_start = 0;
882 want_refresh = 1; 847 want_refresh = 1;
883 } 848 }
… …
907 tt_write (&ch, 1); 872 tt_write (&ch, 1);
908 } 873 }
909 874
910 tt_write (kbuf, (unsigned int)len); 875 tt_write (kbuf, (unsigned int)len);
911} 876}
912/*}}} */ 877
878void
879rxvt_term::key_release (XKeyEvent &ev)
880{
881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
882 KeySym keysym;
883
884 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
885#endif
886
887#if ENABLE_FRILLS || ISO_14755
888 // ISO 14755 support
889 if (iso14755buf)
890 if (iso14755buf & ISO_14755_52)
891 {
892# if ISO_14755
893 scr_overlay_off ();
894# endif
895# if ISO_14755
896 // iso14755 part 5.2 handling: release time
897 // first: controls
898 if ((ev.state & ControlMask)
899 && ((keysym >= 0x40 && keysym <= 0x5f)
900 || (keysym >= 0x61 && keysym <= 0x7f)))
901 {
902 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
903 commit_iso14755 ();
904
905 return;
906 }
907
908 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
909 if (i[0] == keysym)
910 {
911 iso14755buf = ISO_14755_51 | i[1];
912 commit_iso14755 ();
913
914 return;
915 }
916
917 scr_bell ();
918# endif
919 iso14755buf = 0;
920
921 return;
922 }
923 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
924 {
925# if ISO_14755
926 scr_overlay_off ();
927# endif
928 if (iso14755buf & ISO_14755_51)
929 commit_iso14755 ();
930#if ISO_14755
931 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
932 {
933 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
934
935 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
936 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
937 }
938# endif
939 else
940 iso14755buf = 0;
941 }
942#endif
943
944 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
945 return;
946
947#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
948 if (!(ev.state & ControlMask))
949 slip_wheel_ev.stop ();
950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
951 mouse_slip_wheel_speed = 0;
952#endif
953}
913 954
914#if defined (KEYSYM_RESOURCE) 955#if defined (KEYSYM_RESOURCE)
915unsigned int 956unsigned int
916rxvt_term::cmd_write (const char *str, unsigned int count) 957rxvt_term::cmd_write (const char *str, unsigned int count)
917{ 958{
… …
947void 988void
948rxvt_term::flush () 989rxvt_term::flush ()
949{ 990{
950 flush_ev.stop (); 991 flush_ev.stop ();
951 992
952#ifdef TRANSPARENT 993#ifdef HAVE_BG_PIXMAP
953 if (want_full_refresh) 994 if (bgPixmap.check_clearChanged ())
954 { 995 {
955 want_full_refresh = 0; 996// scr_clear (true); This needs to be researched further!
956 scr_clear ();
957 scr_touch (false); 997 scr_touch (false);
958 } 998 }
959#endif 999#endif
960 1000
961 if (want_refresh) 1001 if (want_refresh)
… …
1006 } 1046 }
1007 1047
1008 display->flush (); 1048 display->flush ();
1009} 1049}
1010 1050
1051/* checks wether a refresh is requested and starts the refresh timer */
1011void 1052void
1012rxvt_term::check_cb (check_watcher &w) 1053rxvt_term::refresh_check ()
1054{
1055 if (want_refresh && !flush_ev.is_active ())
1056 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1057
1058 display->flush ();
1059}
1060
1061void
1062rxvt_term::flush_cb (ev::timer &w, int revents)
1013{ 1063{
1014 make_current (); 1064 make_current ();
1015 1065
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; 1066 refresh_count = 0;
1029 flush (); 1067 flush ();
1030} 1068}
1031 1069
1032#ifdef CURSOR_BLINK 1070#ifdef CURSOR_BLINK
1033void 1071void
1034rxvt_term::cursor_blink_cb (time_watcher &w) 1072rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1035{ 1073{
1036 hidden_cursor = !hidden_cursor; 1074 hidden_cursor = !hidden_cursor;
1037 want_refresh = 1; 1075 want_refresh = 1;
1038 1076 refresh_check ();
1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
1040} 1077}
1041#endif 1078#endif
1042 1079
1043#ifdef TEXT_BLINK 1080#ifdef TEXT_BLINK
1044void 1081void
1045rxvt_term::text_blink_cb (time_watcher &w) 1082rxvt_term::text_blink_cb (ev::timer &w, int revents)
1046{ 1083{
1047 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1084 if (scr_refresh_rend (RS_Blink, RS_Blink))
1048 { 1085 {
1049 hidden_text = !hidden_text; 1086 hidden_text = !hidden_text;
1050 want_refresh = 1; 1087 want_refresh = 1;
1051 w.start (w.at + TEXT_BLINK_INTERVAL); 1088 refresh_check ();
1052 } 1089 }
1090 else
1091 w.stop ();
1053} 1092}
1054#endif 1093#endif
1055 1094
1056#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1095#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1057void 1096void
1058rxvt_term::cont_scroll_cb (time_watcher &w) 1097rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1059{ 1098{
1060 if ((scrollbar_isUp() || scrollbar_isDn()) && 1099 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1061 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1100 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1062 { 1101 {
1063 want_refresh = 1; 1102 want_refresh = 1;
1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1103 refresh_check ();
1065 } 1104 }
1105 else
1106 w.stop ();
1066} 1107}
1067#endif 1108#endif
1068 1109
1069#ifdef SELECTION_SCROLLING 1110#ifdef SELECTION_SCROLLING
1070void 1111void
1071rxvt_term::sel_scroll_cb (time_watcher &w) 1112rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1072{ 1113{
1073 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1114 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1074 { 1115 {
1075 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1116 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1076 want_refresh = 1; 1117 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1078 } 1119 }
1120 else
1121 w.stop ();
1079} 1122}
1080#endif 1123#endif
1081 1124
1082#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1125#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1083void 1126void
1084rxvt_term::slip_wheel_cb (time_watcher &w) 1127rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1085{ 1128{
1086 if (mouse_slip_wheel_speed == 0 1129 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 { 1130 {
1090 if (view_start == top_row || view_start == 0)
1091 mouse_slip_wheel_speed = 0;
1092
1093 want_refresh = 1; 1131 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1132 refresh_check ();
1133 }
1134
1135 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1136 {
1137 mouse_slip_wheel_speed = 0;
1138 w.stop ();
1095 } 1139 }
1096} 1140}
1097#endif 1141#endif
1098 1142
1099#if LINUX_YIELD_HACK 1143#if LINUX_YIELD_HACK
1100static struct event_handler 1144static struct event_handler
1101{ 1145{
1102 check_watcher yield_ev; 1146 ev::prepare yield_ev;
1103 1147
1104 void yield_cb (check_watcher &w) 1148 void yield_cb (ev::prepare &w, int revents)
1105 { 1149 {
1106 // this should really be sched_yield(), but the linux guys thought 1150 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than 1151 // 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 1152 // ones with high nice levels is a useful thing to do. It surely is is
1109 // allowed by the sus... as is returning ENOSYS. 1153 // allowed by the sus... as is returning ENOSYS.
… …
1152 } 1196 }
1153 else 1197 else
1154 { 1198 {
1155 pty_ev.stop (); 1199 pty_ev.stop ();
1156 1200
1157 if (!OPTION (Opt_hold)) 1201 if (!option (Opt_hold))
1158 destroy (); 1202 destroy ();
1159 } 1203 }
1160 1204
1161 return false; 1205 return false;
1162} 1206}
1163 1207
1164void 1208void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1210{
1167 make_current (); 1211 make_current ();
1168 1212
1169 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1215 while (pty_fill ())
1172 if (cmd_parse ()) 1216 if (cmd_parse ())
1173 break; 1217 break;
1174 1218
1175 if (revents & EVENT_WRITE) 1219 if (revents & ev::WRITE)
1176 pty_write (); 1220 pty_write ();
1221
1222 refresh_check ();
1177} 1223}
1178 1224
1179void 1225void
1180rxvt_term::pointer_unblank () 1226rxvt_term::pointer_unblank ()
1181{ 1227{
… …
1183 recolour_cursor (); 1229 recolour_cursor ();
1184 1230
1185#ifdef POINTER_BLANK 1231#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1232 hidden_pointer = 0;
1187 1233
1188 if (OPTION (Opt_pointerBlank)) 1234 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1235 pointer_ev.start (pointerBlankDelay);
1190#endif 1236#endif
1191} 1237}
1192 1238
1193#ifdef POINTER_BLANK 1239#ifdef POINTER_BLANK
1194void 1240void
1195rxvt_term::pointer_blank () 1241rxvt_term::pointer_blank ()
1196{ 1242{
1197 if (!OPTION (Opt_pointerBlank)) 1243 if (!option (Opt_pointerBlank))
1198 return; 1244 return;
1199 1245
1200 XDefineCursor (dpy, vt, display->blank_cursor); 1246 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (dpy); 1247 XFlush (dpy);
1202 1248
1203 hidden_pointer = 1; 1249 hidden_pointer = 1;
1204} 1250}
1205 1251
1206void 1252void
1207rxvt_term::pointer_cb (time_watcher &w) 1253rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1254{
1209 make_current (); 1255 make_current ();
1210 1256
1211 pointer_blank (); 1257 pointer_blank ();
1212} 1258}
… …
1215void 1261void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1262rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1263{
1218 int button_number, key_state = 0; 1264 int button_number, key_state = 0;
1219 int x, y; 1265 int x, y;
1266 int code = 32;
1220 1267
1221 x = ev.x; 1268 x = Pixel2Col (ev.x);
1222 y = ev.y; 1269 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1270 if (ev.type == MotionNotify)
1271 {
1272 if (x == mouse_row && y == mouse_col)
1273 return;
1274 mouse_row = x;
1275 mouse_col = y;
1276 code += 32;
1277 }
1224 1278
1225 if (MEvent.button == AnyButton) 1279 if (MEvent.button == AnyButton)
1226 button_number = 3; 1280 button_number = 3;
1227 else 1281 else
1228 { 1282 {
… …
1274 x + 1, 1328 x + 1,
1275 y + 1); 1329 y + 1);
1276#endif 1330#endif
1277 1331
1278 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1333 (code + button_number + key_state),
1280 (32 + x + 1), 1334 (32 + x + 1),
1281 (32 + y + 1)); 1335 (32 + y + 1));
1282} 1336}
1283 1337
1284/*{{{ process an X event */ 1338/*{{{ process an X event */
… …
1300 unsigned int unused_mask; 1354 unsigned int unused_mask;
1301 1355
1302 switch (ev.type) 1356 switch (ev.type)
1303 { 1357 {
1304 case KeyPress: 1358 case KeyPress:
1305#if ISO_14755 1359 key_press (ev.xkey);
1306 if (!(iso14755buf & ISO_14755_52))
1307#endif
1308 lookup_key (ev.xkey);
1309
1310 break; 1360 break;
1311 1361
1312 case KeyRelease: 1362 case KeyRelease:
1313 { 1363 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; 1364 break;
1385 }
1386 1365
1387 case ButtonPress: 1366 case ButtonPress:
1388 button_press (ev.xbutton); 1367 button_press (ev.xbutton);
1389 break; 1368 break;
1390 1369
… …
1421 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1400 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1422 focus_out (); 1401 focus_out ();
1423 } 1402 }
1424#endif 1403#endif
1425 } 1404 }
1426 break;
1427
1428 case MappingNotify:
1429 XRefreshKeyboardMapping (&ev.xmapping);
1430 break; 1405 break;
1431 1406
1432 /* 1407 /*
1433 * XXX: this is not the _current_ arrangement 1408 * XXX: this is not the _current_ arrangement
1434 * Here's my conclusion: 1409 * Here's my conclusion:
… …
1453 break; 1428 break;
1454 } 1429 }
1455 break; 1430 break;
1456 1431
1457 case FocusIn: 1432 case FocusIn:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1458 focus_in (); 1436 focus_in ();
1459 break; 1437 break;
1460 1438
1461 case FocusOut: 1439 case FocusOut:
1440 if (ev.xfocus.detail != NotifyInferior
1441 && ev.xfocus.detail != NotifyPointer
1442 && ev.xfocus.mode != NotifyGrab)
1462 focus_out (); 1443 focus_out ();
1463 break; 1444 break;
1464 1445
1465 case ConfigureNotify: 1446 case ConfigureNotify:
1447 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1448 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1449 szHint.width, szHint.height);*/
1466 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1467 { 1451 {
1468 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1469 ; 1453 ;
1470 1454
1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1455 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1472 { 1456 {
1473 seen_resize = 1; 1457 seen_resize = 1;
1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1458 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1475 } 1459 }
1460 else
1461 {
1462#ifdef HAVE_BG_PIXMAP
1463 if (bgPixmap.window_position_sensitive ())
1464 {
1465 if (mapped)
1466 update_background ();
1467 else
1468 bgPixmap.invalidate ();
1469 }
1470#endif
1471 }
1476 1472
1477 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1473 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 } 1474 }
1484 break; 1475 break;
1485 1476
1486 case PropertyNotify: 1477 case PropertyNotify:
1487 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1478 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1503 case SelectionRequest: 1494 case SelectionRequest:
1504 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1505 break; 1496 break;
1506 1497
1507 case MapNotify: 1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed spcifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriwing while WM does
1504 * reparenting.
1505 * We should not render background immidiately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1513 update_background_ev.start (0.025);
1514#endif
1508 mapped = 1; 1515 mapped = 1;
1509#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1517 text_blink_ev.start ();
1511#endif 1518#endif
1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1513 break; 1520 break;
1514 1521
1515 case UnmapNotify: 1522 case UnmapNotify:
… …
1517#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1518 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1519#endif 1526#endif
1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1521 break; 1528 break;
1522
1523#ifdef TRANSPARENT
1524 case ReparentNotify:
1525 rootwin_cb (ev);
1526 break;
1527#endif /* TRANSPARENT */
1528 1529
1529 case GraphicsExpose: 1530 case GraphicsExpose:
1530 case Expose: 1531 case Expose:
1531 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1532 { 1533 {
1533 do 1534 do
1535 {
1534 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1535 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, False);
1538 }
1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1537 1540
1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1539 1542
1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1543 1548
1544 want_refresh = 1; 1549 want_refresh = 1;
1545 } 1550 }
1546 else 1551 else
1547 { 1552 {
… …
1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1551 ; 1556 ;
1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1553 ; 1558 ;
1554 1559
1555 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1556 { 1561 {
1557 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1558 scrollbar_show (0); 1563 scrollbar_show (0);
1559 } 1564 }
1560
1561#ifdef TRANSPARENT
1562 if (am_transparent && ev.xany.window == parent[0])
1563 XClearWindow (dpy, ev.xany.window);
1564#endif
1565 } 1565 }
1566 break; 1566 break;
1567 1567
1568 case MotionNotify: 1568 case MotionNotify:
1569#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1570 if (hidden_pointer) 1570 if (hidden_pointer)
1571 pointer_unblank (); 1571 pointer_unblank ();
1572#endif 1572#endif
1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1574 || priv_modes & PrivMode_MouseAnyEvent)
1575 mouse_report (ev.xbutton);
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1577 break;
1575 1578
1576 if (ev.xany.window == vt) 1579 if (ev.xany.window == vt)
1577 { 1580 {
… …
1611 int dist; 1614 int dist;
1612 1615
1613 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1614 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1615 */ 1618 */
1616 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1617 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1618 1621
1619 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1620 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1621 */ 1624 */
1622 selection_save_x = ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
… …
1644 else 1647 else
1645 { 1648 {
1646 /* we are within the text window, so we 1649 /* we are within the text window, so we
1647 * shouldn't be scrolling 1650 * shouldn't be scrolling
1648 */ 1651 */
1649 if (sel_scroll_ev.active)
1650 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1651 } 1653 }
1652#endif 1654#endif
1653#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1654 } 1656 }
1655#endif 1657#endif
1656 } 1658 }
1657 } 1659 }
1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1659 { 1661 {
1660 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1661 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1662 ; 1664 ;
1663 1665
… …
1667 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1670 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1672 scrollbar_size ());
1671 want_refresh = 1; 1673 want_refresh = 1;
1672 refresh_limit = 0;
1673 scrollbar_show (1); 1674 scrollbar_show (1);
1674 } 1675 }
1675 break; 1676 break;
1676 } 1677 }
1677 1678
1678skip_switch: ;
1679
1680#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
1681 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1680 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1682 { 1681 {
1683 if (hidden_cursor) 1682 if (hidden_cursor)
1684 { 1683 {
1685 hidden_cursor = 0; 1684 hidden_cursor = 0;
1686 want_refresh = 1; 1685 want_refresh = 1;
1687 } 1686 }
1688 1687
1689 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1690 } 1689 }
1691#endif 1690#endif
1692 1691
1693#if defined(POINTER_BLANK) 1692#if defined(POINTER_BLANK)
1694 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1695 { 1694 {
1696 if (ev.type == MotionNotify 1695 if (ev.type == MotionNotify
1697 || ev.type == ButtonPress 1696 || ev.type == ButtonPress
1698 || ev.type == ButtonRelease) 1697 || ev.type == ButtonRelease)
1699 if (hidden_pointer) 1698 if (hidden_pointer)
… …
1701 1700
1702 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1703 pointer_blank (); 1702 pointer_blank ();
1704 } 1703 }
1705#endif 1704#endif
1705
1706 refresh_check ();
1706} 1707}
1707 1708
1708void 1709void
1709rxvt_term::focus_in () 1710rxvt_term::focus_in ()
1710{ 1711{
1711 if (!focus) 1712 if (!focus)
1712 { 1713 {
1713 focus = 1; 1714 focus = 1;
1714 want_refresh = 1; 1715 want_refresh = 1;
1715 1716
1716 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1717 1718
1718#if USE_XIM 1719#if USE_XIM
1719 if (Input_Context != NULL) 1720 if (Input_Context != NULL)
1720 { 1721 {
1721 IMSetStatusPosition (); 1722 IMSetPosition ();
1722 XSetICFocus (Input_Context); 1723 XSetICFocus (Input_Context);
1723 } 1724 }
1724#endif 1725#endif
1725#if CURSOR_BLINK 1726#if CURSOR_BLINK
1726 if (OPTION (Opt_cursorBlink)) 1727 if (option (Opt_cursorBlink))
1727 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1728 cursor_blink_ev.again ();
1728#endif 1729#endif
1729#if OFF_FOCUS_FADING 1730#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade]) 1731 if (rs[Rs_fade])
1731 { 1732 {
1732 pix_colors = pix_colors_focused; 1733 pix_colors = pix_colors_focused;
1733 scr_recolour (); 1734 scr_recolour ();
1734 } 1735 }
1735#endif 1736#endif
1737#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell))
1739 {
1740 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1741 {
1742 h->flags &= ~XUrgencyHint;
1743 XSetWMHints (dpy, parent[0], h);
1744 }
1745 }
1746#endif
1736 } 1747 }
1737} 1748}
1738 1749
1739void 1750void
1740rxvt_term::focus_out () 1751rxvt_term::focus_out ()
… …
1748 1759
1749#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1750 if (iso14755buf) 1761 if (iso14755buf)
1751 { 1762 {
1752 iso14755buf = 0; 1763 iso14755buf = 0;
1753# if ENABLE_OVERLAY 1764# if ISO_14755
1754 scr_overlay_off (); 1765 scr_overlay_off ();
1755# endif 1766# endif
1756 } 1767 }
1757#endif 1768#endif
1758#if USE_XIM 1769#if USE_XIM
1759 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1760 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1761#endif 1772#endif
1762#if CURSOR_BLINK 1773#if CURSOR_BLINK
1763 if (OPTION (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1764 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1765 hidden_cursor = 0; 1777 hidden_cursor = 0;
1766#endif 1778#endif
1767#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1769 { 1781 {
… …
1772 } 1784 }
1773#endif 1785#endif
1774 } 1786 }
1775} 1787}
1776 1788
1777#if TRANSPARENT 1789void
1790rxvt_term::update_fade_color (unsigned int idx)
1791{
1792#if OFF_FOCUS_FADING
1793 if (rs[Rs_fade])
1794 {
1795 rgba c;
1796 pix_colors [Color_fade].get (c);
1797 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1798 }
1799#endif
1800}
1801
1802#if ENABLE_TRANSPARENCY || ENABLE_PERL
1778void 1803void
1779rxvt_term::rootwin_cb (XEvent &ev) 1804rxvt_term::rootwin_cb (XEvent &ev)
1780{ 1805{
1781 make_current (); 1806 make_current ();
1782 1807
1808 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1809 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1810 return;
1811
1812# if ENABLE_TRANSPARENCY
1783 switch (ev.type) 1813 switch (ev.type)
1784 { 1814 {
1785 case PropertyNotify: 1815 case PropertyNotify:
1786 /* 1816 /*
1787 * if user used some Esetroot compatible prog to set the root bg, 1817 * 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. 1818 * use the property to determine the pixmap. We use it later on.
1789 */ 1819 */
1790 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1791 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1792 return; 1822 {
1823 bgPixmap.set_root_pixmap ();
1824 update_background ();
1825 }
1793 1826
1794 /* FALLTHROUGH */
1795 case ReparentNotify:
1796 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1797 want_refresh = want_full_refresh = 1;
1798 break; 1827 break;
1799 } 1828 }
1829# endif
1830
1831 refresh_check ();
1800} 1832}
1801#endif 1833#endif
1802 1834
1803void 1835void
1804rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
… …
1859 mouse_report (ev); 1891 mouse_report (ev);
1860 } 1892 }
1861#else 1893#else
1862 MEvent.button = ev.button; 1894 MEvent.button = ev.button;
1863 mouse_report (ev); 1895 mouse_report (ev);
1864#endif /* MOUSE_REPORT_DOUBLECLICK */ 1896#endif /* MOUSE_REPORT_DOUBLECLICK */
1865 1897
1866 } 1898 }
1867 else 1899 else
1868 { 1900 {
1869 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
… …
1917 } 1949 }
1918 1950
1919 /* 1951 /*
1920 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1921 */ 1953 */
1922 if (isScrollbarWindow (ev.window)) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1923 { 1955 {
1924 scrollBar.setIdle (); 1956 page_dirn direction = NO_DIR;
1957
1958 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */
1962
1963 scrollBar.state = STATE_IDLE;
1925 /* 1964 /*
1926 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1927 * move up if mouse is above slider 1966 * move up if mouse is above slider
1928 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1929 * 1968 *
… …
1938 /* 1977 /*
1939 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1940 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1941 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1942 */ 1981 */
1943 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1944 && scrollbarnext_upButton (ev.y))
1945 || (scrollBar.style == R_SB_RXVT
1946 && scrollbarrxvt_upButton (ev.y)))
1947 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1948 else if ((scrollBar.style == R_SB_NEXT 1984 else if (direction == DN)
1949 && scrollbarnext_dnButton (ev.y))
1950 || (scrollBar.style == R_SB_RXVT
1951 && scrollbarrxvt_dnButton (ev.y)))
1952 tt_printf ("\033[B"); 1985 tt_printf ("\033[B");
1953 else 1986 else
1954 switch (ev.button) 1987 switch (ev.button)
1955 { 1988 {
1956 case Button2: 1989 case Button2:
… …
1963 tt_printf ("\033[5~"); 1996 tt_printf ("\033[5~");
1964 break; 1997 break;
1965 } 1998 }
1966 } 1999 }
1967 else 2000 else
1968#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1969
1970 {
1971 char upordown = 0;
1972
1973 if (scrollBar.style == R_SB_NEXT)
1974 { 2002 {
1975 if (scrollbarnext_upButton (ev.y)) 2003 if (direction != NO_DIR)
1976 upordown = -1; /* up */
1977 else if (scrollbarnext_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 else if (scrollBar.style == R_SB_RXVT)
1981 {
1982 if (scrollbarrxvt_upButton (ev.y))
1983 upordown = -1; /* up */
1984 else if (scrollbarrxvt_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987 if (upordown)
1988 { 2004 {
1989#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2006 if (!cont_scroll_ev.is_active ())
1990 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1991#endif 2008#endif
1992 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
1993 { 2010 {
1994 if (upordown < 0) 2011 if (direction == UP)
1995 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
1996 else 2013 else
1997 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
1998 } 2015 }
1999 } 2016 }
2000 else 2017 else
2001 switch (ev.button) 2018 switch (ev.button)
2002 { 2019 {
2003 case Button2: 2020 case Button2:
2004 switch (scrollbar_align) 2021 switch (scrollBar.align)
2005 { 2022 {
2006 case R_SB_ALIGN_TOP: 2023 case R_SB_ALIGN_TOP:
2007 csrO = 0; 2024 csrO = 0;
2008 break; 2025 break;
2009 case R_SB_ALIGN_CENTRE: 2026 case R_SB_ALIGN_CENTRE:
… …
2017 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
2018 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
2019 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
2020 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2021 2038
2022 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
2023 break; 2040 break;
2024 2041
2025 case Button1: 2042 case Button1:
2026 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2027 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
2028 /* FALLTHROUGH */ 2045 /* FALLTHROUGH */
2029 2046
2030 case Button3: 2047 case Button3:
2031 if (scrollBar.style != R_SB_XTERM) 2048 if (scrollBar.style != R_SB_XTERM)
… …
2041 scr_page (DN, nrow - 1); 2058 scr_page (DN, nrow - 1);
2042# else 2059# else
2043 scr_page (DN, nrow / 4); 2060 scr_page (DN, nrow / 4);
2044# endif 2061# endif
2045 else 2062 else
2046 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2047 } 2064 }
2048 else 2065 else
2049 { 2066 {
2050 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
2051 (nrow 2068 (nrow
… …
2068 2085
2069 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
2070 if (!bypass_keystate) 2087 if (!bypass_keystate)
2071 reportmode = !! (priv_modes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
2072 2089
2073 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2074 { 2091 {
2075 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
2076 scrollbar_show (0); 2093 scrollbar_show (0);
2077 } 2094 }
2078 2095
2079#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
2080 if (sel_scroll_ev.active)
2081 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2082#endif 2098#endif
2083 2099
2084 if (ev.window == vt) 2100 if (ev.window == vt)
2085 { 2101 {
2086 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2102 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2110 mouse_report (ev); 2126 mouse_report (ev);
2111 } 2127 }
2112#else /* MOUSE_REPORT_DOUBLECLICK */ 2128#else /* MOUSE_REPORT_DOUBLECLICK */
2113 MEvent.button = AnyButton; 2129 MEvent.button = AnyButton;
2114 mouse_report (ev); 2130 mouse_report (ev);
2115#endif /* MOUSE_REPORT_DOUBLECLICK */ 2131#endif /* MOUSE_REPORT_DOUBLECLICK */
2116 return; 2132 return;
2117 } 2133 }
2118 2134
2119 /* 2135 /*
2120 * dumb hack to compensate for the failure of click-and-drag 2136 * dumb hack to compensate for the failure of click-and-drag
… …
2132 selection_make (ev.time); 2148 selection_make (ev.time);
2133 break; 2149 break;
2134 2150
2135 case Button2: 2151 case Button2:
2136 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2152 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); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2138 break; 2154 break;
2139 2155
2140#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2141 case Button4: 2157 case Button4:
2142 case Button5: 2158 case Button5:
… …
2146 2162
2147 v = ev.button == Button4 ? UP : DN; 2163 v = ev.button == Button4 ? UP : DN;
2148 2164
2149 if (ev.state & ShiftMask) 2165 if (ev.state & ShiftMask)
2150 i = 1; 2166 i = 1;
2151 else if (OPTION (Opt_mouseWheelScrollPage)) 2167 else if (option (Opt_mouseWheelScrollPage))
2152 i = nrow - 1; 2168 i = nrow - 1;
2153 else 2169 else
2154 i = 5; 2170 i = 5;
2155 2171
2156# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
… …
2158 { 2174 {
2159 mouse_slip_wheel_speed += v ? -1 : 1; 2175 mouse_slip_wheel_speed += v ? -1 : 1;
2160 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2161 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2162 2178
2163 if (slip_wheel_ev.at < NOW) 2179 if (!slip_wheel_ev.is_active ())
2164 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2165
2166 slip_wheel_ev.start ();
2167 } 2181 }
2168 else 2182 else
2183# endif
2169 { 2184 {
2170# endif
2171 scr_page (v, i); 2185 scr_page (v, i);
2172 scrollbar_show (1); 2186 scrollbar_show (1);
2173# ifdef MOUSE_SLIP_WHEELING
2174 } 2187 }
2175# endif
2176 } 2188 }
2177 break; 2189 break;
2178#endif 2190#endif
2179 } 2191 }
2180 } 2192 }
2181} 2193}
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 (dpy, display->root, &wrootattr);
2436 rootdepth = wrootattr.depth;
2437
2438 XGetWindowAttributes (dpy, parent[0], &wattr);
2439
2440 if (rootdepth != wattr.depth)
2441 {
2442 if (am_transparent)
2443 {
2444 pchanged = 1;
2445 XSetWindowBackground (dpy, 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 (dpy, 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 (dpy, 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 (dpy, 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 (dpy, 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 (dpy, False);
2520 allowedxerror = -1;
2521 image = XGetImage (dpy, 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 (dpy, pixmap);
2535 pixmap = None;
2536 }
2537 }
2538
2539 am_pixmap_trans = 0;
2540 }
2541 else
2542 {
2543 if (pixmap != None)
2544 XFreePixmap (dpy, 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 (dpy, vt, szHint.width, szHint.height, image->depth);
2559 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2560 XPutImage (dpy, pixmap, gc, image, 0, 0,
2561 nx, ny, image->width, image->height);
2562 XFreeGC (dpy, gc);
2563 XDestroyImage (image);
2564 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2565 XClearWindow (dpy, 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 (dpy, 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 (dpy, 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 (dpy, 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 (dpy, parent[0], pix_colors_focused[Color_border]);
2617 XSetWindowBackground (dpy, 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 (dpy, parent[n], ParentRelative);
2626 XClearWindow (dpy, parent[n]);
2627 }
2628
2629 XSetWindowBackgroundPixmap (dpy, 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 (dpy, 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 2194
2655/*}}} */ 2195/*}}} */
2656 2196
2657bool 2197bool
2658rxvt_term::cmd_parse () 2198rxvt_term::cmd_parse ()
… …
2707 if (ch == C0_LF) 2247 if (ch == C0_LF)
2708 nlines++; 2248 nlines++;
2709 2249
2710 refresh_count++; 2250 refresh_count++;
2711 2251
2712 if (!OPTION (Opt_jumpScroll) 2252 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2713 || (refresh_count >= refresh_limit * (nrow - 1)))
2714 { 2253 {
2715 refreshnow = true;
2716 refresh_count = 0; 2254 refresh_count = 0;
2255
2256 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2257 {
2258 refreshnow = true;
2717 ch = NOCHAR; 2259 ch = NOCHAR;
2718 break; 2260 break;
2261 }
2719 } 2262 }
2720 2263
2721 // scr_add_lines only works for nlines <= nrow - 1. 2264 // scr_add_lines only works for nlines <= nrow - 1.
2722 if (nlines >= nrow - 1) 2265 if (nlines >= nrow - 1)
2723 { 2266 {
… …
2751 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2294 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2752 scr_add_lines (buf, str - buf, nlines); 2295 scr_add_lines (buf, str - buf, nlines);
2753 2296
2754 /* 2297 /*
2755 * If there have been a lot of new lines, then update the screen 2298 * 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. 2299 * 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 2300 * if skipScroll is enabled.
2758 * is incremented here because we must be doing flat-out scrolling.
2759 */ 2301 */
2760 if (refreshnow) 2302 if (refreshnow)
2761 { 2303 {
2762 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2763 refresh_limit++;
2764 else
2765 {
2766 flag = true; 2304 flag = true;
2767 scr_refresh (); 2305 scr_refresh ();
2768 want_refresh = 1; 2306 want_refresh = 1;
2769 }
2770 } 2307 }
2771 2308
2772 } 2309 }
2773 else 2310 else
2774 { 2311 {
… …
2923 { 2460 {
2924 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2925 break; /* done = 1 */ 2462 break; /* done = 1 */
2926 } 2463 }
2927 } 2464 }
2928 2465
2929 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2930 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2931 { 2468 {
2932 done = 1; 2469 done = 1;
2933 break; 2470 break;
… …
2935 } 2472 }
2936 } 2473 }
2937 2474
2938 pclose_printer (fd); 2475 pclose_printer (fd);
2939} 2476}
2940#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2941/*}}} */ 2478/*}}} */
2942 2479
2943/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2944enum { 2481enum {
2945 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
2995 process_dcs_seq (); 2532 process_dcs_seq ();
2996 break; 2533 break;
2997 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
2998 process_csi_seq (); 2535 process_csi_seq ();
2999 break; 2536 break;
3000 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
3001 process_osc_seq (); 2538 process_osc_seq ();
3002 break; 2539 break;
3003#endif 2540#endif
3004 } 2541 }
3005} 2542}
… …
3231rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3232{ 2769{
3233 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3234 unsigned int nargs, p; 2771 unsigned int nargs, p;
3235 int n, ndef; 2772 int n, ndef;
3236 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3237 2774
3238 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3239 arg[--nargs] = 0;
3240 2776
3241 priv = 0; 2777 priv = 0;
3242 ch = cmd_getc (); 2778 ch = cmd_getc ();
3243 if (ch >= '<' && ch <= '?') 2779 if (ch >= '<' && ch <= '?')
2780 {
3244 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' */
3245 priv = ch; 2782 priv = ch;
3246 ch = cmd_getc (); 2783 ch = cmd_getc ();
3247 } 2784 }
3248 2785
3249 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3288 switch (priv) 2825 switch (priv)
3289 { 2826 {
3290 case '>': 2827 case '>':
3291 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
3292 { 2829 {
3293 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2830 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3294 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3295 // 2832 //
3296 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2833 // 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 2834 // 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). 2835 // versions.
3299 // 2836 //
3300 tt_printf ("\033[>%d;94;0c", 'U'); 2837 tt_printf ("\033[>%d;95;0c", 'U');
3301 } 2838 }
3302 break; 2839 break;
2840
3303 case '?': 2841 case '?':
3304 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3305 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3306 break; 2844 break;
3307 } 2845 }
… …
3432 break; 2970 break;
3433 case 6: /* CPR requested */ 2971 case 6: /* CPR requested */
3434 scr_report_position (); 2972 scr_report_position ();
3435 break; 2973 break;
3436 case 7: /* unofficial extension */ 2974 case 7: /* unofficial extension */
3437 if (OPTION (Opt_insecure)) 2975 if (option (Opt_insecure))
3438 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2976 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3439 break; 2977 break;
3440 case 8: /* unofficial extension */ 2978 case 8: /* unofficial extension */
3441 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2979 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3442 break; 2980 break;
… …
3606 break; 3144 break;
3607 case 20: /* report icon label */ 3145 case 20: /* report icon label */
3608 { 3146 {
3609 char *s; 3147 char *s;
3610 XGetIconName (dpy, parent[0], &s); 3148 XGetIconName (dpy, parent[0], &s);
3611 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3149 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3612 XFree (s); 3150 XFree (s);
3613 } 3151 }
3614 break; 3152 break;
3615 case 21: /* report window title */ 3153 case 21: /* report window title */
3616 { 3154 {
3617 char *s; 3155 char *s;
3618 XFetchName (dpy, parent[0], &s); 3156 XFetchName (dpy, parent[0], &s);
3619 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3157 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3158 XFree (s);
3621 } 3159 }
3622 break; 3160 break;
3623 } 3161 }
3624} 3162}
… …
3651 seen_esc = true; 3189 seen_esc = true;
3652 continue; 3190 continue;
3653 } 3191 }
3654 else if (ch == C0_BEL || ch == CHAR_ST) 3192 else if (ch == C0_BEL || ch == CHAR_ST)
3655 break; 3193 break;
3194 else if (ch == C0_SYN)
3195 ch = cmd_get8 ();
3656 else if (ch < 0x20) 3196 else if (ch < 0x20)
3657 return NULL; /* other control character - exit */ 3197 return NULL; /* other control character - exit */
3658 3198
3659 seen_esc = false; 3199 seen_esc = false;
3660 3200
3661 if (n >= STRING_MAX - 1) 3201 if (n >= STRING_MAX - 1)
3662 // stop at some sane length 3202 // stop at some sane length
3663 return NULL; 3203 return NULL;
3664 3204
3665 if (ch == C0_SYN)
3666 string[n++] = cmd_get8 ();
3667 else
3668 string[n++] = ch; 3205 string[n++] = ch;
3669 } 3206 }
3670 3207
3671 string[n++] = '\0'; 3208 string[n++] = '\0';
3672 3209
3673 ends_how = (ch == 0x5c ? C0_ESC : ch); 3210 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3752 int saveop = op; 3289 int saveop = op;
3753 3290
3754 dLocal (Display *, dpy); 3291 dLocal (Display *, dpy);
3755 3292
3756 assert (str != NULL); 3293 assert (str != NULL);
3294
3295 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3296 return;
3297
3757 switch (op) 3298 switch (op)
3758 { 3299 {
3759 case XTerm_name: 3300 case XTerm_name:
3760 set_title (str); 3301 set_title (str);
3761 /* FALLTHROUGH */ 3302 /* FALLTHROUGH */
… …
3820 *buf++ = '\0'; 3361 *buf++ = '\0';
3821 3362
3822 process_color_seq (op, color, name, resp); 3363 process_color_seq (op, color, name, resp);
3823 } 3364 }
3824 break; 3365 break;
3366 case Rxvt_restoreFG:
3825 case XTerm_Color00: 3367 case XTerm_Color00:
3826 process_color_seq (op, Color_fg, str, resp); 3368 process_color_seq (op, Color_fg, str, resp);
3827 break; 3369 break;
3370 case Rxvt_restoreBG:
3828 case XTerm_Color01: 3371 case XTerm_Color01:
3829 process_color_seq (op, Color_bg, str, resp); 3372 process_color_seq (op, Color_bg, str, resp);
3830 break; 3373 break;
3831#ifndef NO_CURSORCOLOR 3374#ifndef NO_CURSORCOLOR
3832 case XTerm_Color_cursor: 3375 case XTerm_Color_cursor:
… …
3853 break; 3396 break;
3854 case URxvt_Color_IT: 3397 case URxvt_Color_IT:
3855 process_color_seq (op, Color_IT, str, resp); 3398 process_color_seq (op, Color_IT, str, resp);
3856 break; 3399 break;
3857#endif 3400#endif
3858#if TRANSPARENT && TINTING 3401#if ENABLE_TRANSPARENCY
3859 case URxvt_Color_tint: 3402 case URxvt_Color_tint:
3860 process_color_seq (op, Color_tint, str, resp); 3403 process_color_seq (op, Color_tint, str, resp);
3404 {
3405 bool changed = false;
3861 3406
3862 check_our_parents (); 3407 if (ISSET_PIXCOLOR (Color_tint))
3408 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3409 else
3410 changed = bgPixmap.unset_tint ();
3863 3411
3864 if (am_transparent) 3412 if (changed)
3865 want_full_refresh = want_refresh = 1; 3413 update_background ();
3414 }
3866 3415
3867 break; 3416 break;
3868#endif 3417#endif
3869 3418
3419#if BG_IMAGE_FROM_FILE
3870 case Rxvt_Pixmap: 3420 case Rxvt_Pixmap:
3871 { 3421 if (!strcmp (str, "?"))
3872 if (*str != ';')
3873 { 3422 {
3874#if XPM_BACKGROUND 3423 char str[256];
3875 scale_pixmap (""); /* reset to default scaling */ 3424
3876 set_bgPixmap (str); /* change pixmap */ 3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3877 scr_touch (true); 3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3878#endif 3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428 process_xterm_seq (XTerm_title, str, CHAR_ST);
3879 } 3429 }
3880 3430 else
3431 {
3881 int changed = 0; 3432 int changed = 0;
3882 3433
3883 while ((str = strchr (str, ';')) != NULL) 3434 if (*str != ';')
3884 { 3435 {
3436 /* reset to default scaling :*/
3437 bgPixmap.unset_geometry ();
3438 if (bgPixmap.set_file (str)) /* change pixmap */
3439 changed++;
3440 str = strchr (str, ';');
3441 if (str == NULL)
3442 bgPixmap.set_defaultGeometry ();
3443 }
3444
3445 while (str)
3446 {
3885 str++; 3447 str++;
3886#if XPM_BACKGROUND 3448 if (bgPixmap.set_geometry (str))
3887 changed += scale_pixmap (str); 3449 changed++;
3888#endif 3450 str = strchr (str, ';');
3889 } 3451 }
3890 3452
3891 if (changed) 3453 if (changed)
3892 { 3454 update_background ();
3893#ifdef XPM_BACKGROUND
3894 resize_pixmap ();
3895 scr_touch (true);
3896#endif
3897 } 3455 }
3898 }
3899 break; 3456 break;
3900 3457#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 3458
3908 case XTerm_logfile: 3459 case XTerm_logfile:
3909 // TODO, when secure mode? 3460 // TODO, when secure mode?
3910 break; 3461 break;
3911 3462
… …
3929 case URxvt_italicFont: 3480 case URxvt_italicFont:
3930 case URxvt_boldItalicFont: 3481 case URxvt_boldItalicFont:
3931#endif 3482#endif
3932 if (query) 3483 if (query)
3933 tt_printf ("\33]%d;%-.250s%c", saveop, 3484 tt_printf ("\33]%d;%-.250s%c", saveop,
3934 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3485 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3935 ? fontset[op - URxvt_font]->fontdesc : "", 3486 ? fontset[op - URxvt_font]->fontdesc : "",
3936 resp); 3487 resp);
3937 else 3488 else
3938 { 3489 {
3939 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3490 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3953 break; 3504 break;
3954 3505
3955#if !ENABLE_MINIMAL 3506#if !ENABLE_MINIMAL
3956 case URxvt_locale: 3507 case URxvt_locale:
3957 if (query) 3508 if (query)
3958 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3509 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3959 else 3510 else
3960 { 3511 {
3961 set_locale (str); 3512 set_locale (str);
3962 pty->set_utf8_mode (enc_utf8); 3513 pty->set_utf8_mode (enc_utf8);
3963 init_xlocale (); 3514 init_xlocale ();
… …
3978 break; 3529 break;
3979#endif 3530#endif
3980 3531
3981#if ENABLE_PERL 3532#if ENABLE_PERL
3982 case URxvt_perl: 3533 case URxvt_perl:
3983 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3534 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3984 ; // no responses yet 3535 ; // no responses yet
3985 break; 3536 break;
3986#endif 3537#endif
3987 } 3538 }
3988} 3539}
… …
4026{ 3577{
4027 unsigned int i, j; 3578 unsigned int i, j;
4028 int state; 3579 int state;
4029 3580
4030 static const struct 3581 static const struct
4031 { 3582 {
4032 const int argval; 3583 const int argval;
4033 const unsigned long bit; 3584 const unsigned long bit;
4034 }
4035
4036 argtopriv[] = { 3585 } argtopriv[] = {
4037 { 1, PrivMode_aplCUR }, 3586 { 1, PrivMode_aplCUR },
4038 { 2, PrivMode_vt52 }, 3587 { 2, PrivMode_vt52 },
4039 { 3, PrivMode_132 }, 3588 { 3, PrivMode_132 },
4040 { 4, PrivMode_smoothScroll }, 3589 { 4, PrivMode_smoothScroll },
4041 { 5, PrivMode_rVideo }, 3590 { 5, PrivMode_rVideo },
… …
4057 { 66, PrivMode_aplKP }, 3606 { 66, PrivMode_aplKP },
4058#ifndef NO_BACKSPACE_KEY 3607#ifndef NO_BACKSPACE_KEY
4059 { 67, PrivMode_BackSpace }, 3608 { 67, PrivMode_BackSpace },
4060#endif 3609#endif
4061 { 1000, PrivMode_MouseX11 }, 3610 { 1000, PrivMode_MouseX11 },
4062 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3611 { 1002, PrivMode_MouseBtnEvent },
4063 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3612 { 1003, PrivMode_MouseAnyEvent },
4064 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4065 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4066 { 1011, PrivMode_Keypress }, // rxvt extension 3614 { 1011, PrivMode_Keypress }, // rxvt extension
4067 // 1035 enable modifiers for alt, numlock NYI 3615 // 1035 enable modifiers for alt, numlock NYI
4068 // 1036 send ESC for meta keys NYI 3616 // 1036 send ESC for meta keys NYI
4069 // 1037 send DEL for keypad delete NYI 3617 // 1037 send DEL for keypad delete NYI
4070 { 1047, PrivMode_Screen }, 3618 { 1047, PrivMode_Screen },
4071 // 1048 save and restore cursor 3619 // 1048 save and restore cursor
4072 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3620 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4073 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste },
4074 }; 3623 };
4075 3624
4076 if (nargs == 0) 3625 if (nargs == 0)
4077 return; 3626 return;
4078 3627
… …
4104 scr_touch (true); 3653 scr_touch (true);
4105 break; 3654 break;
4106#endif 3655#endif
4107 case 1048: /* alternative cursor save */ 3656 case 1048: /* alternative cursor save */
4108 case 1049: 3657 case 1049:
4109 if (OPTION (Opt_secondaryScreen)) 3658 if (option (Opt_secondaryScreen))
4110 if (mode == 0) 3659 if (mode == 0)
4111 scr_cursor (RESTORE); 3660 scr_cursor (RESTORE);
4112 else if (mode == 1) 3661 else if (mode == 1)
4113 scr_cursor (SAVE); 3662 scr_cursor (SAVE);
4114 break; 3663 break;
… …
4126 */ 3675 */
4127 PrivMode (1, PrivMode_vt52); 3676 PrivMode (1, PrivMode_vt52);
4128 break; 3677 break;
4129 case 3: /* 80/132 */ 3678 case 3: /* 80/132 */
4130 if (priv_modes & PrivMode_132OK) 3679 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
4131 set_widthheight (((state ? 132 : 80) * fwidth), height); 3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3683 }
4132 break; 3684 break;
4133 case 4: /* smooth scrolling */ 3685 case 4: /* smooth scrolling */
4134 set_option (Opt_jumpScroll, !state); 3686 set_option (Opt_jumpScroll, !state);
4135 break; 3687 break;
4136 case 5: /* reverse video */ 3688 case 5: /* reverse video */
… …
4143 scr_autowrap (state); 3695 scr_autowrap (state);
4144 break; 3696 break;
4145 /* case 8: - auto repeat, can't do on a per window basis */ 3697 /* case 8: - auto repeat, can't do on a per window basis */
4146 case 9: /* X10 mouse reporting */ 3698 case 9: /* X10 mouse reporting */
4147 if (state) /* orthogonal */ 3699 if (state) /* orthogonal */
4148 priv_modes &= ~PrivMode_MouseX11; 3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4149 break; 3701 break;
4150#ifdef scrollBar_esc 3702#ifdef scrollBar_esc
4151 case scrollBar_esc: 3703 case scrollBar_esc:
4152 if (scrollbar_mapping (state)) 3704 if (scrollbar_mapping (state))
4153 { 3705 {
… …
4166 break; 3718 break;
4167 /* case 66: - application key pad */ 3719 /* case 66: - application key pad */
4168 /* case 67: - backspace key */ 3720 /* case 67: - backspace key */
4169 case 1000: /* X11 mouse reporting */ 3721 case 1000: /* X11 mouse reporting */
4170 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4171 priv_modes &= ~PrivMode_MouseX10; 3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4172 break; 3724 break;
4173#if 0
4174 case 1001: 3725 case 1002:
4175 break; /* X11 mouse highlighting */ 3726 case 1003:
4176#endif 3727 if (state)
3728 {
3729 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3730 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3731 vt_emask_mouse = PointerMotionMask;
3732 }
3733 else
3734 vt_emask_mouse = NoEventMask;
3735 vt_select_input ();
3736 break;
4177 case 1010: /* scroll to bottom on TTY output inhibit */ 3737 case 1010: /* scroll to bottom on TTY output inhibit */
4178 set_option (Opt_scrollTtyOutput, !state); 3738 set_option (Opt_scrollTtyOutput, !state);
4179 break; 3739 break;
4180 case 1011: /* scroll to bottom on key press */ 3740 case 1011: /* scroll to bottom on key press */
4181 set_option (Opt_scrollTtyKeypress, state); 3741 set_option (Opt_scrollTtyKeypress, state);
4182 break; 3742 break;
4183 case 1047: /* secondary screen w/ clearing last */ 3743 case 1047: /* secondary screen w/ clearing last */
4184 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4185 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4186 scr_erase_screen (2); 3746 scr_erase_screen (2);
4187 scr_change_screen (state); 3747 scr_change_screen (state);
4188 break; 3748 break;
4189 case 1049: /* secondary screen w/ clearing first */ 3749 case 1049: /* secondary screen w/ clearing first */
4190 scr_change_screen (state); 3750 scr_change_screen (state);
4191 if (OPTION (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
4192 if (current_screen != PRIMARY) 3752 if (current_screen != PRIMARY)
4193 scr_erase_screen (2); 3753 scr_erase_screen (2);
4194 break; 3754 break;
4195 default: 3755 default:
4196 break; 3756 break;
… …
4358rxvt_term::process_graphics () 3918rxvt_term::process_graphics ()
4359{ 3919{
4360 unicode_t ch, cmd = cmd_getc (); 3920 unicode_t ch, cmd = cmd_getc ();
4361 3921
4362 if (cmd == 'Q') 3922 if (cmd == 'Q')
3923 {
4363 { /* query graphics */ 3924 /* query graphics */
4364 tt_printf ("\033G0\012"); /* no graphics */ 3925 tt_printf ("\033G0\012"); /* no graphics */
4365 return; 3926 return;
4366 } 3927 }
4367 /* swallow other graphics sequences until terminating ':' */ 3928 /* swallow other graphics sequences until terminating ':' */
4368 do 3929 do
… …
4418 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4419 3980
4420 memcpy (v_buffer + v_buflen, data, len); 3981 memcpy (v_buffer + v_buflen, data, len);
4421 v_buflen += len; 3982 v_buflen += len;
4422 3983
4423 pty_ev.set (EVENT_READ | EVENT_WRITE); 3984 pty_ev.set (ev::READ | ev::WRITE);
4424} 3985}
4425 3986
4426void rxvt_term::pty_write () 3987void rxvt_term::pty_write ()
4427{ 3988{
4428 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4433 3994
4434 if (v_buflen == 0) 3995 if (v_buflen == 0)
4435 { 3996 {
4436 free (v_buffer); 3997 free (v_buffer);
4437 v_buffer = 0; 3998 v_buffer = 0;
4438 v_buflen = 0;
4439 3999
4440 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4441 return; 4001 return;
4442 } 4002 }
4443 4003
4444 memmove (v_buffer, v_buffer + written, v_buflen); 4004 memmove (v_buffer, v_buffer + written, v_buflen);
4445 } 4005 }
4446 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4006 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4447 pty_ev.set (EVENT_READ); 4007 pty_ev.set (ev::READ);
4448} 4008}
4449 4009
4450/*----------------------- end-of-file (C source) -----------------------*/ 4010/*----------------------- end-of-file (C source) -----------------------*/
4451 4011

Diff Legend

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