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.303 by root, Tue Jan 31 21:47:56 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. 1152 // ones with high nice levels is a useful thing to do. It surely is is
1153 // allowed by the sus... as is returning ENOSYS.
1109 1154
1110 struct timespec ts = { 0, 0 }; 1155 struct timespec ts = { 0, 0 };
1111 nanosleep (&ts, 0); 1156 nanosleep (&ts, 0);
1112 1157
1113 w.stop (); 1158 w.stop ();
… …
1151 } 1196 }
1152 else 1197 else
1153 { 1198 {
1154 pty_ev.stop (); 1199 pty_ev.stop ();
1155 1200
1156 if (!OPTION (Opt_hold)) 1201 if (!option (Opt_hold))
1157 destroy (); 1202 destroy ();
1158 } 1203 }
1159 1204
1160 return false; 1205 return false;
1161} 1206}
1162 1207
1163void 1208void
1164rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1165{ 1210{
1166 make_current (); 1211 make_current ();
1167 1212
1168 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1169 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1170 while (pty_fill ()) 1215 while (pty_fill ())
1171 if (cmd_parse ()) 1216 if (cmd_parse ())
1172 break; 1217 break;
1173 1218
1174 if (revents & EVENT_WRITE) 1219 if (revents & ev::WRITE)
1175 pty_write (); 1220 pty_write ();
1221
1222 refresh_check ();
1176} 1223}
1177 1224
1178void 1225void
1179rxvt_term::pointer_unblank () 1226rxvt_term::pointer_unblank ()
1180{ 1227{
1181 XDefineCursor (xdisp, vt, TermWin_cursor); 1228 XDefineCursor (dpy, vt, TermWin_cursor);
1182 recolour_cursor (); 1229 recolour_cursor ();
1183 1230
1184#ifdef POINTER_BLANK 1231#ifdef POINTER_BLANK
1185 hidden_pointer = 0; 1232 hidden_pointer = 0;
1186 1233
1187 if (OPTION (Opt_pointerBlank)) 1234 if (option (Opt_pointerBlank))
1188 pointer_ev.start (NOW + pointerBlankDelay); 1235 pointer_ev.start (pointerBlankDelay);
1189#endif 1236#endif
1190} 1237}
1191 1238
1192#ifdef POINTER_BLANK 1239#ifdef POINTER_BLANK
1193void 1240void
1194rxvt_term::pointer_blank () 1241rxvt_term::pointer_blank ()
1195{ 1242{
1196 if (!OPTION (Opt_pointerBlank)) 1243 if (!option (Opt_pointerBlank))
1197 return; 1244 return;
1198 1245
1199 XDefineCursor (xdisp, vt, display->blank_cursor); 1246 XDefineCursor (dpy, vt, display->blank_cursor);
1200 XFlush (xdisp); 1247 XFlush (dpy);
1201 1248
1202 hidden_pointer = 1; 1249 hidden_pointer = 1;
1203} 1250}
1204 1251
1205void 1252void
1206rxvt_term::pointer_cb (time_watcher &w) 1253rxvt_term::pointer_cb (ev::timer &w, int revents)
1207{ 1254{
1208 make_current (); 1255 make_current ();
1209 1256
1210 pointer_blank (); 1257 pointer_blank ();
1211} 1258}
… …
1214void 1261void
1215rxvt_term::mouse_report (XButtonEvent &ev) 1262rxvt_term::mouse_report (XButtonEvent &ev)
1216{ 1263{
1217 int button_number, key_state = 0; 1264 int button_number, key_state = 0;
1218 int x, y; 1265 int x, y;
1266 int code = 32;
1219 1267
1220 x = ev.x; 1268 x = Pixel2Col (ev.x);
1221 y = ev.y; 1269 y = Pixel2Row (ev.y);
1222 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 }
1223 1278
1224 if (MEvent.button == AnyButton) 1279 if (MEvent.button == AnyButton)
1225 button_number = 3; 1280 button_number = 3;
1226 else 1281 else
1227 { 1282 {
… …
1273 x + 1, 1328 x + 1,
1274 y + 1); 1329 y + 1);
1275#endif 1330#endif
1276 1331
1277 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1278 (32 + button_number + key_state), 1333 (code + button_number + key_state),
1279 (32 + x + 1), 1334 (32 + x + 1),
1280 (32 + y + 1)); 1335 (32 + y + 1));
1281} 1336}
1282 1337
1283/*{{{ process an X event */ 1338/*{{{ process an X event */
1284void 1339void
1285rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
1286{ 1341{
1287 make_current (); 1342 make_current ();
1288 1343
1289 dLocal (Display *, xdisp); 1344 dLocal (Display *, dpy);
1290 1345
1291 if (ev.xany.window == vt 1346 if (ev.xany.window == vt
1292 && SHOULD_INVOKE (HOOK_X_EVENT) 1347 && SHOULD_INVOKE (HOOK_X_EVENT)
1293 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1348 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1294 return; 1349 return;
… …
1299 unsigned int unused_mask; 1354 unsigned int unused_mask;
1300 1355
1301 switch (ev.type) 1356 switch (ev.type)
1302 { 1357 {
1303 case KeyPress: 1358 case KeyPress:
1304#if ISO_14755 1359 key_press (ev.xkey);
1305 if (!(iso14755buf & ISO_14755_52))
1306#endif
1307 lookup_key (ev.xkey);
1308
1309 break; 1360 break;
1310 1361
1311 case KeyRelease: 1362 case KeyRelease:
1312 { 1363 key_release (ev.xkey);
1313#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1314 KeySym keysym;
1315
1316 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1317#endif
1318
1319#if ENABLE_FRILLS || ISO_14755
1320 // ISO 14755 support
1321 if (iso14755buf)
1322 if (iso14755buf & ISO_14755_52)
1323 {
1324# if ENABLE_OVERLAY
1325 scr_overlay_off ();
1326# endif
1327# if ISO_14755
1328 // iso14755 part 5.2 handling: release time
1329 // first: controls
1330 if ((ev.xkey.state & ControlMask)
1331 && ((keysym >= 0x40 && keysym <= 0x5f)
1332 || (keysym >= 0x61 && keysym <= 0x7f)))
1333 {
1334 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1335 commit_iso14755 ();
1336 goto skip_switch;
1337 }
1338
1339 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1340 if (i[0] == keysym)
1341 {
1342 iso14755buf = ISO_14755_51 | i[1];
1343 commit_iso14755 ();
1344 goto skip_switch;
1345 }
1346
1347 scr_bell ();
1348# endif
1349 iso14755buf = 0;
1350 break;
1351 }
1352 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1353 {
1354# if ENABLE_OVERLAY
1355 scr_overlay_off ();
1356# endif
1357 if (iso14755buf & ISO_14755_51)
1358 commit_iso14755 ();
1359#if ISO_14755
1360 else if (iso14755buf & ISO_14755_STARTED)
1361 {
1362 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1363
1364 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1365 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1366 }
1367# endif
1368 else
1369 iso14755buf = 0;
1370 }
1371#endif
1372
1373 if (ev.xany.window == vt
1374 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1375 break;
1376
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0;
1382#endif
1383 break; 1364 break;
1384 }
1385 1365
1386 case ButtonPress: 1366 case ButtonPress:
1387 button_press (ev.xbutton); 1367 button_press (ev.xbutton);
1388 break; 1368 break;
1389 1369
… …
1404 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1384 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1405 destroy (); 1385 destroy ();
1406 } 1386 }
1407#if ENABLE_EWMH 1387#if ENABLE_EWMH
1408 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1388 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1409 XSendEvent (xdisp, ev.xclient.window = display->root, 1389 XSendEvent (dpy, ev.xclient.window = display->root,
1410 False, SubstructureRedirectMask | SubstructureNotifyMask, 1390 False, SubstructureRedirectMask | SubstructureNotifyMask,
1411 &ev); 1391 &ev);
1412#endif 1392#endif
1413 } 1393 }
1414 } 1394 }
… …
1420 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1400 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1421 focus_out (); 1401 focus_out ();
1422 } 1402 }
1423#endif 1403#endif
1424 } 1404 }
1425 break;
1426
1427 case MappingNotify:
1428 XRefreshKeyboardMapping (&ev.xmapping);
1429 break; 1405 break;
1430 1406
1431 /* 1407 /*
1432 * XXX: this is not the _current_ arrangement 1408 * XXX: this is not the _current_ arrangement
1433 * Here's my conclusion: 1409 * Here's my conclusion:
… …
1452 break; 1428 break;
1453 } 1429 }
1454 break; 1430 break;
1455 1431
1456 case FocusIn: 1432 case FocusIn:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1457 focus_in (); 1436 focus_in ();
1458 break; 1437 break;
1459 1438
1460 case FocusOut: 1439 case FocusOut:
1440 if (ev.xfocus.detail != NotifyInferior
1441 && ev.xfocus.detail != NotifyPointer
1442 && ev.xfocus.mode != NotifyGrab)
1461 focus_out (); 1443 focus_out ();
1462 break; 1444 break;
1463 1445
1464 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);*/
1465 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1466 { 1451 {
1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468 ; 1453 ;
1469 1454
1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1455 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1471 { 1456 {
1472 seen_resize = 1; 1457 seen_resize = 1;
1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1458 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1474 } 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 }
1475 1472
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1473 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477
1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1479 if (OPTION (Opt_transparent))
1480 check_our_parents ();
1481#endif
1482 } 1474 }
1483 break; 1475 break;
1484 1476
1485 case PropertyNotify: 1477 case PropertyNotify:
1486 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)))
… …
1502 case SelectionRequest: 1494 case SelectionRequest:
1503 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1504 break; 1496 break;
1505 1497
1506 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
1507 mapped = 1; 1515 mapped = 1;
1508#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1509 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1517 text_blink_ev.start ();
1510#endif 1518#endif
1511 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1512 break; 1520 break;
1513 1521
1514 case UnmapNotify: 1522 case UnmapNotify:
… …
1516#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1517 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1518#endif 1526#endif
1519 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break; 1528 break;
1521
1522#ifdef TRANSPARENT
1523 case ReparentNotify:
1524 rootwin_cb (ev);
1525 break;
1526#endif /* TRANSPARENT */
1527 1529
1528 case GraphicsExpose: 1530 case GraphicsExpose:
1529 case Expose: 1531 case Expose:
1530 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1531 { 1533 {
1532 do 1534 do
1535 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, False);
1538 }
1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1540
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1542
1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1540 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1541 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1542 1548
1543 want_refresh = 1; 1549 want_refresh = 1;
1544 } 1550 }
1545 else 1551 else
1546 { 1552 {
1547 XEvent unused_event; 1553 XEvent unused_event;
1548 1554
1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1550 ; 1556 ;
1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1552 ; 1558 ;
1553 1559
1554 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1555 { 1561 {
1556 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1557 scrollbar_show (0); 1563 scrollbar_show (0);
1558 } 1564 }
1559
1560#ifdef TRANSPARENT
1561 if (am_transparent && ev.xany.window == parent[0])
1562 XClearWindow (xdisp, ev.xany.window);
1563#endif
1564 } 1565 }
1565 break; 1566 break;
1566 1567
1567 case MotionNotify: 1568 case MotionNotify:
1568#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1569 if (hidden_pointer) 1570 if (hidden_pointer)
1570 pointer_unblank (); 1571 pointer_unblank ();
1571#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);
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1577 break;
1574 1578
1575 if (ev.xany.window == vt) 1579 if (ev.xany.window == vt)
1576 { 1580 {
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1581 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1582 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579 ; // nop 1583 ; // nop
1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1584 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1585 {
1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1586 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1583 ; 1587 ;
1584 1588
1585 XQueryPointer (xdisp, vt, 1589 XQueryPointer (dpy, vt,
1586 &unused_root, &unused_child, 1590 &unused_root, &unused_child,
1587 &unused_root_x, &unused_root_y, 1591 &unused_root_x, &unused_root_y,
1588 &ev.xbutton.x, &ev.xbutton.y, 1592 &ev.xbutton.x, &ev.xbutton.y,
1589 &ev.xbutton.state); 1593 &ev.xbutton.state);
1590#ifdef MOUSE_THRESHOLD 1594#ifdef MOUSE_THRESHOLD
… …
1610 int dist; 1614 int dist;
1611 1615
1612 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1613 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1614 */ 1618 */
1615 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1616 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1617 1621
1618 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1619 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1620 */ 1624 */
1621 selection_save_x = ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
… …
1643 else 1647 else
1644 { 1648 {
1645 /* we are within the text window, so we 1649 /* we are within the text window, so we
1646 * shouldn't be scrolling 1650 * shouldn't be scrolling
1647 */ 1651 */
1648 if (sel_scroll_ev.active)
1649 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1650 } 1653 }
1651#endif 1654#endif
1652#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1653 } 1656 }
1654#endif 1657#endif
1655 } 1658 }
1656 } 1659 }
1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1658 { 1661 {
1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1660 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1661 ; 1664 ;
1662 1665
1663 XQueryPointer (xdisp, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1664 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1665 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1666 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1667 &unused_mask); 1670 &unused_mask);
1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1669 scrollbar_size ()); 1672 scrollbar_size ());
1670 want_refresh = 1; 1673 want_refresh = 1;
1671 refresh_limit = 0;
1672 scrollbar_show (1); 1674 scrollbar_show (1);
1673 } 1675 }
1674 break; 1676 break;
1675 } 1677 }
1676 1678
1677skip_switch: ;
1678
1679#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
1680 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1680 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1681 { 1681 {
1682 if (hidden_cursor) 1682 if (hidden_cursor)
1683 { 1683 {
1684 hidden_cursor = 0; 1684 hidden_cursor = 0;
1685 want_refresh = 1; 1685 want_refresh = 1;
1686 } 1686 }
1687 1687
1688 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1689 } 1689 }
1690#endif 1690#endif
1691 1691
1692#if defined(POINTER_BLANK) 1692#if defined(POINTER_BLANK)
1693 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1694 {
1695 if (ev.type == MotionNotify 1695 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress 1696 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease) 1697 || ev.type == ButtonRelease)
1698 if (hidden_pointer) 1698 if (hidden_pointer)
… …
1700 1700
1701 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1702 pointer_blank (); 1702 pointer_blank ();
1703 } 1703 }
1704#endif 1704#endif
1705
1706 refresh_check ();
1705} 1707}
1706 1708
1707void 1709void
1708rxvt_term::focus_in () 1710rxvt_term::focus_in ()
1709{ 1711{
1710 if (!focus) 1712 if (!focus)
1711 { 1713 {
1712 focus = 1; 1714 focus = 1;
1713 want_refresh = 1; 1715 want_refresh = 1;
1714 1716
1715 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1716 1718
1717#if USE_XIM 1719#if USE_XIM
1718 if (Input_Context != NULL) 1720 if (Input_Context != NULL)
1719 { 1721 {
1720 IMSetStatusPosition (); 1722 IMSetPosition ();
1721 XSetICFocus (Input_Context); 1723 XSetICFocus (Input_Context);
1722 } 1724 }
1723#endif 1725#endif
1724#if CURSOR_BLINK 1726#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink)) 1727 if (option (Opt_cursorBlink))
1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1728 cursor_blink_ev.again ();
1727#endif 1729#endif
1728#if OFF_FOCUS_FADING 1730#if OFF_FOCUS_FADING
1729 if (rs[Rs_fade]) 1731 if (rs[Rs_fade])
1730 { 1732 {
1731 pix_colors = pix_colors_focused; 1733 pix_colors = pix_colors_focused;
1732 scr_recolour (); 1734 scr_recolour ();
1733 } 1735 }
1734#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
1735 } 1747 }
1736} 1748}
1737 1749
1738void 1750void
1739rxvt_term::focus_out () 1751rxvt_term::focus_out ()
… …
1747 1759
1748#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1749 if (iso14755buf) 1761 if (iso14755buf)
1750 { 1762 {
1751 iso14755buf = 0; 1763 iso14755buf = 0;
1752# if ENABLE_OVERLAY 1764# if ISO_14755
1753 scr_overlay_off (); 1765 scr_overlay_off ();
1754# endif 1766# endif
1755 } 1767 }
1756#endif 1768#endif
1757#if USE_XIM 1769#if USE_XIM
1758 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1759 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1760#endif 1772#endif
1761#if CURSOR_BLINK 1773#if CURSOR_BLINK
1762 if (OPTION (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1763 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1764 hidden_cursor = 0; 1777 hidden_cursor = 0;
1765#endif 1778#endif
1766#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1768 { 1781 {
… …
1771 } 1784 }
1772#endif 1785#endif
1773 } 1786 }
1774} 1787}
1775 1788
1776#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
1777void 1803void
1778rxvt_term::rootwin_cb (XEvent &ev) 1804rxvt_term::rootwin_cb (XEvent &ev)
1779{ 1805{
1780 make_current (); 1806 make_current ();
1781 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
1782 switch (ev.type) 1813 switch (ev.type)
1783 { 1814 {
1784 case PropertyNotify: 1815 case PropertyNotify:
1785 /* 1816 /*
1786 * 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,
1787 * 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.
1788 */ 1819 */
1789 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1790 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1791 return; 1822 {
1823 bgPixmap.set_root_pixmap ();
1824 update_background ();
1825 }
1792 1826
1793 /* FALLTHROUGH */
1794 case ReparentNotify:
1795 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1796 want_refresh = want_full_refresh = 1;
1797 break; 1827 break;
1798 } 1828 }
1829# endif
1830
1831 refresh_check ();
1799} 1832}
1800#endif 1833#endif
1801 1834
1802void 1835void
1803rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
… …
1858 mouse_report (ev); 1891 mouse_report (ev);
1859 } 1892 }
1860#else 1893#else
1861 MEvent.button = ev.button; 1894 MEvent.button = ev.button;
1862 mouse_report (ev); 1895 mouse_report (ev);
1863#endif /* MOUSE_REPORT_DOUBLECLICK */ 1896#endif /* MOUSE_REPORT_DOUBLECLICK */
1864 1897
1865 } 1898 }
1866 else 1899 else
1867 { 1900 {
1868 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
… …
1916 } 1949 }
1917 1950
1918 /* 1951 /*
1919 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1920 */ 1953 */
1921 if (isScrollbarWindow (ev.window)) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1922 { 1955 {
1923 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;
1924 /* 1964 /*
1925 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1926 * move up if mouse is above slider 1966 * move up if mouse is above slider
1927 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1928 * 1968 *
… …
1937 /* 1977 /*
1938 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1939 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1940 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1941 */ 1981 */
1942 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1943 && scrollbarnext_upButton (ev.y))
1944 || (scrollBar.style == R_SB_RXVT
1945 && scrollbarrxvt_upButton (ev.y)))
1946 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1947 else if ((scrollBar.style == R_SB_NEXT 1984 else if (direction == DN)
1948 && scrollbarnext_dnButton (ev.y))
1949 || (scrollBar.style == R_SB_RXVT
1950 && scrollbarrxvt_dnButton (ev.y)))
1951 tt_printf ("\033[B"); 1985 tt_printf ("\033[B");
1952 else 1986 else
1953 switch (ev.button) 1987 switch (ev.button)
1954 { 1988 {
1955 case Button2: 1989 case Button2:
… …
1962 tt_printf ("\033[5~"); 1996 tt_printf ("\033[5~");
1963 break; 1997 break;
1964 } 1998 }
1965 } 1999 }
1966 else 2000 else
1967#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1968
1969 {
1970 char upordown = 0;
1971
1972 if (scrollBar.style == R_SB_NEXT)
1973 { 2002 {
1974 if (scrollbarnext_upButton (ev.y)) 2003 if (direction != NO_DIR)
1975 upordown = -1; /* up */
1976 else if (scrollbarnext_dnButton (ev.y))
1977 upordown = 1; /* down */
1978 }
1979 else if (scrollBar.style == R_SB_RXVT)
1980 {
1981 if (scrollbarrxvt_upButton (ev.y))
1982 upordown = -1; /* up */
1983 else if (scrollbarrxvt_dnButton (ev.y))
1984 upordown = 1; /* down */
1985 }
1986 if (upordown)
1987 { 2004 {
1988#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2006 if (!cont_scroll_ev.is_active ())
1989 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1990#endif 2008#endif
1991 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
1992 { 2010 {
1993 if (upordown < 0) 2011 if (direction == UP)
1994 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
1995 else 2013 else
1996 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
1997 } 2015 }
1998 } 2016 }
1999 else 2017 else
2000 switch (ev.button) 2018 switch (ev.button)
2001 { 2019 {
2002 case Button2: 2020 case Button2:
2003 switch (scrollbar_align) 2021 switch (scrollBar.align)
2004 { 2022 {
2005 case R_SB_ALIGN_TOP: 2023 case R_SB_ALIGN_TOP:
2006 csrO = 0; 2024 csrO = 0;
2007 break; 2025 break;
2008 case R_SB_ALIGN_CENTRE: 2026 case R_SB_ALIGN_CENTRE:
… …
2016 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
2017 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
2018 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
2019 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2020 2038
2021 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
2022 break; 2040 break;
2023 2041
2024 case Button1: 2042 case Button1:
2025 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2026 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
2027 /* FALLTHROUGH */ 2045 /* FALLTHROUGH */
2028 2046
2029 case Button3: 2047 case Button3:
2030 if (scrollBar.style != R_SB_XTERM) 2048 if (scrollBar.style != R_SB_XTERM)
… …
2040 scr_page (DN, nrow - 1); 2058 scr_page (DN, nrow - 1);
2041# else 2059# else
2042 scr_page (DN, nrow / 4); 2060 scr_page (DN, nrow / 4);
2043# endif 2061# endif
2044 else 2062 else
2045 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2046 } 2064 }
2047 else 2065 else
2048 { 2066 {
2049 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
2050 (nrow 2068 (nrow
… …
2067 2085
2068 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
2069 if (!bypass_keystate) 2087 if (!bypass_keystate)
2070 reportmode = !! (priv_modes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
2071 2089
2072 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2073 { 2091 {
2074 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
2075 scrollbar_show (0); 2093 scrollbar_show (0);
2076 } 2094 }
2077 2095
2078#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
2079 if (sel_scroll_ev.active)
2080 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2081#endif 2098#endif
2082 2099
2083 if (ev.window == vt) 2100 if (ev.window == vt)
2084 { 2101 {
2085 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)))
… …
2109 mouse_report (ev); 2126 mouse_report (ev);
2110 } 2127 }
2111#else /* MOUSE_REPORT_DOUBLECLICK */ 2128#else /* MOUSE_REPORT_DOUBLECLICK */
2112 MEvent.button = AnyButton; 2129 MEvent.button = AnyButton;
2113 mouse_report (ev); 2130 mouse_report (ev);
2114#endif /* MOUSE_REPORT_DOUBLECLICK */ 2131#endif /* MOUSE_REPORT_DOUBLECLICK */
2115 return; 2132 return;
2116 } 2133 }
2117 2134
2118 /* 2135 /*
2119 * dumb hack to compensate for the failure of click-and-drag 2136 * dumb hack to compensate for the failure of click-and-drag
… …
2131 selection_make (ev.time); 2148 selection_make (ev.time);
2132 break; 2149 break;
2133 2150
2134 case Button2: 2151 case Button2:
2135 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?
2136 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2137 break; 2154 break;
2138 2155
2139#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2140 case Button4: 2157 case Button4:
2141 case Button5: 2158 case Button5:
… …
2145 2162
2146 v = ev.button == Button4 ? UP : DN; 2163 v = ev.button == Button4 ? UP : DN;
2147 2164
2148 if (ev.state & ShiftMask) 2165 if (ev.state & ShiftMask)
2149 i = 1; 2166 i = 1;
2150 else if (OPTION (Opt_mouseWheelScrollPage)) 2167 else if (option (Opt_mouseWheelScrollPage))
2151 i = nrow - 1; 2168 i = nrow - 1;
2152 else 2169 else
2153 i = 5; 2170 i = 5;
2154 2171
2155# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
… …
2157 { 2174 {
2158 mouse_slip_wheel_speed += v ? -1 : 1; 2175 mouse_slip_wheel_speed += v ? -1 : 1;
2159 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2160 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2161 2178
2162 if (slip_wheel_ev.at < NOW) 2179 if (!slip_wheel_ev.is_active ())
2163 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2164
2165 slip_wheel_ev.start ();
2166 } 2181 }
2167 else 2182 else
2183# endif
2168 { 2184 {
2169# endif
2170 scr_page (v, i); 2185 scr_page (v, i);
2171 scrollbar_show (1); 2186 scrollbar_show (1);
2172# ifdef MOUSE_SLIP_WHEELING
2173 } 2187 }
2174# endif
2175 } 2188 }
2176 break; 2189 break;
2177#endif 2190#endif
2178 } 2191 }
2179 } 2192 }
2180} 2193}
2181
2182#ifdef TRANSPARENT
2183#if TINTING
2184/* taken from aterm-0.4.2 */
2185
2186typedef uint32_t RUINT32T;
2187
2188void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2189{
2190 int sh_r, sh_g, sh_b;
2191 RUINT32T mask_r, mask_g, mask_b;
2192 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2193 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2194 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2195 int i;
2196
2197 Visual *visual = term->visual;
2198
2199 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2200
2201 /* for convenience */
2202 mask_r = visual->red_mask;
2203 mask_g = visual->green_mask;
2204 mask_b = visual->blue_mask;
2205
2206 /* boring lookup table pre-initialization */
2207 switch (srcImage->bits_per_pixel) {
2208 case 15:
2209 if ((mask_r != 0x7c00) ||
2210 (mask_g != 0x03e0) ||
2211 (mask_b != 0x001f))
2212 return;
2213 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2214 lookup_r = lookup;
2215 lookup_g = lookup+32;
2216 lookup_b = lookup+32+32;
2217 sh_r = 10;
2218 sh_g = 5;
2219 sh_b = 0;
2220 break;
2221 case 16:
2222 if ((mask_r != 0xf800) ||
2223 (mask_g != 0x07e0) ||
2224 (mask_b != 0x001f))
2225 return;
2226 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2227 lookup_r = lookup;
2228 lookup_g = lookup+32;
2229 lookup_b = lookup+32+64;
2230 sh_r = 11;
2231 sh_g = 5;
2232 sh_b = 0;
2233 break;
2234 case 24:
2235 if ((mask_r != 0xff0000) ||
2236 (mask_g != 0x00ff00) ||
2237 (mask_b != 0x0000ff))
2238 return;
2239 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2240 lookup_r = lookup;
2241 lookup_g = lookup+256;
2242 lookup_b = lookup+256+256;
2243 sh_r = 16;
2244 sh_g = 8;
2245 sh_b = 0;
2246 break;
2247 case 32:
2248 if ((mask_r != 0xff0000) ||
2249 (mask_g != 0x00ff00) ||
2250 (mask_b != 0x0000ff))
2251 return;
2252 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2253 lookup_r = lookup;
2254 lookup_g = lookup+256;
2255 lookup_b = lookup+256+256;
2256 sh_r = 16;
2257 sh_g = 8;
2258 sh_b = 0;
2259 break;
2260 default:
2261 return; /* we do not support this color depth */
2262 }
2263
2264 /* prepare limits for color transformation (each channel is handled separately) */
2265 if (shade < 0) {
2266 shade = -shade;
2267 if (shade < 0) shade = 0;
2268 if (shade > 100) shade = 100;
2269
2270 lower_lim_r = 65535-rm;
2271 lower_lim_g = 65535-gm;
2272 lower_lim_b = 65535-bm;
2273
2274 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2275 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2276 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2277
2278 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2279 } else {
2280 if (shade < 0) shade = 0;
2281 if (shade > 100) shade = 100;
2282
2283 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2284
2285 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2286 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2287 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2288 }
2289
2290 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2291 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2292 {
2293 unsigned int tmp;
2294
2295 tmp = lower_lim_r;
2296 lower_lim_r = lower_lim_b;
2297 lower_lim_b = tmp;
2298
2299 tmp = upper_lim_r;
2300 upper_lim_r = upper_lim_b;
2301 upper_lim_b = tmp;
2302 }
2303
2304 /* fill our lookup tables */
2305 for (i = 0; i <= mask_r>>sh_r; i++)
2306 {
2307 RUINT32T tmp;
2308 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2309 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2310 lookup_r[i] = (tmp/65535)<<sh_r;
2311 }
2312 for (i = 0; i <= mask_g>>sh_g; i++)
2313 {
2314 RUINT32T tmp;
2315 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2316 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2317 lookup_g[i] = (tmp/65535)<<sh_g;
2318 }
2319 for (i = 0; i <= mask_b>>sh_b; i++)
2320 {
2321 RUINT32T tmp;
2322 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2323 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2324 lookup_b[i] = (tmp/65535)<<sh_b;
2325 }
2326
2327 /* apply table to input image (replacing colors by newly calculated ones) */
2328 switch (srcImage->bits_per_pixel)
2329 {
2330 case 15:
2331 {
2332 unsigned short *p1, *pf, *p, *pl;
2333 p1 = (unsigned short *) srcImage->data;
2334 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2335 while (p1 < pf)
2336 {
2337 p = p1;
2338 pl = p1 + srcImage->width;
2339 for (; p < pl; p++)
2340 {
2341 *p = lookup_r[(*p & 0x7c00)>>10] |
2342 lookup_g[(*p & 0x03e0)>> 5] |
2343 lookup_b[(*p & 0x001f)];
2344 }
2345 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2346 }
2347 break;
2348 }
2349 case 16:
2350 {
2351 unsigned short *p1, *pf, *p, *pl;
2352 p1 = (unsigned short *) srcImage->data;
2353 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2354 while (p1 < pf)
2355 {
2356 p = p1;
2357 pl = p1 + srcImage->width;
2358 for (; p < pl; p++)
2359 {
2360 *p = lookup_r[(*p & 0xf800)>>11] |
2361 lookup_g[(*p & 0x07e0)>> 5] |
2362 lookup_b[(*p & 0x001f)];
2363 }
2364 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2365 }
2366 break;
2367 }
2368 case 24:
2369 {
2370 unsigned char *p1, *pf, *p, *pl;
2371 p1 = (unsigned char *) srcImage->data;
2372 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2373 while (p1 < pf)
2374 {
2375 p = p1;
2376 pl = p1 + srcImage->width * 3;
2377 for (; p < pl; p += 3)
2378 {
2379 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2380 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2381 p[2] = lookup_r[(p[2] & 0x0000ff)];
2382 }
2383 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2384 }
2385 break;
2386 }
2387 case 32:
2388 {
2389 RUINT32T *p1, *pf, *p, *pl;
2390 p1 = (RUINT32T *) srcImage->data;
2391 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392
2393 while (p1 < pf)
2394 {
2395 p = p1;
2396 pl = p1 + srcImage->width;
2397 for (; p < pl; p++)
2398 {
2399 *p = lookup_r[(*p & 0xff0000)>>16] |
2400 lookup_g[(*p & 0x00ff00)>> 8] |
2401 lookup_b[(*p & 0x0000ff)] |
2402 (*p & ~0xffffff);
2403 }
2404 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2405 }
2406 break;
2407 }
2408 }
2409
2410 free (lookup);
2411}
2412#endif
2413
2414/*
2415 * Check our parents are still who we think they are.
2416 * Do transparency updates if required
2417 */
2418int
2419rxvt_term::check_our_parents ()
2420{
2421 int i, pchanged, aformat, have_pixmap, rootdepth;
2422 unsigned long nitems, bytes_after;
2423 Atom atype;
2424 unsigned char *prop = NULL;
2425 Window root, oldp, *list;
2426 Pixmap rootpixmap = None;
2427 XWindowAttributes wattr, wrootattr;
2428
2429 pchanged = 0;
2430
2431 if (!OPTION (Opt_transparent))
2432 return pchanged; /* Don't try any more */
2433
2434 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2435 rootdepth = wrootattr.depth;
2436
2437 XGetWindowAttributes (xdisp, parent[0], &wattr);
2438
2439 if (rootdepth != wattr.depth)
2440 {
2441 if (am_transparent)
2442 {
2443 pchanged = 1;
2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2445 am_transparent = am_pixmap_trans = 0;
2446 }
2447
2448 return pchanged; /* Don't try any more */
2449 }
2450
2451 /* Get all X ops out of the queue so that our information is up-to-date. */
2452 XSync (xdisp, False);
2453
2454 /*
2455 * Make the frame window set by the window manager have
2456 * the root background. Some window managers put multiple nested frame
2457 * windows for each client, so we have to take care about that.
2458 */
2459 i = (xa[XA_XROOTPMAP_ID]
2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2462 &nitems, &bytes_after, &prop) == Success);
2463
2464 if (!i || prop == NULL)
2465 i = (xa[XA_ESETROOT_PMAP_ID]
2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success);
2469
2470 if (!i || prop == NULL
2471#if TINTING
2472 || !ISSET_PIXCOLOR (Color_tint)
2473#endif
2474 )
2475 have_pixmap = 0;
2476 else
2477 {
2478 have_pixmap = 1;
2479 rootpixmap = *(Pixmap *)prop;
2480 XFree (prop);
2481 }
2482
2483 if (have_pixmap)
2484 {
2485 /*
2486 * Copy display->root pixmap transparency
2487 */
2488 int sx, sy, nx, ny;
2489 unsigned int nw, nh;
2490 Window cr;
2491 XImage *image;
2492 GC gc;
2493 XGCValues gcvalue;
2494
2495 XTranslateCoordinates (xdisp, parent[0], display->root,
2496 0, 0, &sx, &sy, &cr);
2497 nw = (unsigned int)szHint.width;
2498 nh = (unsigned int)szHint.height;
2499 nx = ny = 0;
2500
2501 if (sx < 0)
2502 {
2503 nw += sx;
2504 nx = -sx;
2505 sx = 0;
2506 }
2507
2508 if (sy < 0)
2509 {
2510 nh += sy;
2511 ny = -sy;
2512 sy = 0;
2513 }
2514
2515 min_it (nw, (unsigned int) (wrootattr.width - sx));
2516 min_it (nh, (unsigned int) (wrootattr.height - sy));
2517
2518 XSync (xdisp, False);
2519 allowedxerror = -1;
2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2521
2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2523 /* XXX: may need a delay here? */
2524 allowedxerror = 0;
2525
2526 if (image == NULL)
2527 {
2528 if (am_transparent && am_pixmap_trans)
2529 {
2530 pchanged = 1;
2531 if (pixmap != None)
2532 {
2533 XFreePixmap (xdisp, pixmap);
2534 pixmap = None;
2535 }
2536 }
2537
2538 am_pixmap_trans = 0;
2539 }
2540 else
2541 {
2542 if (pixmap != None)
2543 XFreePixmap (xdisp, pixmap);
2544
2545#if TINTING
2546 if (ISSET_PIXCOLOR (Color_tint))
2547 {
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 rgba c;
2551 pix_colors_focused [Color_tint].get (c);
2552
2553 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2554 }
2555#endif
2556
2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2559 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (xdisp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2564 XClearWindow (xdisp, parent[0]);
2565
2566 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1;
2568
2569 am_transparent = am_pixmap_trans = 1;
2570 }
2571 }
2572
2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2575 else
2576 {
2577 unsigned int n;
2578 /*
2579 * InheritPixmap transparency
2580 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 {
2583 oldp = parent[i];
2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2585 XFree (list);
2586
2587 if (parent[i] == display->root)
2588 {
2589 if (oldp != None)
2590 pchanged = 1;
2591
2592 break;
2593 }
2594
2595 if (oldp != parent[i])
2596 pchanged = 1;
2597 }
2598
2599 n = 0;
2600
2601 if (pchanged)
2602 for (; n < (unsigned int)i; n++)
2603 {
2604 XGetWindowAttributes (xdisp, parent[n], &wattr);
2605
2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2607 {
2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2609 break;
2610 }
2611 }
2612
2613 if (n > (sizeof (parent) / sizeof (parent[0])))
2614 {
2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2617 am_transparent = 0;
2618 /* XXX: also turn off Opt_transparent? */
2619 }
2620 else
2621 {
2622 for (n = 0; n < (unsigned int)i; n++)
2623 {
2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2625 XClearWindow (xdisp, parent[n]);
2626 }
2627
2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2629 am_transparent = 1;
2630 }
2631
2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2633 parent[i] = None;
2634 }
2635
2636 if (scrollBar.win)
2637 {
2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2639 scrollBar.setIdle ();
2640 scrollbar_show (0);
2641 }
2642
2643 if (am_transparent)
2644 {
2645 want_refresh = want_full_refresh = 1;
2646 if (am_pixmap_trans)
2647 flush ();
2648 }
2649
2650 return pchanged;
2651}
2652#endif
2653 2194
2654/*}}} */ 2195/*}}} */
2655 2196
2656bool 2197bool
2657rxvt_term::cmd_parse () 2198rxvt_term::cmd_parse ()
… …
2706 if (ch == C0_LF) 2247 if (ch == C0_LF)
2707 nlines++; 2248 nlines++;
2708 2249
2709 refresh_count++; 2250 refresh_count++;
2710 2251
2711 if (!OPTION (Opt_jumpScroll) 2252 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2712 || (refresh_count >= refresh_limit * (nrow - 1)))
2713 { 2253 {
2714 refreshnow = true;
2715 refresh_count = 0; 2254 refresh_count = 0;
2255
2256 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2257 {
2258 refreshnow = true;
2716 ch = NOCHAR; 2259 ch = NOCHAR;
2717 break; 2260 break;
2261 }
2718 } 2262 }
2719 2263
2720 // scr_add_lines only works for nlines <= nrow - 1. 2264 // scr_add_lines only works for nlines <= nrow - 1.
2721 if (nlines >= nrow - 1) 2265 if (nlines >= nrow - 1)
2722 { 2266 {
… …
2750 && 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))))
2751 scr_add_lines (buf, str - buf, nlines); 2295 scr_add_lines (buf, str - buf, nlines);
2752 2296
2753 /* 2297 /*
2754 * 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
2755 * 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.
2756 * the number of pages between refreshes is refresh_limit, which 2300 * if skipScroll is enabled.
2757 * is incremented here because we must be doing flat-out scrolling.
2758 */ 2301 */
2759 if (refreshnow) 2302 if (refreshnow)
2760 { 2303 {
2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2762 refresh_limit++;
2763 else
2764 {
2765 flag = true; 2304 flag = true;
2766 scr_refresh (); 2305 scr_refresh ();
2767 want_refresh = 1; 2306 want_refresh = 1;
2768 }
2769 } 2307 }
2770 2308
2771 } 2309 }
2772 else 2310 else
2773 { 2311 {
… …
2922 { 2460 {
2923 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2924 break; /* done = 1 */ 2462 break; /* done = 1 */
2925 } 2463 }
2926 } 2464 }
2927 2465
2928 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2929 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2930 { 2468 {
2931 done = 1; 2469 done = 1;
2932 break; 2470 break;
… …
2934 } 2472 }
2935 } 2473 }
2936 2474
2937 pclose_printer (fd); 2475 pclose_printer (fd);
2938} 2476}
2939#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2940/*}}} */ 2478/*}}} */
2941 2479
2942/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2943enum { 2481enum {
2944 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
2994 process_dcs_seq (); 2532 process_dcs_seq ();
2995 break; 2533 break;
2996 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
2997 process_csi_seq (); 2535 process_csi_seq ();
2998 break; 2536 break;
2999 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
3000 process_osc_seq (); 2538 process_osc_seq ();
3001 break; 2539 break;
3002#endif 2540#endif
3003 } 2541 }
3004} 2542}
… …
3230rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3231{ 2769{
3232 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3233 unsigned int nargs, p; 2771 unsigned int nargs, p;
3234 int n, ndef; 2772 int n, ndef;
3235 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3236 2774
3237 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3238 arg[--nargs] = 0;
3239 2776
3240 priv = 0; 2777 priv = 0;
3241 ch = cmd_getc (); 2778 ch = cmd_getc ();
3242 if (ch >= '<' && ch <= '?') 2779 if (ch >= '<' && ch <= '?')
2780 {
3243 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' */
3244 priv = ch; 2782 priv = ch;
3245 ch = cmd_getc (); 2783 ch = cmd_getc ();
3246 } 2784 }
3247 2785
3248 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3287 switch (priv) 2825 switch (priv)
3288 { 2826 {
3289 case '>': 2827 case '>':
3290 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
3291 { 2829 {
3292 // 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,
3293 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3294 // 2832 //
3295 // 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
3296 // 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
3297 // that we do not support xterm mouse reporting (should be 95 when we do). 2835 // versions.
3298 // 2836 //
3299 tt_printf ("\033[>%d;94;0c", 'U'); 2837 tt_printf ("\033[>%d;95;0c", 'U');
3300 } 2838 }
3301 break; 2839 break;
2840
3302 case '?': 2841 case '?':
3303 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3304 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3305 break; 2844 break;
3306 } 2845 }
… …
3431 break; 2970 break;
3432 case 6: /* CPR requested */ 2971 case 6: /* CPR requested */
3433 scr_report_position (); 2972 scr_report_position ();
3434 break; 2973 break;
3435 case 7: /* unofficial extension */ 2974 case 7: /* unofficial extension */
3436 if (OPTION (Opt_insecure)) 2975 if (option (Opt_insecure))
3437 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2976 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3438 break; 2977 break;
3439 case 8: /* unofficial extension */ 2978 case 8: /* unofficial extension */
3440 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2979 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3441 break; 2980 break;
… …
3534{ 3073{
3535 int x, y; 3074 int x, y;
3536 XWindowAttributes wattr; 3075 XWindowAttributes wattr;
3537 Window wdummy; 3076 Window wdummy;
3538 3077
3539 dLocal (Display *, xdisp); 3078 dLocal (Display *, dpy);
3540 3079
3541 if (nargs == 0) 3080 if (nargs == 0)
3542 return; 3081 return;
3543 3082
3544 switch (args[0]) 3083 switch (args[0])
3545 { 3084 {
3546 /* 3085 /*
3547 * commands 3086 * commands
3548 */ 3087 */
3549 case 1: /* deiconify window */ 3088 case 1: /* deiconify window */
3550 XMapWindow (xdisp, parent[0]); 3089 XMapWindow (dpy, parent[0]);
3551 break; 3090 break;
3552 case 2: /* iconify window */ 3091 case 2: /* iconify window */
3553 XIconifyWindow (xdisp, parent[0], display->screen); 3092 XIconifyWindow (dpy, parent[0], display->screen);
3554 break; 3093 break;
3555 case 3: /* set position (pixels) */ 3094 case 3: /* set position (pixels) */
3556 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3095 XMoveWindow (dpy, parent[0], args[1], args[2]);
3557 break; 3096 break;
3558 case 4: /* set size (pixels) */ 3097 case 4: /* set size (pixels) */
3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3098 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3560 break; 3099 break;
3561 case 5: /* raise window */ 3100 case 5: /* raise window */
3562 XRaiseWindow (xdisp, parent[0]); 3101 XRaiseWindow (dpy, parent[0]);
3563 break; 3102 break;
3564 case 6: /* lower window */ 3103 case 6: /* lower window */
3565 XLowerWindow (xdisp, parent[0]); 3104 XLowerWindow (dpy, parent[0]);
3566 break; 3105 break;
3567 case 7: /* refresh window */ 3106 case 7: /* refresh window */
3568 scr_touch (true); 3107 scr_touch (true);
3569 break; 3108 break;
3570 case 8: /* set size (chars) */ 3109 case 8: /* set size (chars) */
… …
3581 3120
3582 /* 3121 /*
3583 * reports - some output format copied from XTerm 3122 * reports - some output format copied from XTerm
3584 */ 3123 */
3585 case 11: /* report window state */ 3124 case 11: /* report window state */
3586 XGetWindowAttributes (xdisp, parent[0], &wattr); 3125 XGetWindowAttributes (dpy, parent[0], &wattr);
3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3126 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3588 break; 3127 break;
3589 case 13: /* report window position */ 3128 case 13: /* report window position */
3590 XGetWindowAttributes (xdisp, parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3591 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3130 XTranslateCoordinates (dpy, parent[0], wattr.root,
3592 -wattr.border_width, -wattr.border_width, 3131 -wattr.border_width, -wattr.border_width,
3593 &x, &y, &wdummy); 3132 &x, &y, &wdummy);
3594 tt_printf ("\033[3;%d;%dt", x, y); 3133 tt_printf ("\033[3;%d;%dt", x, y);
3595 break; 3134 break;
3596 case 14: /* report window size (pixels) */ 3135 case 14: /* report window size (pixels) */
3597 XGetWindowAttributes (xdisp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3137 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3599 break; 3138 break;
3600 case 18: /* report text area size (chars) */ 3139 case 18: /* report text area size (chars) */
3601 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3140 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3602 break; 3141 break;
… …
3604 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3143 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3605 break; 3144 break;
3606 case 20: /* report icon label */ 3145 case 20: /* report icon label */
3607 { 3146 {
3608 char *s; 3147 char *s;
3609 XGetIconName (xdisp, parent[0], &s); 3148 XGetIconName (dpy, parent[0], &s);
3610 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 */
3611 XFree (s); 3150 XFree (s);
3612 } 3151 }
3613 break; 3152 break;
3614 case 21: /* report window title */ 3153 case 21: /* report window title */
3615 { 3154 {
3616 char *s; 3155 char *s;
3617 XFetchName (xdisp, parent[0], &s); 3156 XFetchName (dpy, parent[0], &s);
3618 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 */
3619 XFree (s); 3158 XFree (s);
3620 } 3159 }
3621 break; 3160 break;
3622 } 3161 }
3623} 3162}
… …
3650 seen_esc = true; 3189 seen_esc = true;
3651 continue; 3190 continue;
3652 } 3191 }
3653 else if (ch == C0_BEL || ch == CHAR_ST) 3192 else if (ch == C0_BEL || ch == CHAR_ST)
3654 break; 3193 break;
3194 else if (ch == C0_SYN)
3195 ch = cmd_get8 ();
3655 else if (ch < 0x20) 3196 else if (ch < 0x20)
3656 return NULL; /* other control character - exit */ 3197 return NULL; /* other control character - exit */
3657 3198
3658 seen_esc = false; 3199 seen_esc = false;
3659 3200
3660 if (n >= STRING_MAX - 1) 3201 if (n >= STRING_MAX - 1)
3661 // stop at some sane length 3202 // stop at some sane length
3662 return NULL; 3203 return NULL;
3663 3204
3664 if (ch == C0_SYN)
3665 string[n++] = cmd_get8 ();
3666 else
3667 string[n++] = ch; 3205 string[n++] = ch;
3668 } 3206 }
3669 3207
3670 string[n++] = '\0'; 3208 string[n++] = '\0';
3671 3209
3672 ends_how = (ch == 0x5c ? C0_ESC : ch); 3210 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3748 int color; 3286 int color;
3749 char *buf, *name; 3287 char *buf, *name;
3750 bool query = str[0] == '?' && !str[1]; 3288 bool query = str[0] == '?' && !str[1];
3751 int saveop = op; 3289 int saveop = op;
3752 3290
3753 dLocal (Display *, xdisp); 3291 dLocal (Display *, dpy);
3754 3292
3755 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
3756 switch (op) 3298 switch (op)
3757 { 3299 {
3758 case XTerm_name: 3300 case XTerm_name:
3759 set_title (str); 3301 set_title (str);
3760 /* FALLTHROUGH */ 3302 /* FALLTHROUGH */
… …
3774 unsigned long bytes_after; 3316 unsigned long bytes_after;
3775 unsigned char *value = 0; 3317 unsigned char *value = 0;
3776 const char *str = ""; 3318 const char *str = "";
3777 3319
3778 if (prop 3320 if (prop
3779 && XGetWindowProperty (xdisp, parent[0], 3321 && XGetWindowProperty (dpy, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType, 3322 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format, 3323 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success 3324 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None 3325 && actual_type != None
3784 && actual_format == 8) 3326 && actual_format == 8)
… …
3796 { 3338 {
3797 *eq = 0; 3339 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1); 3340 set_utf8_property (display->atom (str), eq + 1);
3799 } 3341 }
3800 else 3342 else
3801 XDeleteProperty (xdisp, parent[0], 3343 XDeleteProperty (dpy, parent[0],
3802 display->atom (str)); 3344 display->atom (str));
3803 } 3345 }
3804 break; 3346 break;
3805 3347
3806 case XTerm_Color: 3348 case XTerm_Color:
… …
3819 *buf++ = '\0'; 3361 *buf++ = '\0';
3820 3362
3821 process_color_seq (op, color, name, resp); 3363 process_color_seq (op, color, name, resp);
3822 } 3364 }
3823 break; 3365 break;
3366 case Rxvt_restoreFG:
3824 case XTerm_Color00: 3367 case XTerm_Color00:
3825 process_color_seq (op, Color_fg, str, resp); 3368 process_color_seq (op, Color_fg, str, resp);
3826 break; 3369 break;
3370 case Rxvt_restoreBG:
3827 case XTerm_Color01: 3371 case XTerm_Color01:
3828 process_color_seq (op, Color_bg, str, resp); 3372 process_color_seq (op, Color_bg, str, resp);
3829 break; 3373 break;
3830#ifndef NO_CURSORCOLOR 3374#ifndef NO_CURSORCOLOR
3831 case XTerm_Color_cursor: 3375 case XTerm_Color_cursor:
… …
3852 break; 3396 break;
3853 case URxvt_Color_IT: 3397 case URxvt_Color_IT:
3854 process_color_seq (op, Color_IT, str, resp); 3398 process_color_seq (op, Color_IT, str, resp);
3855 break; 3399 break;
3856#endif 3400#endif
3857#if TRANSPARENT && TINTING 3401#if ENABLE_TRANSPARENCY
3858 case URxvt_Color_tint: 3402 case URxvt_Color_tint:
3859 process_color_seq (op, Color_tint, str, resp); 3403 process_color_seq (op, Color_tint, str, resp);
3404 {
3405 bool changed = false;
3860 3406
3861 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 ();
3862 3411
3863 if (am_transparent) 3412 if (changed)
3864 want_full_refresh = want_refresh = 1; 3413 update_background ();
3414 }
3865 3415
3866 break; 3416 break;
3867#endif 3417#endif
3868 3418
3419#if BG_IMAGE_FROM_FILE
3869 case Rxvt_Pixmap: 3420 case Rxvt_Pixmap:
3870 { 3421 if (!strcmp (str, "?"))
3871 if (*str != ';')
3872 { 3422 {
3873#if XPM_BACKGROUND 3423 char str[256];
3874 scale_pixmap (""); /* reset to default scaling */ 3424
3875 set_bgPixmap (str); /* change pixmap */ 3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3876 scr_touch (true); 3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3877#endif 3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428 process_xterm_seq (XTerm_title, str, CHAR_ST);
3878 } 3429 }
3879 3430 else
3431 {
3880 int changed = 0; 3432 int changed = 0;
3881 3433
3882 while ((str = strchr (str, ';')) != NULL) 3434 if (*str != ';')
3883 { 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 {
3884 str++; 3447 str++;
3885#if XPM_BACKGROUND 3448 if (bgPixmap.set_geometry (str))
3886 changed += scale_pixmap (str); 3449 changed++;
3887#endif 3450 str = strchr (str, ';');
3888 } 3451 }
3889 3452
3890 if (changed) 3453 if (changed)
3891 { 3454 update_background ();
3892#ifdef XPM_BACKGROUND
3893 resize_pixmap ();
3894 scr_touch (true);
3895#endif
3896 } 3455 }
3897 }
3898 break; 3456 break;
3899 3457#endif
3900 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str);
3902 break;
3903 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str);
3905 break;
3906 3458
3907 case XTerm_logfile: 3459 case XTerm_logfile:
3908 // TODO, when secure mode? 3460 // TODO, when secure mode?
3909 break; 3461 break;
3910 3462
… …
3928 case URxvt_italicFont: 3480 case URxvt_italicFont:
3929 case URxvt_boldItalicFont: 3481 case URxvt_boldItalicFont:
3930#endif 3482#endif
3931 if (query) 3483 if (query)
3932 tt_printf ("\33]%d;%-.250s%c", saveop, 3484 tt_printf ("\33]%d;%-.250s%c", saveop,
3933 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3485 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3934 ? fontset[op - URxvt_font]->fontdesc : "", 3486 ? fontset[op - URxvt_font]->fontdesc : "",
3935 resp); 3487 resp);
3936 else 3488 else
3937 { 3489 {
3938 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3490 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3952 break; 3504 break;
3953 3505
3954#if !ENABLE_MINIMAL 3506#if !ENABLE_MINIMAL
3955 case URxvt_locale: 3507 case URxvt_locale:
3956 if (query) 3508 if (query)
3957 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);
3958 else 3510 else
3959 { 3511 {
3960 set_locale (str); 3512 set_locale (str);
3961 pty->set_utf8_mode (enc_utf8); 3513 pty->set_utf8_mode (enc_utf8);
3962 init_xlocale (); 3514 init_xlocale ();
… …
3977 break; 3529 break;
3978#endif 3530#endif
3979 3531
3980#if ENABLE_PERL 3532#if ENABLE_PERL
3981 case URxvt_perl: 3533 case URxvt_perl:
3982 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)))
3983 ; // no responses yet 3535 ; // no responses yet
3984 break; 3536 break;
3985#endif 3537#endif
3986 } 3538 }
3987} 3539}
… …
4025{ 3577{
4026 unsigned int i, j; 3578 unsigned int i, j;
4027 int state; 3579 int state;
4028 3580
4029 static const struct 3581 static const struct
4030 { 3582 {
4031 const int argval; 3583 const int argval;
4032 const unsigned long bit; 3584 const unsigned long bit;
4033 }
4034
4035 argtopriv[] = { 3585 } argtopriv[] = {
4036 { 1, PrivMode_aplCUR }, 3586 { 1, PrivMode_aplCUR },
4037 { 2, PrivMode_vt52 }, 3587 { 2, PrivMode_vt52 },
4038 { 3, PrivMode_132 }, 3588 { 3, PrivMode_132 },
4039 { 4, PrivMode_smoothScroll }, 3589 { 4, PrivMode_smoothScroll },
4040 { 5, PrivMode_rVideo }, 3590 { 5, PrivMode_rVideo },
… …
4056 { 66, PrivMode_aplKP }, 3606 { 66, PrivMode_aplKP },
4057#ifndef NO_BACKSPACE_KEY 3607#ifndef NO_BACKSPACE_KEY
4058 { 67, PrivMode_BackSpace }, 3608 { 67, PrivMode_BackSpace },
4059#endif 3609#endif
4060 { 1000, PrivMode_MouseX11 }, 3610 { 1000, PrivMode_MouseX11 },
4061 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3611 { 1002, PrivMode_MouseBtnEvent },
4062 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3612 { 1003, PrivMode_MouseAnyEvent },
4063 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4064 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4065 { 1011, PrivMode_Keypress }, // rxvt extension 3614 { 1011, PrivMode_Keypress }, // rxvt extension
4066 // 1035 enable modifiers for alt, numlock NYI 3615 // 1035 enable modifiers for alt, numlock NYI
4067 // 1036 send ESC for meta keys NYI 3616 // 1036 send ESC for meta keys NYI
4068 // 1037 send DEL for keypad delete NYI 3617 // 1037 send DEL for keypad delete NYI
4069 { 1047, PrivMode_Screen }, 3618 { 1047, PrivMode_Screen },
4070 // 1048 save and restore cursor 3619 // 1048 save and restore cursor
4071 { 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 */
4072 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste },
4073 }; 3623 };
4074 3624
4075 if (nargs == 0) 3625 if (nargs == 0)
4076 return; 3626 return;
4077 3627
… …
4103 scr_touch (true); 3653 scr_touch (true);
4104 break; 3654 break;
4105#endif 3655#endif
4106 case 1048: /* alternative cursor save */ 3656 case 1048: /* alternative cursor save */
4107 case 1049: 3657 case 1049:
4108 if (OPTION (Opt_secondaryScreen)) 3658 if (option (Opt_secondaryScreen))
4109 if (mode == 0) 3659 if (mode == 0)
4110 scr_cursor (RESTORE); 3660 scr_cursor (RESTORE);
4111 else if (mode == 1) 3661 else if (mode == 1)
4112 scr_cursor (SAVE); 3662 scr_cursor (SAVE);
4113 break; 3663 break;
… …
4125 */ 3675 */
4126 PrivMode (1, PrivMode_vt52); 3676 PrivMode (1, PrivMode_vt52);
4127 break; 3677 break;
4128 case 3: /* 80/132 */ 3678 case 3: /* 80/132 */
4129 if (priv_modes & PrivMode_132OK) 3679 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
4130 set_widthheight (((state ? 132 : 80) * fwidth), height); 3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3683 }
4131 break; 3684 break;
4132 case 4: /* smooth scrolling */ 3685 case 4: /* smooth scrolling */
4133 set_option (Opt_jumpScroll, !state); 3686 set_option (Opt_jumpScroll, !state);
4134 break; 3687 break;
4135 case 5: /* reverse video */ 3688 case 5: /* reverse video */
… …
4142 scr_autowrap (state); 3695 scr_autowrap (state);
4143 break; 3696 break;
4144 /* 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 */
4145 case 9: /* X10 mouse reporting */ 3698 case 9: /* X10 mouse reporting */
4146 if (state) /* orthogonal */ 3699 if (state) /* orthogonal */
4147 priv_modes &= ~PrivMode_MouseX11; 3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4148 break; 3701 break;
4149#ifdef scrollBar_esc 3702#ifdef scrollBar_esc
4150 case scrollBar_esc: 3703 case scrollBar_esc:
4151 if (scrollbar_mapping (state)) 3704 if (scrollbar_mapping (state))
4152 { 3705 {
… …
4165 break; 3718 break;
4166 /* case 66: - application key pad */ 3719 /* case 66: - application key pad */
4167 /* case 67: - backspace key */ 3720 /* case 67: - backspace key */
4168 case 1000: /* X11 mouse reporting */ 3721 case 1000: /* X11 mouse reporting */
4169 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4170 priv_modes &= ~PrivMode_MouseX10; 3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4171 break; 3724 break;
4172#if 0
4173 case 1001: 3725 case 1002:
4174 break; /* X11 mouse highlighting */ 3726 case 1003:
4175#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;
4176 case 1010: /* scroll to bottom on TTY output inhibit */ 3737 case 1010: /* scroll to bottom on TTY output inhibit */
4177 set_option (Opt_scrollTtyOutput, !state); 3738 set_option (Opt_scrollTtyOutput, !state);
4178 break; 3739 break;
4179 case 1011: /* scroll to bottom on key press */ 3740 case 1011: /* scroll to bottom on key press */
4180 set_option (Opt_scrollTtyKeypress, state); 3741 set_option (Opt_scrollTtyKeypress, state);
4181 break; 3742 break;
4182 case 1047: /* secondary screen w/ clearing last */ 3743 case 1047: /* secondary screen w/ clearing last */
4183 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4184 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4185 scr_erase_screen (2); 3746 scr_erase_screen (2);
4186 scr_change_screen (state); 3747 scr_change_screen (state);
4187 break; 3748 break;
4188 case 1049: /* secondary screen w/ clearing first */ 3749 case 1049: /* secondary screen w/ clearing first */
4189 scr_change_screen (state); 3750 scr_change_screen (state);
4190 if (OPTION (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
4191 if (current_screen != PRIMARY) 3752 if (current_screen != PRIMARY)
4192 scr_erase_screen (2); 3753 scr_erase_screen (2);
4193 break; 3754 break;
4194 default: 3755 default:
4195 break; 3756 break;
… …
4357rxvt_term::process_graphics () 3918rxvt_term::process_graphics ()
4358{ 3919{
4359 unicode_t ch, cmd = cmd_getc (); 3920 unicode_t ch, cmd = cmd_getc ();
4360 3921
4361 if (cmd == 'Q') 3922 if (cmd == 'Q')
3923 {
4362 { /* query graphics */ 3924 /* query graphics */
4363 tt_printf ("\033G0\012"); /* no graphics */ 3925 tt_printf ("\033G0\012"); /* no graphics */
4364 return; 3926 return;
4365 } 3927 }
4366 /* swallow other graphics sequences until terminating ':' */ 3928 /* swallow other graphics sequences until terminating ':' */
4367 do 3929 do
… …
4417 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4418 3980
4419 memcpy (v_buffer + v_buflen, data, len); 3981 memcpy (v_buffer + v_buflen, data, len);
4420 v_buflen += len; 3982 v_buflen += len;
4421 3983
4422 pty_ev.set (EVENT_READ | EVENT_WRITE); 3984 pty_ev.set (ev::READ | ev::WRITE);
4423} 3985}
4424 3986
4425void rxvt_term::pty_write () 3987void rxvt_term::pty_write ()
4426{ 3988{
4427 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));
… …
4432 3994
4433 if (v_buflen == 0) 3995 if (v_buflen == 0)
4434 { 3996 {
4435 free (v_buffer); 3997 free (v_buffer);
4436 v_buffer = 0; 3998 v_buffer = 0;
4437 v_buflen = 0;
4438 3999
4439 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4440 return; 4001 return;
4441 } 4002 }
4442 4003
4443 memmove (v_buffer, v_buffer + written, v_buflen); 4004 memmove (v_buffer, v_buffer + written, v_buflen);
4444 } 4005 }
4445 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4006 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4446 pty_ev.set (EVENT_READ); 4007 pty_ev.set (ev::READ);
4447} 4008}
4448 4009
4449/*----------------------- end-of-file (C source) -----------------------*/ 4010/*----------------------- end-of-file (C source) -----------------------*/
4450 4011

Diff Legend

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